carrierwave 3.0.4 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b5171e0463380372e899d91db1f82c40aeed72f29bc6f15192b57fa88025d44
-  data.tar.gz: e9f2a2dea4d9cc8194a7aaee0a7521e9e499cdeb04586c20882bd3d057e17345
+  metadata.gz: 3d156dd7cde36460576c176937cbe38967f0f7ed9f6d3e6fe602e4adc3fedee0
+  data.tar.gz: 4d09e2dae61f271be839edabe60811faa60beec6b699a391ab8f3f5b2a453f04
 SHA512:
-  metadata.gz: da23d7ff667fdb4ff1a939f8946af21b3412349e07b1cb26bc5c691664c94911ea247d01d3ff58ac417fbd7c4ddbdaf9f12fb24ee81cc897d95fa94b45e2608e
-  data.tar.gz: 5313d3bad4cb18a0655a7a480584241c19fb369f53495f005efab10586efd898f24bf04eff81bb11863d0fa4a81d7c9ff27ae30ddc314b8705bf06d13bc494a4
+  metadata.gz: c58ec99cca0ae6fa0068f93b2271f72581406a9a823b03a47f4cad744a758b33460f28de299ff7690022efb97dd277cd04ce5e87f0fc5a06c5cadbb42ef11f36
+  data.tar.gz: 7e588a03b01df29c687c5a418757d4a1d24e0bd22eeff21fd2409206020532f7536d31d6b69bd34c49b1928bde5cac72cea0bec7e23be014deef4fbeb59c7c8c

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/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

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/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.4".freeze
+  VERSION = "3.0.6".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.4
+  version: 3.0.6
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-08 00:00:00.000000000 Z
+date: 2024-03-09 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