activestorage 6.1.2 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f917e62e1f70f5959cf15c4d62007df606148d788697866d2c57c543443c8ee0
-  data.tar.gz: 3335c1326ede090c29b3e3ca1e73e0e695c67d4693b4fdbf8a7110ebec44c0af
+  metadata.gz: ef0dd54811cf8da51cb50eca56d076d8749b980ae3db31226b265a151192328d
+  data.tar.gz: c22c17de56c93fd065162900525f3a5f52704c32ed74b7b457347dee1aff2673
 SHA512:
-  metadata.gz: bb82df76c10bba2e04568c7ea4d628a0097ab89ff080406a59327c9e1f1a1ab9d989e55626eb1dbb4d113a017e2aca78a7747ab1549d9037c79501287dd8ef31
-  data.tar.gz: 5f022ebdde317b5f586427cb40a6d9ef99a103560215936ab64eecea95045971d252d81b9ab23d67fe8edb9279f72c29f97177f677add7a3898b84b73688ca91
+  metadata.gz: '0792f0c459775a2a6356e5e41bb0bfc310b1cd3c0200f05fde47de567fab433d7ee7d5ccee87644c6bf2d3413605fc31d43e66894af55f0c93a7b05aa0872ec2'
+  data.tar.gz: 48d843ff08c3eaf85f69dbe9d4938d7f9413cc98800af3e2bc96de66f661542aa275cda824e88394b7e49755a65a7fc79697550e619da5db7b336f011a2a31be

data/CHANGELOG.md

@@ -1,3 +1,56 @@
+## Rails 6.1.4 (June 24, 2021) ##
+
+*   The parameters sent to `ffmpeg` for generating a video preview image are now
+    configurable under `config.active_storage.video_preview_arguments`.
+
+    *Brendon Muir*
+
+*   Fix Active Storage update task when running in an engine.
+
+    Justin Malčić*
+
+*   Don't raise an error if the mime type is not recognized.
+
+    Fixes #41777.
+
+    *Alex Ghiculescu*
+
+*   `ActiveStorage::PreviewError` is raised when a previewer is unable to generate a preview image.
+
+    *Alex Robbin*
+
+*   respond with 404 given invalid variation key when asking for representations.
+
+    *George Claghorn*
+
+*   `Blob` creation shouldn't crash if no service selected.
+
+    *Alex Ghiculescu*
+
+
+## Rails 6.1.3.2 (May 05, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.3.1 (March 26, 2021) ##
+
+*  Marcel is upgraded to version 1.0.0 to avoid a dependency on GPL-licensed
+   mime types data.
+
+   *George Claghorn*
+
+
+## Rails 6.1.3 (February 17, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.2.1 (February 10, 2021) ##
+
+*   No changes.
+
+
 ## Rails 6.1.2 (February 09, 2021) ##
 
 *   No changes.

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class ActiveStorage::Representations::BaseController < ActiveStorage::BaseController #:nodoc:
+  include ActiveStorage::SetBlob
+
+  before_action :set_representation
+
+  private
+    def set_representation
+      @representation = @blob.representation(params[:variation_key]).processed
+    rescue ActiveSupport::MessageVerifier::InvalidSignature
+      head :not_found
+    end
+end

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

@@ -1,19 +1,13 @@
 # frozen_string_literal: true
 
 # Proxy files through application. This avoids having a redirect and makes files easier to cache.
-class ActiveStorage::Representations::ProxyController < ActiveStorage::BaseController
-  include ActiveStorage::SetBlob
+class ActiveStorage::Representations::ProxyController < ActiveStorage::Representations::BaseController
   include ActiveStorage::SetHeaders
 
   def show
     http_cache_forever public: true do
-      set_content_headers_from representation.image
-      stream representation
+      set_content_headers_from @representation.image
+      stream @representation
     end
   end
-
-  private
-    def representation
-      @representation ||= @blob.representation(params[:variation_key]).processed
-    end
 end

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

@@ -4,11 +4,9 @@
 # Note: These URLs are publicly accessible. If you need to enforce access protection beyond the
 # security-through-obscurity factor of the signed blob and variation reference, you'll need to implement your own
 # authenticated redirection controller.
-class ActiveStorage::Representations::RedirectController < ActiveStorage::BaseController
-  include ActiveStorage::SetBlob
-
+class ActiveStorage::Representations::RedirectController < ActiveStorage::Representations::BaseController
   def show
     expires_in ActiveStorage.service_urls_expire_in
-    redirect_to @blob.representation(params[:variation_key]).processed.url(disposition: params[:disposition])
+    redirect_to @representation.url(disposition: params[:disposition])
   end
 end

data/app/models/active_storage/blob.rb

@@ -49,7 +49,7 @@ class ActiveStorage::Blob < ActiveStorage::Record
   scope :unattached, -> { where.missing(:attachments) }
 
   after_initialize do
-    self.service_name ||= self.class.service.name
+    self.service_name ||= self.class.service&.name
   end
 
   after_update_commit :update_service_metadata, if: :content_type_previously_changed?

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "mimemagic"
+require "mini_mime"
 
 module ActiveStorage::Blob::Representable
   extend ActiveSupport::Concern
@@ -110,10 +110,10 @@ module ActiveStorage::Blob::Representable
     end
 
     def format
-      if filename.extension.present? && MimeMagic.by_extension(filename.extension)&.to_s == content_type
+      if filename.extension.present? && MiniMime.lookup_by_extension(filename.extension)&.content_type == content_type
         filename.extension
       else
-        MimeMagic.new(content_type).extensions.first
+        MiniMime.lookup_by_content_type(content_type)&.extension
       end
     end
 

data/app/models/active_storage/variant.rb

@@ -89,7 +89,7 @@ class ActiveStorage::Variant
   end
 
   def filename
-    ActiveStorage::Filename.new "#{blob.filename.base}.#{variation.format}"
+    ActiveStorage::Filename.new "#{blob.filename.base}.#{variation.format.downcase}"
   end
 
   alias_method :content_type_for_serving, :content_type

data/app/models/active_storage/variant_with_record.rb

@@ -33,7 +33,7 @@ class ActiveStorage::VariantWithRecord
     def transform_blob
       blob.open do |input|
         variation.transform(input) do |output|
-          yield io: output, filename: "#{blob.filename.base}.#{variation.format}",
+          yield io: output, filename: "#{blob.filename.base}.#{variation.format.downcase}",
             content_type: variation.content_type, service_name: blob.service.name
         end
       end

data/app/models/active_storage/variation.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "mimemagic"
+require "mini_mime"
 
 # A set of transformations that can be applied to a blob to create a variant. This class is exposed via
 # the ActiveStorage::Blob#variant method and should rarely be used directly.
@@ -59,14 +59,14 @@ class ActiveStorage::Variation
 
   def format
     transformations.fetch(:format, :png).tap do |format|
-      if MimeMagic.by_extension(format).nil?
+      if MiniMime.lookup_by_extension(format.to_s).nil?
         raise ArgumentError, "Invalid variant format (#{format.inspect})"
       end
     end
   end
 
   def content_type
-    MimeMagic.by_extension(format).to_s
+    MiniMime.lookup_by_extension(format.to_s).content_type
   end
 
   # Returns a signed key for all the +transformations+ that this variation was instantiated with.

data/lib/active_storage.rb

@@ -67,6 +67,8 @@ module ActiveStorage
   mattr_accessor :replace_on_assign_to_many, default: false
   mattr_accessor :track_variants, default: false
 
+  mattr_accessor :video_preview_arguments, default: "-y -vframes 1 -f image2"
+
   module Transformers
     extend ActiveSupport::Autoload
 

data/lib/active_storage/engine.rb

@@ -92,6 +92,7 @@ module ActiveStorage
         ActiveStorage.service_urls_expire_in = app.config.active_storage.service_urls_expire_in || 5.minutes
         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"
 
         ActiveStorage.replace_on_assign_to_many = app.config.active_storage.replace_on_assign_to_many || false
         ActiveStorage.track_variants = app.config.active_storage.track_variants || false

data/lib/active_storage/errors.rb

@@ -23,4 +23,7 @@ module ActiveStorage
   # Raised when ActiveStorage::Blob#download is called on a blob where the
   # backing file is no longer present in its service.
   class FileNotFoundError < Error; end
+
+  # Raised when a Previewer is unable to generate a preview image.
+  class PreviewError < Error; end
 end

data/lib/active_storage/gem_version.rb

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

data/lib/active_storage/previewer.rb

@@ -70,7 +70,16 @@ module ActiveStorage
 
       def capture(*argv, to:)
         to.binmode
-        IO.popen(argv, err: File::NULL) { |out| IO.copy_stream(out, to) }
+
+        open_tempfile do |err|
+          IO.popen(argv, err: err) { |out| IO.copy_stream(out, to) }
+          err.rewind
+
+          unless $?.success?
+            raise PreviewError, "#{argv.first} failed (status #{$?.exitstatus}): #{err.read.to_s.chomp}"
+          end
+        end
+
         to.rewind
       end
 

data/lib/active_storage/previewer/video_previewer.rb

@@ -28,7 +28,7 @@ module ActiveStorage
 
     private
       def draw_relevant_frame_from(file, &block)
-        draw self.class.ffmpeg_path, "-i", file.path, "-y", "-vframes", "1", "-f", "image2", "-", &block
+        draw self.class.ffmpeg_path, "-i", file.path, *Shellwords.split(ActiveStorage.video_preview_arguments), "-", &block
       end
   end
 end

data/lib/tasks/activestorage.rake

@@ -17,6 +17,10 @@ namespace :active_storage do
   task update: :environment do
     ENV["MIGRATIONS_PATH"] = "db/update_migrate"
 
-    Rake::Task["active_storage:install"].invoke
+    if Rake::Task.task_defined?("active_storage:install")
+      Rake::Task["active_storage:install"].invoke
+    else
+      Rake::Task["app:active_storage:install"].invoke
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 6.1.4
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,84 +16,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: mini_mime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 1.1.0
 description: Attach cloud and local files in Rails applications.
 email: david@loudthinking.com
 executables: []
@@ -109,6 +109,7 @@ files:
 - app/controllers/active_storage/blobs/redirect_controller.rb
 - app/controllers/active_storage/direct_uploads_controller.rb
 - app/controllers/active_storage/disk_controller.rb
+- app/controllers/active_storage/representations/base_controller.rb
 - app/controllers/active_storage/representations/proxy_controller.rb
 - app/controllers/active_storage/representations/redirect_controller.rb
 - app/controllers/concerns/active_storage/file_server.rb
@@ -187,11 +188,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.2/activestorage/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.2/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.4/activestorage/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.4/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.2/activestorage
-post_install_message:
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.4/activestorage
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -206,8 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Local and cloud file storage framework.
 test_files: []