carrierwave 3.0.3 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7d9ca1331d473162430928f5819d657e9c601b5663965a75f37c2eacb5bd344
-  data.tar.gz: a78745cfdebaa9b1d3cf49cfc513ac248d83690a6f1bafd6384dab81acd3e150
+  metadata.gz: d0521a369826478de3de2fa97eecc3c3b4cde957eae650f01e9a84064c7a942f
+  data.tar.gz: e9691718fd62655b3990754a334fe7f7637c6e4e9186fb5084aa0da227058bf1
 SHA512:
-  metadata.gz: 51207e993ab7aaed4e68d338c7fdbfeee7f1334d914a403890c9364ad3d5aeadbd94206cc3b5fbb07bec7d7372abd346239e979a4d6c6f3c5278e92b4a823c94
-  data.tar.gz: fcc86123d64aabeb6de357cf81f632c3343b3951915d21f1b69e04c8bacb2e7e4c14c8efab9e4b0be33fac28efb228a0e7795615d19d913c33806eccb8adaedc
+  metadata.gz: ee8a2cbafe89e7f29b898940a2e9fbc391a015ea0a91fc04d00da62ea2ecd8b83721c4f0dc873551255117a59c9b61ac8b57902dc1fbec54f29817acff3f8746
+  data.tar.gz: 4bcd521bc40e84509b779312f5a6eab363bca8e9871c179fb6340044e46cf44397a58b4ba3133caaed71845b3a9630f74cd6da8356f835c2cc7ce17fa4e9be0c

data/lib/carrierwave/downloader/remote_file.rb

@@ -33,9 +33,9 @@ module CarrierWave
 
       def original_filename
         filename = filename_from_header || filename_from_uri
-        mime_type = Marcel::TYPES[content_type]
-        unless File.extname(filename).present? || mime_type.blank?
-          extension = mime_type[0].first
+        extensions = Marcel::Magic.new(content_type).extensions
+        unless File.extname(filename).present? || extensions.blank?
+          extension = extensions.first
           filename = "#{filename}.#{extension}"
         end
         filename

data/lib/carrierwave/mount.rb

@@ -428,6 +428,11 @@ module CarrierWave
 
     private
 
+      def initialize_dup(other)
+        @_mounters = @_mounters.dup
+        super
+      end
+
       def _mounter(column)
         # We cannot memoize in frozen objects :(
         return Mounter.build(self, column) if frozen?

data/lib/carrierwave/orm/activerecord.rb

@@ -24,11 +24,16 @@ module CarrierWave
 
       after_save :"store_#{column}!"
       before_save :"write_#{column}_identifier"
+      if ::ActiveRecord.try(:run_after_transaction_callbacks_in_order_defined)
+        after_commit :"remove_previously_stored_#{column}", :on => :update
+        after_commit :"reset_previous_changes_for_#{column}"
+        after_commit :"mark_remove_#{column}_false", :on => :update
+      else
+        after_commit :"mark_remove_#{column}_false", :on => :update
+        after_commit :"reset_previous_changes_for_#{column}"
+        after_commit :"remove_previously_stored_#{column}", :on => :update
+      end
       after_commit :"remove_#{column}!", :on => :destroy
-      after_commit :"mark_remove_#{column}_false", :on => :update
-
-      after_commit :"reset_previous_changes_for_#{column}"
-      after_commit :"remove_previously_stored_#{column}", :on => :update
       after_rollback :"remove_rolled_back_#{column}"
 
       mod = Module.new
@@ -43,10 +48,10 @@ module CarrierWave
         # Reset cached mounter on record dup
         def initialize_dup(other)
           old_uploaders = _mounter(:"#{column}").uploaders
-          @_mounters[:"#{column}"] = nil
           super
+          @_mounters[:"#{column}"] = nil
           # The attribute needs to be cleared to prevent it from picked up as identifier
-          write_attribute(:"#{column}", nil)
+          write_attribute(_mounter(:#{column}).serialization_column, nil)
           _mounter(:"#{column}").cache(old_uploaders)
         end
 

data/lib/carrierwave/sanitized_file.rb

@@ -307,7 +307,7 @@ module CarrierWave
     def declared_content_type
       @declared_content_type ||
         if @file.respond_to?(:content_type) && @file.content_type
-          @file.content_type.to_s.chomp
+          Marcel::MimeType.for(declared_type: @file.content_type.to_s.chomp)
         end
     end
 

data/lib/carrierwave/uploader/content_type_allowlist.rb

@@ -53,7 +53,7 @@ module CarrierWave
       def allowlisted_content_type?(allowlist, content_type)
         Array(allowlist).any? do |item|
           item = Regexp.quote(item) if item.class != Regexp
-          content_type =~ /#{item}/
+          content_type =~ /\A#{item}/
         end
       end
 

data/lib/carrierwave/uploader/proxy.rb

@@ -40,10 +40,10 @@ module CarrierWave
       #
       # === Returns
       #
-      # [String] a temporary_identifier, by default @original_filename is used
+      # [String] a temporary_identifier, by default the value of #cache_name is used
       #
       def temporary_identifier
-        @original_filename || @identifier
+        cache_name || @identifier
       end
 
       ##

data/lib/carrierwave/uploader/store.rb

@@ -87,7 +87,7 @@ module CarrierWave
             end
             @file = new_file
             @identifier = storage.identifier
-            @cache_id = @deduplication_index = nil
+            @original_filename = @cache_id = @deduplication_index = nil
             @staged = false
           end
         end

data/lib/carrierwave/uploader/versions.rb

@@ -279,7 +279,7 @@ module CarrierWave
         # that are the source of another version.
 
         self.cache_id = CarrierWave.generate_cache_id
-        derived_versions.each do |name, v|
+        derived_versions.each_value do |v|
           v.cache!(file) if names.empty? || !(v.descendant_version_names & names).empty?
         end
         active_versions.each do |name, v|
@@ -308,13 +308,13 @@ module CarrierWave
       def derived_versions
         active_versions.reject do |name, v|
           v.class.version_options[:from_version]
-        end.to_a + active_sibling_versions.select do |name, v|
+        end.merge(active_sibling_versions.select do |name, v|
           v.class.version_options[:from_version] == self.class.version_names.last
-        end.to_a
+        end)
       end
 
       def active_sibling_versions
-        parent_version&.active_versions || []
+        parent_version&.active_versions || {}
       end
 
       def full_filename(for_file)
@@ -326,23 +326,23 @@ module CarrierWave
       end
 
       def cache_versions!(new_file)
-        derived_versions.each { |name, v| v.cache!(new_file) }
+        derived_versions.each_value { |v| v.cache!(new_file) }
       end
 
       def store_versions!(new_file)
-        active_versions.each { |name, v| v.store!(new_file) }
+        active_versions.each_value { |v| v.store!(new_file) }
       end
 
       def remove_versions!
-        versions.each { |name, v| v.remove! }
+        versions.each_value { |v| v.remove! }
       end
 
       def retrieve_versions_from_cache!(cache_name)
-        active_versions.each { |name, v| v.retrieve_from_cache!(cache_name) }
+        active_versions.each_value { |v| v.retrieve_from_cache!(cache_name) }
       end
 
       def retrieve_versions_from_store!(identifier)
-        active_versions.each { |name, v| v.retrieve_from_store!(identifier) }
+        active_versions.each_value { |v| v.retrieve_from_store!(identifier) }
       end
 
     end # Versions

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "3.0.3".freeze
+  VERSION = "3.0.7".freeze
 end

data/lib/generators/templates/uploader.rb.erb

@@ -42,6 +42,6 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
   # Override the filename of the uploaded files:
   # Avoid using model.id or version_name here, see uploader/store.rb for details.
   # def filename
-  #   "something.jpg" if original_filename
+  #   "something.jpg"
   # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.7
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2024-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -400,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Ruby file upload library