carrierwave 3.1.3 → 3.1.4
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.
- checksums.yaml +4 -4
- data/lib/carrierwave/sanitized_file.rb +9 -1
- data/lib/carrierwave/version.rb +1 -1
- metadata +32 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3fce89671ca96c66db403199f1eab005bdb208ae699bcd6c6d58d470ec337d96
|
|
4
|
+
data.tar.gz: 0047624b2e05641fbb2d65d97815726e9bc296fc8cdb53c37815ead2ce30d6e4
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5f63f1e37da1f107660263cc2d4be4e09dd0076e12bf80bc057449ddbd288887210ae17392d4092ff240c9992be3819721e7665a72023e4b58a8e9d351434d37
|
|
7
|
+
data.tar.gz: 205220c3605f50f23379781d94c587aee68a75aa7d4d854a258d362983122115641482098e81574dd873acce90deeb124d01b24c9ff7970dc45c2cb3146a9bd1
|
|
@@ -317,10 +317,18 @@ module CarrierWave
|
|
|
317
317
|
def declared_content_type
|
|
318
318
|
@declared_content_type ||
|
|
319
319
|
if @file.respond_to?(:content_type) && @file.content_type
|
|
320
|
-
Marcel::MimeType.for(declared_type: @file.content_type
|
|
320
|
+
Marcel::MimeType.for(declared_type: first_declared_content_type(@file.content_type))
|
|
321
321
|
end
|
|
322
322
|
end
|
|
323
323
|
|
|
324
|
+
# Clients occasionally send more than one MIME type in a single header
|
|
325
|
+
# (e.g. "image/png; text/html" or "image/png, text/html"). Marcel 2 validates
|
|
326
|
+
# the declared type against the RFC grammar and rejects such values, so pick
|
|
327
|
+
# the first media type ourselves before handing it over.
|
|
328
|
+
def first_declared_content_type(content_type)
|
|
329
|
+
content_type.to_s.strip.split(/[;,\s]/, 2).first
|
|
330
|
+
end
|
|
331
|
+
|
|
324
332
|
# Guess content type from its file extension. Limit what to be returned to prevent spoofing.
|
|
325
333
|
def guessed_safe_content_type
|
|
326
334
|
return unless path
|
data/lib/carrierwave/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: carrierwave
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.1.
|
|
4
|
+
version: 3.1.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Jonas Nicklas
|
|
@@ -41,30 +41,42 @@ dependencies:
|
|
|
41
41
|
name: image_processing
|
|
42
42
|
requirement: !ruby/object:Gem::Requirement
|
|
43
43
|
requirements:
|
|
44
|
-
- - "
|
|
44
|
+
- - ">="
|
|
45
45
|
- !ruby/object:Gem::Version
|
|
46
46
|
version: '1.1'
|
|
47
|
+
- - "<"
|
|
48
|
+
- !ruby/object:Gem::Version
|
|
49
|
+
version: '3'
|
|
47
50
|
type: :runtime
|
|
48
51
|
prerelease: false
|
|
49
52
|
version_requirements: !ruby/object:Gem::Requirement
|
|
50
53
|
requirements:
|
|
51
|
-
- - "
|
|
54
|
+
- - ">="
|
|
52
55
|
- !ruby/object:Gem::Version
|
|
53
56
|
version: '1.1'
|
|
57
|
+
- - "<"
|
|
58
|
+
- !ruby/object:Gem::Version
|
|
59
|
+
version: '3'
|
|
54
60
|
- !ruby/object:Gem::Dependency
|
|
55
61
|
name: marcel
|
|
56
62
|
requirement: !ruby/object:Gem::Requirement
|
|
57
63
|
requirements:
|
|
58
|
-
- - "
|
|
64
|
+
- - ">="
|
|
59
65
|
- !ruby/object:Gem::Version
|
|
60
66
|
version: 1.0.0
|
|
67
|
+
- - "<"
|
|
68
|
+
- !ruby/object:Gem::Version
|
|
69
|
+
version: '3'
|
|
61
70
|
type: :runtime
|
|
62
71
|
prerelease: false
|
|
63
72
|
version_requirements: !ruby/object:Gem::Requirement
|
|
64
73
|
requirements:
|
|
65
|
-
- - "
|
|
74
|
+
- - ">="
|
|
66
75
|
- !ruby/object:Gem::Version
|
|
67
76
|
version: 1.0.0
|
|
77
|
+
- - "<"
|
|
78
|
+
- !ruby/object:Gem::Version
|
|
79
|
+
version: '3'
|
|
68
80
|
- !ruby/object:Gem::Dependency
|
|
69
81
|
name: addressable
|
|
70
82
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -239,6 +251,20 @@ dependencies:
|
|
|
239
251
|
- - ">="
|
|
240
252
|
- !ruby/object:Gem::Version
|
|
241
253
|
version: '0'
|
|
254
|
+
- !ruby/object:Gem::Dependency
|
|
255
|
+
name: ruby-vips
|
|
256
|
+
requirement: !ruby/object:Gem::Requirement
|
|
257
|
+
requirements:
|
|
258
|
+
- - ">="
|
|
259
|
+
- !ruby/object:Gem::Version
|
|
260
|
+
version: '0'
|
|
261
|
+
type: :development
|
|
262
|
+
prerelease: false
|
|
263
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
264
|
+
requirements:
|
|
265
|
+
- - ">="
|
|
266
|
+
- !ruby/object:Gem::Version
|
|
267
|
+
version: '0'
|
|
242
268
|
- !ruby/object:Gem::Dependency
|
|
243
269
|
name: rmagick
|
|
244
270
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -385,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
385
411
|
- !ruby/object:Gem::Version
|
|
386
412
|
version: '0'
|
|
387
413
|
requirements: []
|
|
388
|
-
rubygems_version:
|
|
414
|
+
rubygems_version: 4.0.19
|
|
389
415
|
specification_version: 4
|
|
390
416
|
summary: Ruby file upload library
|
|
391
417
|
test_files: []
|