paperclip 3.4.0 → 6.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/.codeclimate.yml +17 -0
- data/.github/issue_template.md +3 -0
- data/.gitignore +0 -6
- data/.hound.yml +1055 -0
- data/.rubocop.yml +1 -0
- data/.travis.yml +19 -12
- data/Appraisals +4 -11
- data/CONTRIBUTING.md +29 -13
- data/Gemfile +13 -4
- data/LICENSE +1 -3
- data/MIGRATING-ES.md +317 -0
- data/MIGRATING.md +375 -0
- data/NEWS +390 -71
- data/README.md +607 -152
- data/RELEASING.md +17 -0
- data/Rakefile +6 -8
- data/UPGRADING +12 -9
- data/features/basic_integration.feature +34 -21
- data/features/migration.feature +0 -24
- data/features/rake_tasks.feature +2 -3
- data/features/step_definitions/attachment_steps.rb +44 -36
- data/features/step_definitions/html_steps.rb +2 -2
- data/features/step_definitions/rails_steps.rb +125 -26
- data/features/step_definitions/s3_steps.rb +3 -3
- data/features/step_definitions/web_steps.rb +1 -103
- data/features/support/env.rb +3 -2
- data/features/support/fakeweb.rb +4 -1
- data/features/support/file_helpers.rb +12 -2
- data/features/support/fixtures/gemfile.txt +1 -1
- data/features/support/paths.rb +1 -1
- data/features/support/rails.rb +4 -11
- 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 +215 -82
- data/lib/paperclip/attachment_registry.rb +60 -0
- data/lib/paperclip/callbacks.rb +13 -1
- data/lib/paperclip/content_type_detector.rb +48 -24
- data/lib/paperclip/errors.rb +8 -1
- data/lib/paperclip/file_command_content_type_detector.rb +6 -8
- data/lib/paperclip/filename_cleaner.rb +15 -0
- data/lib/paperclip/geometry_detector_factory.rb +12 -5
- data/lib/paperclip/geometry_parser_factory.rb +1 -1
- data/lib/paperclip/glue.rb +1 -2
- data/lib/paperclip/has_attached_file.rb +115 -0
- data/lib/paperclip/helpers.rb +15 -20
- data/lib/paperclip/interpolations/plural_cache.rb +18 -0
- data/lib/paperclip/interpolations.rb +36 -14
- data/lib/paperclip/io_adapters/abstract_adapter.rb +42 -5
- data/lib/paperclip/io_adapters/attachment_adapter.rb +20 -9
- data/lib/paperclip/io_adapters/data_uri_adapter.rb +22 -0
- data/lib/paperclip/io_adapters/empty_string_adapter.rb +19 -0
- data/lib/paperclip/io_adapters/file_adapter.rb +13 -7
- data/lib/paperclip/io_adapters/http_url_proxy_adapter.rb +16 -0
- 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 +11 -7
- data/lib/paperclip/io_adapters/uri_adapter.rb +43 -19
- data/lib/paperclip/locales/en.yml +1 -0
- data/lib/paperclip/logger.rb +1 -1
- data/lib/paperclip/matchers/have_attached_file_matcher.rb +3 -6
- data/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb +4 -4
- data/lib/paperclip/matchers/validate_attachment_presence_matcher.rb +7 -2
- data/lib/paperclip/matchers/validate_attachment_size_matcher.rb +2 -1
- data/lib/paperclip/matchers.rb +1 -1
- data/lib/paperclip/media_type_spoof_detector.rb +93 -0
- data/lib/paperclip/missing_attachment_styles.rb +11 -16
- data/lib/paperclip/processor.rb +15 -43
- data/lib/paperclip/processor_helpers.rb +50 -0
- data/lib/paperclip/rails_environment.rb +25 -0
- data/lib/paperclip/schema.rb +10 -8
- data/lib/paperclip/storage/filesystem.rb +20 -5
- data/lib/paperclip/storage/fog.rb +49 -23
- data/lib/paperclip/storage/s3.rb +153 -82
- data/lib/paperclip/style.rb +8 -3
- data/lib/paperclip/tempfile_factory.rb +6 -4
- data/lib/paperclip/thumbnail.rb +35 -19
- data/lib/paperclip/url_generator.rb +26 -14
- data/lib/paperclip/validators/attachment_content_type_validator.rb +15 -2
- 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 +12 -8
- data/lib/paperclip/validators/attachment_size_validator.rb +17 -10
- data/lib/paperclip/validators/media_type_spoof_detection_validator.rb +31 -0
- data/lib/paperclip/validators.rb +31 -3
- data/lib/paperclip/version.rb +3 -1
- data/lib/paperclip.rb +41 -55
- data/lib/tasks/paperclip.rake +56 -9
- data/paperclip.gemspec +18 -17
- data/shoulda_macros/paperclip.rb +13 -3
- data/spec/paperclip/attachment_definitions_spec.rb +13 -0
- data/spec/paperclip/attachment_processing_spec.rb +79 -0
- data/spec/paperclip/attachment_registry_spec.rb +158 -0
- data/{test/attachment_test.rb → spec/paperclip/attachment_spec.rb} +597 -389
- data/spec/paperclip/content_type_detector_spec.rb +48 -0
- data/spec/paperclip/file_command_content_type_detector_spec.rb +40 -0
- data/spec/paperclip/filename_cleaner_spec.rb +13 -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} +179 -199
- data/{test/interpolations_test.rb → spec/paperclip/interpolations_spec.rb} +79 -46
- data/spec/paperclip/io_adapters/abstract_adapter_spec.rb +160 -0
- data/{test/io_adapters/attachment_adapter_test.rb → spec/paperclip/io_adapters/attachment_adapter_spec.rb} +54 -25
- 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/spec/paperclip/io_adapters/file_adapter_spec.rb +131 -0
- data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb +138 -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/spec/paperclip/io_adapters/stringio_adapter_spec.rb +64 -0
- data/spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb +146 -0
- data/spec/paperclip/io_adapters/uri_adapter_spec.rb +220 -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 +120 -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/spec/paperclip/rake_spec.rb +103 -0
- 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 +254 -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} +186 -141
- data/spec/paperclip/url_generator_spec.rb +221 -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} +87 -59
- 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 +46 -0
- data/spec/support/assertions.rb +82 -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 +395 -346
- data/Gemfile.lock +0 -200
- 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/lib/paperclip/attachment_options.rb +0 -9
- data/lib/paperclip/instance_methods.rb +0 -35
- data/test/attachment_options_test.rb +0 -27
- data/test/attachment_processing_test.rb +0 -29
- data/test/content_type_detector_test.rb +0 -40
- data/test/file_command_content_type_detector_test.rb +0 -25
- data/test/generator_test.rb +0 -80
- data/test/geometry_detector_test.rb +0 -24
- data/test/helper.rb +0 -199
- data/test/io_adapters/abstract_adapter_test.rb +0 -50
- data/test/io_adapters/file_adapter_test.rb +0 -100
- data/test/io_adapters/identity_adapter_test.rb +0 -8
- data/test/io_adapters/stringio_adapter_test.rb +0 -51
- data/test/io_adapters/uploaded_file_adapter_test.rb +0 -123
- data/test/io_adapters/uri_adapter_test.rb +0 -86
- 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 -47
- 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 -94
- data/test/paperclip_test.rb +0 -259
- data/test/schema_test.rb +0 -200
- data/test/storage/fog_test.rb +0 -453
- data/test/storage/s3_live_test.rb +0 -179
- data/test/storage/s3_test.rb +0 -1236
- data/test/style_test.rb +0 -213
- data/test/support/mock_model.rb +0 -2
- data/test/tempfile_factory_test.rb +0 -13
- data/test/url_generator_test.rb +0 -187
- data/test/validators/attachment_content_type_validator_test.rb +0 -292
- data/test/validators_test.rb +0 -25
- /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
@@ -0,0 +1,220 @@
|
|
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
|
+
let(:meta) { { "content-type" => "image/png" } }
|
20
|
+
|
21
|
+
before do
|
22
|
+
Paperclip::UriAdapter.any_instance.
|
23
|
+
stubs(:download_content).returns(@open_return)
|
24
|
+
|
25
|
+
@uri = URI.parse("http://thoughtbot.com/images/thoughtbot-logo.png")
|
26
|
+
@subject = Paperclip.io_adapters.for(@uri, hash_digest: Digest::MD5)
|
27
|
+
end
|
28
|
+
|
29
|
+
it "returns a file name" do
|
30
|
+
assert_equal "thoughtbot-logo.png", @subject.original_filename
|
31
|
+
end
|
32
|
+
|
33
|
+
it 'closes open handle after reading' do
|
34
|
+
assert_equal true, @open_return.closed?
|
35
|
+
end
|
36
|
+
|
37
|
+
it "returns a content type" do
|
38
|
+
assert_equal "image/png", @subject.content_type
|
39
|
+
end
|
40
|
+
|
41
|
+
it "returns the size of the data" do
|
42
|
+
assert_equal @open_return.size, @subject.size
|
43
|
+
end
|
44
|
+
|
45
|
+
it "generates an MD5 hash of the contents" do
|
46
|
+
assert_equal Digest::MD5.hexdigest("xxx"), @subject.fingerprint
|
47
|
+
end
|
48
|
+
|
49
|
+
it "generates correct fingerprint after read" do
|
50
|
+
fingerprint = Digest::MD5.hexdigest(@subject.read)
|
51
|
+
assert_equal fingerprint, @subject.fingerprint
|
52
|
+
end
|
53
|
+
|
54
|
+
it "generates same fingerprint" do
|
55
|
+
assert_equal @subject.fingerprint, @subject.fingerprint
|
56
|
+
end
|
57
|
+
|
58
|
+
it "returns the data contained in the StringIO" do
|
59
|
+
assert_equal "xxx", @subject.read
|
60
|
+
end
|
61
|
+
|
62
|
+
it 'accepts a content_type' do
|
63
|
+
@subject.content_type = 'image/png'
|
64
|
+
assert_equal 'image/png', @subject.content_type
|
65
|
+
end
|
66
|
+
|
67
|
+
it "accepts an original_filename" do
|
68
|
+
@subject.original_filename = 'image.png'
|
69
|
+
assert_equal 'image.png', @subject.original_filename
|
70
|
+
end
|
71
|
+
|
72
|
+
end
|
73
|
+
|
74
|
+
context "a directory index url" do
|
75
|
+
let(:content_type) { "text/html" }
|
76
|
+
let(:meta) { { "content-type" => "text/html" } }
|
77
|
+
|
78
|
+
before do
|
79
|
+
Paperclip::UriAdapter.any_instance.
|
80
|
+
stubs(:download_content).returns(@open_return)
|
81
|
+
|
82
|
+
@uri = URI.parse("http://thoughtbot.com")
|
83
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
84
|
+
end
|
85
|
+
|
86
|
+
it "returns a file name" do
|
87
|
+
assert_equal "index.html", @subject.original_filename
|
88
|
+
end
|
89
|
+
|
90
|
+
it "returns a content type" do
|
91
|
+
assert_equal "text/html", @subject.content_type
|
92
|
+
end
|
93
|
+
end
|
94
|
+
|
95
|
+
context "a url with query params" do
|
96
|
+
before do
|
97
|
+
Paperclip::UriAdapter.any_instance.
|
98
|
+
stubs(:download_content).returns(@open_return)
|
99
|
+
|
100
|
+
@uri = URI.parse("https://github.com/thoughtbot/paperclip?file=test")
|
101
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
102
|
+
end
|
103
|
+
|
104
|
+
it "returns a file name" do
|
105
|
+
assert_equal "paperclip", @subject.original_filename
|
106
|
+
end
|
107
|
+
end
|
108
|
+
|
109
|
+
context "a url with content disposition headers" do
|
110
|
+
let(:file_name) { "test_document.pdf" }
|
111
|
+
let(:filename_from_path) { "paperclip" }
|
112
|
+
|
113
|
+
before do
|
114
|
+
Paperclip::UriAdapter.any_instance.
|
115
|
+
stubs(:download_content).returns(@open_return)
|
116
|
+
|
117
|
+
@uri = URI.parse(
|
118
|
+
"https://github.com/thoughtbot/#{filename_from_path}?file=test")
|
119
|
+
end
|
120
|
+
|
121
|
+
it "returns file name from path" do
|
122
|
+
meta["content-disposition"] = "inline;"
|
123
|
+
|
124
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
125
|
+
|
126
|
+
assert_equal filename_from_path, @subject.original_filename
|
127
|
+
end
|
128
|
+
|
129
|
+
it "returns a file name enclosed in double quotes" do
|
130
|
+
file_name = "john's test document.pdf"
|
131
|
+
meta["content-disposition"] = "attachment; filename=\"#{file_name}\";"
|
132
|
+
|
133
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
134
|
+
|
135
|
+
assert_equal file_name, @subject.original_filename
|
136
|
+
end
|
137
|
+
|
138
|
+
it "returns a file name not enclosed in double quotes" do
|
139
|
+
meta["content-disposition"] = "ATTACHMENT; FILENAME=#{file_name};"
|
140
|
+
|
141
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
142
|
+
|
143
|
+
assert_equal file_name, @subject.original_filename
|
144
|
+
end
|
145
|
+
|
146
|
+
it "does not crash when an empty filename is given" do
|
147
|
+
meta["content-disposition"] = "ATTACHMENT; FILENAME=\"\";"
|
148
|
+
|
149
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
150
|
+
|
151
|
+
assert_equal "", @subject.original_filename
|
152
|
+
end
|
153
|
+
|
154
|
+
it "returns a file name ignoring RFC 5987 encoding" do
|
155
|
+
meta["content-disposition"] =
|
156
|
+
"attachment; filename=#{file_name}; filename* = utf-8''%e2%82%ac%20rates"
|
157
|
+
|
158
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
159
|
+
|
160
|
+
assert_equal file_name, @subject.original_filename
|
161
|
+
end
|
162
|
+
|
163
|
+
context "when file name has consecutive periods" do
|
164
|
+
let(:file_name) { "test_document..pdf" }
|
165
|
+
|
166
|
+
it "returns a file name" do
|
167
|
+
@uri = URI.parse(
|
168
|
+
"https://github.com/thoughtbot/#{file_name}?file=test")
|
169
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
170
|
+
assert_equal file_name, @subject.original_filename
|
171
|
+
end
|
172
|
+
end
|
173
|
+
end
|
174
|
+
|
175
|
+
context "a url with restricted characters in the filename" do
|
176
|
+
before do
|
177
|
+
Paperclip::UriAdapter.any_instance.
|
178
|
+
stubs(:download_content).returns(@open_return)
|
179
|
+
|
180
|
+
@uri = URI.parse("https://github.com/thoughtbot/paper:clip.jpg")
|
181
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
182
|
+
end
|
183
|
+
|
184
|
+
it "does not generate filenames that include restricted characters" do
|
185
|
+
assert_equal "paper_clip.jpg", @subject.original_filename
|
186
|
+
end
|
187
|
+
|
188
|
+
it "does not generate paths that include restricted characters" do
|
189
|
+
expect(@subject.path).to_not match(/:/)
|
190
|
+
end
|
191
|
+
end
|
192
|
+
|
193
|
+
describe "#download_content" do
|
194
|
+
before do
|
195
|
+
Paperclip::UriAdapter.any_instance.stubs(:open).returns(@open_return)
|
196
|
+
@uri = URI.parse("https://github.com/thoughtbot/paper:clip.jpg")
|
197
|
+
@subject = Paperclip.io_adapters.for(@uri)
|
198
|
+
end
|
199
|
+
|
200
|
+
after do
|
201
|
+
@subject.send(:download_content)
|
202
|
+
end
|
203
|
+
|
204
|
+
context "with default read_timeout" do
|
205
|
+
it "calls open without options" do
|
206
|
+
@subject.expects(:open).with(@uri, {}).at_least_once
|
207
|
+
end
|
208
|
+
end
|
209
|
+
|
210
|
+
context "with custom read_timeout" do
|
211
|
+
before do
|
212
|
+
Paperclip.options[:read_timeout] = 120
|
213
|
+
end
|
214
|
+
|
215
|
+
it "calls open with read_timeout option" do
|
216
|
+
@subject.expects(:open).with(@uri, read_timeout: 120).at_least_once
|
217
|
+
end
|
218
|
+
end
|
219
|
+
end
|
220
|
+
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.bigint :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
|
@@ -0,0 +1,120 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Paperclip::MediaTypeSpoofDetector do
|
4
|
+
it 'rejects a file that is named .html and identifies as PNG' do
|
5
|
+
file = File.open(fixture_file("5k.png"))
|
6
|
+
assert Paperclip::MediaTypeSpoofDetector.using(file, "5k.html", "image/png").spoofed?
|
7
|
+
end
|
8
|
+
|
9
|
+
it 'does not reject a file that is named .jpg and identifies as PNG' do
|
10
|
+
file = File.open(fixture_file("5k.png"))
|
11
|
+
assert ! Paperclip::MediaTypeSpoofDetector.using(file, "5k.jpg", "image/png").spoofed?
|
12
|
+
end
|
13
|
+
|
14
|
+
it 'does not reject a file that is named .html and identifies as HTML' do
|
15
|
+
file = File.open(fixture_file("empty.html"))
|
16
|
+
assert ! Paperclip::MediaTypeSpoofDetector.using(file, "empty.html", "text/html").spoofed?
|
17
|
+
end
|
18
|
+
|
19
|
+
it 'does not reject a file that does not have a name' do
|
20
|
+
file = File.open(fixture_file("empty.html"))
|
21
|
+
assert ! Paperclip::MediaTypeSpoofDetector.using(file, "", "text/html").spoofed?
|
22
|
+
end
|
23
|
+
|
24
|
+
it 'does not reject a file that does have an extension' do
|
25
|
+
file = File.open(fixture_file("empty.html"))
|
26
|
+
assert ! Paperclip::MediaTypeSpoofDetector.using(file, "data", "text/html").spoofed?
|
27
|
+
end
|
28
|
+
|
29
|
+
it 'does not reject when the supplied file is an IOAdapter' do
|
30
|
+
adapter = Paperclip.io_adapters.for(File.new(fixture_file("5k.png")))
|
31
|
+
assert ! Paperclip::MediaTypeSpoofDetector.using(adapter, adapter.original_filename, adapter.content_type).spoofed?
|
32
|
+
end
|
33
|
+
|
34
|
+
it 'does not reject when the extension => content_type is in :content_type_mappings' do
|
35
|
+
begin
|
36
|
+
Paperclip.options[:content_type_mappings] = { pem: "text/plain" }
|
37
|
+
file = Tempfile.open(["test", ".PEM"])
|
38
|
+
file.puts "Certificate!"
|
39
|
+
file.close
|
40
|
+
adapter = Paperclip.io_adapters.for(File.new(file.path));
|
41
|
+
assert ! Paperclip::MediaTypeSpoofDetector.using(adapter, adapter.original_filename, adapter.content_type).spoofed?
|
42
|
+
ensure
|
43
|
+
Paperclip.options[:content_type_mappings] = {}
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
47
|
+
context "file named .html and is as HTML, but we're told JPG" do
|
48
|
+
let(:file) { File.open(fixture_file("empty.html")) }
|
49
|
+
let(:spoofed?) { Paperclip::MediaTypeSpoofDetector.using(file, "empty.html", "image/jpg").spoofed? }
|
50
|
+
|
51
|
+
it "rejects the file" do
|
52
|
+
assert spoofed?
|
53
|
+
end
|
54
|
+
|
55
|
+
it "logs info about the detected spoof" do
|
56
|
+
Paperclip.expects(:log).with('Content Type Spoof: Filename empty.html (image/jpg from Headers, ["text/html"] from Extension), content type discovered from file command: text/html. See documentation to allow this combination.')
|
57
|
+
spoofed?
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
61
|
+
context "GIF file named without extension, but we're told GIF" do
|
62
|
+
let(:file) { File.open(fixture_file("animated")) }
|
63
|
+
let(:spoofed?) do
|
64
|
+
Paperclip::MediaTypeSpoofDetector.
|
65
|
+
using(file, "animated", "image/gif").
|
66
|
+
spoofed?
|
67
|
+
end
|
68
|
+
|
69
|
+
it "accepts the file" do
|
70
|
+
assert !spoofed?
|
71
|
+
end
|
72
|
+
end
|
73
|
+
|
74
|
+
context "GIF file named without extension, but we're told HTML" do
|
75
|
+
let(:file) { File.open(fixture_file("animated")) }
|
76
|
+
let(:spoofed?) do
|
77
|
+
Paperclip::MediaTypeSpoofDetector.
|
78
|
+
using(file, "animated", "text/html").
|
79
|
+
spoofed?
|
80
|
+
end
|
81
|
+
|
82
|
+
it "rejects the file" do
|
83
|
+
assert spoofed?
|
84
|
+
end
|
85
|
+
end
|
86
|
+
|
87
|
+
it "does not reject if content_type is empty but otherwise checks out" do
|
88
|
+
file = File.open(fixture_file("empty.html"))
|
89
|
+
assert ! Paperclip::MediaTypeSpoofDetector.using(file, "empty.html", "").spoofed?
|
90
|
+
end
|
91
|
+
|
92
|
+
it 'does allow array as :content_type_mappings' do
|
93
|
+
begin
|
94
|
+
Paperclip.options[:content_type_mappings] = {
|
95
|
+
html: ['binary', 'text/html']
|
96
|
+
}
|
97
|
+
file = File.open(fixture_file('empty.html'))
|
98
|
+
spoofed = Paperclip::MediaTypeSpoofDetector
|
99
|
+
.using(file, "empty.html", "text/html").spoofed?
|
100
|
+
assert !spoofed
|
101
|
+
ensure
|
102
|
+
Paperclip.options[:content_type_mappings] = {}
|
103
|
+
end
|
104
|
+
end
|
105
|
+
|
106
|
+
context "#type_from_file_command" do
|
107
|
+
let(:file) { File.new(fixture_file("empty.html")) }
|
108
|
+
let(:detector) { Paperclip::MediaTypeSpoofDetector.new(file, "html", "") }
|
109
|
+
|
110
|
+
it "does work with the output of old versions of file" do
|
111
|
+
Paperclip.stubs(:run).returns("text/html charset=us-ascii")
|
112
|
+
expect(detector.send(:type_from_file_command)).to eq("text/html")
|
113
|
+
end
|
114
|
+
|
115
|
+
it "does work with the output of new versions of file" do
|
116
|
+
Paperclip.stubs(:run).returns("text/html; charset=us-ascii")
|
117
|
+
expect(detector.send(:type_from_file_command)).to eq("text/html")
|
118
|
+
end
|
119
|
+
end
|
120
|
+
end
|
@@ -0,0 +1,30 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe 'Metaclasses' do
|
4
|
+
context "A meta-class of dummy" do
|
5
|
+
if active_support_version >= "4.1" || ruby_version < "2.1"
|
6
|
+
before do
|
7
|
+
rebuild_model
|
8
|
+
reset_class("Dummy")
|
9
|
+
end
|
10
|
+
|
11
|
+
it "is able to use Paperclip like a normal class" do
|
12
|
+
@dummy = Dummy.new
|
13
|
+
|
14
|
+
assert_nothing_raised do
|
15
|
+
rebuild_meta_class_of(@dummy)
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
it "works like any other instance" do
|
20
|
+
@dummy = Dummy.new
|
21
|
+
rebuild_meta_class_of(@dummy)
|
22
|
+
|
23
|
+
assert_nothing_raised do
|
24
|
+
@dummy.avatar = File.new(fixture_file("5k.png"), 'rb')
|
25
|
+
end
|
26
|
+
assert @dummy.save
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|