carrierwave 1.0.0 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. checksums.yaml +5 -5
  2. data/README.md +95 -34
  3. data/lib/carrierwave/downloader/base.rb +50 -0
  4. data/lib/carrierwave/downloader/remote_file.rb +42 -0
  5. data/lib/carrierwave/locale/en.yml +1 -1
  6. data/lib/carrierwave/mount.rb +29 -21
  7. data/lib/carrierwave/mounter.rb +70 -47
  8. data/lib/carrierwave/orm/activerecord.rb +18 -12
  9. data/lib/carrierwave/processing/mini_magick.rb +102 -99
  10. data/lib/carrierwave/processing/rmagick.rb +24 -3
  11. data/lib/carrierwave/sanitized_file.rb +39 -24
  12. data/lib/carrierwave/storage/file.rb +7 -3
  13. data/lib/carrierwave/storage/fog.rb +77 -19
  14. data/lib/carrierwave/storage.rb +1 -0
  15. data/lib/carrierwave/uploader/cache.rb +24 -16
  16. data/lib/carrierwave/uploader/configuration.rb +32 -16
  17. data/lib/carrierwave/uploader/content_type_whitelist.rb +1 -1
  18. data/lib/carrierwave/uploader/download.rb +2 -75
  19. data/lib/carrierwave/uploader/extension_whitelist.rb +2 -1
  20. data/lib/carrierwave/uploader/file_size.rb +4 -2
  21. data/lib/carrierwave/uploader/mountable.rb +6 -0
  22. data/lib/carrierwave/uploader/processing.rb +9 -7
  23. data/lib/carrierwave/uploader/proxy.rb +2 -2
  24. data/lib/carrierwave/uploader/serialization.rb +1 -1
  25. data/lib/carrierwave/uploader/store.rb +13 -2
  26. data/lib/carrierwave/uploader/url.rb +2 -2
  27. data/lib/carrierwave/uploader/versions.rb +50 -13
  28. data/lib/carrierwave/utilities/uri.rb +2 -0
  29. data/lib/carrierwave/validations/active_model.rb +3 -3
  30. data/lib/carrierwave/version.rb +1 -1
  31. data/lib/carrierwave.rb +28 -0
  32. data/lib/generators/templates/uploader.rb +1 -3
  33. metadata +103 -34
  34. data/lib/carrierwave/uploader/magic_mime_blacklist.rb +0 -94
  35. data/lib/carrierwave/uploader/magic_mime_whitelist.rb +0 -94
@@ -43,7 +43,8 @@ module CarrierWave
43
43
  end
44
44
 
45
45
  def whitelisted_extension?(extension)
46
- Array(extension_whitelist).any? { |item| extension =~ /\A#{item}\z/i }
46
+ downcase_extension = extension.downcase
47
+ Array(extension_whitelist).any? { |item| downcase_extension =~ /\A#{item}\z/i }
47
48
  end
48
49
 
49
50
  end # ExtensionWhitelist
@@ -1,3 +1,5 @@
1
+ require 'active_support'
2
+
1
3
  module CarrierWave
2
4
  module Uploader
3
5
  module FileSize
@@ -29,9 +31,9 @@ module CarrierWave
29
31
  expected_size_range = size_range
30
32
  if expected_size_range.is_a?(::Range)
31
33
  if size < expected_size_range.min
32
- raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.min_size_error", :min_size => expected_size_range.min)
34
+ raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.min_size_error", :min_size => ActiveSupport::NumberHelper.number_to_human_size(expected_size_range.min))
33
35
  elsif size > expected_size_range.max
34
- raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.max_size_error", :max_size => expected_size_range.max)
36
+ raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.max_size_error", :max_size => ActiveSupport::NumberHelper.number_to_human_size(expected_size_range.max))
35
37
  end
36
38
  end
37
39
  end
@@ -33,6 +33,12 @@ module CarrierWave
33
33
  @mounted_as = mounted_as
34
34
  end
35
35
 
36
+ ##
37
+ # Returns array index of given uploader within currently mounted uploaders
38
+ #
39
+ def index
40
+ model.__send__(:_mounter, mounted_as).uploaders.index(self)
41
+ end
36
42
  end # Mountable
37
43
  end # Uploader
38
44
  end # CarrierWave
@@ -71,15 +71,17 @@ module CarrierWave
71
71
  def process!(new_file=nil)
72
72
  return unless enable_processing
73
73
 
74
- self.class.processors.each do |method, args, condition|
75
- if(condition)
76
- if condition.respond_to?(:call)
77
- next unless condition.call(self, :args => args, :method => method, :file => new_file)
78
- else
79
- next unless self.send(condition, new_file)
74
+ with_callbacks(:process, new_file) do
75
+ self.class.processors.each do |method, args, condition|
76
+ if(condition)
77
+ if condition.respond_to?(:call)
78
+ next unless condition.call(self, :args => args, :method => method, :file => new_file)
79
+ else
80
+ next unless self.send(condition, new_file)
81
+ end
80
82
  end
83
+ self.send(method, *args)
81
84
  end
82
- self.send(method, *args)
83
85
  end
84
86
  end
85
87
 
@@ -23,14 +23,14 @@ module CarrierWave
23
23
  alias_method :path, :current_path
24
24
 
25
25
  ##
26
- # Returns a string that uniquely identifies the last stored file
26
+ # Returns a string that uniquely identifies the retrieved or last stored file
27
27
  #
28
28
  # === Returns
29
29
  #
30
30
  # [String] uniquely identifies a file
31
31
  #
32
32
  def identifier
33
- storage.try(:identifier)
33
+ @identifier || storage.try(:identifier)
34
34
  end
35
35
 
36
36
  ##
@@ -7,7 +7,7 @@ module CarrierWave
7
7
  extend ActiveSupport::Concern
8
8
 
9
9
  def serializable_hash(options = nil)
10
- {"url" => url}.merge Hash[versions.map { |name, version| [name, { "url" => version.url }] }]
10
+ {"url" => url}.merge Hash[versions.map { |name, version| [name.to_s, { "url" => version.url }] }]
11
11
  end
12
12
 
13
13
  def as_json(options=nil)
@@ -7,6 +7,15 @@ module CarrierWave
7
7
  include CarrierWave::Uploader::Configuration
8
8
  include CarrierWave::Uploader::Cache
9
9
 
10
+ included do
11
+ prepend Module.new {
12
+ def initialize(*)
13
+ super
14
+ @file, @filename, @cache_id, @identifier = nil
15
+ end
16
+ }
17
+ end
18
+
10
19
  ##
11
20
  # Override this in your Uploader to change the filename.
12
21
  #
@@ -52,7 +61,7 @@ module CarrierWave
52
61
  #
53
62
  def store!(new_file=nil)
54
63
  cache!(new_file) if new_file && ((@cache_id != parent_cache_id) || @cache_id.nil?)
55
- if !cache_only and @file and @cache_id
64
+ if !cache_only && @file && @cache_id
56
65
  with_callbacks(:store, new_file) do
57
66
  new_file = storage.store!(@file)
58
67
  if delete_tmp_file_after_storage
@@ -60,7 +69,8 @@ module CarrierWave
60
69
  cache_storage.delete_dir!(cache_path(nil))
61
70
  end
62
71
  @file = new_file
63
- @cache_id = nil
72
+ @cache_id = @identifier = nil
73
+ @staged = false
64
74
  end
65
75
  end
66
76
  end
@@ -75,6 +85,7 @@ module CarrierWave
75
85
  def retrieve_from_store!(identifier)
76
86
  with_callbacks(:retrieve_from_store, identifier) do
77
87
  @file = storage.retrieve!(identifier)
88
+ @identifier = identifier
78
89
  end
79
90
  end
80
91
 
@@ -15,8 +15,8 @@ module CarrierWave
15
15
  # [String] the location where this file is accessible via a url
16
16
  #
17
17
  def url(options = {})
18
- if file.respond_to?(:url) and not file.url.blank?
19
- file.method(:url).arity == 0 ? file.url : file.url(options)
18
+ if file.respond_to?(:url) && !(tmp_url = file.url).blank?
19
+ file.method(:url).arity.zero? ? tmp_url : file.url(options)
20
20
  elsif file.respond_to?(:path)
21
21
  path = encode_path(file.path.sub(File.expand_path(root), ''))
22
22
 
@@ -19,6 +19,13 @@ module CarrierWave
19
19
  after :remove, :remove_versions!
20
20
  after :retrieve_from_cache, :retrieve_versions_from_cache!
21
21
  after :retrieve_from_store, :retrieve_versions_from_store!
22
+
23
+ prepend Module.new {
24
+ def initialize(*)
25
+ super
26
+ @versions = nil
27
+ end
28
+ }
22
29
  end
23
30
 
24
31
  module ClassMethods
@@ -77,7 +84,7 @@ module CarrierWave
77
84
  # value from the parent class unless explicitly overwritten
78
85
  def self.enable_processing(value=nil)
79
86
  self.enable_processing = value if value
80
- if !@enable_processing.nil?
87
+ if defined?(@enable_processing) && !@enable_processing.nil?
81
88
  @enable_processing
82
89
  else
83
90
  superclass.enable_processing
@@ -213,16 +220,18 @@ module CarrierWave
213
220
  # Recreate versions and reprocess them. This can be used to recreate
214
221
  # versions if their parameters somehow have changed.
215
222
  #
216
- def recreate_versions!(*versions)
223
+ def recreate_versions!(*names)
217
224
  # Some files could possibly not be stored on the local disk. This
218
225
  # doesn't play nicely with processing. Make sure that we're only
219
226
  # processing a cached file
220
227
  #
221
228
  # The call to store! will trigger the necessary callbacks to both
222
229
  # process this version and all sub-versions
223
- if versions.any?
224
- file = sanitized_file if !cached?
225
- store_versions!(file, versions)
230
+
231
+ if names.any?
232
+ set_versions_to_cache_and_store(names)
233
+ store!(file)
234
+ reset_versions_to_cache_and_store
226
235
  else
227
236
  cache! if !cached?
228
237
  store!
@@ -230,6 +239,39 @@ module CarrierWave
230
239
  end
231
240
 
232
241
  private
242
+
243
+ def set_versions_to_cache_and_store(names)
244
+ @versions_to_cache = source_versions_of(names)
245
+ @versions_to_store = active_versions_with_names_in(@versions_to_cache + names)
246
+ end
247
+
248
+ def reset_versions_to_cache_and_store
249
+ @versions_to_cache, @versions_to_store = nil, nil
250
+ end
251
+
252
+ def versions_to_cache
253
+ @versions_to_cache || dependent_versions
254
+ end
255
+
256
+ def versions_to_store
257
+ @versions_to_store || active_versions
258
+ end
259
+
260
+ def source_versions_of(requested_names)
261
+ versions.inject([]) do |sources, (name, uploader)|
262
+ next sources unless requested_names.include?(name)
263
+ next sources unless source_name = uploader.class.version_options[:from_version]
264
+
265
+ sources << [source_name, versions[source_name]]
266
+ end.uniq
267
+ end
268
+
269
+ def active_versions_with_names_in(names)
270
+ active_versions.select do |pretendent_name, uploader|
271
+ names.include?(pretendent_name)
272
+ end
273
+ end
274
+
233
275
  def assign_parent_cache_id(file)
234
276
  active_versions.each do |name, uploader|
235
277
  uploader.parent_cache_id = @cache_id
@@ -263,19 +305,14 @@ module CarrierWave
263
305
  end
264
306
 
265
307
  def cache_versions!(new_file)
266
- dependent_versions.each do |name, v|
308
+ versions_to_cache.each do |name, v|
267
309
  v.send(:cache_id=, @cache_id)
268
310
  v.cache!(new_file)
269
311
  end
270
312
  end
271
313
 
272
- def store_versions!(new_file, versions=nil)
273
- if versions
274
- active = Hash[active_versions]
275
- versions.each { |v| active[v].try(:store!, new_file) } unless active.empty?
276
- else
277
- active_versions.each { |name, v| v.store!(new_file) }
278
- end
314
+ def store_versions!(new_file)
315
+ versions_to_store.each { |name, v| v.store!(new_file) }
279
316
  end
280
317
 
281
318
  def remove_versions!
@@ -1,3 +1,5 @@
1
+ require 'uri'
2
+
1
3
  module CarrierWave
2
4
  module Utilities
3
5
  module Uri
@@ -11,7 +11,7 @@ module CarrierWave
11
11
  class ProcessingValidator < ::ActiveModel::EachValidator
12
12
 
13
13
  def validate_each(record, attribute, value)
14
- if e = record.send("#{attribute}_processing_error")
14
+ record.__send__("#{attribute}_processing_errors").each do |e|
15
15
  message = (e.message == e.class.to_s) ? :carrierwave_processing_error : e.message
16
16
  record.errors.add(attribute, message)
17
17
  end
@@ -21,7 +21,7 @@ module CarrierWave
21
21
  class IntegrityValidator < ::ActiveModel::EachValidator
22
22
 
23
23
  def validate_each(record, attribute, value)
24
- if e = record.send("#{attribute}_integrity_error")
24
+ record.__send__("#{attribute}_integrity_errors").each do |e|
25
25
  message = (e.message == e.class.to_s) ? :carrierwave_integrity_error : e.message
26
26
  record.errors.add(attribute, message)
27
27
  end
@@ -31,7 +31,7 @@ module CarrierWave
31
31
  class DownloadValidator < ::ActiveModel::EachValidator
32
32
 
33
33
  def validate_each(record, attribute, value)
34
- if e = record.send("#{attribute}_download_error")
34
+ record.__send__("#{attribute}_download_errors").each do |e|
35
35
  message = (e.message == e.class.to_s) ? :carrierwave_download_error : e.message
36
36
  record.errors.add(attribute, message)
37
37
  end
@@ -1,3 +1,3 @@
1
1
  module CarrierWave
2
- VERSION = "1.0.0"
2
+ VERSION = "2.0.0"
3
3
  end
data/lib/carrierwave.rb CHANGED
@@ -34,6 +34,26 @@ if defined?(Merb)
34
34
  Dir.glob(File.join(Merb.load_paths[:uploaders])).each {|f| require f }
35
35
  end
36
36
 
37
+ elsif defined?(Jets)
38
+
39
+ module CarrierWave
40
+ class Turbine < Jets::Turbine
41
+ initializer "carrierwave.setup_paths" do |app|
42
+ CarrierWave.root = Jets.root.to_s
43
+ CarrierWave.tmp_path = "/tmp/carrierwave"
44
+ CarrierWave.configure do |config|
45
+ config.cache_dir = "/tmp/carrierwave/uploads/tmp"
46
+ end
47
+ end
48
+
49
+ initializer "carrierwave.active_record" do
50
+ ActiveSupport.on_load :active_record do
51
+ require 'carrierwave/orm/activerecord'
52
+ end
53
+ end
54
+ end
55
+ end
56
+
37
57
  elsif defined?(Rails)
38
58
 
39
59
  module CarrierWave
@@ -41,6 +61,10 @@ elsif defined?(Rails)
41
61
  initializer "carrierwave.setup_paths" do |app|
42
62
  CarrierWave.root = Rails.root.join(Rails.public_path).to_s
43
63
  CarrierWave.base_path = ENV['RAILS_RELATIVE_URL_ROOT']
64
+ available_locales = Array(app.config.i18n.available_locales || [])
65
+ if available_locales.blank? || available_locales.include?(:en)
66
+ I18n.load_path.prepend(File.join(File.dirname(__FILE__), 'carrierwave', 'locale', "en.yml"))
67
+ end
44
68
  end
45
69
 
46
70
  initializer "carrierwave.active_record" do
@@ -48,6 +72,10 @@ elsif defined?(Rails)
48
72
  require 'carrierwave/orm/activerecord'
49
73
  end
50
74
  end
75
+
76
+ config.before_eager_load do
77
+ CarrierWave::Storage::Fog.eager_load
78
+ end
51
79
  end
52
80
  end
53
81
 
@@ -1,5 +1,4 @@
1
1
  class <%= class_name %>Uploader < CarrierWave::Uploader::Base
2
-
3
2
  # Include RMagick or MiniMagick support:
4
3
  # include CarrierWave::RMagick
5
4
  # include CarrierWave::MiniMagick
@@ -15,7 +14,7 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
15
14
  end
16
15
 
17
16
  # Provide a default URL as a default if there hasn't been a file uploaded:
18
- # def default_url
17
+ # def default_url(*args)
19
18
  # # For Rails 3.1+ asset pipeline compatibility:
20
19
  # # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
21
20
  #
@@ -45,5 +44,4 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
45
44
  # def filename
46
45
  # "something.jpg" if original_filename
47
46
  # end
48
-
49
47
  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: 1.0.0
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonas Nicklas
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-12-24 00:00:00.000000000 Z
11
+ date: 2019-08-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -16,42 +16,84 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 4.0.0
19
+ version: 5.0.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: 4.0.0
26
+ version: 5.0.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: activemodel
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: 4.0.0
33
+ version: 5.0.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: 4.0.0
40
+ version: 5.0.0
41
41
  - !ruby/object:Gem::Dependency
42
- name: mime-types
42
+ name: mini_mime
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: '1.16'
47
+ version: 0.1.3
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: '1.16'
54
+ version: 0.1.3
55
+ - !ruby/object:Gem::Dependency
56
+ name: image_processing
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - "~>"
60
+ - !ruby/object:Gem::Version
61
+ version: '1.1'
62
+ type: :runtime
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - "~>"
67
+ - !ruby/object:Gem::Version
68
+ version: '1.1'
69
+ - !ruby/object:Gem::Dependency
70
+ name: mimemagic
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - ">="
74
+ - !ruby/object:Gem::Version
75
+ version: 0.3.0
76
+ type: :runtime
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - ">="
81
+ - !ruby/object:Gem::Version
82
+ version: 0.3.0
83
+ - !ruby/object:Gem::Dependency
84
+ name: addressable
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - "~>"
88
+ - !ruby/object:Gem::Version
89
+ version: '2.6'
90
+ type: :runtime
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - "~>"
95
+ - !ruby/object:Gem::Version
96
+ version: '2.6'
55
97
  - !ruby/object:Gem::Dependency
56
98
  name: pg
57
99
  requirement: !ruby/object:Gem::Requirement
@@ -72,42 +114,42 @@ dependencies:
72
114
  requirements:
73
115
  - - ">="
74
116
  - !ruby/object:Gem::Version
75
- version: 4.0.0
117
+ version: 5.0.0
76
118
  type: :development
77
119
  prerelease: false
78
120
  version_requirements: !ruby/object:Gem::Requirement
79
121
  requirements:
80
122
  - - ">="
81
123
  - !ruby/object:Gem::Version
82
- version: 4.0.0
124
+ version: 5.0.0
83
125
  - !ruby/object:Gem::Dependency
84
126
  name: cucumber
85
127
  requirement: !ruby/object:Gem::Requirement
86
128
  requirements:
87
129
  - - "~>"
88
130
  - !ruby/object:Gem::Version
89
- version: 2.3.2
131
+ version: '2.3'
90
132
  type: :development
91
133
  prerelease: false
92
134
  version_requirements: !ruby/object:Gem::Requirement
93
135
  requirements:
94
136
  - - "~>"
95
137
  - !ruby/object:Gem::Version
96
- version: 2.3.2
138
+ version: '2.3'
97
139
  - !ruby/object:Gem::Dependency
98
140
  name: rspec
99
141
  requirement: !ruby/object:Gem::Requirement
100
142
  requirements:
101
143
  - - "~>"
102
144
  - !ruby/object:Gem::Version
103
- version: 3.4.0
145
+ version: '3.4'
104
146
  type: :development
105
147
  prerelease: false
106
148
  version_requirements: !ruby/object:Gem::Requirement
107
149
  requirements:
108
150
  - - "~>"
109
151
  - !ruby/object:Gem::Version
110
- version: 3.4.0
152
+ version: '3.4'
111
153
  - !ruby/object:Gem::Dependency
112
154
  name: webmock
113
155
  requirement: !ruby/object:Gem::Requirement
@@ -123,35 +165,49 @@ dependencies:
123
165
  - !ruby/object:Gem::Version
124
166
  version: '0'
125
167
  - !ruby/object:Gem::Dependency
126
- name: fog
168
+ name: fog-aws
127
169
  requirement: !ruby/object:Gem::Requirement
128
170
  requirements:
129
171
  - - ">="
130
172
  - !ruby/object:Gem::Version
131
- version: 1.28.0
173
+ version: '0'
132
174
  type: :development
133
175
  prerelease: false
134
176
  version_requirements: !ruby/object:Gem::Requirement
135
177
  requirements:
136
178
  - - ">="
137
179
  - !ruby/object:Gem::Version
138
- version: 1.28.0
180
+ version: '0'
139
181
  - !ruby/object:Gem::Dependency
140
- name: mini_magick
182
+ name: fog-google
183
+ requirement: !ruby/object:Gem::Requirement
184
+ requirements:
185
+ - - "~>"
186
+ - !ruby/object:Gem::Version
187
+ version: '1.7'
188
+ type: :development
189
+ prerelease: false
190
+ version_requirements: !ruby/object:Gem::Requirement
191
+ requirements:
192
+ - - "~>"
193
+ - !ruby/object:Gem::Version
194
+ version: '1.7'
195
+ - !ruby/object:Gem::Dependency
196
+ name: fog-local
141
197
  requirement: !ruby/object:Gem::Requirement
142
198
  requirements:
143
199
  - - ">="
144
200
  - !ruby/object:Gem::Version
145
- version: 3.6.0
201
+ version: '0'
146
202
  type: :development
147
203
  prerelease: false
148
204
  version_requirements: !ruby/object:Gem::Requirement
149
205
  requirements:
150
206
  - - ">="
151
207
  - !ruby/object:Gem::Version
152
- version: 3.6.0
208
+ version: '0'
153
209
  - !ruby/object:Gem::Dependency
154
- name: rmagick
210
+ name: fog-rackspace
155
211
  requirement: !ruby/object:Gem::Requirement
156
212
  requirements:
157
213
  - - ">="
@@ -165,33 +221,47 @@ dependencies:
165
221
  - !ruby/object:Gem::Version
166
222
  version: '0'
167
223
  - !ruby/object:Gem::Dependency
168
- name: nokogiri
224
+ name: mini_magick
225
+ requirement: !ruby/object:Gem::Requirement
226
+ requirements:
227
+ - - ">="
228
+ - !ruby/object:Gem::Version
229
+ version: 3.6.0
230
+ type: :development
231
+ prerelease: false
232
+ version_requirements: !ruby/object:Gem::Requirement
233
+ requirements:
234
+ - - ">="
235
+ - !ruby/object:Gem::Version
236
+ version: 3.6.0
237
+ - !ruby/object:Gem::Dependency
238
+ name: rmagick
169
239
  requirement: !ruby/object:Gem::Requirement
170
240
  requirements:
171
241
  - - "~>"
172
242
  - !ruby/object:Gem::Version
173
- version: 1.6.3
243
+ version: '2.16'
174
244
  type: :development
175
245
  prerelease: false
176
246
  version_requirements: !ruby/object:Gem::Requirement
177
247
  requirements:
178
248
  - - "~>"
179
249
  - !ruby/object:Gem::Version
180
- version: 1.6.3
250
+ version: '2.16'
181
251
  - !ruby/object:Gem::Dependency
182
252
  name: timecop
183
253
  requirement: !ruby/object:Gem::Requirement
184
254
  requirements:
185
- - - '='
255
+ - - ">="
186
256
  - !ruby/object:Gem::Version
187
- version: 0.7.1
257
+ version: '0'
188
258
  type: :development
189
259
  prerelease: false
190
260
  version_requirements: !ruby/object:Gem::Requirement
191
261
  requirements:
192
- - - '='
262
+ - - ">="
193
263
  - !ruby/object:Gem::Version
194
- version: 0.7.1
264
+ version: '0'
195
265
  - !ruby/object:Gem::Dependency
196
266
  name: generator_spec
197
267
  requirement: !ruby/object:Gem::Requirement
@@ -232,6 +302,8 @@ files:
232
302
  - README.md
233
303
  - lib/carrierwave.rb
234
304
  - lib/carrierwave/compatibility/paperclip.rb
305
+ - lib/carrierwave/downloader/base.rb
306
+ - lib/carrierwave/downloader/remote_file.rb
235
307
  - lib/carrierwave/error.rb
236
308
  - lib/carrierwave/locale/en.yml
237
309
  - lib/carrierwave/mount.rb
@@ -257,8 +329,6 @@ files:
257
329
  - lib/carrierwave/uploader/extension_blacklist.rb
258
330
  - lib/carrierwave/uploader/extension_whitelist.rb
259
331
  - lib/carrierwave/uploader/file_size.rb
260
- - lib/carrierwave/uploader/magic_mime_blacklist.rb
261
- - lib/carrierwave/uploader/magic_mime_whitelist.rb
262
332
  - lib/carrierwave/uploader/mountable.rb
263
333
  - lib/carrierwave/uploader/processing.rb
264
334
  - lib/carrierwave/uploader/proxy.rb
@@ -286,15 +356,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
286
356
  requirements:
287
357
  - - ">="
288
358
  - !ruby/object:Gem::Version
289
- version: 2.0.0
359
+ version: 2.2.2
290
360
  required_rubygems_version: !ruby/object:Gem::Requirement
291
361
  requirements:
292
362
  - - ">="
293
363
  - !ruby/object:Gem::Version
294
364
  version: '0'
295
365
  requirements: []
296
- rubyforge_project:
297
- rubygems_version: 2.5.1
366
+ rubygems_version: 3.0.3
298
367
  signing_key:
299
368
  specification_version: 4
300
369
  summary: Ruby file upload library