carrierwave 0.9.0 → 3.0.2
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 +7 -0
- data/README.md +508 -158
- data/lib/carrierwave/compatibility/paperclip.rb +31 -21
- data/lib/carrierwave/downloader/base.rb +101 -0
- data/lib/carrierwave/downloader/remote_file.rb +68 -0
- data/lib/carrierwave/error.rb +1 -0
- data/lib/carrierwave/locale/en.yml +11 -5
- data/lib/carrierwave/mount.rb +220 -187
- data/lib/carrierwave/mounter.rb +255 -0
- data/lib/carrierwave/orm/activerecord.rb +24 -34
- data/lib/carrierwave/processing/mini_magick.rb +142 -79
- data/lib/carrierwave/processing/rmagick.rb +76 -35
- data/lib/carrierwave/processing/vips.rb +284 -0
- data/lib/carrierwave/processing.rb +1 -1
- data/lib/carrierwave/sanitized_file.rb +89 -70
- data/lib/carrierwave/storage/abstract.rb +16 -3
- data/lib/carrierwave/storage/file.rb +71 -3
- data/lib/carrierwave/storage/fog.rb +215 -58
- data/lib/carrierwave/storage.rb +1 -7
- data/lib/carrierwave/test/matchers.rb +88 -19
- data/lib/carrierwave/uploader/cache.rb +88 -44
- data/lib/carrierwave/uploader/callbacks.rb +1 -3
- data/lib/carrierwave/uploader/configuration.rb +81 -9
- data/lib/carrierwave/uploader/content_type_allowlist.rb +62 -0
- data/lib/carrierwave/uploader/content_type_denylist.rb +62 -0
- data/lib/carrierwave/uploader/default_url.rb +3 -5
- data/lib/carrierwave/uploader/dimension.rb +66 -0
- data/lib/carrierwave/uploader/download.rb +5 -69
- data/lib/carrierwave/uploader/extension_allowlist.rb +63 -0
- data/lib/carrierwave/uploader/extension_denylist.rb +64 -0
- data/lib/carrierwave/uploader/file_size.rb +43 -0
- data/lib/carrierwave/uploader/mountable.rb +13 -8
- data/lib/carrierwave/uploader/processing.rb +54 -21
- data/lib/carrierwave/uploader/proxy.rb +30 -8
- data/lib/carrierwave/uploader/remove.rb +0 -2
- data/lib/carrierwave/uploader/serialization.rb +3 -5
- data/lib/carrierwave/uploader/store.rb +59 -28
- data/lib/carrierwave/uploader/url.rb +8 -7
- data/lib/carrierwave/uploader/versions.rb +173 -124
- data/lib/carrierwave/uploader.rb +12 -6
- data/lib/carrierwave/utilities/file_name.rb +47 -0
- data/lib/carrierwave/utilities/uri.rb +14 -12
- data/lib/carrierwave/utilities.rb +2 -3
- data/lib/carrierwave/validations/active_model.rb +7 -13
- data/lib/carrierwave/version.rb +1 -1
- data/lib/carrierwave.rb +41 -16
- data/lib/generators/templates/{uploader.rb → uploader.rb.erb} +5 -9
- data/lib/generators/uploader_generator.rb +3 -3
- metadata +224 -100
- data/lib/carrierwave/locale/cs.yml +0 -11
- data/lib/carrierwave/locale/de.yml +0 -11
- data/lib/carrierwave/locale/nl.yml +0 -11
- data/lib/carrierwave/locale/sk.yml +0 -11
- data/lib/carrierwave/processing/mime_types.rb +0 -73
- data/lib/carrierwave/uploader/extension_blacklist.rb +0 -47
- data/lib/carrierwave/uploader/extension_whitelist.rb +0 -49
@@ -1,5 +1,3 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
|
3
1
|
module CarrierWave
|
4
2
|
module Test
|
5
3
|
|
@@ -23,13 +21,16 @@ module CarrierWave
|
|
23
21
|
"expected #{@actual.inspect} to be identical to #{@expected.inspect}"
|
24
22
|
end
|
25
23
|
|
26
|
-
def
|
24
|
+
def failure_message_when_negated
|
27
25
|
"expected #{@actual.inspect} to not be identical to #{@expected.inspect}"
|
28
26
|
end
|
29
27
|
|
30
28
|
def description
|
31
29
|
"be identical to #{@expected.inspect}"
|
32
30
|
end
|
31
|
+
|
32
|
+
# RSpec 2 compatibility:
|
33
|
+
alias_method :negative_failure_message, :failure_message_when_negated
|
33
34
|
end
|
34
35
|
|
35
36
|
def be_identical_to(expected)
|
@@ -44,20 +45,23 @@ module CarrierWave
|
|
44
45
|
def matches?(actual)
|
45
46
|
@actual = actual
|
46
47
|
# Satisfy expectation here. Return false or raise an error if it's not met.
|
47
|
-
(File.stat(@actual.path).mode &
|
48
|
+
(File.stat(@actual.path).mode & 0o777) == @expected
|
48
49
|
end
|
49
50
|
|
50
51
|
def failure_message
|
51
|
-
"expected #{@actual.current_path.inspect} to have permissions #{@expected.to_s(8)}, but they were #{(File.stat(@actual.path).mode &
|
52
|
+
"expected #{@actual.current_path.inspect} to have permissions #{@expected.to_s(8)}, but they were #{(File.stat(@actual.path).mode & 0o777).to_s(8)}"
|
52
53
|
end
|
53
54
|
|
54
|
-
def
|
55
|
+
def failure_message_when_negated
|
55
56
|
"expected #{@actual.current_path.inspect} not to have permissions #{@expected.to_s(8)}, but it did"
|
56
57
|
end
|
57
58
|
|
58
59
|
def description
|
59
60
|
"have permissions #{@expected.to_s(8)}"
|
60
61
|
end
|
62
|
+
|
63
|
+
# RSpec 2 compatibility:
|
64
|
+
alias_method :negative_failure_message, :failure_message_when_negated
|
61
65
|
end
|
62
66
|
|
63
67
|
def have_permissions(expected)
|
@@ -72,20 +76,23 @@ module CarrierWave
|
|
72
76
|
def matches?(actual)
|
73
77
|
@actual = actual
|
74
78
|
# Satisfy expectation here. Return false or raise an error if it's not met.
|
75
|
-
(File.stat(File.dirname
|
79
|
+
(File.stat(File.dirname(@actual.path)).mode & 0o777) == @expected
|
76
80
|
end
|
77
81
|
|
78
82
|
def failure_message
|
79
|
-
"expected #{File.dirname @actual.current_path.inspect} to have permissions #{@expected.to_s(8)}, but they were #{(File.stat(@actual.path).mode &
|
83
|
+
"expected #{File.dirname @actual.current_path.inspect} to have permissions #{@expected.to_s(8)}, but they were #{(File.stat(@actual.path).mode & 0o777).to_s(8)}"
|
80
84
|
end
|
81
85
|
|
82
|
-
def
|
86
|
+
def failure_message_when_negated
|
83
87
|
"expected #{File.dirname @actual.current_path.inspect} not to have permissions #{@expected.to_s(8)}, but it did"
|
84
88
|
end
|
85
89
|
|
86
90
|
def description
|
87
91
|
"have permissions #{@expected.to_s(8)}"
|
88
92
|
end
|
93
|
+
|
94
|
+
# RSpec 2 compatibility:
|
95
|
+
alias_method :negative_failure_message, :failure_message_when_negated
|
89
96
|
end
|
90
97
|
|
91
98
|
def have_directory_permissions(expected)
|
@@ -110,13 +117,16 @@ module CarrierWave
|
|
110
117
|
"expected #{@actual.current_path.inspect} to be no larger than #{@width} by #{@height}, but it was #{@actual_width} by #{@actual_height}."
|
111
118
|
end
|
112
119
|
|
113
|
-
def
|
120
|
+
def failure_message_when_negated
|
114
121
|
"expected #{@actual.current_path.inspect} to be larger than #{@width} by #{@height}, but it wasn't."
|
115
122
|
end
|
116
123
|
|
117
124
|
def description
|
118
125
|
"be no larger than #{@width} by #{@height}"
|
119
126
|
end
|
127
|
+
|
128
|
+
# RSpec 2 compatibility:
|
129
|
+
alias_method :negative_failure_message, :failure_message_when_negated
|
120
130
|
end
|
121
131
|
|
122
132
|
def be_no_larger_than(width, height)
|
@@ -141,13 +151,16 @@ module CarrierWave
|
|
141
151
|
"expected #{@actual.current_path.inspect} to have an exact size of #{@width} by #{@height}, but it was #{@actual_width} by #{@actual_height}."
|
142
152
|
end
|
143
153
|
|
144
|
-
def
|
154
|
+
def failure_message_when_negated
|
145
155
|
"expected #{@actual.current_path.inspect} not to have an exact size of #{@width} by #{@height}, but it did."
|
146
156
|
end
|
147
157
|
|
148
158
|
def description
|
149
159
|
"have an exact size of #{@width} by #{@height}"
|
150
160
|
end
|
161
|
+
|
162
|
+
# RSpec 2 compatibility:
|
163
|
+
alias_method :negative_failure_message, :failure_message_when_negated
|
151
164
|
end
|
152
165
|
|
153
166
|
def have_dimensions(width, height)
|
@@ -171,13 +184,16 @@ module CarrierWave
|
|
171
184
|
"expected #{@actual.current_path.inspect} to have an exact size of #{@height}, but it was #{@actual_height}."
|
172
185
|
end
|
173
186
|
|
174
|
-
def
|
187
|
+
def failure_message_when_negated
|
175
188
|
"expected #{@actual.current_path.inspect} not to have an exact size of #{@height}, but it did."
|
176
189
|
end
|
177
190
|
|
178
191
|
def description
|
179
192
|
"have an exact height of #{@height}"
|
180
193
|
end
|
194
|
+
|
195
|
+
# RSpec 2 compatibility:
|
196
|
+
alias_method :negative_failure_message, :failure_message_when_negated
|
181
197
|
end
|
182
198
|
|
183
199
|
def have_height(height)
|
@@ -201,13 +217,16 @@ module CarrierWave
|
|
201
217
|
"expected #{@actual.current_path.inspect} to have an exact size of #{@width}, but it was #{@actual_width}."
|
202
218
|
end
|
203
219
|
|
204
|
-
def
|
220
|
+
def failure_message_when_negated
|
205
221
|
"expected #{@actual.current_path.inspect} not to have an exact size of #{@width}, but it did."
|
206
222
|
end
|
207
223
|
|
208
224
|
def description
|
209
225
|
"have an exact width of #{@width}"
|
210
226
|
end
|
227
|
+
|
228
|
+
# RSpec 2 compatibility:
|
229
|
+
alias_method :negative_failure_message, :failure_message_when_negated
|
211
230
|
end
|
212
231
|
|
213
232
|
def have_width(width)
|
@@ -231,13 +250,16 @@ module CarrierWave
|
|
231
250
|
"expected #{@actual.current_path.inspect} to be no wider than #{@width}, but it was #{@actual_width}."
|
232
251
|
end
|
233
252
|
|
234
|
-
def
|
253
|
+
def failure_message_when_negated
|
235
254
|
"expected #{@actual.current_path.inspect} not to be wider than #{@width}, but it is."
|
236
255
|
end
|
237
256
|
|
238
257
|
def description
|
239
258
|
"have a width less than or equal to #{@width}"
|
240
259
|
end
|
260
|
+
|
261
|
+
# RSpec 2 compatibility:
|
262
|
+
alias_method :negative_failure_message, :failure_message_when_negated
|
241
263
|
end
|
242
264
|
|
243
265
|
def be_no_wider_than(width)
|
@@ -261,19 +283,55 @@ module CarrierWave
|
|
261
283
|
"expected #{@actual.current_path.inspect} to be no taller than #{@height}, but it was #{@actual_height}."
|
262
284
|
end
|
263
285
|
|
264
|
-
def
|
286
|
+
def failure_message_when_negated
|
265
287
|
"expected #{@actual.current_path.inspect} not to be taller than #{@height}, but it is."
|
266
288
|
end
|
267
289
|
|
268
290
|
def description
|
269
291
|
"have a height less than or equal to #{@height}"
|
270
292
|
end
|
293
|
+
|
294
|
+
# RSpec 2 compatibility:
|
295
|
+
alias_method :negative_failure_message, :failure_message_when_negated
|
271
296
|
end
|
272
297
|
|
273
298
|
def be_no_taller_than(height)
|
274
299
|
BeNoTallerThan.new(height)
|
275
300
|
end
|
276
301
|
|
302
|
+
class BeFormat # :nodoc:
|
303
|
+
def initialize(expected)
|
304
|
+
@expected = expected
|
305
|
+
end
|
306
|
+
|
307
|
+
def matches?(actual)
|
308
|
+
@actual = actual
|
309
|
+
# Satisfy expectation here. Return false or raise an error if it's not met.
|
310
|
+
image = ImageLoader.load_image(@actual.current_path)
|
311
|
+
@actual_expected = image.format
|
312
|
+
!@expected.nil? && @actual_expected.casecmp(@expected).zero?
|
313
|
+
end
|
314
|
+
|
315
|
+
def failure_message
|
316
|
+
"expected #{@actual.current_path.inspect} to have #{@expected} format, but it was #{@actual_expected}."
|
317
|
+
end
|
318
|
+
|
319
|
+
def failure_message_when_negated
|
320
|
+
"expected #{@actual.current_path.inspect} not to have #{@expected} format, but it did."
|
321
|
+
end
|
322
|
+
|
323
|
+
def description
|
324
|
+
"have #{@expected} format"
|
325
|
+
end
|
326
|
+
|
327
|
+
# RSpec 2 compatibility:
|
328
|
+
alias_method :negative_failure_message, :failure_message_when_negated
|
329
|
+
end
|
330
|
+
|
331
|
+
def be_format(expected)
|
332
|
+
BeFormat.new(expected)
|
333
|
+
end
|
334
|
+
|
277
335
|
class ImageLoader # :nodoc:
|
278
336
|
def self.load_image(filename)
|
279
337
|
if defined? ::MiniMagick
|
@@ -283,9 +341,11 @@ module CarrierWave
|
|
283
341
|
begin
|
284
342
|
require 'rmagick'
|
285
343
|
rescue LoadError
|
286
|
-
|
287
|
-
|
288
|
-
|
344
|
+
begin
|
345
|
+
require 'RMagick'
|
346
|
+
rescue LoadError
|
347
|
+
puts "WARNING: Failed to require rmagick, image processing may fail!"
|
348
|
+
end
|
289
349
|
end
|
290
350
|
end
|
291
351
|
MagickWrapper.new(filename)
|
@@ -295,6 +355,7 @@ module CarrierWave
|
|
295
355
|
|
296
356
|
class MagickWrapper # :nodoc:
|
297
357
|
attr_reader :image
|
358
|
+
|
298
359
|
def width
|
299
360
|
image.columns
|
300
361
|
end
|
@@ -303,6 +364,10 @@ module CarrierWave
|
|
303
364
|
image.rows
|
304
365
|
end
|
305
366
|
|
367
|
+
def format
|
368
|
+
image.format
|
369
|
+
end
|
370
|
+
|
306
371
|
def initialize(filename)
|
307
372
|
@image = ::Magick::Image.read(filename).first
|
308
373
|
end
|
@@ -310,6 +375,7 @@ module CarrierWave
|
|
310
375
|
|
311
376
|
class MiniMagickWrapper # :nodoc:
|
312
377
|
attr_reader :image
|
378
|
+
|
313
379
|
def width
|
314
380
|
image[:width]
|
315
381
|
end
|
@@ -318,6 +384,10 @@ module CarrierWave
|
|
318
384
|
image[:height]
|
319
385
|
end
|
320
386
|
|
387
|
+
def format
|
388
|
+
image[:format]
|
389
|
+
end
|
390
|
+
|
321
391
|
def initialize(filename)
|
322
392
|
@image = ::MiniMagick::Image.open(filename)
|
323
393
|
end
|
@@ -326,4 +396,3 @@ module CarrierWave
|
|
326
396
|
end # Matchers
|
327
397
|
end # Test
|
328
398
|
end # CarrierWave
|
329
|
-
|
@@ -1,4 +1,4 @@
|
|
1
|
-
|
1
|
+
require 'securerandom'
|
2
2
|
|
3
3
|
module CarrierWave
|
4
4
|
|
@@ -8,15 +8,28 @@ module CarrierWave
|
|
8
8
|
end
|
9
9
|
end
|
10
10
|
|
11
|
+
class CacheCounter
|
12
|
+
@@counter = 0
|
13
|
+
|
14
|
+
def self.increment
|
15
|
+
@@counter += 1
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
11
19
|
##
|
12
20
|
# Generates a unique cache id for use in the caching system
|
13
21
|
#
|
14
22
|
# === Returns
|
15
23
|
#
|
16
|
-
# [String] a cache id in the format TIMEINT-PID-RND
|
24
|
+
# [String] a cache id in the format TIMEINT-PID-COUNTER-RND
|
17
25
|
#
|
18
26
|
def self.generate_cache_id
|
19
|
-
|
27
|
+
[
|
28
|
+
Time.now.utc.to_i,
|
29
|
+
SecureRandom.random_number(1_000_000_000_000_000),
|
30
|
+
'%04d' % (CarrierWave::CacheCounter.increment % 10_000),
|
31
|
+
'%04d' % SecureRandom.random_number(10_000)
|
32
|
+
].map(&:to_s).join('-')
|
20
33
|
end
|
21
34
|
|
22
35
|
module Uploader
|
@@ -26,6 +39,16 @@ module CarrierWave
|
|
26
39
|
include CarrierWave::Uploader::Callbacks
|
27
40
|
include CarrierWave::Uploader::Configuration
|
28
41
|
|
42
|
+
included do
|
43
|
+
prepend Module.new {
|
44
|
+
def initialize(*)
|
45
|
+
super
|
46
|
+
@staged = false
|
47
|
+
end
|
48
|
+
}
|
49
|
+
attr_accessor :staged
|
50
|
+
end
|
51
|
+
|
29
52
|
module ClassMethods
|
30
53
|
|
31
54
|
##
|
@@ -42,13 +65,7 @@ module CarrierWave
|
|
42
65
|
# It's recommended that you keep cache files in one place only.
|
43
66
|
#
|
44
67
|
def clean_cached_files!(seconds=60*60*24)
|
45
|
-
|
46
|
-
time = dir.scan(/(\d+)-\d+-\d+/).first.map { |t| t.to_i }
|
47
|
-
time = Time.at(*time)
|
48
|
-
if time < (Time.now.utc - seconds)
|
49
|
-
FileUtils.rm_rf(dir)
|
50
|
-
end
|
51
|
-
end
|
68
|
+
(cache_storage || storage).new(new).clean_cache!(seconds)
|
52
69
|
end
|
53
70
|
end
|
54
71
|
|
@@ -60,7 +77,7 @@ module CarrierWave
|
|
60
77
|
# [Bool] whether the current file is cached
|
61
78
|
#
|
62
79
|
def cached?
|
63
|
-
|
80
|
+
!!@cache_id
|
64
81
|
end
|
65
82
|
|
66
83
|
##
|
@@ -74,16 +91,8 @@ module CarrierWave
|
|
74
91
|
end
|
75
92
|
|
76
93
|
def sanitized_file
|
77
|
-
|
78
|
-
|
79
|
-
sanitized = CarrierWave::Storage::Fog.new(self).retrieve!(File.basename(_content.path))
|
80
|
-
sanitized.read if sanitized.exists?
|
81
|
-
|
82
|
-
else
|
83
|
-
sanitized = SanitizedFile.new :tempfile => StringIO.new(file.read),
|
84
|
-
:filename => File.basename(path), :content_type => file.content_type
|
85
|
-
end
|
86
|
-
sanitized
|
94
|
+
ActiveSupport::Deprecation.warn('#sanitized_file is deprecated, use #file instead.')
|
95
|
+
file
|
87
96
|
end
|
88
97
|
|
89
98
|
##
|
@@ -91,10 +100,10 @@ module CarrierWave
|
|
91
100
|
#
|
92
101
|
# === Returns
|
93
102
|
#
|
94
|
-
# [String] a cache name, in the format
|
103
|
+
# [String] a cache name, in the format TIMEINT-PID-COUNTER-RND/filename.txt
|
95
104
|
#
|
96
105
|
def cache_name
|
97
|
-
File.join(cache_id,
|
106
|
+
File.join(cache_id, original_filename) if cache_id && original_filename
|
98
107
|
end
|
99
108
|
|
100
109
|
##
|
@@ -102,7 +111,7 @@ module CarrierWave
|
|
102
111
|
#
|
103
112
|
# By default, cache!() uses copy_to(), which operates by copying the file
|
104
113
|
# to the cache, then deleting the original file. If move_to_cache() is
|
105
|
-
#
|
114
|
+
# overridden to return true, then cache!() uses move_to(), which simply
|
106
115
|
# moves the file to the cache. Useful for large files.
|
107
116
|
#
|
108
117
|
# === Parameters
|
@@ -113,24 +122,32 @@ module CarrierWave
|
|
113
122
|
#
|
114
123
|
# [CarrierWave::FormNotMultipart] if the assigned parameter is a string
|
115
124
|
#
|
116
|
-
def cache!(new_file =
|
125
|
+
def cache!(new_file = file)
|
117
126
|
new_file = CarrierWave::SanitizedFile.new(new_file)
|
127
|
+
return if new_file.empty?
|
128
|
+
|
129
|
+
raise CarrierWave::FormNotMultipart if new_file.is_path? && ensure_multipart_form
|
118
130
|
|
119
|
-
unless
|
120
|
-
raise CarrierWave::FormNotMultipart if new_file.is_path? && ensure_multipart_form
|
131
|
+
self.cache_id = CarrierWave.generate_cache_id unless cache_id
|
121
132
|
|
122
|
-
|
123
|
-
|
133
|
+
@identifier = nil
|
134
|
+
@staged = true
|
135
|
+
@filename = new_file.filename
|
136
|
+
self.original_filename = new_file.filename
|
124
137
|
|
125
|
-
|
126
|
-
|
138
|
+
begin
|
139
|
+
# first, create a workfile on which we perform processings
|
140
|
+
if move_to_cache
|
141
|
+
@file = new_file.move_to(File.expand_path(workfile_path, root), permissions, directory_permissions)
|
142
|
+
else
|
143
|
+
@file = new_file.copy_to(File.expand_path(workfile_path, root), permissions, directory_permissions)
|
144
|
+
end
|
127
145
|
|
128
|
-
|
129
|
-
|
130
|
-
else
|
131
|
-
@file = new_file.copy_to(cache_path, permissions, directory_permissions)
|
132
|
-
end
|
146
|
+
with_callbacks(:cache, @file) do
|
147
|
+
@file = cache_storage.cache!(@file)
|
133
148
|
end
|
149
|
+
ensure
|
150
|
+
FileUtils.rm_rf(workfile_path(''))
|
134
151
|
end
|
135
152
|
end
|
136
153
|
|
@@ -148,24 +165,43 @@ module CarrierWave
|
|
148
165
|
def retrieve_from_cache!(cache_name)
|
149
166
|
with_callbacks(:retrieve_from_cache, cache_name) do
|
150
167
|
self.cache_id, self.original_filename = cache_name.to_s.split('/', 2)
|
168
|
+
@staged = true
|
151
169
|
@filename = original_filename
|
152
|
-
@file =
|
170
|
+
@file = cache_storage.retrieve_from_cache!(full_original_filename)
|
153
171
|
end
|
154
172
|
end
|
155
173
|
|
174
|
+
##
|
175
|
+
# Calculates the path where the cache file should be stored.
|
176
|
+
#
|
177
|
+
# === Parameters
|
178
|
+
#
|
179
|
+
# [for_file (String)] name of the file <optional>
|
180
|
+
#
|
181
|
+
# === Returns
|
182
|
+
#
|
183
|
+
# [String] the cache path
|
184
|
+
#
|
185
|
+
def cache_path(for_file=full_original_filename)
|
186
|
+
File.join(*[cache_dir, @cache_id, for_file].compact)
|
187
|
+
end
|
188
|
+
|
189
|
+
protected
|
190
|
+
|
191
|
+
attr_reader :cache_id
|
192
|
+
|
156
193
|
private
|
157
194
|
|
158
|
-
def
|
159
|
-
File.
|
195
|
+
def workfile_path(for_file=original_filename)
|
196
|
+
File.join(CarrierWave.tmp_path, @cache_id, version_name.to_s, for_file)
|
160
197
|
end
|
161
198
|
|
162
|
-
attr_reader :
|
163
|
-
|
164
|
-
# We can override the full_original_filename method in other modules
|
165
|
-
alias_method :full_original_filename, :original_filename
|
199
|
+
attr_reader :original_filename
|
166
200
|
|
167
201
|
def cache_id=(cache_id)
|
168
|
-
|
202
|
+
# Earlier version used 3 part cache_id. Thus we should allow for
|
203
|
+
# the cache_id to have both 3 part and 4 part formats.
|
204
|
+
raise CarrierWave::InvalidParameter, "invalid cache id" unless cache_id =~ /\A(-)?[\d]+\-[\d]+(\-[\d]{4})?\-[\d]{4}\z/
|
169
205
|
@cache_id = cache_id
|
170
206
|
end
|
171
207
|
|
@@ -174,6 +210,14 @@ module CarrierWave
|
|
174
210
|
@original_filename = filename
|
175
211
|
end
|
176
212
|
|
213
|
+
def cache_storage
|
214
|
+
@cache_storage ||= (self.class.cache_storage || self.class.storage).new(self)
|
215
|
+
end
|
216
|
+
|
217
|
+
# We can override the full_original_filename method in other modules
|
218
|
+
def full_original_filename
|
219
|
+
forcing_extension(original_filename)
|
220
|
+
end
|
177
221
|
end # Cache
|
178
222
|
end # Uploader
|
179
223
|
end # CarrierWave
|
@@ -1,5 +1,3 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
|
3
1
|
module CarrierWave
|
4
2
|
module Uploader
|
5
3
|
module Callbacks
|
@@ -7,7 +5,7 @@ module CarrierWave
|
|
7
5
|
|
8
6
|
included do
|
9
7
|
class_attribute :_before_callbacks, :_after_callbacks,
|
10
|
-
|
8
|
+
:instance_writer => false
|
11
9
|
self._before_callbacks = Hash.new []
|
12
10
|
self._after_callbacks = Hash.new []
|
13
11
|
end
|