activestorage 7.0.3.1 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d223d77617c5341863d41685fc68ae30b1a96fe97688851968153d3123ef588d
-  data.tar.gz: a78b262a1b5713ed6f702a49c87a0055de40165814e3d7d9a8b41ac5965570ea
+  metadata.gz: 30d8fadbd6953b6f7df95ba3dd293c0f720d5be32938a81c1395f460f43265d7
+  data.tar.gz: 432a78ced992c5717986d2a9bdb08ca21216a73e18246dfd86ce22b3c1c250cc
 SHA512:
-  metadata.gz: 15320db3bdd06e5b1218a648ca4961250900ccc924d816c9f4286f85bce354f1845dbedc1ac92f9637ffe1c7089c9920555233055c673315cdd9810f1ea4478e
-  data.tar.gz: 3c168d10718be7517f9db003da739fcbe7e2f5b943bc45cc7934e40937aae9065e181fcb258b7051f71740e4130f55a7e90d93ff8971328b0c220d741849247b
+  metadata.gz: de7317b086cf3d36aaf9a256ebac4cb7ebeb49e5087edbe665c49c17bc28544878d3bb4edc7cff271a4428ca4a57ea7ec66ca454e08aabebed137709c2e0a7ae
+  data.tar.gz: 0c8c8623a5c4e071938ae50add7e199274dc874964d1cf64f8ffff1f863f905392e54bb1dca24d0e1cd44f87c099d367080b144da265094bad861c58bb9b709b

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## Rails 7.0.4 (September 09, 2022) ##
+
+*   Fixes proxy downloads of files over 5MiB
+
+    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*
+
 ## Rails 7.0.3.1 (July 12, 2022) ##
 
 *   No changes.

data/app/controllers/concerns/active_storage/streaming.rb

@@ -3,6 +3,7 @@
 require "securerandom"
 
 module ActiveStorage::Streaming
+  extend ActiveSupport::Concern
   DEFAULT_BLOB_STREAMING_DISPOSITION = "inline"
 
   include ActionController::DataStreaming

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

@@ -10,9 +10,14 @@ module ActiveStorage
 
     private
       def read_image
-        download_blob_to_tempfile do |file|
+        begin
           require "mini_magick"
+        rescue LoadError
+          logger.info "Skipping image analysis because the mini_magick gem isn't installed"
+          return {}
+        end
 
+        download_blob_to_tempfile do |file|
           image = instrument("mini_magick") do
             MiniMagick::Image.new(file.path)
           end
@@ -23,13 +28,10 @@ module ActiveStorage
             logger.info "Skipping image analysis because ImageMagick doesn't support the file"
             {}
           end
+        rescue MiniMagick::Error => error
+          logger.error "Skipping image analysis due to an ImageMagick error: #{error.message}"
+          {}
         end
-      rescue LoadError
-        logger.info "Skipping image analysis because the mini_magick gem isn't installed"
-        {}
-      rescue MiniMagick::Error => error
-        logger.error "Skipping image analysis due to an ImageMagick error: #{error.message}"
-        {}
       end
 
       def rotated_image?(image)

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

@@ -10,9 +10,14 @@ module ActiveStorage
 
     private
       def read_image
-        download_blob_to_tempfile do |file|
+        begin
           require "ruby-vips"
+        rescue LoadError
+          logger.info "Skipping image analysis because the ruby-vips gem isn't installed"
+          return {}
+        end
 
+        download_blob_to_tempfile do |file|
           image = instrument("vips") do
             ::Vips::Image.new_from_file(file.path, access: :sequential)
           end
@@ -23,13 +28,10 @@ module ActiveStorage
             logger.info "Skipping image analysis because Vips doesn't support the file"
             {}
           end
+        rescue ::Vips::Error => error
+          logger.error "Skipping image analysis due to an Vips error: #{error.message}"
+          {}
         end
-      rescue LoadError
-        logger.info "Skipping image analysis because the ruby-vips gem isn't installed"
-        {}
-      rescue ::Vips::Error => error
-        logger.error "Skipping image analysis due to an Vips error: #{error.message}"
-        {}
       end
 
       ROTATIONS = /Right-top|Left-bottom|Top-right|Bottom-left/

data/lib/active_storage/gem_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage
 version: !ruby/object:Gem::Version
-  version: 7.0.3.1
+  version: 7.0.4
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.3.1
+        version: 7.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.3.1
+        version: 7.0.4
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.3.1
+        version: 7.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.3.1
+        version: 7.0.4
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.3.1
+        version: 7.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.3.1
+        version: 7.0.4
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.3.1
+        version: 7.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.3.1
+        version: 7.0.4
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -198,10 +198,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.3.1/activestorage/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.3.1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.4/activestorage/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.4/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.3.1/activestorage
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.4/activestorage
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []