diff --git a/Gemfile b/Gemfile index 99e6db21..1c54e1f9 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,7 @@ gem 'devise' gem 'figaro', git: 'https://github.com/ryanckulp/figaro' # patched version for Ruby 3.2.0 File.exist?() gem 'groupdate' # used by Chartkick gem 'httparty' +gem "image_processing", ">= 1.2" gem 'importmap-rails' gem 'jbuilder' gem 'metamagic' # easily insert metatags for SEO / opengraph @@ -25,7 +26,6 @@ gem 'stimulus-rails' gem 'stripe' gem 'tailwindcss-rails' gem 'turbo-rails' -gem "image_processing", ">= 1.2" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] diff --git a/app/controllers/blog_posts_controller.rb b/app/controllers/blog_posts_controller.rb index 52c8197c..6c5d9362 100644 --- a/app/controllers/blog_posts_controller.rb +++ b/app/controllers/blog_posts_controller.rb @@ -10,18 +10,15 @@ def index end # GET /blog_posts/slug - def show - end + def show; end # GET /blog_posts/new def new @blog_post = BlogPost.new - end # GET /blog_posts/slug/edit - def edit - end + def edit; end # POST /blog_posts def create diff --git a/app/models/blog_post.rb b/app/models/blog_post.rb index 117c44df..f233b4fd 100644 --- a/app/models/blog_post.rb +++ b/app/models/blog_post.rb @@ -16,10 +16,10 @@ def generate_unique_slug base_slug = slug.blank? ? title.parameterize : slug other = self.class.where("slug LIKE ?", "#{base_slug}%") self.slug = if other.exists? - "#{base_slug}-#{other.count + 1}" - else - base_slug - end + "#{base_slug}-#{other.count + 1}" + else + base_slug + end end end end diff --git a/db/migrate/20231230212421_create_active_storage_tables.active_storage.rb b/db/migrate/20231230212421_create_active_storage_tables.active_storage.rb index e4706aa2..6a3d0054 100644 --- a/db/migrate/20231230212421_create_active_storage_tables.active_storage.rb +++ b/db/migrate/20231230212421_create_active_storage_tables.active_storage.rb @@ -19,7 +19,7 @@ def change t.datetime :created_at, null: false end - t.index [ :key ], unique: true + t.index [:key], unique: true end create_table :active_storage_attachments, id: primary_key_type do |t| @@ -33,7 +33,7 @@ def change t.datetime :created_at, null: false end - t.index [ :record_type, :record_id, :name, :blob_id ], name: :index_active_storage_attachments_uniqueness, unique: true + t.index [:record_type, :record_id, :name, :blob_id], name: :index_active_storage_attachments_uniqueness, unique: true t.foreign_key :active_storage_blobs, column: :blob_id end @@ -41,17 +41,18 @@ def change t.belongs_to :blob, null: false, index: false, type: foreign_key_type t.string :variation_digest, null: false - t.index [ :blob_id, :variation_digest ], name: :index_active_storage_variant_records_uniqueness, unique: true + t.index [:blob_id, :variation_digest], name: :index_active_storage_variant_records_uniqueness, unique: true t.foreign_key :active_storage_blobs, column: :blob_id end end private - def primary_and_foreign_key_types - config = Rails.configuration.generators - setting = config.options[config.orm][:primary_key_type] - primary_key_type = setting || :primary_key - foreign_key_type = setting || :bigint - [primary_key_type, foreign_key_type] - end + + def primary_and_foreign_key_types + config = Rails.configuration.generators + setting = config.options[config.orm][:primary_key_type] + primary_key_type = setting || :primary_key + foreign_key_type = setting || :bigint + [primary_key_type, foreign_key_type] + end end diff --git a/db/migrate/20231230212422_create_action_text_tables.action_text.rb b/db/migrate/20231230212422_create_action_text_tables.action_text.rb index 1be48d70..e9c30fac 100644 --- a/db/migrate/20231230212422_create_action_text_tables.action_text.rb +++ b/db/migrate/20231230212422_create_action_text_tables.action_text.rb @@ -11,16 +11,17 @@ def change t.timestamps - t.index [ :record_type, :record_id, :name ], name: "index_action_text_rich_texts_uniqueness", unique: true + t.index [:record_type, :record_id, :name], name: "index_action_text_rich_texts_uniqueness", unique: true end end private - def primary_and_foreign_key_types - config = Rails.configuration.generators - setting = config.options[config.orm][:primary_key_type] - primary_key_type = setting || :primary_key - foreign_key_type = setting || :bigint - [primary_key_type, foreign_key_type] - end + + def primary_and_foreign_key_types + config = Rails.configuration.generators + setting = config.options[config.orm][:primary_key_type] + primary_key_type = setting || :primary_key + foreign_key_type = setting || :bigint + [primary_key_type, foreign_key_type] + end end