activestorage 7.1.0 → 7.2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f09e751b9896e3e99bda5b07a2f946e14cc08a8b25b29b872c85d918fa906c1
-  data.tar.gz: f10ad7fbf13f79f91b690a6417a7f035038f62f2c82ee39a94070566773c2bd5
+  metadata.gz: 19f4fa25c348a39b38b18a049dd123c5a0c6f80d70e05cdfc4790c7e0dbf96d1
+  data.tar.gz: 48ba490e74129a1495ed0b3249730bfeba7b12f916e787849e7cfa4f81235bf9
 SHA512:
-  metadata.gz: d5fc945abbfdfbe05b6aeafa393ef6b6995fa1c0e6f908006dc52e570ba9d17e982f40df652814b95e5da0db68a7bacf8f0a7820de2bec928fbaf1519fed00bd
-  data.tar.gz: 627a0bf0f41c633ce7f3c098b264ffafebe6d081b2aea39ef0c9e30985fe06fb167b192abfd5fd5d729cef9592abe2acade5760ea792089373482dce1183b867
+  metadata.gz: 6656a5f10b464e63d86f0e4fc60984735e522d56789f93ce4f0d6ec4684b0b7e6a449f14af01a92e5929b1a4854f283b0bf89b37fe67ecb5d8cc207430b81c71
+  data.tar.gz: a8fe146a25f52b241de32978f344a2303ad5221f05306a57776337194ba67aa2691c715790131056dec44dfe21cb26b7df1fe33fef5d09efba3ff5f226b83e58

data/CHANGELOG.md

@@ -1,252 +1,103 @@
-## Rails 7.1.0 (October 05, 2023) ##
+## Rails 7.2.2.1 (December 10, 2024) ##
 
 *   No changes.
 
 
-## Rails 7.1.0.rc2 (October 01, 2023) ##
+## Rails 7.2.2 (October 30, 2024) ##
 
 *   No changes.
 
 
-## Rails 7.1.0.rc1 (September 27, 2023) ##
+## Rails 7.2.1.2 (October 23, 2024) ##
 
-*   Add `expires_at` option to `ActiveStorage::Blob#signed_id`.
-
-    ```ruby
-    rails_blob_path(user.avatar, disposition: "attachment", expires_at: 30.minutes.from_now)
-    <%= image_tag rails_blob_path(user.avatar.variant(resize: "100x100"), expires_at: 30.minutes.from_now) %>
-    ```
-
-    *Aki*
-
-*   Allow attaching File and Pathname when assigning attributes, e.g.
-
-    ```ruby
-    User.create!(avatar: File.open("image.jpg"))
-    User.create!(avatar: file_fixture("image.jpg"))
-    ```
-
-    *Dorian Marié*
-
-
-## Rails 7.1.0.beta1 (September 13, 2023) ##
-
-*   Disables the session in `ActiveStorage::Blobs::ProxyController`
-    and `ActiveStorage::Representations::ProxyController`
-    in order to allow caching by default in some CDNs as CloudFlare
-
-    Fixes #44136
-
-    *Bruno Prieto*
-
-*   Add `tags` to `ActiveStorage::Analyzer::AudioAnalyzer` output
-
-    *Keaton Roux*
-
-*   Add an option to preprocess variants
-
-    ActiveStorage variants are processed on the fly when they are needed but
-    sometimes we're sure that they are accessed and want to processed them
-    upfront.
-
-    `preprocessed` option is added when declaring variants.
-
-    ```
-    class User < ApplicationRecord
-      has_one_attached :avatar do |attachable|
-        attachable.variant :thumb, resize_to_limit: [100, 100], preprocessed: true
-      end
-    end
-    ```
-
-    *Shouichi Kamiya*
-
-*   Fix variants not included when eager loading multiple records containing a single attachment
-
-    When using the `with_attached_#{name}` scope for a `has_one_attached` relation,
-    attachment variants were not eagerly loaded.
-
-    *Russell Porter*
-
-*   Allow an ActiveStorage attachment to be removed via a form post
-
-    Attachments can already be removed by updating the attachment to be nil such as:
-    ```ruby
-    User.find(params[:id]).update!(avatar: nil)
-    ```
-
-    However, a form cannot post a nil param, it can only post an empty string. But, posting an
-    empty string would result in an `ActiveSupport::MessageVerifier::InvalidSignature: mismatched digest`
-    error being raised, because it's being treated as a signed blob id.
-
-    Now, nil and an empty string are treated as a delete, which allows attachments to be removed via:
-    ```ruby
-    User.find(params[:id]).update!(params.require(:user).permit(:avatar))
-
-    ```
-
-    *Nate Matykiewicz*
-
-*   Remove mini_mime usage in favour of marcel.
-
-    We have two libraries that are have similar usage. This change removes
-    dependency on mini_mime and makes use of similar methods from marcel.
-
-    *Vipul A M*
-
-*   Allow destroying active storage variants
+*   No changes.
 
-    ```ruby
-    User.first.avatar.variant(resize_to_limit: [100, 100]).destroy
-    ```
 
-    *Shouichi Kamiya*, *Yuichiro NAKAGAWA*, *Ryohei UEDA*
+## Rails 7.2.1.1 (October 15, 2024) ##
 
-*   Add `sample_rate` to `ActiveStorage::Analyzer::AudioAnalyzer` output
+*   No changes.
 
-    *Matija Čupić*
 
-*   Remove deprecated `purge` and `purge_later` methods from the attachments association.
+## Rails 7.2.1 (August 22, 2024) ##
 
-    *Rafael Mendonça França*
-
-*   Remove deprecated behavior when assigning to a collection of attachments.
+*   No changes.
 
-    Instead of appending to the collection, the collection is now replaced.
 
-    *Rafael Mendonça França*
+## Rails 7.2.0 (August 09, 2024) ##
 
-*   Remove deprecated `ActiveStorage::Current#host` and `ActiveStorage::Current#host=` methods.
+*   Remove deprecated `config.active_storage.silence_invalid_content_types_warning`.
 
     *Rafael Mendonça França*
 
-*   Remove deprecated invalid default content types in Active Storage configurations.
+*   Remove deprecated `config.active_storage.replace_on_assign_to_many`.
 
     *Rafael Mendonça França*
 
-*   Add missing preview event to `ActiveStorage::LogSubscriber`
-
-    A `preview` event is being instrumented in `ActiveStorage::Previewer`.
-    However it was not added inside ActiveStorage's LogSubscriber class.
-
-    This will allow to have logs for when a preview happens
-    in the same fashion as all other ActiveStorage events such as
-    `upload` and `download` inside `Rails.logger`.
-
-    *Chedli Bourguiba*
-
-*   Fix retrieving rotation value from FFmpeg on version 5.0+.
-
-    In FFmpeg version 5.0+ the rotation value has been removed from tags.
-    Instead the value can be found in side_data_list. Along with
-    this update it's possible to have values of -90, -270 to denote the video
-    has been rotated.
-
-    *Haroon Ahmed*
-
-*   Touch all corresponding model records after ActiveStorage::Blob is analyzed
-
-    This fixes a race condition where a record can be requested and have a cache entry built, before
-    the initial `analyze_later` completes, which will not be invalidated until something else
-    updates the record. This also invalidates cache entries when a blob is re-analyzed, which
-    is helpful if a bug is fixed in an analyzer or a new analyzer is added.
-
-    *Nate Matykiewicz*
+*   Add support for custom `key` in `ActiveStorage::Blob#compose`.
 
-*   Add ability to use pre-defined variants when calling `preview` or
-    `representation` on an attachment.
+    *Elvin Efendiev*
 
-    ```ruby
-    class User < ActiveRecord::Base
-      has_one_attached :file do |attachable|
-        attachable.variant :thumb, resize_to_limit: [100, 100]
-      end
-    end
+*   Add `image/webp` to `config.active_storage.web_image_content_types` when `load_defaults "7.2"`
+    is set.
 
-    <%= image_tag user.file.representation(:thumb) %>
-    ```
+    *Lewis Buckley*
 
-    *Richard Böhme*
+*   Fix JSON-encoding of `ActiveStorage::Filename` instances.
 
-*   Method `attach` always returns the attachments except when the record
-    is persisted, unchanged, and saving it fails, in which case it returns `nil`.
+    *Jonathan del Strother*
 
-    *Santiago Bartesaghi*
+*   Fix N+1 query when fetching preview images for non-image assets.
 
-*   Fixes multiple `attach` calls within transaction not uploading files correctly.
+    *Aaron Patterson & Justin Searls*
 
-    In the following example, the code failed to upload all but the last file to the configured service.
-    ```ruby
-    ActiveRecord::Base.transaction do
-      user.attachments.attach({
-        content_type: "text/plain",
-        filename: "dummy.txt",
-        io: ::StringIO.new("dummy"),
-      })
-      user.attachments.attach({
-        content_type: "text/plain",
-        filename: "dummy2.txt",
-        io: ::StringIO.new("dummy2"),
-      })
-    end
+*   Fix all Active Storage database related models to respect
+    `ActiveRecord::Base.table_name_prefix` configuration.
 
-    assert_equal 2, user.attachments.count
-    assert user.attachments.first.service.exist?(user.attachments.first.key)  # Fails
-    ```
-
-    This was addressed by keeping track of the subchanges pending upload, and uploading them
-    once the transaction is committed.
+    *Chedli Bourguiba*
 
-    Fixes #41661
+*   Fix `ActiveStorage::Representations::ProxyController` not returning the proper
+    preview image variant for previewable files.
 
-    *Santiago Bartesaghi*, *Bruno Vezoli*, *Juan Roig*, *Abhay Nikam*
+    *Chedli Bourguiba*
 
-*   Raise an exception if `config.active_storage.service` is not set.
+*   Fix `ActiveStorage::Representations::ProxyController` to proxy untracked
+    variants.
 
-    If Active Storage is configured and `config.active_storage.service` is not
-    set in the respective environment's configuration file, then an exception
-    is raised with a meaningful message when attempting to use Active Storage.
+    *Chedli Bourguiba*
 
-    *Ghouse Mohamed*
+*   When using the `preprocessed: true` option, avoid enqueuing transform jobs
+    for blobs that are not representable.
 
-*   Fixes proxy downloads of files over 5mb
+    *Chedli Bourguiba*
 
-    Previously, trying to view and/or download files larger than 5mb stored in
-    services like S3 via proxy mode could return corrupted files at around
-    5.2mb or cause random halts in the download. Now,
-    `ActiveStorage::Blobs::ProxyController` correctly handles streaming these
-    larger files from the service to the client without any issues.
+*   Prevent `ActiveStorage::Blob#preview` to generate a variant if an empty variation is passed.
 
-    Fixes #44679
+    Calls to `#url`, `#key` or `#download` will now use the original preview
+    image instead of generating a variant with the exact same dimensions.
 
-    *Felipe Raul*
+    *Chedli Bourguiba*
 
-*   Saving attachment(s) to a record returns the blob/blobs object
+*   Process preview image variant when calling `ActiveStorage::Preview#processed`.
 
-    Previously, saving attachments did not return the blob/blobs that
-    were attached. Now, saving attachments to a record with `#attach`
-    method returns the blob or array of blobs that were attached to
-    the record. If it fails to save the attachment(s), then it returns
-    `false`.
+    For example, `attached_pdf.preview(:thumb).processed` will now immediately
+    generate the full-sized preview image and the `:thumb` variant of it.
+    Previously, the `:thumb` variant would not be generated until a further call
+    to e.g. `processed.url`.
 
-    *Ghouse Mohamed*
+    *Chedli Bourguiba* and *Jonathan Hefner*
 
-*   Don't stream responses in redirect mode
+*   Prevent `ActiveRecord::StrictLoadingViolationError` when strict loading is
+    enabled and the variant of an Active Storage preview has already been
+    processed (for example, by calling `ActiveStorage::Preview#url`).
 
-    Previously, both redirect mode and proxy mode streamed their
-    responses which caused a new thread to be created, and could end
-    up leaking connections in the connection pool. But since redirect
-    mode doesn't actually send any data, it doesn't need to be
-    streamed.
+    *Jonathan Hefner*
 
-    *Luke Lau*
+*   Fix `preprocessed: true` option for named variants of previewable files.
 
-*   Safe for direct upload on Libraries or Frameworks
+    *Nico Wenterodt*
 
-    Enable the use of custom headers during direct uploads, which allows for
-    the inclusion of Authorization bearer tokens or other forms of authorization
-    tokens through headers.
+*   Allow accepting `service` as a proc as well in `has_one_attached` and `has_many_attached`.
 
-    *Radamés Roriz*
+    *Yogesh Khater*
 
-Please check [7-0-stable](https://github.com/rails/rails/blob/7-0-stable/activestorage/CHANGELOG.md) for previous changes.
+Please check [7-1-stable](https://github.com/rails/rails/blob/7-1-stable/activestorage/CHANGELOG.md) for previous changes.

data/app/assets/javascripts/activestorage.esm.js

@@ -771,9 +771,9 @@ function start() {
 }
 
 function didClick(event) {
-  const {target: target} = event;
-  if ((target.tagName == "INPUT" || target.tagName == "BUTTON") && target.type == "submit" && target.form) {
-    submitButtonsByForm.set(target.form, target);
+  const button = event.target.closest("button, input");
+  if (button && button.type === "submit" && button.form) {
+    submitButtonsByForm.set(button.form, button);
   }
 }
 

data/app/assets/javascripts/activestorage.js

@@ -754,9 +754,9 @@
     }
   }
   function didClick(event) {
-    const {target: target} = event;
-    if ((target.tagName == "INPUT" || target.tagName == "BUTTON") && target.type == "submit" && target.form) {
-      submitButtonsByForm.set(target.form, target);
+    const button = event.target.closest("button, input");
+    if (button && button.type === "submit" && button.form) {
+      submitButtonsByForm.set(button.form, button);
     }
   }
   function didSubmitForm(event) {

data/app/controllers/active_storage/representations/proxy_controller.rb

@@ -12,7 +12,7 @@ class ActiveStorage::Representations::ProxyController < ActiveStorage::Represent
 
   def show
     http_cache_forever public: true do
-      send_blob_stream @representation.image, disposition: params[:disposition]
+      send_blob_stream @representation, disposition: params[:disposition]
     end
   end
 end

data/app/javascript/activestorage/ujs.js

@@ -15,9 +15,9 @@ export function start() {
 }
 
 function didClick(event) {
-  const { target } = event
-  if ((target.tagName == "INPUT" || target.tagName == "BUTTON") && target.type == "submit" && target.form) {
-    submitButtonsByForm.set(target.form, target)
+  const button = event.target.closest("button, input")
+  if (button && button.type === "submit" && button.form) {
+    submitButtonsByForm.set(button.form, button)
   }
 }
 

data/app/jobs/active_storage/preview_image_job.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class ActiveStorage::PreviewImageJob < ActiveStorage::BaseJob
+  queue_as { ActiveStorage.queues[:preview_image] }
+
+  discard_on ActiveRecord::RecordNotFound, ActiveStorage::UnrepresentableError
+  retry_on ActiveStorage::IntegrityError, attempts: 10, wait: :polynomially_longer
+
+  def perform(blob, variations)
+    blob.preview({}).processed
+
+    variations.each do |transformations|
+      blob.preprocessed(transformations)
+    end
+  end
+end

data/app/jobs/active_storage/transform_job.rb

@@ -3,10 +3,10 @@
 class ActiveStorage::TransformJob < ActiveStorage::BaseJob
   queue_as { ActiveStorage.queues[:transform] }
 
-  discard_on ActiveRecord::RecordNotFound
+  discard_on ActiveRecord::RecordNotFound, ActiveStorage::UnrepresentableError
   retry_on ActiveStorage::IntegrityError, attempts: 10, wait: :polynomially_longer
 
   def perform(blob, transformations)
-    blob.variant(transformations).processed
+    blob.representation(transformations).processed
   end
 end

data/app/models/active_storage/attachment.rb

@@ -18,19 +18,17 @@ require "active_support/core_ext/module/delegation"
 #   # preloads blobs and variant records (if using `ActiveStorage.track_variants`)
 #   User.first.avatars.with_all_variant_records
 class ActiveStorage::Attachment < ActiveStorage::Record
-  self.table_name = "active_storage_attachments"
-
   ##
   # :method:
   #
   # Returns the associated record.
-  belongs_to :record, polymorphic: true, touch: true
+  belongs_to :record, polymorphic: true, touch: ActiveStorage.touch_attachment_records
 
   ##
   # :method:
   #
   # Returns the associated ActiveStorage::Blob.
-  belongs_to :blob, class_name: "ActiveStorage::Blob", autosave: true
+  belongs_to :blob, class_name: "ActiveStorage::Blob", autosave: true, inverse_of: :attachments
 
   delegate_missing_to :blob
   delegate :signed_id, to: :blob
@@ -44,7 +42,10 @@ class ActiveStorage::Attachment < ActiveStorage::Record
   # Eager load all variant records on an attachment at once.
   #
   #   User.first.avatars.with_all_variant_records
-  scope :with_all_variant_records, -> { includes(blob: { variant_records: { image_attachment: :blob } }) }
+  scope :with_all_variant_records, -> { includes(blob: {
+    variant_records: { image_attachment: :blob },
+    preview_image_attachment: { blob: { variant_records: { image_attachment: :blob } } }
+  }) }
 
   # Synchronously deletes the attachment and {purges the blob}[rdoc-ref:ActiveStorage::Blob#purge].
   def purge
@@ -131,8 +132,18 @@ class ActiveStorage::Attachment < ActiveStorage::Record
     end
 
     def transform_variants_later
-      named_variants.each do |_name, named_variant|
-        blob.preprocessed(named_variant.transformations) if named_variant.preprocessed?(record)
+      preprocessed_variations = named_variants.filter_map { |_name, named_variant|
+        if named_variant.preprocessed?(record)
+          named_variant.transformations
+        end
+      }
+
+      if blob.preview_image_needed_before_processing_variants? && preprocessed_variations.any?
+        blob.create_preview_image_later(preprocessed_variations)
+      else
+        preprocessed_variations.each do |transformations|
+          blob.preprocessed(transformations)
+        end
       end
     end
 
@@ -145,7 +156,7 @@ class ActiveStorage::Attachment < ActiveStorage::Record
     end
 
     def named_variants
-      record.attachment_reflections[name]&.named_variants
+      record.attachment_reflections[name]&.named_variants || {}
     end
 
     def transformations_by_name(transformations)

data/app/models/active_storage/blob/representable.rb

@@ -98,8 +98,16 @@ module ActiveStorage::Blob::Representable
     variable? || previewable?
   end
 
+  def preview_image_needed_before_processing_variants? # :nodoc:
+    previewable? && !preview_image.attached?
+  end
+
+  def create_preview_image_later(variations) # :nodoc:
+    ActiveStorage::PreviewImageJob.perform_later(self, variations) if representable?
+  end
+
   def preprocessed(transformations) # :nodoc:
-    ActiveStorage::TransformJob.perform_later(self, transformations)
+    ActiveStorage::TransformJob.perform_later(self, transformations) if representable?
   end
 
   private

data/app/models/active_storage/blob/servable.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module ActiveStorage::Blob::Servable # :nodoc:
+  def content_type_for_serving
+    forcibly_serve_as_binary? ? ActiveStorage.binary_content_type : content_type
+  end
+
+  def forced_disposition_for_serving
+    if forcibly_serve_as_binary? || !allowed_inline?
+      :attachment
+    end
+  end
+
+  private
+    def forcibly_serve_as_binary?
+      ActiveStorage.content_types_to_serve_as_binary.include?(content_type)
+    end
+
+    def allowed_inline?
+      ActiveStorage.content_types_allowed_inline.include?(content_type)
+    end
+end

data/app/models/active_storage/blob.rb

@@ -17,12 +17,6 @@
 # update a blob's metadata on a subsequent pass, but you should not update the key or change the uploaded file.
 # If you need to create a derivative or otherwise change the blob, simply create a new blob and purge the old one.
 class ActiveStorage::Blob < ActiveStorage::Record
-  include Analyzable
-  include Identifiable
-  include Representable
-
-  self.table_name = "active_storage_blobs"
-
   MINIMUM_TOKEN_LENGTH = 28
 
   has_secure_token :key, length: MINIMUM_TOKEN_LENGTH
@@ -34,7 +28,7 @@ class ActiveStorage::Blob < ActiveStorage::Record
   ##
   # :method:
   #
-  # Returns the associated +ActiveStorage::Attachment+s.
+  # Returns the associated ActiveStorage::Attachment instances.
   has_many :attachments
 
   ##
@@ -47,7 +41,7 @@ class ActiveStorage::Blob < ActiveStorage::Record
     self.service_name ||= self.class.service&.name
   end
 
-  after_update :touch_attachment_records
+  after_update :touch_attachments
 
   after_update_commit :update_service_metadata, if: -> { content_type_previously_changed? || metadata_previously_changed? }
 
@@ -138,25 +132,49 @@ class ActiveStorage::Blob < ActiveStorage::Record
 
     def scope_for_strict_loading # :nodoc:
       if strict_loading_by_default? && ActiveStorage.track_variants
-        includes(variant_records: { image_attachment: :blob }, preview_image_attachment: :blob)
+        includes(
+          variant_records: { image_attachment: :blob },
+          preview_image_attachment: { blob: { variant_records: { image_attachment: :blob } } }
+        )
       else
         all
       end
     end
 
     # Concatenate multiple blobs into a single "composed" blob.
-    def compose(blobs, filename:, content_type: nil, metadata: nil)
+    def compose(blobs, key: nil, filename:, content_type: nil, metadata: nil)
       raise ActiveRecord::RecordNotSaved, "All blobs must be persisted." if blobs.any?(&:new_record?)
 
       content_type ||= blobs.pluck(:content_type).compact.first
 
-      new(filename: filename, content_type: content_type, metadata: metadata, byte_size: blobs.sum(&:byte_size)).tap do |combined_blob|
+      new(key: key, filename: filename, content_type: content_type, metadata: metadata, byte_size: blobs.sum(&:byte_size)).tap do |combined_blob|
         combined_blob.compose(blobs.pluck(:key))
         combined_blob.save!
       end
     end
+
+    def validate_service_configuration(service_name, model_class, association_name) # :nodoc:
+      if service_name
+        services.fetch(service_name) do
+          raise ArgumentError, "Cannot configure service #{service_name.inspect} for #{model_class}##{association_name}"
+        end
+      else
+        validate_global_service_configuration
+      end
+    end
+
+    def validate_global_service_configuration # :nodoc:
+      if connected? && table_exists? && Rails.configuration.active_storage.service.nil?
+        raise RuntimeError, "Missing Active Storage service name. Specify Active Storage service name for config.active_storage.service in config/environments/#{Rails.env}.rb"
+      end
+    end
   end
 
+  include Analyzable
+  include Identifiable
+  include Representable
+  include Servable
+
   # Returns a signed ID for this blob that's suitable for reference on the client-side without fear of tampering.
   def signed_id(purpose: :blob_id, expires_in: nil, expires_at: nil)
     super
@@ -226,16 +244,6 @@ class ActiveStorage::Blob < ActiveStorage::Record
     service.headers_for_direct_upload key, filename: filename, content_type: content_type, content_length: byte_size, checksum: checksum, custom_metadata: custom_metadata
   end
 
-  def content_type_for_serving # :nodoc:
-    forcibly_serve_as_binary? ? ActiveStorage.binary_content_type : content_type
-  end
-
-  def forced_disposition_for_serving # :nodoc:
-    if forcibly_serve_as_binary? || !allowed_inline?
-      :attachment
-    end
-  end
-
 
   # Uploads the +io+ to the service on the +key+ for this blob. Blobs are intended to be immutable, so you shouldn't be
   # using this method after a file has already been uploaded to fit with a blob. If you want to create a derivative blob,
@@ -342,8 +350,9 @@ class ActiveStorage::Blob < ActiveStorage::Record
       raise ArgumentError, "io must be rewindable" unless io.respond_to?(:rewind)
 
       OpenSSL::Digest::MD5.new.tap do |checksum|
-        while chunk = io.read(5.megabytes)
-          checksum << chunk
+        read_buffer = "".b
+        while io.read(5.megabytes, read_buffer)
+          checksum << read_buffer
         end
 
         io.rewind
@@ -354,14 +363,6 @@ class ActiveStorage::Blob < ActiveStorage::Record
       Marcel::MimeType.for io, name: filename.to_s, declared_type: content_type
     end
 
-    def forcibly_serve_as_binary?
-      ActiveStorage.content_types_to_serve_as_binary.include?(content_type)
-    end
-
-    def allowed_inline?
-      ActiveStorage.content_types_allowed_inline.include?(content_type)
-    end
-
     def web_image?
       ActiveStorage.web_image_content_types.include?(content_type)
     end
@@ -376,8 +377,14 @@ class ActiveStorage::Blob < ActiveStorage::Record
       end
     end
 
-    def touch_attachment_records
-      attachments.includes(:record).each do |attachment|
+    def touch_attachments
+      attachments.then do |relation|
+        if ActiveStorage.touch_attachment_records
+          relation.includes(:record)
+        else
+          relation
+        end
+      end.each do |attachment|
         attachment.touch
       end
     end

data/app/models/active_storage/filename.rb

@@ -69,10 +69,6 @@ class ActiveStorage::Filename
     to_s
   end
 
-  def to_json
-    to_s
-  end
-
   def <=>(other)
     to_s.downcase <=> other.to_s.downcase
   end