paperclip 3.5.4 → 5.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.codeclimate.yml +17 -0
- data/.gitignore +0 -6
- data/.hound.yml +1055 -0
- data/.rubocop.yml +1 -0
- data/.travis.yml +17 -20
- data/Appraisals +4 -16
- data/CONTRIBUTING.md +29 -13
- data/Gemfile +11 -3
- data/LICENSE +1 -3
- data/NEWS +241 -49
- data/README.md +471 -166
- data/RELEASING.md +17 -0
- data/Rakefile +6 -8
- data/UPGRADING +12 -9
- data/features/basic_integration.feature +27 -8
- data/features/migration.feature +0 -24
- data/features/step_definitions/attachment_steps.rb +36 -28
- data/features/step_definitions/html_steps.rb +2 -2
- data/features/step_definitions/rails_steps.rb +68 -37
- data/features/step_definitions/s3_steps.rb +2 -2
- data/features/step_definitions/web_steps.rb +1 -103
- data/features/support/env.rb +3 -2
- data/features/support/file_helpers.rb +2 -2
- data/features/support/fixtures/gemfile.txt +1 -1
- data/features/support/paths.rb +1 -1
- data/features/support/rails.rb +2 -25
- data/gemfiles/4.2.gemfile +17 -0
- data/gemfiles/5.0.gemfile +17 -0
- data/lib/generators/paperclip/paperclip_generator.rb +9 -3
- data/lib/generators/paperclip/templates/paperclip_migration.rb.erb +2 -2
- data/lib/paperclip/attachment.rb +151 -46
- data/lib/paperclip/attachment_registry.rb +3 -2
- data/lib/paperclip/callbacks.rb +13 -1
- data/lib/paperclip/content_type_detector.rb +26 -22
- data/lib/paperclip/errors.rb +8 -1
- data/lib/paperclip/file_command_content_type_detector.rb +6 -8
- data/lib/paperclip/geometry_detector_factory.rb +5 -3
- data/lib/paperclip/geometry_parser_factory.rb +1 -1
- data/lib/paperclip/glue.rb +1 -1
- data/lib/paperclip/has_attached_file.rb +17 -1
- data/lib/paperclip/helpers.rb +15 -11
- data/lib/paperclip/interpolations/plural_cache.rb +6 -5
- data/lib/paperclip/interpolations.rb +26 -13
- data/lib/paperclip/io_adapters/abstract_adapter.rb +32 -4
- data/lib/paperclip/io_adapters/attachment_adapter.rb +13 -8
- data/lib/paperclip/io_adapters/data_uri_adapter.rb +11 -16
- data/lib/paperclip/io_adapters/empty_string_adapter.rb +5 -4
- data/lib/paperclip/io_adapters/file_adapter.rb +12 -6
- data/lib/paperclip/io_adapters/http_url_proxy_adapter.rb +7 -7
- data/lib/paperclip/io_adapters/identity_adapter.rb +12 -6
- data/lib/paperclip/io_adapters/nil_adapter.rb +8 -5
- data/lib/paperclip/io_adapters/registry.rb +6 -2
- data/lib/paperclip/io_adapters/stringio_adapter.rb +15 -16
- data/lib/paperclip/io_adapters/uploaded_file_adapter.rb +10 -6
- data/lib/paperclip/io_adapters/uri_adapter.rb +41 -19
- data/lib/paperclip/locales/en.yml +1 -0
- data/lib/paperclip/matchers/have_attached_file_matcher.rb +2 -1
- data/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb +4 -4
- data/lib/paperclip/matchers/validate_attachment_presence_matcher.rb +2 -1
- data/lib/paperclip/matchers/validate_attachment_size_matcher.rb +2 -1
- data/lib/paperclip/media_type_spoof_detector.rb +90 -0
- data/lib/paperclip/processor.rb +5 -41
- data/lib/paperclip/processor_helpers.rb +50 -0
- data/lib/paperclip/rails_environment.rb +25 -0
- data/lib/paperclip/schema.rb +9 -7
- data/lib/paperclip/storage/filesystem.rb +14 -3
- data/lib/paperclip/storage/fog.rb +37 -19
- data/lib/paperclip/storage/s3.rb +129 -69
- data/lib/paperclip/style.rb +8 -2
- data/lib/paperclip/tempfile_factory.rb +5 -1
- data/lib/paperclip/thumbnail.rb +30 -18
- data/lib/paperclip/url_generator.rb +26 -14
- data/lib/paperclip/validators/attachment_content_type_validator.rb +4 -0
- data/lib/paperclip/validators/attachment_file_name_validator.rb +80 -0
- data/lib/paperclip/validators/attachment_file_type_ignorance_validator.rb +29 -0
- data/lib/paperclip/validators/attachment_presence_validator.rb +4 -0
- data/lib/paperclip/validators/attachment_size_validator.rb +5 -3
- data/lib/paperclip/validators/media_type_spoof_detection_validator.rb +27 -0
- data/lib/paperclip/validators.rb +11 -4
- data/lib/paperclip/version.rb +3 -1
- data/lib/paperclip.rb +30 -11
- data/lib/tasks/paperclip.rake +34 -5
- data/paperclip.gemspec +21 -16
- data/shoulda_macros/paperclip.rb +0 -1
- data/spec/paperclip/attachment_definitions_spec.rb +13 -0
- data/{test/attachment_processing_test.rb → spec/paperclip/attachment_processing_spec.rb} +17 -20
- data/spec/paperclip/attachment_registry_spec.rb +158 -0
- data/{test/attachment_test.rb → spec/paperclip/attachment_spec.rb} +502 -407
- data/{test/content_type_detector_test.rb → spec/paperclip/content_type_detector_spec.rb} +17 -20
- data/spec/paperclip/file_command_content_type_detector_spec.rb +40 -0
- data/spec/paperclip/filename_cleaner_spec.rb +14 -0
- data/spec/paperclip/geometry_detector_spec.rb +39 -0
- data/{test/geometry_parser_test.rb → spec/paperclip/geometry_parser_spec.rb} +27 -27
- data/{test/geometry_test.rb → spec/paperclip/geometry_spec.rb} +50 -52
- data/spec/paperclip/glue_spec.rb +44 -0
- data/spec/paperclip/has_attached_file_spec.rb +158 -0
- data/{test/integration_test.rb → spec/paperclip/integration_spec.rb} +137 -128
- data/{test/interpolations_test.rb → spec/paperclip/interpolations_spec.rb} +70 -46
- data/spec/paperclip/io_adapters/abstract_adapter_spec.rb +132 -0
- data/{test/io_adapters/attachment_adapter_test.rb → spec/paperclip/io_adapters/attachment_adapter_spec.rb} +33 -32
- data/spec/paperclip/io_adapters/data_uri_adapter_spec.rb +89 -0
- data/spec/paperclip/io_adapters/empty_string_adapter_spec.rb +17 -0
- data/{test/io_adapters/file_adapter_test.rb → spec/paperclip/io_adapters/file_adapter_spec.rb} +38 -42
- data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb +121 -0
- data/spec/paperclip/io_adapters/identity_adapter_spec.rb +8 -0
- data/{test/io_adapters/nil_adapter_test.rb → spec/paperclip/io_adapters/nil_adapter_spec.rb} +7 -7
- data/{test/io_adapters/registry_test.rb → spec/paperclip/io_adapters/registry_spec.rb} +12 -9
- data/{test/io_adapters/stringio_adapter_test.rb → spec/paperclip/io_adapters/stringio_adapter_spec.rb} +21 -18
- data/{test/io_adapters/uploaded_file_adapter_test.rb → spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb} +46 -46
- data/spec/paperclip/io_adapters/uri_adapter_spec.rb +172 -0
- data/spec/paperclip/matchers/have_attached_file_matcher_spec.rb +19 -0
- data/spec/paperclip/matchers/validate_attachment_content_type_matcher_spec.rb +109 -0
- data/spec/paperclip/matchers/validate_attachment_presence_matcher_spec.rb +69 -0
- data/spec/paperclip/matchers/validate_attachment_size_matcher_spec.rb +88 -0
- data/spec/paperclip/media_type_spoof_detector_spec.rb +94 -0
- data/spec/paperclip/meta_class_spec.rb +30 -0
- data/spec/paperclip/paperclip_missing_attachment_styles_spec.rb +84 -0
- data/spec/paperclip/paperclip_spec.rb +192 -0
- data/spec/paperclip/plural_cache_spec.rb +37 -0
- data/spec/paperclip/processor_helpers_spec.rb +57 -0
- data/{test/processor_test.rb → spec/paperclip/processor_spec.rb} +7 -7
- data/spec/paperclip/rails_environment_spec.rb +33 -0
- data/{test/rake_test.rb → spec/paperclip/rake_spec.rb} +15 -15
- data/spec/paperclip/schema_spec.rb +248 -0
- data/{test/storage/filesystem_test.rb → spec/paperclip/storage/filesystem_spec.rb} +18 -18
- data/spec/paperclip/storage/fog_spec.rb +566 -0
- data/spec/paperclip/storage/s3_live_spec.rb +188 -0
- data/spec/paperclip/storage/s3_spec.rb +1693 -0
- data/spec/paperclip/style_spec.rb +255 -0
- data/spec/paperclip/tempfile_factory_spec.rb +33 -0
- data/spec/paperclip/tempfile_spec.rb +35 -0
- data/{test/thumbnail_test.rb → spec/paperclip/thumbnail_spec.rb} +153 -134
- data/spec/paperclip/url_generator_spec.rb +222 -0
- data/spec/paperclip/validators/attachment_content_type_validator_spec.rb +322 -0
- data/spec/paperclip/validators/attachment_file_name_validator_spec.rb +160 -0
- data/{test/validators/attachment_presence_validator_test.rb → spec/paperclip/validators/attachment_presence_validator_spec.rb} +20 -20
- data/{test/validators/attachment_size_validator_test.rb → spec/paperclip/validators/attachment_size_validator_spec.rb} +77 -64
- data/spec/paperclip/validators/media_type_spoof_detection_validator_spec.rb +52 -0
- data/spec/paperclip/validators_spec.rb +164 -0
- data/spec/spec_helper.rb +47 -0
- data/spec/support/assertions.rb +82 -0
- data/spec/support/conditional_filter_helper.rb +5 -0
- data/spec/support/fake_model.rb +25 -0
- data/spec/support/fake_rails.rb +12 -0
- data/spec/support/fixtures/empty.html +1 -0
- data/spec/support/fixtures/empty.xlsx +0 -0
- data/spec/support/fixtures/spaced file.jpg +0 -0
- data/spec/support/matchers/accept.rb +5 -0
- data/spec/support/matchers/exist.rb +5 -0
- data/spec/support/matchers/have_column.rb +23 -0
- data/{test → spec}/support/mock_attachment.rb +2 -0
- data/{test → spec}/support/mock_url_generator_builder.rb +2 -2
- data/spec/support/model_reconstruction.rb +68 -0
- data/spec/support/reporting.rb +11 -0
- data/spec/support/test_data.rb +13 -0
- data/spec/support/version_helper.rb +9 -0
- metadata +348 -225
- data/RUNNING_TESTS.md +0 -4
- data/cucumber/paperclip_steps.rb +0 -6
- data/gemfiles/3.0.gemfile +0 -11
- data/gemfiles/3.1.gemfile +0 -11
- data/gemfiles/3.2.gemfile +0 -11
- data/gemfiles/4.0.gemfile +0 -11
- data/test/attachment_definitions_test.rb +0 -12
- data/test/attachment_registry_test.rb +0 -88
- data/test/file_command_content_type_detector_test.rb +0 -27
- data/test/filename_cleaner_test.rb +0 -14
- data/test/generator_test.rb +0 -84
- data/test/geometry_detector_test.rb +0 -24
- data/test/has_attached_file_test.rb +0 -125
- data/test/helper.rb +0 -232
- data/test/io_adapters/abstract_adapter_test.rb +0 -58
- data/test/io_adapters/data_uri_adapter_test.rb +0 -74
- data/test/io_adapters/empty_string_adapter_test.rb +0 -18
- data/test/io_adapters/http_url_proxy_adapter_test.rb +0 -102
- data/test/io_adapters/identity_adapter_test.rb +0 -8
- data/test/io_adapters/uri_adapter_test.rb +0 -102
- data/test/matchers/have_attached_file_matcher_test.rb +0 -24
- data/test/matchers/validate_attachment_content_type_matcher_test.rb +0 -110
- data/test/matchers/validate_attachment_presence_matcher_test.rb +0 -69
- data/test/matchers/validate_attachment_size_matcher_test.rb +0 -86
- data/test/meta_class_test.rb +0 -32
- data/test/paperclip_missing_attachment_styles_test.rb +0 -90
- data/test/paperclip_test.rb +0 -217
- data/test/plural_cache_test.rb +0 -36
- data/test/schema_test.rb +0 -200
- data/test/storage/fog_test.rb +0 -473
- data/test/storage/s3_live_test.rb +0 -179
- data/test/storage/s3_test.rb +0 -1356
- data/test/style_test.rb +0 -213
- data/test/support/mock_model.rb +0 -2
- data/test/tempfile_factory_test.rb +0 -17
- data/test/url_generator_test.rb +0 -187
- data/test/validators/attachment_content_type_validator_test.rb +0 -324
- data/test/validators_test.rb +0 -61
- /data/{test → spec}/database.yml +0 -0
- /data/{test → spec/support}/fixtures/12k.png +0 -0
- /data/{test → spec/support}/fixtures/50x50.png +0 -0
- /data/{test → spec/support}/fixtures/5k.png +0 -0
- /data/{test → spec/support}/fixtures/animated +0 -0
- /data/{test → spec/support}/fixtures/animated.gif +0 -0
- /data/{test → spec/support}/fixtures/animated.unknown +0 -0
- /data/{test → spec/support}/fixtures/bad.png +0 -0
- /data/{test → spec/support}/fixtures/fog.yml +0 -0
- /data/{test → spec/support}/fixtures/rotated.jpg +0 -0
- /data/{test → spec/support}/fixtures/s3.yml +0 -0
- /data/{test → spec/support}/fixtures/spaced file.png +0 -0
- /data/{test → spec/support}/fixtures/text.txt +0 -0
- /data/{test → spec/support}/fixtures/twopage.pdf +0 -0
- /data/{test → spec/support}/fixtures/uppercase.PNG +0 -0
- /data/{test → spec}/support/mock_interpolator.rb +0 -0
@@ -1,9 +1,9 @@
|
|
1
|
-
require '
|
1
|
+
require 'spec_helper'
|
2
2
|
|
3
|
-
|
3
|
+
describe Paperclip::UploadedFileAdapter do
|
4
4
|
context "a new instance" do
|
5
5
|
context "with UploadedFile responding to #tempfile" do
|
6
|
-
|
6
|
+
before do
|
7
7
|
Paperclip::UploadedFileAdapter.content_type_detector = nil
|
8
8
|
|
9
9
|
class UploadedFile < OpenStruct; end
|
@@ -11,41 +11,41 @@ class UploadedFileAdapterTest < Test::Unit::TestCase
|
|
11
11
|
tempfile.binmode
|
12
12
|
|
13
13
|
@file = UploadedFile.new(
|
14
|
-
:
|
15
|
-
:
|
16
|
-
:
|
17
|
-
:
|
18
|
-
:
|
14
|
+
original_filename: "5k.png",
|
15
|
+
content_type: "image/x-png-by-browser\r",
|
16
|
+
head: "",
|
17
|
+
tempfile: tempfile,
|
18
|
+
path: tempfile.path
|
19
19
|
)
|
20
|
-
@subject = Paperclip.io_adapters.for(@file)
|
20
|
+
@subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
|
21
21
|
end
|
22
22
|
|
23
|
-
|
23
|
+
it "gets the right filename" do
|
24
24
|
assert_equal "5k.png", @subject.original_filename
|
25
25
|
end
|
26
26
|
|
27
|
-
|
27
|
+
it "forces binmode on tempfile" do
|
28
28
|
assert @subject.instance_variable_get("@tempfile").binmode?
|
29
29
|
end
|
30
30
|
|
31
|
-
|
32
|
-
assert_equal "image/
|
31
|
+
it "gets the content type" do
|
32
|
+
assert_equal "image/png", @subject.content_type
|
33
33
|
end
|
34
34
|
|
35
|
-
|
35
|
+
it "gets the file's size" do
|
36
36
|
assert_equal 4456, @subject.size
|
37
37
|
end
|
38
38
|
|
39
|
-
|
39
|
+
it "returns false for a call to nil?" do
|
40
40
|
assert ! @subject.nil?
|
41
41
|
end
|
42
42
|
|
43
|
-
|
43
|
+
it "generates a MD5 hash of the contents" do
|
44
44
|
expected = Digest::MD5.file(@file.tempfile.path).to_s
|
45
45
|
assert_equal expected, @subject.fingerprint
|
46
46
|
end
|
47
47
|
|
48
|
-
|
48
|
+
it "reads the contents of the file" do
|
49
49
|
expected = @file.tempfile.read
|
50
50
|
assert expected.length > 0
|
51
51
|
assert_equal expected, @subject.read
|
@@ -53,68 +53,68 @@ class UploadedFileAdapterTest < Test::Unit::TestCase
|
|
53
53
|
end
|
54
54
|
|
55
55
|
context "with UploadedFile that has restricted characters" do
|
56
|
-
|
56
|
+
before do
|
57
57
|
Paperclip::UploadedFileAdapter.content_type_detector = nil
|
58
58
|
|
59
59
|
class UploadedFile < OpenStruct; end
|
60
60
|
@file = UploadedFile.new(
|
61
|
-
:
|
62
|
-
:
|
63
|
-
:
|
64
|
-
:
|
61
|
+
original_filename: "image:restricted.gif",
|
62
|
+
content_type: "image/x-png-by-browser",
|
63
|
+
head: "",
|
64
|
+
path: fixture_file("5k.png")
|
65
65
|
)
|
66
|
-
@subject = Paperclip.io_adapters.for(@file)
|
66
|
+
@subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
|
67
67
|
end
|
68
68
|
|
69
|
-
|
70
|
-
|
69
|
+
it "does not generate paths that include restricted characters" do
|
70
|
+
expect(@subject.path).to_not match(/:/)
|
71
71
|
end
|
72
72
|
|
73
|
-
|
73
|
+
it "does not generate filenames that include restricted characters" do
|
74
74
|
assert_equal 'image_restricted.gif', @subject.original_filename
|
75
75
|
end
|
76
76
|
end
|
77
77
|
|
78
78
|
context "with UploadFile responding to #path" do
|
79
|
-
|
79
|
+
before do
|
80
80
|
Paperclip::UploadedFileAdapter.content_type_detector = nil
|
81
81
|
|
82
82
|
class UploadedFile < OpenStruct; end
|
83
83
|
@file = UploadedFile.new(
|
84
|
-
:
|
85
|
-
:
|
86
|
-
:
|
87
|
-
:
|
84
|
+
original_filename: "5k.png",
|
85
|
+
content_type: "image/x-png-by-browser",
|
86
|
+
head: "",
|
87
|
+
path: fixture_file("5k.png")
|
88
88
|
)
|
89
|
-
@subject = Paperclip.io_adapters.for(@file)
|
89
|
+
@subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
|
90
90
|
end
|
91
91
|
|
92
|
-
|
92
|
+
it "gets the right filename" do
|
93
93
|
assert_equal "5k.png", @subject.original_filename
|
94
94
|
end
|
95
95
|
|
96
|
-
|
96
|
+
it "forces binmode on tempfile" do
|
97
97
|
assert @subject.instance_variable_get("@tempfile").binmode?
|
98
98
|
end
|
99
99
|
|
100
|
-
|
101
|
-
assert_equal "image/
|
100
|
+
it "gets the content type" do
|
101
|
+
assert_equal "image/png", @subject.content_type
|
102
102
|
end
|
103
103
|
|
104
|
-
|
104
|
+
it "gets the file's size" do
|
105
105
|
assert_equal 4456, @subject.size
|
106
106
|
end
|
107
107
|
|
108
|
-
|
108
|
+
it "returns false for a call to nil?" do
|
109
109
|
assert ! @subject.nil?
|
110
110
|
end
|
111
111
|
|
112
|
-
|
112
|
+
it "generates a MD5 hash of the contents" do
|
113
113
|
expected = Digest::MD5.file(@file.path).to_s
|
114
114
|
assert_equal expected, @subject.fingerprint
|
115
115
|
end
|
116
116
|
|
117
|
-
|
117
|
+
it "reads the contents of the file" do
|
118
118
|
expected_file = File.new(@file.path)
|
119
119
|
expected_file.binmode
|
120
120
|
expected = expected_file.read
|
@@ -123,21 +123,21 @@ class UploadedFileAdapterTest < Test::Unit::TestCase
|
|
123
123
|
end
|
124
124
|
|
125
125
|
context "don't trust client-given MIME type" do
|
126
|
-
|
126
|
+
before do
|
127
127
|
Paperclip::UploadedFileAdapter.content_type_detector =
|
128
128
|
Paperclip::FileCommandContentTypeDetector
|
129
129
|
|
130
130
|
class UploadedFile < OpenStruct; end
|
131
131
|
@file = UploadedFile.new(
|
132
|
-
:
|
133
|
-
:
|
134
|
-
:
|
135
|
-
:
|
132
|
+
original_filename: "5k.png",
|
133
|
+
content_type: "image/x-png-by-browser",
|
134
|
+
head: "",
|
135
|
+
path: fixture_file("5k.png")
|
136
136
|
)
|
137
137
|
@subject = Paperclip.io_adapters.for(@file)
|
138
138
|
end
|
139
139
|
|
140
|
-
|
140
|
+
it "gets the content type" do
|
141
141
|
assert_equal "image/png", @subject.content_type
|
142
142
|
end
|
143
143
|
end
|
@@ -0,0 +1,172 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Paperclip::UriAdapter do
|
4
|
+
let(:content_type) { "image/png" }
|
5
|
+
let(:meta) { {} }
|
6
|
+
|
7
|
+
before do
|
8
|
+
@open_return = StringIO.new("xxx")
|
9
|
+
@open_return.stubs(:content_type).returns(content_type)
|
10
|
+
@open_return.stubs(:meta).returns(meta)
|
11
|
+
Paperclip::UriAdapter.register
|
12
|
+
end
|
13
|
+
|
14
|
+
after do
|
15
|
+
Paperclip.io_adapters.unregister(described_class)
|
16
|
+
end
|
17
|
+
|
18
|
+
context "a new instance" do
|
19
|
+
before do
|
20
|
+
Paperclip::UriAdapter.any_instance.
|
21
|
+
stubs(:download_content).returns(@open_return)
|
22
|
+
|
23
|
+
@uri = URI.parse("http://thoughtbot.com/images/thoughtbot-logo.png")
|
24
|
+
@subject = Paperclip.io_adapters.for(@uri, hash_digest: Digest::MD5)
|
25
|
+
end
|
26
|
+
|
27
|
+
it "returns a file name" do
|
28
|
+
assert_equal "thoughtbot-logo.png", @subject.original_filename
|
29
|
+
end
|
30
|
+
|
31
|
+
it 'closes open handle after reading' do
|
32
|
+
assert_equal true, @open_return.closed?
|
33
|
+
end
|
34
|
+
|
35
|
+
it "returns a content type" do
|
36
|
+
assert_equal "image/png", @subject.content_type
|
37
|
+
end
|
38
|
+
|
39
|
+
it "returns the size of the data" do
|
40
|
+
assert_equal @open_return.size, @subject.size
|
41
|
+
end
|
42
|
+
|
43
|
+
it "generates an MD5 hash of the contents" do
|
44
|
+
assert_equal Digest::MD5.hexdigest("xxx"), @subject.fingerprint
|
45
|
+
end
|
46
|
+
|
47
|
+
it "generates correct fingerprint after read" do
|
48
|
+
fingerprint = Digest::MD5.hexdigest(@subject.read)
|
49
|
+
assert_equal fingerprint, @subject.fingerprint
|
50
|
+
end
|
51
|
+
|
52
|
+
it "generates same fingerprint" do
|
53
|
+
assert_equal @subject.fingerprint, @subject.fingerprint
|
54
|
+
end
|
55
|
+
|
56
|
+
it "returns the data contained in the StringIO" do
|
57
|
+
assert_equal "xxx", @subject.read
|
58
|
+
end
|
59
|
+
|
60
|
+
it 'accepts a content_type' do
|
61
|
+
@subject.content_type = 'image/png'
|
62
|
+
assert_equal 'image/png', @subject.content_type
|
63
|
+
end
|
64
|
+
|
65
|
+
it 'accepts an orgiginal_filename' do
|
66
|
+
@subject.original_filename = 'image.png'
|
67
|
+
assert_equal 'image.png', @subject.original_filename
|
68
|
+
end
|
69
|
+
|
70
|
+
end
|
71
|
+
|
72
|
+
context "a directory index url" do
|
73
|
+
let(:content_type) { "text/html" }
|
74
|
+
|
75
|
+
before do
|
76
|
+
Paperclip::UriAdapter.any_instance.
|
77
|
+
stubs(:download_content).returns(@open_return)
|
78
|
+
|
79
|
+
@uri = URI.parse("http://thoughtbot.com")
|
80
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
81
|
+
end
|
82
|
+
|
83
|
+
it "returns a file name" do
|
84
|
+
assert_equal "index.html", @subject.original_filename
|
85
|
+
end
|
86
|
+
|
87
|
+
it "returns a content type" do
|
88
|
+
assert_equal "text/html", @subject.content_type
|
89
|
+
end
|
90
|
+
end
|
91
|
+
|
92
|
+
context "a url with query params" do
|
93
|
+
before do
|
94
|
+
Paperclip::UriAdapter.any_instance.
|
95
|
+
stubs(:download_content).returns(@open_return)
|
96
|
+
|
97
|
+
@uri = URI.parse("https://github.com/thoughtbot/paperclip?file=test")
|
98
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
99
|
+
end
|
100
|
+
|
101
|
+
it "returns a file name" do
|
102
|
+
assert_equal "paperclip", @subject.original_filename
|
103
|
+
end
|
104
|
+
end
|
105
|
+
|
106
|
+
context "a url with content disposition headers" do
|
107
|
+
let(:file_name) { "test_document.pdf" }
|
108
|
+
let(:meta) do
|
109
|
+
{
|
110
|
+
"content-disposition" => "attachment; filename=\"#{file_name}\";",
|
111
|
+
}
|
112
|
+
end
|
113
|
+
|
114
|
+
before do
|
115
|
+
Paperclip::UriAdapter.any_instance.
|
116
|
+
stubs(:download_content).returns(@open_return)
|
117
|
+
|
118
|
+
@uri = URI.parse("https://github.com/thoughtbot/paperclip?file=test")
|
119
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
120
|
+
end
|
121
|
+
|
122
|
+
it "returns a file name" do
|
123
|
+
assert_equal file_name, @subject.original_filename
|
124
|
+
end
|
125
|
+
end
|
126
|
+
|
127
|
+
context "a url with restricted characters in the filename" do
|
128
|
+
before do
|
129
|
+
Paperclip::UriAdapter.any_instance.
|
130
|
+
stubs(:download_content).returns(@open_return)
|
131
|
+
|
132
|
+
@uri = URI.parse("https://github.com/thoughtbot/paper:clip.jpg")
|
133
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
134
|
+
end
|
135
|
+
|
136
|
+
it "does not generate filenames that include restricted characters" do
|
137
|
+
assert_equal "paper_clip.jpg", @subject.original_filename
|
138
|
+
end
|
139
|
+
|
140
|
+
it "does not generate paths that include restricted characters" do
|
141
|
+
expect(@subject.path).to_not match(/:/)
|
142
|
+
end
|
143
|
+
end
|
144
|
+
|
145
|
+
describe "#download_content" do
|
146
|
+
before do
|
147
|
+
Paperclip::UriAdapter.any_instance.stubs(:open).returns(@open_return)
|
148
|
+
@uri = URI.parse("https://github.com/thoughtbot/paper:clip.jpg")
|
149
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
150
|
+
end
|
151
|
+
|
152
|
+
after do
|
153
|
+
@subject.send(:download_content)
|
154
|
+
end
|
155
|
+
|
156
|
+
context "with default read_timeout" do
|
157
|
+
it "calls open without options" do
|
158
|
+
@subject.expects(:open).with(@uri, {}).at_least_once
|
159
|
+
end
|
160
|
+
end
|
161
|
+
|
162
|
+
context "with custom read_timeout" do
|
163
|
+
before do
|
164
|
+
Paperclip.options[:read_timeout] = 120
|
165
|
+
end
|
166
|
+
|
167
|
+
it "calls open with read_timeout option" do
|
168
|
+
@subject.expects(:open).with(@uri, read_timeout: 120).at_least_once
|
169
|
+
end
|
170
|
+
end
|
171
|
+
end
|
172
|
+
end
|
@@ -0,0 +1,19 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
require 'paperclip/matchers'
|
3
|
+
|
4
|
+
describe Paperclip::Shoulda::Matchers::HaveAttachedFileMatcher do
|
5
|
+
extend Paperclip::Shoulda::Matchers
|
6
|
+
|
7
|
+
it "rejects the dummy class if it has no attachment" do
|
8
|
+
reset_table "dummies"
|
9
|
+
reset_class "Dummy"
|
10
|
+
matcher = self.class.have_attached_file(:avatar)
|
11
|
+
expect(matcher).to_not accept(Dummy)
|
12
|
+
end
|
13
|
+
|
14
|
+
it 'accepts the dummy class if it has an attachment' do
|
15
|
+
rebuild_model
|
16
|
+
matcher = self.class.have_attached_file(:avatar)
|
17
|
+
expect(matcher).to accept(Dummy)
|
18
|
+
end
|
19
|
+
end
|
@@ -0,0 +1,109 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
require 'paperclip/matchers'
|
3
|
+
|
4
|
+
describe Paperclip::Shoulda::Matchers::ValidateAttachmentContentTypeMatcher do
|
5
|
+
extend Paperclip::Shoulda::Matchers
|
6
|
+
|
7
|
+
before do
|
8
|
+
reset_table("dummies") do |d|
|
9
|
+
d.string :title
|
10
|
+
d.string :avatar_file_name
|
11
|
+
d.string :avatar_content_type
|
12
|
+
end
|
13
|
+
reset_class "Dummy"
|
14
|
+
Dummy.do_not_validate_attachment_file_type :avatar
|
15
|
+
Dummy.has_attached_file :avatar
|
16
|
+
end
|
17
|
+
|
18
|
+
it "rejects a class with no validation" do
|
19
|
+
expect(matcher).to_not accept(Dummy)
|
20
|
+
expect { matcher.failure_message }.to_not raise_error
|
21
|
+
end
|
22
|
+
|
23
|
+
it 'rejects a class when the validation fails' do
|
24
|
+
Dummy.validates_attachment_content_type :avatar, content_type: %r{audio/.*}
|
25
|
+
expect(matcher).to_not accept(Dummy)
|
26
|
+
expect { matcher.failure_message }.to_not raise_error
|
27
|
+
end
|
28
|
+
|
29
|
+
it "accepts a class with a matching validation" do
|
30
|
+
Dummy.validates_attachment_content_type :avatar, content_type: %r{image/.*}
|
31
|
+
expect(matcher).to accept(Dummy)
|
32
|
+
expect { matcher.failure_message }.to_not raise_error
|
33
|
+
end
|
34
|
+
|
35
|
+
it "accepts a class with other validations but matching types" do
|
36
|
+
Dummy.validates_presence_of :title
|
37
|
+
Dummy.validates_attachment_content_type :avatar, content_type: %r{image/.*}
|
38
|
+
expect(matcher).to accept(Dummy)
|
39
|
+
expect { matcher.failure_message }.to_not raise_error
|
40
|
+
end
|
41
|
+
|
42
|
+
it "accepts a class that matches and a matcher that only specifies 'allowing'" do
|
43
|
+
Dummy.validates_attachment_content_type :avatar, content_type: %r{image/.*}
|
44
|
+
matcher = plain_matcher.allowing(%w(image/png image/jpeg))
|
45
|
+
|
46
|
+
expect(matcher).to accept(Dummy)
|
47
|
+
expect { matcher.failure_message }.to_not raise_error
|
48
|
+
end
|
49
|
+
|
50
|
+
it "rejects a class that does not match and a matcher that only specifies 'allowing'" do
|
51
|
+
Dummy.validates_attachment_content_type :avatar, content_type: %r{audio/.*}
|
52
|
+
matcher = plain_matcher.allowing(%w(image/png image/jpeg))
|
53
|
+
|
54
|
+
expect(matcher).to_not accept(Dummy)
|
55
|
+
expect { matcher.failure_message }.to_not raise_error
|
56
|
+
end
|
57
|
+
|
58
|
+
it "accepts a class that matches and a matcher that only specifies 'rejecting'" do
|
59
|
+
Dummy.validates_attachment_content_type :avatar, content_type: %r{image/.*}
|
60
|
+
matcher = plain_matcher.rejecting(%w(audio/mp3 application/octet-stream))
|
61
|
+
|
62
|
+
expect(matcher).to accept(Dummy)
|
63
|
+
expect { matcher.failure_message }.to_not raise_error
|
64
|
+
end
|
65
|
+
|
66
|
+
it "rejects a class that does not match and a matcher that only specifies 'rejecting'" do
|
67
|
+
Dummy.validates_attachment_content_type :avatar, content_type: %r{audio/.*}
|
68
|
+
matcher = plain_matcher.rejecting(%w(audio/mp3 application/octet-stream))
|
69
|
+
|
70
|
+
expect(matcher).to_not accept(Dummy)
|
71
|
+
expect { matcher.failure_message }.to_not raise_error
|
72
|
+
end
|
73
|
+
|
74
|
+
context "using an :if to control the validation" do
|
75
|
+
before do
|
76
|
+
Dummy.class_eval do
|
77
|
+
validates_attachment_content_type :avatar, content_type: %r{image/*} , if: :go
|
78
|
+
attr_accessor :go
|
79
|
+
end
|
80
|
+
end
|
81
|
+
|
82
|
+
it "runs the validation if the control is true" do
|
83
|
+
dummy = Dummy.new
|
84
|
+
dummy.go = true
|
85
|
+
expect(matcher).to accept(dummy)
|
86
|
+
expect { matcher.failure_message }.to_not raise_error
|
87
|
+
end
|
88
|
+
|
89
|
+
it "does not run the validation if the control is false" do
|
90
|
+
dummy = Dummy.new
|
91
|
+
dummy.go = false
|
92
|
+
expect(matcher).to_not accept(dummy)
|
93
|
+
expect { matcher.failure_message }.to_not raise_error
|
94
|
+
end
|
95
|
+
end
|
96
|
+
|
97
|
+
private
|
98
|
+
|
99
|
+
def plain_matcher
|
100
|
+
self.class.validate_attachment_content_type(:avatar)
|
101
|
+
end
|
102
|
+
|
103
|
+
def matcher
|
104
|
+
plain_matcher.
|
105
|
+
allowing(%w(image/png image/jpeg)).
|
106
|
+
rejecting(%w(audio/mp3 application/octet-stream))
|
107
|
+
end
|
108
|
+
|
109
|
+
end
|
@@ -0,0 +1,69 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
require 'paperclip/matchers'
|
3
|
+
|
4
|
+
describe Paperclip::Shoulda::Matchers::ValidateAttachmentPresenceMatcher do
|
5
|
+
extend Paperclip::Shoulda::Matchers
|
6
|
+
|
7
|
+
before do
|
8
|
+
reset_table("dummies") do |d|
|
9
|
+
d.string :avatar_file_name
|
10
|
+
end
|
11
|
+
reset_class "Dummy"
|
12
|
+
Dummy.has_attached_file :avatar
|
13
|
+
Dummy.do_not_validate_attachment_file_type :avatar
|
14
|
+
end
|
15
|
+
|
16
|
+
it "rejects a class with no validation" do
|
17
|
+
expect(matcher).to_not accept(Dummy)
|
18
|
+
end
|
19
|
+
|
20
|
+
it "accepts a class with a matching validation" do
|
21
|
+
Dummy.validates_attachment_presence :avatar
|
22
|
+
expect(matcher).to accept(Dummy)
|
23
|
+
end
|
24
|
+
|
25
|
+
it "accepts an instance with other attachment validations" do
|
26
|
+
reset_table("dummies") do |d|
|
27
|
+
d.string :avatar_file_name
|
28
|
+
d.string :avatar_content_type
|
29
|
+
end
|
30
|
+
Dummy.class_eval do
|
31
|
+
validates_attachment_presence :avatar
|
32
|
+
validates_attachment_content_type :avatar, content_type: 'image/gif'
|
33
|
+
end
|
34
|
+
dummy = Dummy.new
|
35
|
+
|
36
|
+
dummy.avatar = File.new fixture_file('5k.png')
|
37
|
+
|
38
|
+
expect(matcher).to accept(dummy)
|
39
|
+
end
|
40
|
+
|
41
|
+
context "using an :if to control the validation" do
|
42
|
+
before do
|
43
|
+
Dummy.class_eval do
|
44
|
+
validates_attachment_presence :avatar, if: :go
|
45
|
+
attr_accessor :go
|
46
|
+
end
|
47
|
+
end
|
48
|
+
|
49
|
+
it "runs the validation if the control is true" do
|
50
|
+
dummy = Dummy.new
|
51
|
+
dummy.avatar = nil
|
52
|
+
dummy.go = true
|
53
|
+
expect(matcher).to accept(dummy)
|
54
|
+
end
|
55
|
+
|
56
|
+
it "does not run the validation if the control is false" do
|
57
|
+
dummy = Dummy.new
|
58
|
+
dummy.avatar = nil
|
59
|
+
dummy.go = false
|
60
|
+
expect(matcher).to_not accept(dummy)
|
61
|
+
end
|
62
|
+
end
|
63
|
+
|
64
|
+
private
|
65
|
+
|
66
|
+
def matcher
|
67
|
+
self.class.validate_attachment_presence(:avatar)
|
68
|
+
end
|
69
|
+
end
|
@@ -0,0 +1,88 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
require 'paperclip/matchers'
|
3
|
+
|
4
|
+
describe Paperclip::Shoulda::Matchers::ValidateAttachmentSizeMatcher do
|
5
|
+
extend Paperclip::Shoulda::Matchers
|
6
|
+
|
7
|
+
before do
|
8
|
+
reset_table("dummies") do |d|
|
9
|
+
d.string :avatar_file_name
|
10
|
+
d.integer :avatar_file_size
|
11
|
+
end
|
12
|
+
reset_class "Dummy"
|
13
|
+
Dummy.do_not_validate_attachment_file_type :avatar
|
14
|
+
Dummy.has_attached_file :avatar
|
15
|
+
end
|
16
|
+
|
17
|
+
context "Limiting size" do
|
18
|
+
it "rejects a class with no validation" do
|
19
|
+
expect(matcher.in(256..1024)).to_not accept(Dummy)
|
20
|
+
end
|
21
|
+
|
22
|
+
it "rejects a class with a validation that's too high" do
|
23
|
+
Dummy.validates_attachment_size :avatar, in: 256..2048
|
24
|
+
expect(matcher.in(256..1024)).to_not accept(Dummy)
|
25
|
+
end
|
26
|
+
|
27
|
+
it "accepts a class with a validation that's too low" do
|
28
|
+
Dummy.validates_attachment_size :avatar, in: 0..1024
|
29
|
+
expect(matcher.in(256..1024)).to_not accept(Dummy)
|
30
|
+
end
|
31
|
+
|
32
|
+
it "accepts a class with a validation that matches" do
|
33
|
+
Dummy.validates_attachment_size :avatar, in: 256..1024
|
34
|
+
expect(matcher.in(256..1024)).to accept(Dummy)
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
context "allowing anything" do
|
39
|
+
it "given a class with an upper limit" do
|
40
|
+
Dummy.validates_attachment_size :avatar, less_than: 1
|
41
|
+
expect(matcher).to accept(Dummy)
|
42
|
+
end
|
43
|
+
|
44
|
+
it "given a class with a lower limit" do
|
45
|
+
Dummy.validates_attachment_size :avatar, greater_than: 1
|
46
|
+
expect(matcher).to accept(Dummy)
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
context "using an :if to control the validation" do
|
51
|
+
before do
|
52
|
+
Dummy.class_eval do
|
53
|
+
validates_attachment_size :avatar, greater_than: 1024, if: :go
|
54
|
+
attr_accessor :go
|
55
|
+
end
|
56
|
+
end
|
57
|
+
|
58
|
+
it "run the validation if the control is true" do
|
59
|
+
dummy = Dummy.new
|
60
|
+
dummy.go = true
|
61
|
+
expect(matcher.greater_than(1024)).to accept(dummy)
|
62
|
+
end
|
63
|
+
|
64
|
+
it "not run the validation if the control is false" do
|
65
|
+
dummy = Dummy.new
|
66
|
+
dummy.go = false
|
67
|
+
expect(matcher.greater_than(1024)).to_not accept(dummy)
|
68
|
+
end
|
69
|
+
end
|
70
|
+
|
71
|
+
context "post processing" do
|
72
|
+
before do
|
73
|
+
Dummy.validates_attachment_size :avatar, greater_than: 1024
|
74
|
+
end
|
75
|
+
|
76
|
+
it "be skipped" do
|
77
|
+
dummy = Dummy.new
|
78
|
+
dummy.avatar.expects(:post_process).never
|
79
|
+
expect(matcher.greater_than(1024)).to accept(dummy)
|
80
|
+
end
|
81
|
+
end
|
82
|
+
|
83
|
+
private
|
84
|
+
|
85
|
+
def matcher
|
86
|
+
self.class.validate_attachment_size(:avatar)
|
87
|
+
end
|
88
|
+
end
|