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
@@ -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
|
data/{test/io_adapters/file_adapter_test.rb → spec/paperclip/io_adapters/file_adapter_spec.rb}
RENAMED
@@ -1,53 +1,57 @@
|
|
1
|
-
require '
|
1
|
+
require 'spec_helper'
|
2
2
|
|
3
|
-
|
3
|
+
describe Paperclip::FileAdapter do
|
4
4
|
context "a new instance" do
|
5
5
|
context "with normal file" do
|
6
|
-
|
6
|
+
before do
|
7
7
|
@file = File.new(fixture_file("5k.png"))
|
8
8
|
@file.binmode
|
9
9
|
end
|
10
10
|
|
11
|
-
|
11
|
+
after do
|
12
12
|
@file.close
|
13
13
|
@subject.close if @subject
|
14
14
|
end
|
15
15
|
|
16
16
|
context 'doing normal things' do
|
17
|
-
|
18
|
-
@subject = Paperclip.io_adapters.for(@file)
|
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")
|
19
23
|
end
|
20
24
|
|
21
|
-
|
25
|
+
it "gets the right filename" do
|
22
26
|
assert_equal "5k.png", @subject.original_filename
|
23
27
|
end
|
24
28
|
|
25
|
-
|
29
|
+
it "forces binmode on tempfile" do
|
26
30
|
assert @subject.instance_variable_get("@tempfile").binmode?
|
27
31
|
end
|
28
32
|
|
29
|
-
|
33
|
+
it "gets the content type" do
|
30
34
|
assert_equal "image/png", @subject.content_type
|
31
35
|
end
|
32
36
|
|
33
|
-
|
34
|
-
|
37
|
+
it "returns content type as a string" do
|
38
|
+
expect(@subject.content_type).to be_a String
|
35
39
|
end
|
36
40
|
|
37
|
-
|
41
|
+
it "gets the file's size" do
|
38
42
|
assert_equal 4456, @subject.size
|
39
43
|
end
|
40
44
|
|
41
|
-
|
45
|
+
it "returns false for a call to nil?" do
|
42
46
|
assert ! @subject.nil?
|
43
47
|
end
|
44
48
|
|
45
|
-
|
49
|
+
it "generates a MD5 hash of the contents" do
|
46
50
|
expected = Digest::MD5.file(@file.path).to_s
|
47
51
|
assert_equal expected, @subject.fingerprint
|
48
52
|
end
|
49
53
|
|
50
|
-
|
54
|
+
it "reads the contents of the file" do
|
51
55
|
expected = @file.read
|
52
56
|
assert expected.length > 0
|
53
57
|
assert_equal expected, @subject.read
|
@@ -55,46 +59,38 @@ class FileAdapterTest < Test::Unit::TestCase
|
|
55
59
|
end
|
56
60
|
|
57
61
|
context "file with multiple possible content type" do
|
58
|
-
|
62
|
+
before do
|
59
63
|
MIME::Types.stubs(:type_for).returns([MIME::Type.new('image/x-png'), MIME::Type.new('image/png')])
|
60
|
-
@subject = Paperclip.io_adapters.for(@file)
|
64
|
+
@subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
|
61
65
|
end
|
62
66
|
|
63
|
-
|
67
|
+
it "prefers officially registered mime type" do
|
64
68
|
assert_equal "image/png", @subject.content_type
|
65
69
|
end
|
66
70
|
|
67
|
-
|
68
|
-
|
71
|
+
it "returns content type as a string" do
|
72
|
+
expect(@subject.content_type).to be_a String
|
69
73
|
end
|
70
74
|
end
|
71
75
|
|
72
|
-
context "file with
|
73
|
-
|
74
|
-
MIME::Types.stubs(:type_for).returns([MIME::Type.new('image/x-mp4'), MIME::Type.new('image/x-video')])
|
75
|
-
@subject = Paperclip.io_adapters.for(@file)
|
76
|
-
end
|
77
|
-
|
78
|
-
should "return the first" do
|
79
|
-
assert_equal "image/x-mp4", @subject.content_type
|
80
|
-
end
|
81
|
-
end
|
82
|
-
|
83
|
-
context "file with content type derived from file command on *nix" do
|
84
|
-
setup do
|
76
|
+
context "file with content type derived from file contents on *nix" do
|
77
|
+
before do
|
85
78
|
MIME::Types.stubs(:type_for).returns([])
|
86
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
|
+
|
87
83
|
@subject = Paperclip.io_adapters.for(@file)
|
88
84
|
end
|
89
85
|
|
90
|
-
|
86
|
+
it "returns content type without newline character" do
|
91
87
|
assert_equal "application/vnd.ms-office", @subject.content_type
|
92
88
|
end
|
93
89
|
end
|
94
90
|
end
|
95
91
|
|
96
92
|
context "filename with restricted characters" do
|
97
|
-
|
93
|
+
before do
|
98
94
|
@file = File.open(fixture_file("animated.gif")) do |file|
|
99
95
|
StringIO.new(file.read)
|
100
96
|
end
|
@@ -102,32 +98,32 @@ class FileAdapterTest < Test::Unit::TestCase
|
|
102
98
|
@subject = Paperclip.io_adapters.for(@file)
|
103
99
|
end
|
104
100
|
|
105
|
-
|
101
|
+
after do
|
106
102
|
@file.close
|
107
103
|
@subject.close
|
108
104
|
end
|
109
105
|
|
110
|
-
|
106
|
+
it "does not generate filenames that include restricted characters" do
|
111
107
|
assert_equal 'image_restricted.gif', @subject.original_filename
|
112
108
|
end
|
113
109
|
|
114
|
-
|
115
|
-
|
110
|
+
it "does not generate paths that include restricted characters" do
|
111
|
+
expect(@subject.path).to_not match(/:/)
|
116
112
|
end
|
117
113
|
end
|
118
114
|
|
119
115
|
context "empty file" do
|
120
|
-
|
116
|
+
before do
|
121
117
|
@file = Tempfile.new("file_adapter_test")
|
122
118
|
@subject = Paperclip.io_adapters.for(@file)
|
123
119
|
end
|
124
120
|
|
125
|
-
|
121
|
+
after do
|
126
122
|
@file.close
|
127
123
|
@subject.close
|
128
124
|
end
|
129
125
|
|
130
|
-
|
126
|
+
it "provides correct mime-type" do
|
131
127
|
assert_match %r{.*/x-empty}, @subject.content_type
|
132
128
|
end
|
133
129
|
end
|
@@ -0,0 +1,121 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Paperclip::HttpUrlProxyAdapter do
|
4
|
+
before do
|
5
|
+
@open_return = StringIO.new("xxx")
|
6
|
+
@open_return.stubs(:content_type).returns("image/png")
|
7
|
+
@open_return.stubs(:meta).returns({})
|
8
|
+
Paperclip::HttpUrlProxyAdapter.any_instance.
|
9
|
+
stubs(:download_content).returns(@open_return)
|
10
|
+
Paperclip::HttpUrlProxyAdapter.register
|
11
|
+
end
|
12
|
+
|
13
|
+
after do
|
14
|
+
Paperclip.io_adapters.unregister(described_class)
|
15
|
+
end
|
16
|
+
|
17
|
+
context "a new instance" do
|
18
|
+
before do
|
19
|
+
@url = "http://thoughtbot.com/images/thoughtbot-logo.png"
|
20
|
+
@subject = Paperclip.io_adapters.for(@url, hash_digest: Digest::MD5)
|
21
|
+
end
|
22
|
+
|
23
|
+
after do
|
24
|
+
@subject.close
|
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 original_filename' do
|
66
|
+
@subject.original_filename = 'image.png'
|
67
|
+
assert_equal 'image.png', @subject.original_filename
|
68
|
+
end
|
69
|
+
end
|
70
|
+
|
71
|
+
context "a url with query params" do
|
72
|
+
before do
|
73
|
+
@url = "https://github.com/thoughtbot/paperclip?file=test"
|
74
|
+
@subject = Paperclip.io_adapters.for(@url)
|
75
|
+
end
|
76
|
+
|
77
|
+
after do
|
78
|
+
@subject.close
|
79
|
+
end
|
80
|
+
|
81
|
+
it "returns a file name" do
|
82
|
+
assert_equal "paperclip", @subject.original_filename
|
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
|
+
it "returns a encoded filename" do
|
111
|
+
Paperclip::HttpUrlProxyAdapter.any_instance.stubs(:download_content).
|
112
|
+
returns(@open_return)
|
113
|
+
url = "https://github.com/thoughtbot/paperclip-öäü字´½♥زÈ.png"
|
114
|
+
subject = Paperclip.io_adapters.for(url)
|
115
|
+
filename = "paperclip-%C3%B6%C3%A4%C3%BC%E5%AD%97%C2%B4%C2%BD%E2%99%A5"\
|
116
|
+
"%C3%98%C2%B2%C3%88.png"
|
117
|
+
|
118
|
+
assert_equal filename, subject.original_filename
|
119
|
+
end
|
120
|
+
end
|
121
|
+
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
|
@@ -1,61 +1,64 @@
|
|
1
|
-
require '
|
1
|
+
require 'spec_helper'
|
2
2
|
|
3
|
-
|
3
|
+
describe Paperclip::StringioAdapter do
|
4
4
|
context "a new instance" do
|
5
|
-
|
5
|
+
before do
|
6
6
|
@contents = "abc123"
|
7
7
|
@stringio = StringIO.new(@contents)
|
8
|
-
@subject = Paperclip.io_adapters.for(@stringio)
|
8
|
+
@subject = Paperclip.io_adapters.for(@stringio, hash_digest: Digest::MD5)
|
9
9
|
end
|
10
10
|
|
11
|
-
|
12
|
-
assert_equal "
|
11
|
+
it "returns a file name" do
|
12
|
+
assert_equal "data", @subject.original_filename
|
13
13
|
end
|
14
14
|
|
15
|
-
|
15
|
+
it "returns a content type" do
|
16
16
|
assert_equal "text/plain", @subject.content_type
|
17
17
|
end
|
18
18
|
|
19
|
-
|
19
|
+
it "returns the size of the data" do
|
20
20
|
assert_equal 6, @subject.size
|
21
21
|
end
|
22
22
|
|
23
|
-
|
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
|
24
28
|
assert_equal Digest::MD5.hexdigest(@contents), @subject.fingerprint
|
25
29
|
end
|
26
30
|
|
27
|
-
|
31
|
+
it "generates correct fingerprint after read" do
|
28
32
|
fingerprint = Digest::MD5.hexdigest(@subject.read)
|
29
33
|
assert_equal fingerprint, @subject.fingerprint
|
30
34
|
end
|
31
35
|
|
32
|
-
|
36
|
+
it "generates same fingerprint" do
|
33
37
|
assert_equal @subject.fingerprint, @subject.fingerprint
|
34
38
|
end
|
35
39
|
|
36
|
-
|
40
|
+
it "returns the data contained in the StringIO" do
|
37
41
|
assert_equal "abc123", @subject.read
|
38
42
|
end
|
39
43
|
|
40
|
-
|
44
|
+
it 'accepts a content_type' do
|
41
45
|
@subject.content_type = 'image/png'
|
42
46
|
assert_equal 'image/png', @subject.content_type
|
43
47
|
end
|
44
48
|
|
45
|
-
|
49
|
+
it 'accepts an original_filename' do
|
46
50
|
@subject.original_filename = 'image.png'
|
47
51
|
assert_equal 'image.png', @subject.original_filename
|
48
52
|
end
|
49
53
|
|
50
|
-
|
54
|
+
it "does not generate filenames that include restricted characters" do
|
51
55
|
@subject.original_filename = 'image:restricted.png'
|
52
56
|
assert_equal 'image_restricted.png', @subject.original_filename
|
53
57
|
end
|
54
58
|
|
55
|
-
|
59
|
+
it "does not generate paths that include restricted characters" do
|
56
60
|
@subject.original_filename = 'image:restricted.png'
|
57
|
-
|
61
|
+
expect(@subject.path).to_not match(/:/)
|
58
62
|
end
|
59
|
-
|
60
63
|
end
|
61
64
|
end
|