From a251929fbdbd90093da345e69d53527e5bcac1da Mon Sep 17 00:00:00 2001 From: donrestarone Date: Sun, 4 Apr 2021 18:46:55 -0400 Subject: [PATCH 1/3] fix image_processing variant breakage in activestorage, include new dependency in gemspec --- Gemfile | 1 + app/views/comfy/admin/cms/files/_file.html.haml | 2 +- comfortable_mexican_sofa.gemspec | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 15a1f2929..8b040c9d5 100644 --- a/Gemfile +++ b/Gemfile @@ -13,6 +13,7 @@ group :development, :test do gem "rubocop", "~> 0.55.0", require: false gem "selenium-webdriver", "~> 3.9.0" gem "sqlite3", "~> 1.4.2" + gem "image_processing", ">= 1.2" end group :development do diff --git a/app/views/comfy/admin/cms/files/_file.html.haml b/app/views/comfy/admin/cms/files/_file.html.haml index 10b564ebe..785490010 100644 --- a/app/views/comfy/admin/cms/files/_file.html.haml +++ b/app/views/comfy/admin/cms/files/_file.html.haml @@ -1,7 +1,7 @@ %li{data: {id: file.id}} :ruby file_tag = cms_file_link_tag(file) - thumb_url = url_for(file.attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:thumb])) if file.attachment.variable? + thumb_url = url_for(file.attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb])) if file.attachment.variable? .row .col-md-5.item .item-controls.d-none.d-lg-block diff --git a/comfortable_mexican_sofa.gemspec b/comfortable_mexican_sofa.gemspec index 0492d7665..91476e74d 100644 --- a/comfortable_mexican_sofa.gemspec +++ b/comfortable_mexican_sofa.gemspec @@ -29,4 +29,5 @@ Gem::Specification.new do |s| s.add_dependency "rails", ">= 5.2.0" s.add_dependency "rails-i18n", ">= 5.0.0" s.add_dependency "sassc-rails", ">= 2.0.0" + s.add_dependency "image_processing", ">= 1.2" end From b999f484aec0ae4cfc463a9312ca1bdc3fb8ceca Mon Sep 17 00:00:00 2001 From: donrestarone Date: Sun, 4 Apr 2021 18:47:31 -0400 Subject: [PATCH 2/3] activestorage install was outdated, updated it (includes database changes) --- ...e_to_active_storage_blobs.active_storage.rb | 18 ++++++++++++++++++ ...e_storage_variant_records.active_storage.rb | 12 ++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 db/migrate/20210404223642_add_service_name_to_active_storage_blobs.active_storage.rb create mode 100644 db/migrate/20210404223643_create_active_storage_variant_records.active_storage.rb diff --git a/db/migrate/20210404223642_add_service_name_to_active_storage_blobs.active_storage.rb b/db/migrate/20210404223642_add_service_name_to_active_storage_blobs.active_storage.rb new file mode 100644 index 000000000..9967a1323 --- /dev/null +++ b/db/migrate/20210404223642_add_service_name_to_active_storage_blobs.active_storage.rb @@ -0,0 +1,18 @@ +# This migration comes from active_storage (originally 20190112182829) +class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0] + def up + unless column_exists?(:active_storage_blobs, :service_name) + add_column :active_storage_blobs, :service_name, :string + + if configured_service = ActiveStorage::Blob.service.name + ActiveStorage::Blob.unscoped.update_all(service_name: configured_service) + end + + change_column :active_storage_blobs, :service_name, :string, null: false + end + end + + def down + remove_column :active_storage_blobs, :service_name + end +end diff --git a/db/migrate/20210404223643_create_active_storage_variant_records.active_storage.rb b/db/migrate/20210404223643_create_active_storage_variant_records.active_storage.rb new file mode 100644 index 000000000..a2862695e --- /dev/null +++ b/db/migrate/20210404223643_create_active_storage_variant_records.active_storage.rb @@ -0,0 +1,12 @@ +# This migration comes from active_storage (originally 20191206030411) +class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0] + def change + create_table :active_storage_variant_records do |t| + t.belongs_to :blob, null: false, index: false + t.string :variation_digest, null: false + + t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true + t.foreign_key :active_storage_blobs, column: :blob_id + end + end +end From c7b5360dd61fcb2bd2a0b9c1fddac7a06479191a Mon Sep 17 00:00:00 2001 From: donrestarone Date: Sun, 4 Apr 2021 18:53:28 -0400 Subject: [PATCH 3/3] rubocop --- Gemfile | 2 +- comfortable_mexican_sofa.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 8b040c9d5..51e9f1491 100644 --- a/Gemfile +++ b/Gemfile @@ -8,12 +8,12 @@ group :development, :test do gem "autoprefixer-rails", "~> 8.1.0" gem "byebug", "~> 10.0.0", platforms: %i[mri mingw x64_mingw] gem "capybara", "~> 2.17.0" + gem "image_processing", ">= 1.2" gem "kaminari", "~> 1.1.1" gem "puma", "~> 3.12.2" gem "rubocop", "~> 0.55.0", require: false gem "selenium-webdriver", "~> 3.9.0" gem "sqlite3", "~> 1.4.2" - gem "image_processing", ">= 1.2" end group :development do diff --git a/comfortable_mexican_sofa.gemspec b/comfortable_mexican_sofa.gemspec index 91476e74d..f0670057e 100644 --- a/comfortable_mexican_sofa.gemspec +++ b/comfortable_mexican_sofa.gemspec @@ -22,6 +22,7 @@ Gem::Specification.new do |s| s.add_dependency "active_link_to", ">= 1.0.0" s.add_dependency "comfy_bootstrap_form", ">= 4.0.0" s.add_dependency "haml-rails", ">= 1.0.0" + s.add_dependency "image_processing", ">= 1.2" s.add_dependency "jquery-rails", ">= 4.3.1" s.add_dependency "kramdown", ">= 1.0.0" s.add_dependency "mimemagic", ">= 0.3.2" @@ -29,5 +30,4 @@ Gem::Specification.new do |s| s.add_dependency "rails", ">= 5.2.0" s.add_dependency "rails-i18n", ">= 5.0.0" s.add_dependency "sassc-rails", ">= 2.0.0" - s.add_dependency "image_processing", ">= 1.2" end