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,89 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Paperclip::DataUriAdapter do
|
4
|
+
before do
|
5
|
+
Paperclip::DataUriAdapter.register
|
6
|
+
end
|
7
|
+
|
8
|
+
after do
|
9
|
+
Paperclip.io_adapters.unregister(described_class)
|
10
|
+
|
11
|
+
if @subject
|
12
|
+
@subject.close
|
13
|
+
end
|
14
|
+
end
|
15
|
+
|
16
|
+
it 'allows a missing mime-type' do
|
17
|
+
adapter = Paperclip.io_adapters.for("data:;base64,#{original_base64_content}")
|
18
|
+
assert_equal Paperclip::DataUriAdapter, adapter.class
|
19
|
+
end
|
20
|
+
|
21
|
+
it 'alows mime type that has dot in it' do
|
22
|
+
adapter = Paperclip.io_adapters.for("data:image/vnd.microsoft.icon;base64,#{original_base64_content}")
|
23
|
+
assert_equal Paperclip::DataUriAdapter, adapter.class
|
24
|
+
end
|
25
|
+
|
26
|
+
context "a new instance" do
|
27
|
+
before do
|
28
|
+
@contents = "data:image/png;base64,#{original_base64_content}"
|
29
|
+
@subject = Paperclip.io_adapters.for(@contents, hash_digest: Digest::MD5)
|
30
|
+
end
|
31
|
+
|
32
|
+
it "returns a nondescript file name" do
|
33
|
+
assert_equal "data", @subject.original_filename
|
34
|
+
end
|
35
|
+
|
36
|
+
it "returns a content type" do
|
37
|
+
assert_equal "image/png", @subject.content_type
|
38
|
+
end
|
39
|
+
|
40
|
+
it "returns the size of the data" do
|
41
|
+
assert_equal 4456, @subject.size
|
42
|
+
end
|
43
|
+
|
44
|
+
it "generates a correct MD5 hash of the contents" do
|
45
|
+
assert_equal(
|
46
|
+
Digest::MD5.hexdigest(Base64.decode64(original_base64_content)),
|
47
|
+
@subject.fingerprint
|
48
|
+
)
|
49
|
+
end
|
50
|
+
|
51
|
+
it "generates correct fingerprint after read" do
|
52
|
+
fingerprint = Digest::MD5.hexdigest(@subject.read)
|
53
|
+
assert_equal fingerprint, @subject.fingerprint
|
54
|
+
end
|
55
|
+
|
56
|
+
it "generates same fingerprint" do
|
57
|
+
assert_equal @subject.fingerprint, @subject.fingerprint
|
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 original_filename' do
|
66
|
+
@subject.original_filename = 'image.png'
|
67
|
+
assert_equal 'image.png', @subject.original_filename
|
68
|
+
end
|
69
|
+
|
70
|
+
it "does not generate filenames that include restricted characters" do
|
71
|
+
@subject.original_filename = 'image:restricted.png'
|
72
|
+
assert_equal 'image_restricted.png', @subject.original_filename
|
73
|
+
end
|
74
|
+
|
75
|
+
it "does not generate paths that include restricted characters" do
|
76
|
+
@subject.original_filename = 'image:restricted.png'
|
77
|
+
expect(@subject.path).to_not match(/:/)
|
78
|
+
end
|
79
|
+
|
80
|
+
end
|
81
|
+
|
82
|
+
def original_base64_content
|
83
|
+
Base64.encode64(original_file_contents)
|
84
|
+
end
|
85
|
+
|
86
|
+
def original_file_contents
|
87
|
+
@original_file_contents ||= File.read(fixture_file('5k.png'))
|
88
|
+
end
|
89
|
+
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Paperclip::EmptyStringAdapter do
|
4
|
+
context 'a new instance' do
|
5
|
+
before do
|
6
|
+
@subject = Paperclip.io_adapters.for('')
|
7
|
+
end
|
8
|
+
|
9
|
+
it "returns false for a call to nil?" do
|
10
|
+
assert !@subject.nil?
|
11
|
+
end
|
12
|
+
|
13
|
+
it 'returns false for a call to assignment?' do
|
14
|
+
assert !@subject.assignment?
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
@@ -0,0 +1,131 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Paperclip::FileAdapter do
|
4
|
+
context "a new instance" do
|
5
|
+
context "with normal file" do
|
6
|
+
before do
|
7
|
+
@file = File.new(fixture_file("5k.png"))
|
8
|
+
@file.binmode
|
9
|
+
end
|
10
|
+
|
11
|
+
after do
|
12
|
+
@file.close
|
13
|
+
@subject.close if @subject
|
14
|
+
end
|
15
|
+
|
16
|
+
context 'doing normal things' do
|
17
|
+
before do
|
18
|
+
@subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
|
19
|
+
end
|
20
|
+
|
21
|
+
it 'uses the original filename to generate the tempfile' do
|
22
|
+
assert @subject.path.ends_with?(".png")
|
23
|
+
end
|
24
|
+
|
25
|
+
it "gets the right filename" do
|
26
|
+
assert_equal "5k.png", @subject.original_filename
|
27
|
+
end
|
28
|
+
|
29
|
+
it "forces binmode on tempfile" do
|
30
|
+
assert @subject.instance_variable_get("@tempfile").binmode?
|
31
|
+
end
|
32
|
+
|
33
|
+
it "gets the content type" do
|
34
|
+
assert_equal "image/png", @subject.content_type
|
35
|
+
end
|
36
|
+
|
37
|
+
it "returns content type as a string" do
|
38
|
+
expect(@subject.content_type).to be_a String
|
39
|
+
end
|
40
|
+
|
41
|
+
it "gets the file's size" do
|
42
|
+
assert_equal 4456, @subject.size
|
43
|
+
end
|
44
|
+
|
45
|
+
it "returns false for a call to nil?" do
|
46
|
+
assert ! @subject.nil?
|
47
|
+
end
|
48
|
+
|
49
|
+
it "generates a MD5 hash of the contents" do
|
50
|
+
expected = Digest::MD5.file(@file.path).to_s
|
51
|
+
assert_equal expected, @subject.fingerprint
|
52
|
+
end
|
53
|
+
|
54
|
+
it "reads the contents of the file" do
|
55
|
+
expected = @file.read
|
56
|
+
assert expected.length > 0
|
57
|
+
assert_equal expected, @subject.read
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
61
|
+
context "file with multiple possible content type" do
|
62
|
+
before do
|
63
|
+
MIME::Types.stubs(:type_for).returns([MIME::Type.new('image/x-png'), MIME::Type.new('image/png')])
|
64
|
+
@subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
|
65
|
+
end
|
66
|
+
|
67
|
+
it "prefers officially registered mime type" do
|
68
|
+
assert_equal "image/png", @subject.content_type
|
69
|
+
end
|
70
|
+
|
71
|
+
it "returns content type as a string" do
|
72
|
+
expect(@subject.content_type).to be_a String
|
73
|
+
end
|
74
|
+
end
|
75
|
+
|
76
|
+
context "file with content type derived from file contents on *nix" do
|
77
|
+
before do
|
78
|
+
MIME::Types.stubs(:type_for).returns([])
|
79
|
+
Paperclip.stubs(:run).returns("application/vnd.ms-office\n")
|
80
|
+
Paperclip::ContentTypeDetector.any_instance
|
81
|
+
.stubs(:type_from_mime_magic).returns("application/vnd.ms-office")
|
82
|
+
|
83
|
+
@subject = Paperclip.io_adapters.for(@file)
|
84
|
+
end
|
85
|
+
|
86
|
+
it "returns content type without newline character" do
|
87
|
+
assert_equal "application/vnd.ms-office", @subject.content_type
|
88
|
+
end
|
89
|
+
end
|
90
|
+
end
|
91
|
+
|
92
|
+
context "filename with restricted characters" do
|
93
|
+
before do
|
94
|
+
@file = File.open(fixture_file("animated.gif")) do |file|
|
95
|
+
StringIO.new(file.read)
|
96
|
+
end
|
97
|
+
@file.stubs(:original_filename).returns('image:restricted.gif')
|
98
|
+
@subject = Paperclip.io_adapters.for(@file)
|
99
|
+
end
|
100
|
+
|
101
|
+
after do
|
102
|
+
@file.close
|
103
|
+
@subject.close
|
104
|
+
end
|
105
|
+
|
106
|
+
it "does not generate filenames that include restricted characters" do
|
107
|
+
assert_equal 'image_restricted.gif', @subject.original_filename
|
108
|
+
end
|
109
|
+
|
110
|
+
it "does not generate paths that include restricted characters" do
|
111
|
+
expect(@subject.path).to_not match(/:/)
|
112
|
+
end
|
113
|
+
end
|
114
|
+
|
115
|
+
context "empty file" do
|
116
|
+
before do
|
117
|
+
@file = Tempfile.new("file_adapter_test")
|
118
|
+
@subject = Paperclip.io_adapters.for(@file)
|
119
|
+
end
|
120
|
+
|
121
|
+
after do
|
122
|
+
@file.close
|
123
|
+
@subject.close
|
124
|
+
end
|
125
|
+
|
126
|
+
it "provides correct mime-type" do
|
127
|
+
assert_match %r{.*/x-empty}, @subject.content_type
|
128
|
+
end
|
129
|
+
end
|
130
|
+
end
|
131
|
+
end
|
@@ -0,0 +1,138 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Paperclip::HttpUrlProxyAdapter do
|
4
|
+
before do
|
5
|
+
@open_return = StringIO.new("xxx")
|
6
|
+
@open_return.stubs(:meta).returns("content-type" => "image/png")
|
7
|
+
Paperclip::HttpUrlProxyAdapter.any_instance.stubs(:download_content).
|
8
|
+
returns(@open_return)
|
9
|
+
Paperclip::HttpUrlProxyAdapter.register
|
10
|
+
end
|
11
|
+
|
12
|
+
after do
|
13
|
+
Paperclip.io_adapters.unregister(described_class)
|
14
|
+
end
|
15
|
+
|
16
|
+
context "a new instance" do
|
17
|
+
before do
|
18
|
+
@url = "http://thoughtbot.com/images/thoughtbot-logo.png"
|
19
|
+
@subject = Paperclip.io_adapters.for(@url, hash_digest: Digest::MD5)
|
20
|
+
end
|
21
|
+
|
22
|
+
after do
|
23
|
+
@subject.close
|
24
|
+
end
|
25
|
+
|
26
|
+
it "returns a file name" do
|
27
|
+
assert_equal "thoughtbot-logo.png", @subject.original_filename
|
28
|
+
end
|
29
|
+
|
30
|
+
it 'closes open handle after reading' do
|
31
|
+
assert_equal true, @open_return.closed?
|
32
|
+
end
|
33
|
+
|
34
|
+
it "returns a content type" do
|
35
|
+
assert_equal "image/png", @subject.content_type
|
36
|
+
end
|
37
|
+
|
38
|
+
it "returns the size of the data" do
|
39
|
+
assert_equal @open_return.size, @subject.size
|
40
|
+
end
|
41
|
+
|
42
|
+
it "generates an MD5 hash of the contents" do
|
43
|
+
assert_equal Digest::MD5.hexdigest("xxx"), @subject.fingerprint
|
44
|
+
end
|
45
|
+
|
46
|
+
it "generates correct fingerprint after read" do
|
47
|
+
fingerprint = Digest::MD5.hexdigest(@subject.read)
|
48
|
+
assert_equal fingerprint, @subject.fingerprint
|
49
|
+
end
|
50
|
+
|
51
|
+
it "generates same fingerprint" do
|
52
|
+
assert_equal @subject.fingerprint, @subject.fingerprint
|
53
|
+
end
|
54
|
+
|
55
|
+
it "returns the data contained in the StringIO" do
|
56
|
+
assert_equal "xxx", @subject.read
|
57
|
+
end
|
58
|
+
|
59
|
+
it 'accepts a content_type' do
|
60
|
+
@subject.content_type = 'image/png'
|
61
|
+
assert_equal 'image/png', @subject.content_type
|
62
|
+
end
|
63
|
+
|
64
|
+
it 'accepts an original_filename' do
|
65
|
+
@subject.original_filename = 'image.png'
|
66
|
+
assert_equal 'image.png', @subject.original_filename
|
67
|
+
end
|
68
|
+
end
|
69
|
+
|
70
|
+
context "a url with query params" do
|
71
|
+
subject { Paperclip.io_adapters.for(url) }
|
72
|
+
|
73
|
+
after { subject.close }
|
74
|
+
|
75
|
+
let(:url) { "https://github.com/thoughtbot/paperclip?file=test" }
|
76
|
+
|
77
|
+
it "returns a file name" do
|
78
|
+
assert_equal "paperclip", subject.original_filename
|
79
|
+
end
|
80
|
+
|
81
|
+
it "preserves params" do
|
82
|
+
assert_equal url, subject.instance_variable_get(:@target).to_s
|
83
|
+
end
|
84
|
+
end
|
85
|
+
|
86
|
+
context "a url with restricted characters in the filename" do
|
87
|
+
before do
|
88
|
+
@url = "https://github.com/thoughtbot/paper:clip.jpg"
|
89
|
+
@subject = Paperclip.io_adapters.for(@url)
|
90
|
+
end
|
91
|
+
|
92
|
+
after do
|
93
|
+
begin
|
94
|
+
@subject.close
|
95
|
+
rescue Exception
|
96
|
+
true
|
97
|
+
end
|
98
|
+
end
|
99
|
+
|
100
|
+
it "does not generate filenames that include restricted characters" do
|
101
|
+
assert_equal "paper_clip.jpg", @subject.original_filename
|
102
|
+
end
|
103
|
+
|
104
|
+
it "does not generate paths that include restricted characters" do
|
105
|
+
expect(@subject.path).to_not match(/:/)
|
106
|
+
end
|
107
|
+
end
|
108
|
+
|
109
|
+
context "a url with special characters in the filename" do
|
110
|
+
before do
|
111
|
+
Paperclip::HttpUrlProxyAdapter.any_instance.stubs(:download_content).
|
112
|
+
returns(@open_return)
|
113
|
+
end
|
114
|
+
|
115
|
+
let(:filename) do
|
116
|
+
"paperclip-%C3%B6%C3%A4%C3%BC%E5%AD%97%C2%B4%C2%BD%E2%99%A5"\
|
117
|
+
"%C3%98%C2%B2%C3%88.png"
|
118
|
+
end
|
119
|
+
let(:url) { "https://github.com/thoughtbot/paperclip-öäü字´½♥زÈ.png" }
|
120
|
+
|
121
|
+
subject { Paperclip.io_adapters.for(url) }
|
122
|
+
|
123
|
+
it "returns a encoded filename" do
|
124
|
+
assert_equal filename, subject.original_filename
|
125
|
+
end
|
126
|
+
|
127
|
+
context "when already URI encoded" do
|
128
|
+
let(:url) do
|
129
|
+
"https://github.com/thoughtbot/paperclip-%C3%B6%C3%A4%C3%BC%E5%AD%97"\
|
130
|
+
"%C2%B4%C2%BD%E2%99%A5%C3%98%C2%B2%C3%88.png"
|
131
|
+
end
|
132
|
+
|
133
|
+
it "returns a encoded filename" do
|
134
|
+
assert_equal filename, subject.original_filename
|
135
|
+
end
|
136
|
+
end
|
137
|
+
end
|
138
|
+
end
|
data/{test/io_adapters/nil_adapter_test.rb → spec/paperclip/io_adapters/nil_adapter_spec.rb}
RENAMED
@@ -1,24 +1,24 @@
|
|
1
|
-
require '
|
1
|
+
require 'spec_helper'
|
2
2
|
|
3
|
-
|
3
|
+
describe Paperclip::NilAdapter do
|
4
4
|
context 'a new instance' do
|
5
|
-
|
5
|
+
before do
|
6
6
|
@subject = Paperclip.io_adapters.for(nil)
|
7
7
|
end
|
8
8
|
|
9
|
-
|
9
|
+
it "gets the right filename" do
|
10
10
|
assert_equal "", @subject.original_filename
|
11
11
|
end
|
12
12
|
|
13
|
-
|
13
|
+
it "gets the content type" do
|
14
14
|
assert_equal "", @subject.content_type
|
15
15
|
end
|
16
16
|
|
17
|
-
|
17
|
+
it "gets the file's size" do
|
18
18
|
assert_equal 0, @subject.size
|
19
19
|
end
|
20
20
|
|
21
|
-
|
21
|
+
it "returns true for a call to nil?" do
|
22
22
|
assert @subject.nil?
|
23
23
|
end
|
24
24
|
end
|
@@ -1,31 +1,34 @@
|
|
1
|
-
require '
|
1
|
+
require 'spec_helper'
|
2
2
|
|
3
|
-
|
3
|
+
describe Paperclip::AttachmentRegistry do
|
4
4
|
context "for" do
|
5
|
-
|
5
|
+
before do
|
6
6
|
class AdapterTest
|
7
|
-
def initialize(
|
7
|
+
def initialize(_target, _ = {}); end
|
8
8
|
end
|
9
9
|
@subject = Paperclip::AdapterRegistry.new
|
10
10
|
@subject.register(AdapterTest){|t| Symbol === t }
|
11
11
|
end
|
12
|
-
|
12
|
+
|
13
|
+
it "returns the class registered for the adapted type" do
|
13
14
|
assert_equal AdapterTest, @subject.for(:target).class
|
14
15
|
end
|
15
16
|
end
|
16
17
|
|
17
18
|
context "registered?" do
|
18
|
-
|
19
|
+
before do
|
19
20
|
class AdapterTest
|
20
|
-
def initialize(
|
21
|
+
def initialize(_target, _ = {}); end
|
21
22
|
end
|
22
23
|
@subject = Paperclip::AdapterRegistry.new
|
23
24
|
@subject.register(AdapterTest){|t| Symbol === t }
|
24
25
|
end
|
25
|
-
|
26
|
+
|
27
|
+
it "returns true when the class of this adapter has been registered" do
|
26
28
|
assert @subject.registered?(AdapterTest.new(:target))
|
27
29
|
end
|
28
|
-
|
30
|
+
|
31
|
+
it "returns false when the adapter has not been registered" do
|
29
32
|
assert ! @subject.registered?(Object)
|
30
33
|
end
|
31
34
|
end
|
@@ -0,0 +1,64 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Paperclip::StringioAdapter do
|
4
|
+
context "a new instance" do
|
5
|
+
before do
|
6
|
+
@contents = "abc123"
|
7
|
+
@stringio = StringIO.new(@contents)
|
8
|
+
@subject = Paperclip.io_adapters.for(@stringio, hash_digest: Digest::MD5)
|
9
|
+
end
|
10
|
+
|
11
|
+
it "returns a file name" do
|
12
|
+
assert_equal "data", @subject.original_filename
|
13
|
+
end
|
14
|
+
|
15
|
+
it "returns a content type" do
|
16
|
+
assert_equal "text/plain", @subject.content_type
|
17
|
+
end
|
18
|
+
|
19
|
+
it "returns the size of the data" do
|
20
|
+
assert_equal 6, @subject.size
|
21
|
+
end
|
22
|
+
|
23
|
+
it "returns the length of the data" do
|
24
|
+
assert_equal 6, @subject.length
|
25
|
+
end
|
26
|
+
|
27
|
+
it "generates an MD5 hash of the contents" do
|
28
|
+
assert_equal Digest::MD5.hexdigest(@contents), @subject.fingerprint
|
29
|
+
end
|
30
|
+
|
31
|
+
it "generates correct fingerprint after read" do
|
32
|
+
fingerprint = Digest::MD5.hexdigest(@subject.read)
|
33
|
+
assert_equal fingerprint, @subject.fingerprint
|
34
|
+
end
|
35
|
+
|
36
|
+
it "generates same fingerprint" do
|
37
|
+
assert_equal @subject.fingerprint, @subject.fingerprint
|
38
|
+
end
|
39
|
+
|
40
|
+
it "returns the data contained in the StringIO" do
|
41
|
+
assert_equal "abc123", @subject.read
|
42
|
+
end
|
43
|
+
|
44
|
+
it 'accepts a content_type' do
|
45
|
+
@subject.content_type = 'image/png'
|
46
|
+
assert_equal 'image/png', @subject.content_type
|
47
|
+
end
|
48
|
+
|
49
|
+
it 'accepts an original_filename' do
|
50
|
+
@subject.original_filename = 'image.png'
|
51
|
+
assert_equal 'image.png', @subject.original_filename
|
52
|
+
end
|
53
|
+
|
54
|
+
it "does not generate filenames that include restricted characters" do
|
55
|
+
@subject.original_filename = 'image:restricted.png'
|
56
|
+
assert_equal 'image_restricted.png', @subject.original_filename
|
57
|
+
end
|
58
|
+
|
59
|
+
it "does not generate paths that include restricted characters" do
|
60
|
+
@subject.original_filename = 'image:restricted.png'
|
61
|
+
expect(@subject.path).to_not match(/:/)
|
62
|
+
end
|
63
|
+
end
|
64
|
+
end
|
@@ -0,0 +1,146 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Paperclip::UploadedFileAdapter do
|
4
|
+
context "a new instance" do
|
5
|
+
context "with UploadedFile responding to #tempfile" do
|
6
|
+
before do
|
7
|
+
Paperclip::UploadedFileAdapter.content_type_detector = nil
|
8
|
+
|
9
|
+
class UploadedFile < OpenStruct; end
|
10
|
+
tempfile = File.new(fixture_file("5k.png"))
|
11
|
+
tempfile.binmode
|
12
|
+
|
13
|
+
@file = UploadedFile.new(
|
14
|
+
original_filename: "5k.png",
|
15
|
+
content_type: "image/x-png-by-browser\r",
|
16
|
+
head: "",
|
17
|
+
tempfile: tempfile,
|
18
|
+
path: tempfile.path
|
19
|
+
)
|
20
|
+
@subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
|
21
|
+
end
|
22
|
+
|
23
|
+
it "gets the right filename" do
|
24
|
+
assert_equal "5k.png", @subject.original_filename
|
25
|
+
end
|
26
|
+
|
27
|
+
it "forces binmode on tempfile" do
|
28
|
+
assert @subject.instance_variable_get("@tempfile").binmode?
|
29
|
+
end
|
30
|
+
|
31
|
+
it "gets the content type" do
|
32
|
+
assert_equal "image/png", @subject.content_type
|
33
|
+
end
|
34
|
+
|
35
|
+
it "gets the file's size" do
|
36
|
+
assert_equal 4456, @subject.size
|
37
|
+
end
|
38
|
+
|
39
|
+
it "returns false for a call to nil?" do
|
40
|
+
assert ! @subject.nil?
|
41
|
+
end
|
42
|
+
|
43
|
+
it "generates a MD5 hash of the contents" do
|
44
|
+
expected = Digest::MD5.file(@file.tempfile.path).to_s
|
45
|
+
assert_equal expected, @subject.fingerprint
|
46
|
+
end
|
47
|
+
|
48
|
+
it "reads the contents of the file" do
|
49
|
+
expected = @file.tempfile.read
|
50
|
+
assert expected.length > 0
|
51
|
+
assert_equal expected, @subject.read
|
52
|
+
end
|
53
|
+
end
|
54
|
+
|
55
|
+
context "with UploadedFile that has restricted characters" do
|
56
|
+
before do
|
57
|
+
Paperclip::UploadedFileAdapter.content_type_detector = nil
|
58
|
+
|
59
|
+
class UploadedFile < OpenStruct; end
|
60
|
+
@file = UploadedFile.new(
|
61
|
+
original_filename: "image:restricted.gif",
|
62
|
+
content_type: "image/x-png-by-browser",
|
63
|
+
head: "",
|
64
|
+
path: fixture_file("5k.png")
|
65
|
+
)
|
66
|
+
@subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
|
67
|
+
end
|
68
|
+
|
69
|
+
it "does not generate paths that include restricted characters" do
|
70
|
+
expect(@subject.path).to_not match(/:/)
|
71
|
+
end
|
72
|
+
|
73
|
+
it "does not generate filenames that include restricted characters" do
|
74
|
+
assert_equal 'image_restricted.gif', @subject.original_filename
|
75
|
+
end
|
76
|
+
end
|
77
|
+
|
78
|
+
context "with UploadFile responding to #path" do
|
79
|
+
before do
|
80
|
+
Paperclip::UploadedFileAdapter.content_type_detector = nil
|
81
|
+
|
82
|
+
class UploadedFile < OpenStruct; end
|
83
|
+
@file = UploadedFile.new(
|
84
|
+
original_filename: "5k.png",
|
85
|
+
content_type: "image/x-png-by-browser",
|
86
|
+
head: "",
|
87
|
+
path: fixture_file("5k.png")
|
88
|
+
)
|
89
|
+
@subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
|
90
|
+
end
|
91
|
+
|
92
|
+
it "gets the right filename" do
|
93
|
+
assert_equal "5k.png", @subject.original_filename
|
94
|
+
end
|
95
|
+
|
96
|
+
it "forces binmode on tempfile" do
|
97
|
+
assert @subject.instance_variable_get("@tempfile").binmode?
|
98
|
+
end
|
99
|
+
|
100
|
+
it "gets the content type" do
|
101
|
+
assert_equal "image/png", @subject.content_type
|
102
|
+
end
|
103
|
+
|
104
|
+
it "gets the file's size" do
|
105
|
+
assert_equal 4456, @subject.size
|
106
|
+
end
|
107
|
+
|
108
|
+
it "returns false for a call to nil?" do
|
109
|
+
assert ! @subject.nil?
|
110
|
+
end
|
111
|
+
|
112
|
+
it "generates a MD5 hash of the contents" do
|
113
|
+
expected = Digest::MD5.file(@file.path).to_s
|
114
|
+
assert_equal expected, @subject.fingerprint
|
115
|
+
end
|
116
|
+
|
117
|
+
it "reads the contents of the file" do
|
118
|
+
expected_file = File.new(@file.path)
|
119
|
+
expected_file.binmode
|
120
|
+
expected = expected_file.read
|
121
|
+
assert expected.length > 0
|
122
|
+
assert_equal expected, @subject.read
|
123
|
+
end
|
124
|
+
|
125
|
+
context "don't trust client-given MIME type" do
|
126
|
+
before do
|
127
|
+
Paperclip::UploadedFileAdapter.content_type_detector =
|
128
|
+
Paperclip::FileCommandContentTypeDetector
|
129
|
+
|
130
|
+
class UploadedFile < OpenStruct; end
|
131
|
+
@file = UploadedFile.new(
|
132
|
+
original_filename: "5k.png",
|
133
|
+
content_type: "image/x-png-by-browser",
|
134
|
+
head: "",
|
135
|
+
path: fixture_file("5k.png")
|
136
|
+
)
|
137
|
+
@subject = Paperclip.io_adapters.for(@file)
|
138
|
+
end
|
139
|
+
|
140
|
+
it "gets the content type" do
|
141
|
+
assert_equal "image/png", @subject.content_type
|
142
|
+
end
|
143
|
+
end
|
144
|
+
end
|
145
|
+
end
|
146
|
+
end
|