activestorage 7.1.3.4 → 7.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10c31beefd192ae50216812e96dd7326c6d301f84f3a9ac4c42cf41369bfbd68
-  data.tar.gz: b744929e6b8cab0e2c2d2f834b453d538fad962a42b6b52f62ed74cf67fd000b
+  metadata.gz: fca1b79c56ba1dc2eb959accd532129316a09a2ebfc79e0247aa331540eee041
+  data.tar.gz: 6b334fdf91d5cff5f284d1a5069ee083a65c699342e942edcb24536f0c7bb0ae
 SHA512:
-  metadata.gz: 93dcf40c82c8a7ecb7308c9e90c42a22816876cfe31c42304369a3979b4a6153a6296a8509d60a9e28bccdd0789f299ef3a734cb0b1b46ca1bd1cbd3c5f411ea
-  data.tar.gz: 56d0c210295b80a5bd0fa4145901652ddb3d1baede6a22993a294ae4031a378e99c45775e73caefa8890cf6a5bdafb224c215fc12ca33c20491a0cdf1b201b17
+  metadata.gz: f460771f93a8e1d5d497e4b57c7f236da416067fa7ccbfb59b61990556cdfbdae3ad16a78179359e3b767c5d0b444bd14b2e563c4ac3a07ec713b5d300462872
+  data.tar.gz: 47504a9899f66235c189ffd946f447a2db0ced710ac7f66c83fd5b74e978f2a47b227067b7af4a71da75d81c5cb891505d67881ee5ef8c1fb00b3f9935c1aabf

data/CHANGELOG.md

@@ -1,24 +1,25 @@
-## Rails 7.1.3.4 (June 04, 2024) ##
+## Rails 7.2.0.beta1 (May 29, 2024) ##
 
-*   No changes.
+*   Remove deprecated `config.active_storage.silence_invalid_content_types_warning`.
 
+    *Rafael Mendonça França*
 
-## Rails 7.1.3.3 (May 16, 2024) ##
-
-*   No changes.
-
+*   Remove deprecated `config.active_storage.replace_on_assign_to_many`.
 
-## Rails 7.1.3.2 (February 21, 2024) ##
+    *Rafael Mendonça França*
 
-*   No changes.
+*   Add support for custom `key` in `ActiveStorage::Blob#compose`.
 
+    *Elvin Efendiev*
 
-## Rails 7.1.3.1 (February 21, 2024) ##
+*   Add `image/webp` to `config.active_storage.web_image_content_types` when `load_defaults "7.2"`
+    is set.
 
-*   No changes.
+    *Lewis Buckley*
 
+*   Fix JSON-encoding of `ActiveStorage::Filename` instances.
 
-## Rails 7.1.3 (January 16, 2024) ##
+    *Jonathan del Strother*
 
 *   Fix N+1 query when fetching preview images for non-image assets.
 
@@ -39,16 +40,20 @@
 
     *Chedli Bourguiba*
 
-*   Fix direct upload forms when submit button contains nested elements.
-
-    *Marc Köhlbrugge*
-
 *   When using the `preprocessed: true` option, avoid enqueuing transform jobs
     for blobs that are not representable.
 
     *Chedli Bourguiba*
 
+*   Prevent `ActiveStorage::Blob#preview` to generate a variant if an empty variation is passed.
+
+    Calls to `#url`, `#key` or `#download` will now use the original preview
+    image instead of generating a variant with the exact same dimensions.
+
+    *Chedli Bourguiba*
+
 *   Process preview image variant when calling `ActiveStorage::Preview#processed`.
+
     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
@@ -66,266 +71,8 @@
 
     *Nico Wenterodt*
 
+*   Allow accepting `service` as a proc as well in `has_one_attached` and `has_many_attached`.
 
-## Rails 7.1.2 (November 10, 2023) ##
-
-*   No changes.
-
-
-## Rails 7.1.1 (October 11, 2023) ##
-
-*   No changes.
-
-
-## Rails 7.1.0 (October 05, 2023) ##
-
-*   No changes.
-
-
-## Rails 7.1.0.rc2 (October 01, 2023) ##
-
-*   No changes.
-
-
-## Rails 7.1.0.rc1 (September 27, 2023) ##
-
-*   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
-
-    ```ruby
-    User.first.avatar.variant(resize_to_limit: [100, 100]).destroy
-    ```
-
-    *Shouichi Kamiya*, *Yuichiro NAKAGAWA*, *Ryohei UEDA*
-
-*   Add `sample_rate` to `ActiveStorage::Analyzer::AudioAnalyzer` output
-
-    *Matija Čupić*
-
-*   Remove deprecated `purge` and `purge_later` methods from the attachments association.
-
-    *Rafael Mendonça França*
-
-*   Remove deprecated behavior when assigning to a collection of attachments.
-
-    Instead of appending to the collection, the collection is now replaced.
-
-    *Rafael Mendonça França*
-
-*   Remove deprecated `ActiveStorage::Current#host` and `ActiveStorage::Current#host=` methods.
-
-    *Rafael Mendonça França*
-
-*   Remove deprecated invalid default content types in Active Storage configurations.
-
-    *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 ability to use pre-defined variants when calling `preview` or
-    `representation` on an attachment.
-
-    ```ruby
-    class User < ActiveRecord::Base
-      has_one_attached :file do |attachable|
-        attachable.variant :thumb, resize_to_limit: [100, 100]
-      end
-    end
-
-    <%= image_tag user.file.representation(:thumb) %>
-    ```
-
-    *Richard Böhme*
-
-*   Method `attach` always returns the attachments except when the record
-    is persisted, unchanged, and saving it fails, in which case it returns `nil`.
-
-    *Santiago Bartesaghi*
-
-*   Fixes multiple `attach` calls within transaction not uploading files correctly.
-
-    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
-
-    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.
-
-    Fixes #41661
-
-    *Santiago Bartesaghi*, *Bruno Vezoli*, *Juan Roig*, *Abhay Nikam*
-
-*   Raise an exception if `config.active_storage.service` is not set.
-
-    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.
-
-    *Ghouse Mohamed*
-
-*   Fixes proxy downloads of files over 5mb
-
-    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.
-
-    Fixes #44679
-
-    *Felipe Raul*
-
-*   Saving attachment(s) to a record returns the blob/blobs object
-
-    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`.
-
-    *Ghouse Mohamed*
-
-*   Don't stream responses in redirect mode
-
-    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.
-
-    *Luke Lau*
-
-*   Safe for direct upload on Libraries or Frameworks
-
-    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.
-
-    *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/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/models/active_storage/attachment.rb

@@ -22,13 +22,13 @@ class ActiveStorage::Attachment < ActiveStorage::Record
   # :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
@@ -132,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
 
@@ -146,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,6 +98,14 @@ 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) if representable?
   end

data/app/models/active_storage/blob.rb

@@ -17,11 +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
-  include Servable
-
   MINIMUM_TOKEN_LENGTH = 28
 
   has_secure_token :key, length: MINIMUM_TOKEN_LENGTH
@@ -46,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? }
 
@@ -147,18 +142,39 @@ class ActiveStorage::Blob < ActiveStorage::Record
     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
@@ -334,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
@@ -360,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

data/app/models/active_storage/preview.rb

@@ -35,7 +35,7 @@ class ActiveStorage::Preview
 
   class UnprocessedError < StandardError; end
 
-  delegate :filename, :content_type, to: :variant
+  delegate :filename, :content_type, to: :presentation
 
   attr_reader :blob, :variation
 
@@ -51,7 +51,7 @@ class ActiveStorage::Preview
   # image is stored with the blob, it is only generated once.
   def processed
     process unless processed?
-    variant.processed
+    variant.processed if variant?
     self
   end
 
@@ -67,7 +67,7 @@ class ActiveStorage::Preview
   # a stable URL that redirects to the URL returned by this method.
   def url(**options)
     if processed?
-      variant.url(**options)
+      presentation.url(**options)
     else
       raise UnprocessedError
     end
@@ -76,7 +76,7 @@ class ActiveStorage::Preview
   # Returns a combination key of the blob and the variation that together identifies a specific variant.
   def key
     if processed?
-      variant.key
+      presentation.key
     else
       raise UnprocessedError
     end
@@ -89,7 +89,7 @@ class ActiveStorage::Preview
   # if the preview has not been processed yet.
   def download(&block)
     if processed?
-      variant.download(&block)
+      presentation.download(&block)
     else
       raise UnprocessedError
     end
@@ -109,7 +109,15 @@ class ActiveStorage::Preview
     end
 
     def variant
-      image.variant(variation).processed
+      image.variant(variation)
+    end
+
+    def variant?
+      variation.transformations.present?
+    end
+
+    def presentation
+      variant? ? variant.processed : image
     end
 
 

data/db/migrate/20170806125915_create_active_storage_tables.rb

@@ -51,6 +51,6 @@ class CreateActiveStorageTables < ActiveRecord::Migration[7.0]
       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]
+      [ primary_key_type, foreign_key_type ]
     end
 end

data/lib/active_storage/analyzer/image_analyzer/vips.rb

@@ -19,13 +19,16 @@ module ActiveStorage
 
         download_blob_to_tempfile do |file|
           image = instrument("vips") do
+            # ruby-vips will raise Vips::Error if it can't find an appropriate loader for the file
             ::Vips::Image.new_from_file(file.path, access: :sequential)
+          rescue ::Vips::Error
+            logger.info "Skipping image analysis because Vips doesn't support the file"
+            nil
           end
 
-          if valid_image?(image)
+          if image
             yield image
           else
-            logger.info "Skipping image analysis because Vips doesn't support the file"
             {}
           end
         rescue ::Vips::Error => error
@@ -40,12 +43,5 @@ module ActiveStorage
       rescue ::Vips::Error
         false
       end
-
-      def valid_image?(image)
-        image.avg
-        true
-      rescue ::Vips::Error
-        false
-      end
   end
 end

data/lib/active_storage/analyzer/video_analyzer.rb

@@ -55,11 +55,15 @@ module ActiveStorage
       def angle
         if tags["rotate"]
           Integer(tags["rotate"])
-        elsif side_data && side_data[0] && side_data[0]["rotation"]
-          Integer(side_data[0]["rotation"])
+        elsif display_matrix && display_matrix["rotation"]
+          Integer(display_matrix["rotation"])
         end
       end
 
+      def display_matrix
+        side_data.detect { |data| data["side_data_type"] == "Display Matrix" }
+      end
+
       def display_aspect_ratio
         if descriptor = video_stream["display_aspect_ratio"]
           if terms = descriptor.split(":", 2)

data/lib/active_storage/attached/changes/create_one.rb

@@ -118,7 +118,12 @@ module ActiveStorage
       end
 
       def attachment_service_name
-        record.attachment_reflections[name].options[:service_name]
+        service_name = record.attachment_reflections[name].options[:service_name]
+        if service_name.is_a?(Proc)
+          service_name = service_name.call(record)
+          ActiveStorage::Blob.validate_service_configuration(service_name, record.class, name)
+        end
+        service_name
       end
   end
 end

data/lib/active_storage/attached/changes/create_one_of_many.rb

@@ -4,7 +4,11 @@ module ActiveStorage
   class Attached::Changes::CreateOneOfMany < Attached::Changes::CreateOne # :nodoc:
     private
       def find_attachment
-        record.public_send("#{name}_attachments").detect { |attachment| attachment.blob_id == blob.id }
+        if blob.persisted?
+          record.public_send("#{name}_attachments").detect { |attachment| attachment.blob_id == blob.id }
+        else
+          blob.attachments.find { |attachment| attachment.record == record }
+        end
       end
   end
 end

data/lib/active_storage/attached/model.rb

@@ -74,16 +74,24 @@ module ActiveStorage
       # The system has been designed to having you go through the ActiveStorage::Attached::One
       # proxy that provides the dynamic proxy to the associations and factory methods, like +attach+.
       #
-      # If the +:dependent+ option isn't set, the attachment will be purged
-      # (i.e. destroyed) whenever the record is destroyed.
+      # The +:dependent+ option defaults to +:purge_later+. This means the attachment will be
+      # purged (i.e. destroyed) in the background whenever the record is destroyed.
+      # If an ActiveJob::Backend queue adapter is not set in the application set it to
+      # +purge+ instead.
       #
       # If you need the attachment to use a service which differs from the globally configured one,
-      # pass the +:service+ option. For instance:
+      # pass the +:service+ option. For example:
       #
       #   class User < ActiveRecord::Base
       #     has_one_attached :avatar, service: :s3
       #   end
       #
+      # +:service+ can also be specified as a proc, and it will be called with the model instance:
+      #
+      #   class User < ActiveRecord::Base
+      #     has_one_attached :avatar, service: ->(user) { user.in_europe_region? ? :s3_europe : :s3_usa }
+      #   end
+      #
       # If you need to enable +strict_loading+ to prevent lazy loading of attachment,
       # pass the +:strict_loading+ option. You can do:
       #
@@ -91,8 +99,12 @@ module ActiveStorage
       #     has_one_attached :avatar, strict_loading: true
       #   end
       #
+      # Note: Active Storage relies on polymorphic associations, which in turn store class names in the database.
+      # When renaming classes that use <tt>has_one_attached</tt>, make sure to also update the class names in the
+      # <tt>active_storage_attachments.record_type</tt> polymorphic type column of
+      # the corresponding rows.
       def has_one_attached(name, dependent: :purge_later, service: nil, strict_loading: false)
-        validate_service_configuration(name, service)
+        ActiveStorage::Blob.validate_service_configuration(service, self, name) unless service.is_a?(Proc)
 
         generated_association_methods.class_eval <<-CODE, __FILE__, __LINE__ + 1
           # frozen_string_literal: true
@@ -162,16 +174,24 @@ module ActiveStorage
       # The system has been designed to having you go through the ActiveStorage::Attached::Many
       # proxy that provides the dynamic proxy to the associations and factory methods, like +#attach+.
       #
-      # If the +:dependent+ option isn't set, all the attachments will be purged
-      # (i.e. destroyed) whenever the record is destroyed.
+      # The +:dependent+ option defaults to +:purge_later+. This means the attachments will be
+      # purged (i.e. destroyed) in the background whenever the record is destroyed.
+      # If an ActiveJob::Backend queue adapter is not set in the application set it to
+      # +purge+ instead.
       #
       # If you need the attachment to use a service which differs from the globally configured one,
-      # pass the +:service+ option. For instance:
+      # pass the +:service+ option. For example:
       #
       #   class Gallery < ActiveRecord::Base
       #     has_many_attached :photos, service: :s3
       #   end
       #
+      # +:service+ can also be specified as a proc, and it will be called with the model instance:
+      #
+      #   class Gallery < ActiveRecord::Base
+      #     has_many_attached :photos, service: ->(gallery) { gallery.personal? ? :personal_s3 : :s3 }
+      #   end
+      #
       # If you need to enable +strict_loading+ to prevent lazy loading of attachments,
       # pass the +:strict_loading+ option. You can do:
       #
@@ -179,8 +199,12 @@ module ActiveStorage
       #     has_many_attached :photos, strict_loading: true
       #   end
       #
+      # Note: Active Storage relies on polymorphic associations, which in turn store class names in the database.
+      # When renaming classes that use <tt>has_many</tt>, make sure to also update the class names in the
+      # <tt>active_storage_attachments.record_type</tt> polymorphic type column of
+      # the corresponding rows.
       def has_many_attached(name, dependent: :purge_later, service: nil, strict_loading: false)
-        validate_service_configuration(name, service)
+        ActiveStorage::Blob.validate_service_configuration(service, self, name) unless service.is_a?(Proc)
 
         generated_association_methods.class_eval <<-CODE, __FILE__, __LINE__ + 1
           # frozen_string_literal: true
@@ -229,23 +253,6 @@ module ActiveStorage
         yield reflection if block_given?
         ActiveRecord::Reflection.add_attachment_reflection(self, name, reflection)
       end
-
-      private
-        def validate_service_configuration(association_name, service)
-          if service.present?
-            ActiveStorage::Blob.services.fetch(service) do
-              raise ArgumentError, "Cannot configure service :#{service} for #{name}##{association_name}"
-            end
-          else
-            validate_global_service_configuration
-          end
-        end
-
-        def validate_global_service_configuration
-          if connected? && ActiveStorage::Blob.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
 
     def attachment_changes # :nodoc:

data/lib/active_storage/engine.rb

@@ -65,6 +65,8 @@ module ActiveStorage
     )
 
     config.active_storage.content_types_allowed_inline = %w(
+      image/webp
+      image/avif
       image/png
       image/gif
       image/jpeg
@@ -110,6 +112,7 @@ module ActiveStorage
         ActiveStorage.variable_content_types = app.config.active_storage.variable_content_types || []
         ActiveStorage.web_image_content_types = app.config.active_storage.web_image_content_types || []
         ActiveStorage.content_types_to_serve_as_binary = app.config.active_storage.content_types_to_serve_as_binary || []
+        ActiveStorage.touch_attachment_records = app.config.active_storage.touch_attachment_records != false
         ActiveStorage.service_urls_expire_in = app.config.active_storage.service_urls_expire_in || 5.minutes
         ActiveStorage.urls_expire_in = app.config.active_storage.urls_expire_in
         ActiveStorage.content_types_allowed_inline = app.config.active_storage.content_types_allowed_inline || []

data/lib/active_storage/gem_version.rb

@@ -8,9 +8,9 @@ module ActiveStorage
 
   module VERSION
     MAJOR = 7
-    MINOR = 1
-    TINY  = 3
-    PRE   = "4"
+    MINOR = 2
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_storage/previewer/mupdf_previewer.rb

@@ -4,7 +4,11 @@ module ActiveStorage
   class Previewer::MuPDFPreviewer < Previewer
     class << self
       def accept?(blob)
-        blob.content_type == "application/pdf" && mutool_exists?
+        pdf?(blob.content_type) && mutool_exists?
+      end
+
+      def pdf?(content_type)
+        Marcel::Magic.child? content_type, "application/pdf"
       end
 
       def mutool_path
@@ -12,7 +16,7 @@ module ActiveStorage
       end
 
       def mutool_exists?
-        return @mutool_exists if defined?(@mutool_exists) && !@mutool_exists.nil?
+        return @mutool_exists unless @mutool_exists.nil?
 
         system mutool_path, out: File::NULL, err: File::NULL
 

data/lib/active_storage/previewer/poppler_pdf_previewer.rb

@@ -4,7 +4,11 @@ module ActiveStorage
   class Previewer::PopplerPDFPreviewer < Previewer
     class << self
       def accept?(blob)
-        blob.content_type == "application/pdf" && pdftoppm_exists?
+        pdf?(blob.content_type) && pdftoppm_exists?
+      end
+
+      def pdf?(content_type)
+        Marcel::Magic.child? content_type, "application/pdf"
       end
 
       def pdftoppm_path
@@ -12,7 +16,7 @@ module ActiveStorage
       end
 
       def pdftoppm_exists?
-        return @pdftoppm_exists if defined?(@pdftoppm_exists)
+        return @pdftoppm_exists unless @pdftoppm_exists.nil?
 
         @pdftoppm_exists = system(pdftoppm_path, "-v", out: File::NULL, err: File::NULL)
       end

data/lib/active_storage/previewer/video_previewer.rb

@@ -10,7 +10,7 @@ module ActiveStorage
       end
 
       def ffmpeg_exists?
-        return @ffmpeg_exists if defined?(@ffmpeg_exists)
+        return @ffmpeg_exists unless @ffmpeg_exists.nil?
 
         @ffmpeg_exists = system(ffmpeg_path, "-version", out: File::NULL, err: File::NULL)
       end

data/lib/active_storage/transformers/image_processing_transformer.rb

@@ -5,7 +5,7 @@ begin
 rescue LoadError
   raise LoadError, <<~ERROR.squish
     Generating image variants require the image_processing gem.
-    Please add `gem 'image_processing', '~> 1.2'` to your Gemfile.
+    Please add `gem "image_processing", "~> 1.2"` to your Gemfile.
   ERROR
 end
 

data/lib/active_storage.rb

@@ -35,7 +35,7 @@ require "active_storage/errors"
 require "marcel"
 
 # :markup: markdown
-# :include: activestorage/README.md
+# :include: ../README.md
 module ActiveStorage
   extend ActiveSupport::Autoload
 
@@ -354,6 +354,7 @@ module ActiveStorage
   mattr_accessor :unsupported_image_processing_arguments
 
   mattr_accessor :service_urls_expire_in, default: 5.minutes
+  mattr_accessor :touch_attachment_records, default: true
   mattr_accessor :urls_expire_in
 
   mattr_accessor :routes_prefix, default: "/rails/active_storage"
@@ -364,22 +365,6 @@ module ActiveStorage
 
   mattr_accessor :video_preview_arguments, default: "-y -vframes 1 -f image2"
 
-  def self.replace_on_assign_to_many
-    ActiveStorage.deprecator.warn("config.active_storage.replace_on_assign_to_many is deprecated and has no effect.")
-  end
-
-  def self.replace_on_assign_to_many=(value)
-    ActiveStorage.deprecator.warn("config.active_storage.replace_on_assign_to_many is deprecated and has no effect.")
-  end
-
-  def self.silence_invalid_content_types_warning
-    ActiveStorage.deprecator.warn("config.active_storage.silence_invalid_content_types_warning is deprecated and has no effect.")
-  end
-
-  def self.silence_invalid_content_types_warning=(value)
-    ActiveStorage.deprecator.warn("config.active_storage.silence_invalid_content_types_warning is deprecated and has no effect.")
-  end
-
   module Transformers
     extend ActiveSupport::Autoload
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage
 version: !ruby/object:Gem::Version
-  version: 7.1.3.4
+  version: 7.2.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2024-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.4
+        version: 7.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.4
+        version: 7.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.4
+        version: 7.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.4
+        version: 7.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.4
+        version: 7.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.4
+        version: 7.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.4
+        version: 7.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.4
+        version: 7.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ files:
 - app/jobs/active_storage/analyze_job.rb
 - app/jobs/active_storage/base_job.rb
 - app/jobs/active_storage/mirror_job.rb
+- app/jobs/active_storage/preview_image_job.rb
 - app/jobs/active_storage/purge_job.rb
 - app/jobs/active_storage/transform_job.rb
 - app/models/active_storage/attachment.rb
@@ -189,10 +190,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.1.3.4/activestorage/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.1.3.4/
+  changelog_uri: https://github.com/rails/rails/blob/v7.2.0.beta1/activestorage/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.2.0.beta1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.1.3.4/activestorage
+  source_code_uri: https://github.com/rails/rails/tree/v7.2.0.beta1/activestorage
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -202,14 +203,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: Local and cloud file storage framework.