carrierwave 3.0.0 → 3.0.1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of carrierwave might be problematic. Click here for more details.

checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 79bb0ece072359fdea6b0f556a9b403bca195713a29424fb10d778bf3a9e557e
4
- data.tar.gz: 2d566cf522931dba1289644c2a0e1318db509d3086235e022c439d3e0e34e83a
3
+ metadata.gz: 93ce71b0513b78b021bb85c121625135145ea8b78fc21bb64542e9114220d6cf
4
+ data.tar.gz: cfa74c58a128998a51b9d50d1f1f5d44ca95aeeb1847ff860fc9e55aedc33f61
5
5
  SHA512:
6
- metadata.gz: 748384d2c1cd398385ebe72c7b17dbce246fee2e51d233c69ae9667bb698ede98065971f4502cdfe47de99e63826b638c47e4f32cb77ade88d63f18f0db1d075
7
- data.tar.gz: 184d1e098e7cf781a58e8f927de3b79d22abeae1ff6e1475c62cdbd7b4c114e3744e542e7506821b6e53a2da084af3a1395653051b61a513df33ba5e0b0556cb
6
+ metadata.gz: 320adb08f7b9e280f43daa2663acd22bbe7bfc26a03461210a888e593136fd65c641f2aae3d332091ab4c59704cec6b9293864f85e7eb676ebebd06648c1b943
7
+ data.tar.gz: 140d651ba46ecda9e0e9209e01731e02782d3e4dc113e6e0b042faa64b3277aace8ac1f69a9f626bf0e083f4b60b5b9665612ae66b481c1f96b0ef074961d7cc
@@ -202,7 +202,7 @@ module CarrierWave
202
202
  end
203
203
 
204
204
  def remove_added
205
- current_paths = (@removed_uploaders + @uploaders.select(&:staged)).map(&:path)
205
+ current_paths = (@removed_uploaders + uploaders.select(&:staged)).map(&:path)
206
206
  @added_uploaders
207
207
  .reject {|uploader| current_paths.include?(uploader.path) }
208
208
  .each { |uploader| uploader.remove! }
@@ -44,6 +44,8 @@ module CarrierWave
44
44
  def initialize_dup(other)
45
45
  old_uploaders = _mounter(:"#{column}").uploaders
46
46
  @_mounters[:"#{column}"] = nil
47
+ # The attribute needs to be cleared to prevent it from picked up as identifier
48
+ write_attribute(:"#{column}", nil)
47
49
  super
48
50
  _mounter(:"#{column}").cache(old_uploaders)
49
51
  end
@@ -43,11 +43,12 @@ module CarrierWave
43
43
  #
44
44
  def deduplicated_filename
45
45
  return unless filename
46
+ return filename unless @deduplication_index
46
47
 
47
48
  parts = filename.split('.')
48
49
  basename = parts.shift
49
50
  basename.sub!(/ ?\(\d+\)\z/, '')
50
- ([basename.to_s + (@deduplication_index ? "(#{@deduplication_index})" : '')] + parts).join('.')
51
+ ([basename.to_s + (@deduplication_index > 1 ? "(#{@deduplication_index})" : '')] + parts).join('.')
51
52
  end
52
53
 
53
54
  ##
@@ -120,7 +121,7 @@ module CarrierWave
120
121
  @deduplication_index = nil
121
122
  return unless current_paths.include?(store_path)
122
123
 
123
- (2..current_paths.size + 1).each do |i|
124
+ (1..current_paths.size + 1).each do |i|
124
125
  @deduplication_index = i
125
126
  break unless current_paths.include?(store_path)
126
127
  end
@@ -1,3 +1,5 @@
1
+ require "active_support/core_ext/object/deep_dup"
2
+
1
3
  module CarrierWave
2
4
  module Uploader
3
5
  module Versions
@@ -25,6 +27,17 @@ module CarrierWave
25
27
  @klass.processors = []
26
28
  @klass.version_options = @options
27
29
  @klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
30
+ # Define the enable_processing method for versions so they get the
31
+ # value from the parent class unless explicitly overwritten
32
+ def self.enable_processing(value=nil)
33
+ self.enable_processing = value if value
34
+ if defined?(@enable_processing) && !@enable_processing.nil?
35
+ @enable_processing
36
+ else
37
+ superclass.enable_processing
38
+ end
39
+ end
40
+
28
41
  # Regardless of what is set in the parent uploader, do not enforce the
29
42
  # move_to_cache config option on versions because it moves the original
30
43
  # file to the version's target file.
@@ -1,3 +1,3 @@
1
1
  module CarrierWave
2
- VERSION = "3.0.0".freeze
2
+ VERSION = "3.0.1".freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: carrierwave
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0
4
+ version: 3.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonas Nicklas
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-07-02 00:00:00.000000000 Z
11
+ date: 2023-07-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport