carrierwave 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79bb0ece072359fdea6b0f556a9b403bca195713a29424fb10d778bf3a9e557e
-  data.tar.gz: 2d566cf522931dba1289644c2a0e1318db509d3086235e022c439d3e0e34e83a
+  metadata.gz: 93ce71b0513b78b021bb85c121625135145ea8b78fc21bb64542e9114220d6cf
+  data.tar.gz: cfa74c58a128998a51b9d50d1f1f5d44ca95aeeb1847ff860fc9e55aedc33f61
 SHA512:
-  metadata.gz: 748384d2c1cd398385ebe72c7b17dbce246fee2e51d233c69ae9667bb698ede98065971f4502cdfe47de99e63826b638c47e4f32cb77ade88d63f18f0db1d075
-  data.tar.gz: 184d1e098e7cf781a58e8f927de3b79d22abeae1ff6e1475c62cdbd7b4c114e3744e542e7506821b6e53a2da084af3a1395653051b61a513df33ba5e0b0556cb
+  metadata.gz: 320adb08f7b9e280f43daa2663acd22bbe7bfc26a03461210a888e593136fd65c641f2aae3d332091ab4c59704cec6b9293864f85e7eb676ebebd06648c1b943
+  data.tar.gz: 140d651ba46ecda9e0e9209e01731e02782d3e4dc113e6e0b042faa64b3277aace8ac1f69a9f626bf0e083f4b60b5b9665612ae66b481c1f96b0ef074961d7cc

data/lib/carrierwave/mounter.rb

@@ -202,7 +202,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
 
       ##
@@ -120,7 +121,7 @@ module CarrierWave
         @deduplication_index = nil
         return unless current_paths.include?(store_path)
 
-        (2..current_paths.size + 1).each do |i|
+        (1..current_paths.size + 1).each do |i|
           @deduplication_index = i
           break unless current_paths.include?(store_path)
         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.1".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.1
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-02 00:00:00.000000000 Z
+date: 2023-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport