activestorage 7.1.1 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5191c2c08c3cf6683595f664612b36f0df861a027b6674e804fe0e8065cff4a
-  data.tar.gz: 791d7ee3f601bfaba5822619cdef840c902289895734fcdbc309f850ebbe463e
+  metadata.gz: b815d6fed50a14fe82602e35311e37ccece872b1d41c54c9154748b63c388456
+  data.tar.gz: 67b71203864af875c16e762c76839c1867dacb0fc2a1e6d5d09d6bce4e044049
 SHA512:
-  metadata.gz: 2cb516e85268a2ccbb78a8ee5ac9b6bd52c51053ae0592b7f22572627eb34c9e38b461ff5dcf3b45ab7940dc22b977cf997ed55745b3672d65b7bcf8bfae31ae
-  data.tar.gz: 9c79ef5fda487863703d324f829250ef42255ea5c3ae1213acc34a7c6a82b04bc244bb8a57b223552a0783f04cdb9d64e15dcb0b8cb946a3400f439a015fff1e
+  metadata.gz: fe00e4b4db1a83ff95b5c2d1ae52c1aacc5994b46de0b7b473a8d816b85a0621b7ead8f42d826ad88d5bc31fa627e5b0689a20750bded392c001f317af8330e8
+  data.tar.gz: 94ac2b137a96a722d3d6200379d2156b91fa6a24952d3daba83530d7a6b60a9c55899671066fc0aa9d638d721b9f2f32b017b77c0c67d6c6f1e232c2f850f9fd

data/CHANGELOG.md

@@ -1,3 +1,57 @@
+## Rails 7.1.3 (January 16, 2024) ##
+
+*   Fix N+1 query when fetching preview images for non-image assets.
+
+    *Aaron Patterson & Justin Searls*
+
+*   Fix all Active Storage database related models to respect
+    `ActiveRecord::Base.table_name_prefix` configuration.
+
+    *Chedli Bourguiba*
+
+*   Fix `ActiveStorage::Representations::ProxyController` not returning the proper
+    preview image variant for previewable files.
+
+    *Chedli Bourguiba*
+
+*   Fix `ActiveStorage::Representations::ProxyController` to proxy untracked
+    variants.
+
+    *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*
+
+*   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
+    to e.g. `processed.url`.
+
+    *Chedli Bourguiba* and *Jonathan Hefner*
+
+*   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`).
+
+    *Jonathan Hefner*
+
+*   Fix `preprocessed: true` option for named variants of previewable files.
+
+    *Nico Wenterodt*
+
+
+## Rails 7.1.2 (November 10, 2023) ##
+
+*   No changes.
+
+
 ## Rails 7.1.1 (October 11, 2023) ##
 
 *   No 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/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,8 +18,6 @@ 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:
   #
@@ -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

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

@@ -99,7 +99,7 @@ module ActiveStorage::Blob::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

@@ -20,8 +20,7 @@ class ActiveStorage::Blob < ActiveStorage::Record
   include Analyzable
   include Identifiable
   include Representable
-
-  self.table_name = "active_storage_blobs"
+  include Servable
 
   MINIMUM_TOKEN_LENGTH = 28
 
@@ -138,7 +137,10 @@ 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
@@ -226,16 +228,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,
@@ -354,14 +346,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

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: :variant
+
   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
     self
   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/lib/active_storage/attached/model.rb

@@ -116,7 +116,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
@@ -203,7 +206,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

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

@@ -9,7 +9,7 @@ module ActiveStorage
   module VERSION
     MAJOR = 7
     MINOR = 1
-    TINY  = 1
+    TINY  = 3
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2024-01-16 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.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,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,10 +189,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.1.1/activestorage/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.1.1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.1.3/activestorage/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.1.3/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.1.1/activestorage
+  source_code_uri: https://github.com/rails/rails/tree/v7.1.3/activestorage
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []