carrierwave 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79bb0ece072359fdea6b0f556a9b403bca195713a29424fb10d778bf3a9e557e
-  data.tar.gz: 2d566cf522931dba1289644c2a0e1318db509d3086235e022c439d3e0e34e83a
+  metadata.gz: 4f12b8894846b8a7fdfecb1c537020481e3bb9c6c61d8169341b9cc8c2136f56
+  data.tar.gz: 2ca2f58d5fbedacf2f355e84e3fe57980b51fa6c17dc0fde2cbd87a40460a7d4
 SHA512:
-  metadata.gz: 748384d2c1cd398385ebe72c7b17dbce246fee2e51d233c69ae9667bb698ede98065971f4502cdfe47de99e63826b638c47e4f32cb77ade88d63f18f0db1d075
-  data.tar.gz: 184d1e098e7cf781a58e8f927de3b79d22abeae1ff6e1475c62cdbd7b4c114e3744e542e7506821b6e53a2da084af3a1395653051b61a513df33ba5e0b0556cb
+  metadata.gz: ee31d0127aa61484b2e9ddb8d9bd64e684d9a553e571487408f5a239837d3be369dfb64a81784239f76ea4355113a0f1b6098ddf28689eb5555b222e59596f2f
+  data.tar.gz: 75ec8c867a5048a988b63b7b3cc78d2d0da943b48605c7f96ec48d0a04f113a022eb7c138230bff079a7d478140d1738b58c2f65f32a0ce132631877006c0ec9

data/lib/carrierwave/mounter.rb

@@ -139,20 +139,22 @@ module CarrierWave
     end
 
     def store!
-      additions, remains = uploaders.partition(&:cached?)
-      existing_paths = (@removed_uploaders + remains).map(&:store_path)
-      additions.each do |uploader|
-        uploader.deduplicate(existing_paths)
-        uploader.store!
-        existing_paths << uploader.store_path
-      end
-      @added_uploaders += additions
+      uploaders.each(&:store!)
+      @added_uploaders += uploaders.reject(&:staged)
     end
 
     def write_identifier
       return if record.frozen?
 
       clear! if remove?
+
+      additions, remains = uploaders.partition(&:cached?)
+      existing_identifiers = (@removed_uploaders + remains).map(&:identifier)
+      additions.each do |uploader|
+        uploader.deduplicate(existing_identifiers)
+        existing_identifiers << uploader.identifier
+      end
+
       record.write_uploader(serialization_column, identifier)
     end
 
@@ -202,7 +204,7 @@ module CarrierWave
     end
 
     def remove_added
-      current_paths = (@removed_uploaders + @uploaders.select(&:staged)).map(&:path)
+      current_paths = (@removed_uploaders + uploaders.select(&:staged)).map(&:path)
       @added_uploaders
         .reject {|uploader| current_paths.include?(uploader.path) }
         .each { |uploader| uploader.remove! }

data/lib/carrierwave/orm/activerecord.rb

@@ -44,6 +44,8 @@ module CarrierWave
         def initialize_dup(other)
           old_uploaders = _mounter(:"#{column}").uploaders
           @_mounters[:"#{column}"] = nil
+          # The attribute needs to be cleared to prevent it from picked up as identifier
+          write_attribute(:"#{column}", nil)
           super
           _mounter(:"#{column}").cache(old_uploaders)
         end

data/lib/carrierwave/uploader/store.rb

@@ -43,11 +43,12 @@ module CarrierWave
       #
       def deduplicated_filename
         return unless filename
+        return filename unless @deduplication_index
 
         parts = filename.split('.')
         basename = parts.shift
         basename.sub!(/ ?\(\d+\)\z/, '')
-        ([basename.to_s + (@deduplication_index ? "(#{@deduplication_index})" : '')] + parts).join('.')
+        ([basename.to_s + (@deduplication_index > 1 ? "(#{@deduplication_index})" : '')] + parts).join('.')
       end
 
       ##
@@ -107,22 +108,22 @@ module CarrierWave
       end
 
       ##
-      # Look for a store path which doesn't collide with the given already-stored paths.
+      # Look for an identifier which doesn't collide with the given already-stored identifiers.
       # It is done by adding a index number as the suffix.
       # For example, if there's 'image.jpg' and the @deduplication_index is set to 2,
       # The stored file will be named as 'image(2).jpg'.
       #
       # === Parameters
       #
-      # [current_paths (Array[String])] List of paths for already-stored files
+      # [current_identifiers (Array[String])] List of identifiers for already-stored files
       #
-      def deduplicate(current_paths)
+      def deduplicate(current_identifiers)
         @deduplication_index = nil
-        return unless current_paths.include?(store_path)
+        return unless current_identifiers.include?(identifier)
 
-        (2..current_paths.size + 1).each do |i|
+        (1..current_identifiers.size + 1).each do |i|
           @deduplication_index = i
-          break unless current_paths.include?(store_path)
+          break unless current_identifiers.include?(identifier)
         end
       end
 

data/lib/carrierwave/uploader/versions.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/object/deep_dup"
+
 module CarrierWave
   module Uploader
     module Versions
@@ -25,6 +27,17 @@ module CarrierWave
           @klass.processors = []
           @klass.version_options = @options
           @klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            # Define the enable_processing method for versions so they get the
+            # value from the parent class unless explicitly overwritten
+            def self.enable_processing(value=nil)
+              self.enable_processing = value if value
+              if defined?(@enable_processing) && !@enable_processing.nil?
+                @enable_processing
+              else
+                superclass.enable_processing
+              end
+            end
+
             # Regardless of what is set in the parent uploader, do not enforce the
             # move_to_cache config option on versions because it moves the original
             # file to the version's target file.

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "3.0.0".freeze
+  VERSION = "3.0.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-02 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport