Finalize rails 7.0 config defaults

mawise · mawise · commit 6aa1fc690adb · 2025-03-25T09:27:18.000-05:00
diff --git a/Gemfile b/Gemfile
@@ -18,7 +18,7 @@ gem 'css_parser', '= 1.10.0' # pinned because we use private methods
 gem 'rb-readline'
 
 # Image processing
-gem 'image_processing', '~> 1.12.2'
+gem 'image_processing', '~> 1.13.0'
 
 gem 'rss', '~> 0.3.1'
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -132,7 +132,7 @@ GEM
       activesupport (>= 6.1)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    image_processing (1.12.2)
+    image_processing (1.13.0)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     jbuilder (2.13.0)
@@ -315,7 +315,7 @@ DEPENDENCIES
   css_parser (= 1.10.0)
   devise (~> 4.9.4)
   dotenv-rails (= 2.7.6)
-  image_processing (~> 1.12.2)
+  image_processing (~> 1.13.0)
   jbuilder (~> 2.5)
   kaminari (~> 1.2.1)
   letter_opener (~> 1.7.0)
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
@@ -161,7 +161,7 @@ def process_new_audio(image) ## Image model used for all media
   ## takes a saved Image object, returns the markdown content to refer to the image
   def process_new_image(image)
     blob_path = path_for(image.blob)
-    image_meta = ActiveStorage::Analyzer::ImageAnalyzer.new(image.blob).metadata
+    image_meta = ActiveStorage::Analyzer::ImageAnalyzer::ImageMagick.new(image.blob).metadata
     if image_meta[:width] > 1600 #resize at lower quality with link
       return "\n\n<a href=\"#{image_path(image)}\">\n  <img src=\"#{image_resized_path(image)}\"></img>\n</a>"
     else #simple full image
diff --git a/config/application.rb b/config/application.rb
@@ -21,7 +21,7 @@
 module Blog
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.1
+    config.load_defaults 7.0
 
     # Configuration for the application, engines, and railties goes here.
     #
@@ -30,5 +30,9 @@ class Application < Rails::Application
     #
     # config.time_zone = "Central Time (US & Canada)"
     # config.eager_load_paths << Rails.root.join("extras")
+
+    ## from migration to Rails version 7.0.x
+    #config.active_support.cache_format_version = 7.0
+    #config.active_support.disable_to_s_conversion = true
   end
 end
diff --git a/config/initializers/cookie_rotator.rb b/config/initializers/cookie_rotator.rb
@@ -0,0 +1,20 @@
+# https://guides.rubyonrails.org/v7.0/upgrading_ruby_on_rails.html#key-generator-digest-class-changing-to-use-sha256
+Rails.application.config.after_initialize do
+  Rails.application.config.action_dispatch.cookies_rotations.tap do |cookies|
+    authenticated_encrypted_cookie_salt = Rails.application.config.action_dispatch.authenticated_encrypted_cookie_salt
+    signed_cookie_salt = Rails.application.config.action_dispatch.signed_cookie_salt
+
+    secret_key_base = Rails.application.secret_key_base
+
+    key_generator = ActiveSupport::KeyGenerator.new(
+      secret_key_base, iterations: 1000, hash_digest_class: OpenSSL::Digest::SHA1
+    )
+    key_len = ActiveSupport::MessageEncryptor.key_len
+
+    old_encrypted_secret = key_generator.generate_key(authenticated_encrypted_cookie_salt, key_len)
+    old_signed_secret = key_generator.generate_key(signed_cookie_salt)
+
+    cookies.rotate :encrypted, old_encrypted_secret
+    cookies.rotate :signed, old_signed_secret
+  end
+end
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
@@ -2,4 +2,15 @@
 
 # Specify a serializer for the signed and encrypted cookie jars.
 # Valid options are :json, :marshal, and :hybrid.
-Rails.application.config.action_dispatch.cookies_serializer = :json
+
+# If you're upgrading and haven't set `cookies_serializer` previously, your cookie serializer
+# is `:marshal`. The default for new apps is `:json`.
+#
+# To migrate an existing application to the `:json` serializer, use the `:hybrid` option.
+#
+# Rails transparently deserializes existing (Marshal-serialized) cookies on read and
+# re-writes them in the JSON format.
+#
+# It is fine to use `:hybrid` long term; you should do that until you're confident *all* your cookies
+# have been converted to JSON.
+Rails.application.config.action_dispatch.cookies_serializer = :hybrid
diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb
