activestorage 7.1.0 → 7.2.2.1

data/app/models/active_storage/preview.rb

@@ -31,15 +31,19 @@
 # These libraries are not provided by \Rails. You must install them yourself to use the built-in previewers. Before you
 # install and use third-party software, make sure you understand the licensing implications of doing so.
 class ActiveStorage::Preview
+  include ActiveStorage::Blob::Servable
+
   class UnprocessedError < StandardError; end
 
+  delegate :filename, :content_type, to: :presentation
+
   attr_reader :blob, :variation
 
   def initialize(blob, variation_or_variation_key)
     @blob, @variation = blob, ActiveStorage::Variation.wrap(variation_or_variation_key)
   end
 
-  # Processes the preview if it has not been processed yet. Returns the receiving Preview instance for convenience:
+  # Processes the preview if it has not been processed yet. Returns the receiving +ActiveStorage::Preview+ instance for convenience:
   #
   #   blob.preview(resize_to_limit: [100, 100]).processed.url
   #
@@ -47,6 +51,7 @@ class ActiveStorage::Preview
   # image is stored with the blob, it is only generated once.
   def processed
     process unless processed?
+    variant.processed if variant?
     self
   end
 
@@ -62,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
@@ -71,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
@@ -84,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
@@ -104,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/app/models/active_storage/variant.rb

@@ -53,6 +53,8 @@
 # * {ImageProcessing::Vips}[https://github.com/janko/image_processing/blob/master/doc/vips.md#methods]
 # * {ruby-vips reference}[http://www.rubydoc.info/gems/ruby-vips/Vips/Image]
 class ActiveStorage::Variant
+  include ActiveStorage::Blob::Servable
+
   attr_reader :blob, :variation
   delegate :service, to: :blob
   delegate :content_type, to: :variation

data/app/models/active_storage/variant_record.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class ActiveStorage::VariantRecord < ActiveStorage::Record
-  self.table_name = "active_storage_variant_records"
-
   belongs_to :blob
   has_one_attached :image
 end

data/app/models/active_storage/variant_with_record.rb

@@ -5,6 +5,8 @@
 # Like an ActiveStorage::Variant, but keeps detail about the variant in the database as an
 # ActiveStorage::VariantRecord. This is only used if +ActiveStorage.track_variants+ is enabled.
 class ActiveStorage::VariantWithRecord
+  include ActiveStorage::Blob::Servable
+
   attr_reader :blob, :variation
   delegate :service, to: :blob
   delegate :content_type, to: :variation

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
@@ -116,7 +128,10 @@ module ActiveStorage
 
         scope :"with_attached_#{name}", -> {
           if ActiveStorage.track_variants
-            includes("#{name}_attachment": { blob: { variant_records: { image_attachment: :blob } } })
+            includes("#{name}_attachment": { blob: {
+              variant_records: { image_attachment: :blob },
+              preview_image_attachment: { blob: { variant_records: { image_attachment: :blob } } }
+            } })
           else
             includes("#{name}_attachment": :blob)
           end
@@ -159,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:
       #
@@ -176,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
@@ -203,7 +230,10 @@ module ActiveStorage
 
         scope :"with_attached_#{name}", -> {
           if ActiveStorage.track_variants
-            includes("#{name}_attachments": { blob: { variant_records: { image_attachment: :blob } } })
+            includes("#{name}_attachments": { blob: {
+              variant_records: { image_attachment: :blob },
+              preview_image_attachment: { blob: { variant_records: { image_attachment: :blob } } }
+            } })
           else
             includes("#{name}_attachments": :blob)
           end
@@ -223,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,20 +112,12 @@ 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 || []
         ActiveStorage.binary_content_type = app.config.active_storage.binary_content_type || "application/octet-stream"
         ActiveStorage.video_preview_arguments = app.config.active_storage.video_preview_arguments || "-y -vframes 1 -f image2"
-
-        unless app.config.active_storage.silence_invalid_content_types_warning.nil?
-          ActiveStorage.silence_invalid_content_types_warning = app.config.active_storage.silence_invalid_content_types_warning
-        end
-
-        unless app.config.active_storage.replace_on_assign_to_many.nil?
-          ActiveStorage.replace_on_assign_to_many = app.config.active_storage.replace_on_assign_to_many
-        end
-
         ActiveStorage.track_variants = app.config.active_storage.track_variants || false
       end
     end

data/lib/active_storage/fixture_set.rb

@@ -26,9 +26,13 @@ module ActiveStorage
   #     has_one_attached :thumbnail
   #   end
   #
+  # <code></code>
+  #
   #   # fixtures/active_storage/blobs.yml
   #   first_thumbnail_blob: <%= ActiveStorage::FixtureSet.blob filename: "first.png" %>
   #
+  # <code></code>
+  #
   #   # fixtures/active_storage/attachments.yml
   #   first_thumbnail_attachment:
   #     name: thumbnail
@@ -48,7 +52,7 @@ module ActiveStorage
     #
     # === Examples
     #
-    #   # tests/fixtures/action_text/blobs.yml
+    #   # tests/fixtures/active_storage/blobs.yml
     #   second_thumbnail_blob: <%= ActiveStorage::FixtureSet.blob(
     #     filename: "second.svg",
     #   ) %>

data/lib/active_storage/gem_version.rb

@@ -8,9 +8,9 @@ module ActiveStorage
 
   module VERSION
     MAJOR = 7
-    MINOR = 1
-    TINY  = 0
-    PRE   = nil
+    MINOR = 2
+    TINY  = 2
+    PRE   = "1"
 
     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.0
+  version: 7.2.2.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2024-12-10 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.0
+        version: 7.2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2.1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2.1
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.2.1
 - !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
@@ -123,6 +124,7 @@ files:
 - app/models/active_storage/blob/analyzable.rb
 - app/models/active_storage/blob/identifiable.rb
 - app/models/active_storage/blob/representable.rb
+- app/models/active_storage/blob/servable.rb
 - app/models/active_storage/current.rb
 - app/models/active_storage/filename.rb
 - app/models/active_storage/named_variant.rb
@@ -188,12 +190,12 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.1.0/activestorage/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.1.0/
+  changelog_uri: https://github.com/rails/rails/blob/v7.2.2.1/activestorage/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.2.2.1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.1.0/activestorage
+  source_code_uri: https://github.com/rails/rails/tree/v7.2.2.1/activestorage
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -201,15 +203,15 @@ 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.4.18
-signing_key:
+rubygems_version: 3.5.22
+signing_key: 
 specification_version: 4
 summary: Local and cloud file storage framework.
 test_files: []