activestorage 6.1.3 → 6.1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c394453fcb90015316928972c840ad4e55d9d416714a815d8de5a053f71fe2f8
-  data.tar.gz: 268d6d5ad38257e819ea0da120de16acf90f27eff8ad64c114c106ea88fd498b
+  metadata.gz: 645186a399a2dbb7842cf5aad3138fd0b33cae1e5906c36b41095ae530c4df75
+  data.tar.gz: 722028d745d419c548fdb944c0f9fb39267dcc8a0d110202857d8356acc46211
 SHA512:
-  metadata.gz: 900742e2629c95938f358f86c4135ff3a1ba289184da3fc44ca2a9086dd8eedbd58c72c830de616b6b118c4b005b946eba1d3f6d0bc1f1553400cb2ee966e6c4
-  data.tar.gz: 26c8f0bcf812c970856007898f89f5fb9fed1d512031db3a52620d80a8b7fb217af68c9f7daaeeb8e132617dd75268952ab35220f7a46a58341dd369478711d7
+  metadata.gz: 63a5dfbd6fac7fbbfaecc30e3f95efc03242ba5d5785b952914a80c30807f6699954b9b4b5e31c26be8f2573785c0bd50b13358063acb690abf694cc04c8fe98
+  data.tar.gz: 0d3e165f3722f166f033735f7cb4203206727980f542d8f8687ff8560dc3d2f67830b928d1c5e33e4279323b3fbbc0cbfdec15d27935fbe6edcd823ed4dcd8a2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 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.

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/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/gem_version.rb

@@ -10,7 +10,7 @@ module ActiveStorage
     MAJOR = 6
     MINOR = 1
     TINY  = 3
-    PRE   = nil
+    PRE   = "1"
 
     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: 6.1.3
+  version: 6.1.3.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-03-26 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.3
+        version: 6.1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.3.1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.3.1
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.3.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.1.3.1
 - !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.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 1.0.2
 description: Attach cloud and local files in Rails applications.
 email: david@loudthinking.com
 executables: []
@@ -187,11 +187,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.3/activestorage/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.3/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.3.1/activestorage/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.3.1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.3/activestorage
-post_install_message:
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.3.1/activestorage
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -206,8 +206,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: []