paperclip 3.5.2 → 5.2.1
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/.gitignore +0 -6
- data/.hound.yml +1055 -0
- data/.rubocop.yml +1 -0
- data/.travis.yml +19 -13
- data/Appraisals +4 -16
- data/CONTRIBUTING.md +29 -13
- data/Gemfile +10 -7
- data/LICENSE +1 -3
- data/NEWS +226 -23
- data/README.md +494 -152
- 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 +0 -2
- data/lib/generators/paperclip/templates/paperclip_migration.rb.erb +1 -1
- data/lib/paperclip/attachment.rb +160 -47
- data/lib/paperclip/attachment_registry.rb +4 -1
- data/lib/paperclip/callbacks.rb +13 -1
- data/lib/paperclip/content_type_detector.rb +26 -24
- 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 +10 -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 +14 -10
- data/lib/paperclip/interpolations/plural_cache.rb +6 -5
- data/lib/paperclip/interpolations.rb +27 -14
- data/lib/paperclip/io_adapters/abstract_adapter.rb +28 -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 +8 -8
- 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 +89 -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 +47 -22
- data/lib/paperclip/storage/s3.rb +144 -73
- data/lib/paperclip/style.rb +8 -2
- data/lib/paperclip/tempfile_factory.rb +6 -4
- data/lib/paperclip/thumbnail.rb +26 -14
- data/lib/paperclip/url_generator.rb +25 -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 +12 -3
- data/lib/paperclip/version.rb +3 -1
- data/lib/paperclip.rb +31 -11
- data/lib/tasks/paperclip.rake +34 -5
- data/paperclip.gemspec +18 -17
- data/shoulda_macros/paperclip.rb +13 -3
- data/{test → spec}/database.yml +0 -0
- 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} +524 -400
- data/{test/content_type_detector_test.rb → spec/paperclip/content_type_detector_spec.rb} +17 -19
- data/{test/file_command_content_type_detector_test.rb → spec/paperclip/file_command_content_type_detector_spec.rb} +7 -6
- 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} +141 -133
- data/{test/interpolations_test.rb → spec/paperclip/interpolations_spec.rb} +70 -46
- data/spec/paperclip/io_adapters/abstract_adapter_spec.rb +101 -0
- data/{test/io_adapters/attachment_adapter_test.rb → spec/paperclip/io_adapters/attachment_adapter_spec.rb} +38 -34
- 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 +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 +79 -0
- data/spec/paperclip/meta_class_spec.rb +30 -0
- data/spec/paperclip/paperclip_missing_attachment_styles_spec.rb +84 -0
- data/{test/paperclip_test.rb → spec/paperclip/paperclip_spec.rb} +46 -71
- 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} +5 -5
- 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 +561 -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} +150 -131
- 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/{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/spec/support/fixtures/empty.html +1 -0
- data/spec/support/fixtures/empty.xlsx +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/spec/support/fixtures/spaced file.jpg +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/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_interpolator.rb +0 -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 +262 -297
- 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 -77
- data/test/filename_cleaner_test.rb +0 -14
- data/test/generator_test.rb +0 -80
- data/test/geometry_detector_test.rb +0 -24
- data/test/has_attached_file_test.rb +0 -125
- data/test/helper.rb +0 -215
- data/test/io_adapters/abstract_adapter_test.rb +0 -58
- data/test/io_adapters/data_uri_adapter_test.rb +0 -67
- data/test/io_adapters/empty_string_adapter_test.rb +0 -17
- data/test/io_adapters/file_adapter_test.rb +0 -119
- 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/plural_cache_test.rb +0 -36
- 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 -1348
- 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 -323
- data/test/validators_test.rb +0 -32
@@ -1,7 +1,7 @@
|
|
1
|
-
require '
|
1
|
+
require 'spec_helper'
|
2
2
|
|
3
|
-
|
4
|
-
|
3
|
+
describe Paperclip::Interpolations do
|
4
|
+
it "returns all methods but the infrastructure when sent #all" do
|
5
5
|
methods = Paperclip::Interpolations.all
|
6
6
|
assert ! methods.include?(:[])
|
7
7
|
assert ! methods.include?(:[]=)
|
@@ -11,58 +11,59 @@ class InterpolationsTest < Test::Unit::TestCase
|
|
11
11
|
end
|
12
12
|
end
|
13
13
|
|
14
|
-
|
14
|
+
it "returns the Rails.root" do
|
15
15
|
assert_equal Rails.root, Paperclip::Interpolations.rails_root(:attachment, :style)
|
16
16
|
end
|
17
17
|
|
18
|
-
|
18
|
+
it "returns the Rails.env" do
|
19
19
|
assert_equal Rails.env, Paperclip::Interpolations.rails_env(:attachment, :style)
|
20
20
|
end
|
21
21
|
|
22
|
-
|
22
|
+
it "returns the class of the Interpolations module when called with no params" do
|
23
23
|
assert_equal Module, Paperclip::Interpolations.class
|
24
24
|
end
|
25
25
|
|
26
|
-
|
26
|
+
it "returns the class of the instance" do
|
27
|
+
class Thing ; end
|
27
28
|
attachment = mock
|
28
29
|
attachment.expects(:instance).returns(attachment)
|
29
|
-
attachment.expects(:class).returns(
|
30
|
+
attachment.expects(:class).returns(Thing)
|
30
31
|
assert_equal "things", Paperclip::Interpolations.class(attachment, :style)
|
31
32
|
end
|
32
33
|
|
33
|
-
|
34
|
+
it "returns the basename of the file" do
|
34
35
|
attachment = mock
|
35
|
-
attachment.expects(:original_filename).returns("one.jpg").times(
|
36
|
+
attachment.expects(:original_filename).returns("one.jpg").times(1)
|
36
37
|
assert_equal "one", Paperclip::Interpolations.basename(attachment, :style)
|
37
38
|
end
|
38
39
|
|
39
|
-
|
40
|
+
it "returns the extension of the file" do
|
40
41
|
attachment = mock
|
41
42
|
attachment.expects(:original_filename).returns("one.jpg")
|
42
43
|
attachment.expects(:styles).returns({})
|
43
44
|
assert_equal "jpg", Paperclip::Interpolations.extension(attachment, :style)
|
44
45
|
end
|
45
46
|
|
46
|
-
|
47
|
+
it "returns the extension of the file as the format if defined in the style" do
|
47
48
|
attachment = mock
|
48
49
|
attachment.expects(:original_filename).never
|
49
|
-
attachment.expects(:styles).twice.returns({:
|
50
|
+
attachment.expects(:styles).twice.returns({style: {format: "png"}})
|
50
51
|
|
51
52
|
[:style, 'style'].each do |style|
|
52
53
|
assert_equal "png", Paperclip::Interpolations.extension(attachment, style)
|
53
54
|
end
|
54
55
|
end
|
55
56
|
|
56
|
-
|
57
|
+
it "returns the extension of the file based on the content type" do
|
57
58
|
attachment = mock
|
58
|
-
attachment.expects(:content_type).returns('image/
|
59
|
+
attachment.expects(:content_type).returns('image/png')
|
59
60
|
attachment.expects(:styles).returns({})
|
60
61
|
interpolations = Paperclip::Interpolations
|
61
62
|
interpolations.expects(:extension).returns('random')
|
62
|
-
assert_equal "
|
63
|
+
assert_equal "png", interpolations.content_type_extension(attachment, :style)
|
63
64
|
end
|
64
65
|
|
65
|
-
|
66
|
+
it "returns the original extension of the file if it matches a content type extension" do
|
66
67
|
attachment = mock
|
67
68
|
attachment.expects(:content_type).returns('image/jpeg')
|
68
69
|
attachment.expects(:styles).returns({})
|
@@ -71,7 +72,21 @@ class InterpolationsTest < Test::Unit::TestCase
|
|
71
72
|
assert_equal "jpe", interpolations.content_type_extension(attachment, :style)
|
72
73
|
end
|
73
74
|
|
74
|
-
|
75
|
+
it "returns the extension of the file with a dot" do
|
76
|
+
attachment = mock
|
77
|
+
attachment.expects(:original_filename).returns("one.jpg")
|
78
|
+
attachment.expects(:styles).returns({})
|
79
|
+
assert_equal ".jpg", Paperclip::Interpolations.dotextension(attachment, :style)
|
80
|
+
end
|
81
|
+
|
82
|
+
it "returns the extension of the file without a dot if the extension is empty" do
|
83
|
+
attachment = mock
|
84
|
+
attachment.expects(:original_filename).returns("one")
|
85
|
+
attachment.expects(:styles).returns({})
|
86
|
+
assert_equal "", Paperclip::Interpolations.dotextension(attachment, :style)
|
87
|
+
end
|
88
|
+
|
89
|
+
it "returns the latter half of the content type of the extension if no match found" do
|
75
90
|
attachment = mock
|
76
91
|
attachment.expects(:content_type).at_least_once().returns('not/found')
|
77
92
|
attachment.expects(:styles).returns({})
|
@@ -80,87 +95,87 @@ class InterpolationsTest < Test::Unit::TestCase
|
|
80
95
|
assert_equal "found", interpolations.content_type_extension(attachment, :style)
|
81
96
|
end
|
82
97
|
|
83
|
-
|
98
|
+
it "returns the format if defined in the style, ignoring the content type" do
|
84
99
|
attachment = mock
|
85
100
|
attachment.expects(:content_type).returns('image/jpeg')
|
86
|
-
attachment.expects(:styles).returns({:
|
101
|
+
attachment.expects(:styles).returns({style: {format: "png"}})
|
87
102
|
interpolations = Paperclip::Interpolations
|
88
103
|
interpolations.expects(:extension).returns('random')
|
89
104
|
assert_equal "png", interpolations.content_type_extension(attachment, :style)
|
90
105
|
end
|
91
106
|
|
92
|
-
|
107
|
+
it "is able to handle numeric style names" do
|
93
108
|
attachment = mock(
|
94
|
-
:
|
109
|
+
styles: {:"4" => {format: :expected_extension}}
|
95
110
|
)
|
96
111
|
assert_equal :expected_extension, Paperclip::Interpolations.extension(attachment, 4)
|
97
112
|
end
|
98
113
|
|
99
|
-
|
114
|
+
it "returns the #to_param of the attachment" do
|
100
115
|
attachment = mock
|
101
116
|
attachment.expects(:to_param).returns("23-awesome")
|
102
117
|
attachment.expects(:instance).returns(attachment)
|
103
118
|
assert_equal "23-awesome", Paperclip::Interpolations.param(attachment, :style)
|
104
119
|
end
|
105
120
|
|
106
|
-
|
121
|
+
it "returns the id of the attachment" do
|
107
122
|
attachment = mock
|
108
123
|
attachment.expects(:id).returns(23)
|
109
124
|
attachment.expects(:instance).returns(attachment)
|
110
125
|
assert_equal 23, Paperclip::Interpolations.id(attachment, :style)
|
111
126
|
end
|
112
127
|
|
113
|
-
|
128
|
+
it "returns nil for attachments to new records" do
|
114
129
|
attachment = mock
|
115
130
|
attachment.expects(:id).returns(nil)
|
116
131
|
attachment.expects(:instance).returns(attachment)
|
117
132
|
assert_nil Paperclip::Interpolations.id(attachment, :style)
|
118
133
|
end
|
119
134
|
|
120
|
-
|
135
|
+
it "returns the partitioned id of the attachment when the id is an integer" do
|
121
136
|
attachment = mock
|
122
137
|
attachment.expects(:id).returns(23)
|
123
138
|
attachment.expects(:instance).returns(attachment)
|
124
139
|
assert_equal "000/000/023", Paperclip::Interpolations.id_partition(attachment, :style)
|
125
140
|
end
|
126
141
|
|
127
|
-
|
142
|
+
it "returns the partitioned id of the attachment when the id is a string" do
|
128
143
|
attachment = mock
|
129
144
|
attachment.expects(:id).returns("32fnj23oio2f")
|
130
145
|
attachment.expects(:instance).returns(attachment)
|
131
146
|
assert_equal "32f/nj2/3oi", Paperclip::Interpolations.id_partition(attachment, :style)
|
132
147
|
end
|
133
148
|
|
134
|
-
|
149
|
+
it "returns nil for the partitioned id of an attachment to a new record (when the id is nil)" do
|
135
150
|
attachment = mock
|
136
151
|
attachment.expects(:id).returns(nil)
|
137
152
|
attachment.expects(:instance).returns(attachment)
|
138
153
|
assert_nil Paperclip::Interpolations.id_partition(attachment, :style)
|
139
154
|
end
|
140
155
|
|
141
|
-
|
156
|
+
it "returns the name of the attachment" do
|
142
157
|
attachment = mock
|
143
158
|
attachment.expects(:name).returns("file")
|
144
159
|
assert_equal "files", Paperclip::Interpolations.attachment(attachment, :style)
|
145
160
|
end
|
146
161
|
|
147
|
-
|
162
|
+
it "returns the style" do
|
148
163
|
assert_equal :style, Paperclip::Interpolations.style(:attachment, :style)
|
149
164
|
end
|
150
165
|
|
151
|
-
|
166
|
+
it "returns the default style" do
|
152
167
|
attachment = mock
|
153
168
|
attachment.expects(:default_style).returns(:default_style)
|
154
169
|
assert_equal :default_style, Paperclip::Interpolations.style(attachment, nil)
|
155
170
|
end
|
156
171
|
|
157
|
-
|
172
|
+
it "reinterpolates :url" do
|
158
173
|
attachment = mock
|
159
|
-
attachment.expects(:url).with(:style, :
|
174
|
+
attachment.expects(:url).with(:style, timestamp: false, escape: false).returns("1234")
|
160
175
|
assert_equal "1234", Paperclip::Interpolations.url(attachment, :style)
|
161
176
|
end
|
162
177
|
|
163
|
-
|
178
|
+
it "raises if infinite loop detcted reinterpolating :url" do
|
164
179
|
attachment = Object.new
|
165
180
|
class << attachment
|
166
181
|
def url(*args)
|
@@ -170,35 +185,35 @@ class InterpolationsTest < Test::Unit::TestCase
|
|
170
185
|
assert_raises(Paperclip::Errors::InfiniteInterpolationError){ Paperclip::Interpolations.url(attachment, :style) }
|
171
186
|
end
|
172
187
|
|
173
|
-
|
188
|
+
it "returns the filename as basename.extension" do
|
174
189
|
attachment = mock
|
175
190
|
attachment.expects(:styles).returns({})
|
176
|
-
attachment.expects(:original_filename).returns("one.jpg").times(
|
191
|
+
attachment.expects(:original_filename).returns("one.jpg").times(2)
|
177
192
|
assert_equal "one.jpg", Paperclip::Interpolations.filename(attachment, :style)
|
178
193
|
end
|
179
194
|
|
180
|
-
|
195
|
+
it "returns the filename as basename.extension when format supplied" do
|
181
196
|
attachment = mock
|
182
|
-
attachment.expects(:styles).returns({:
|
183
|
-
attachment.expects(:original_filename).returns("one.jpg").times(
|
197
|
+
attachment.expects(:styles).returns({style: {format: :png}})
|
198
|
+
attachment.expects(:original_filename).returns("one.jpg").times(1)
|
184
199
|
assert_equal "one.png", Paperclip::Interpolations.filename(attachment, :style)
|
185
200
|
end
|
186
201
|
|
187
|
-
|
202
|
+
it "returns the filename as basename when extension is blank" do
|
188
203
|
attachment = mock
|
189
204
|
attachment.stubs(:styles).returns({})
|
190
205
|
attachment.stubs(:original_filename).returns("one")
|
191
206
|
assert_equal "one", Paperclip::Interpolations.filename(attachment, :style)
|
192
207
|
end
|
193
208
|
|
194
|
-
|
209
|
+
it "returns the basename when the extension contains regexp special characters" do
|
195
210
|
attachment = mock
|
196
211
|
attachment.stubs(:styles).returns({})
|
197
212
|
attachment.stubs(:original_filename).returns("one.ab)")
|
198
213
|
assert_equal "one", Paperclip::Interpolations.basename(attachment, :style)
|
199
214
|
end
|
200
215
|
|
201
|
-
|
216
|
+
it "returns the timestamp" do
|
202
217
|
now = Time.now
|
203
218
|
zone = 'UTC'
|
204
219
|
attachment = mock
|
@@ -207,32 +222,41 @@ class InterpolationsTest < Test::Unit::TestCase
|
|
207
222
|
assert_equal now.in_time_zone(zone).to_s, Paperclip::Interpolations.timestamp(attachment, :style)
|
208
223
|
end
|
209
224
|
|
210
|
-
|
225
|
+
it "returns updated_at" do
|
211
226
|
attachment = mock
|
212
227
|
seconds_since_epoch = 1234567890
|
213
228
|
attachment.expects(:updated_at).returns(seconds_since_epoch)
|
214
229
|
assert_equal seconds_since_epoch, Paperclip::Interpolations.updated_at(attachment, :style)
|
215
230
|
end
|
216
231
|
|
217
|
-
|
232
|
+
it "returns attachment's hash when passing both arguments" do
|
218
233
|
attachment = mock
|
219
234
|
fake_hash = "a_wicked_secure_hash"
|
220
235
|
attachment.expects(:hash_key).returns(fake_hash)
|
221
236
|
assert_equal fake_hash, Paperclip::Interpolations.hash(attachment, :style)
|
222
237
|
end
|
223
238
|
|
224
|
-
|
239
|
+
it "returns Object#hash when passing no argument" do
|
225
240
|
attachment = mock
|
226
241
|
fake_hash = "a_wicked_secure_hash"
|
227
242
|
attachment.expects(:hash_key).never.returns(fake_hash)
|
228
243
|
assert_not_equal fake_hash, Paperclip::Interpolations.hash
|
229
244
|
end
|
230
245
|
|
231
|
-
|
246
|
+
it "calls all expected interpolations with the given arguments" do
|
232
247
|
Paperclip::Interpolations.expects(:id).with(:attachment, :style).returns(1234)
|
233
248
|
Paperclip::Interpolations.expects(:attachment).with(:attachment, :style).returns("attachments")
|
234
249
|
Paperclip::Interpolations.expects(:notreal).never
|
235
250
|
value = Paperclip::Interpolations.interpolate(":notreal/:id/:attachment", :attachment, :style)
|
236
251
|
assert_equal ":notreal/1234/attachments", value
|
237
252
|
end
|
253
|
+
|
254
|
+
it "handles question marks" do
|
255
|
+
Paperclip.interpolates :foo? do
|
256
|
+
"bar"
|
257
|
+
end
|
258
|
+
Paperclip::Interpolations.expects(:fool).never
|
259
|
+
value = Paperclip::Interpolations.interpolate(":fo/:foo?")
|
260
|
+
assert_equal ":fo/bar", value
|
261
|
+
end
|
238
262
|
end
|
@@ -0,0 +1,101 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Paperclip::AbstractAdapter do
|
4
|
+
class TestAdapter < Paperclip::AbstractAdapter
|
5
|
+
attr_accessor :tempfile
|
6
|
+
|
7
|
+
def content_type
|
8
|
+
Paperclip::ContentTypeDetector.new(path).detect
|
9
|
+
end
|
10
|
+
end
|
11
|
+
|
12
|
+
subject { TestAdapter.new(nil) }
|
13
|
+
|
14
|
+
context "content type from file contents" do
|
15
|
+
before do
|
16
|
+
subject.stubs(:path).returns("image.png")
|
17
|
+
Paperclip.stubs(:run).returns("image/png\n")
|
18
|
+
Paperclip::ContentTypeDetector.any_instance.stubs(:type_from_mime_magic).returns("image/png")
|
19
|
+
end
|
20
|
+
|
21
|
+
it "returns the content type without newline" do
|
22
|
+
assert_equal "image/png", subject.content_type
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
context "nil?" do
|
27
|
+
it "returns false" do
|
28
|
+
assert !subject.nil?
|
29
|
+
end
|
30
|
+
end
|
31
|
+
|
32
|
+
context "delegation" do
|
33
|
+
before do
|
34
|
+
subject.tempfile = stub("Tempfile")
|
35
|
+
end
|
36
|
+
|
37
|
+
[:binmode, :binmode?, :close, :close!, :closed?, :eof?, :path, :readbyte, :rewind, :unlink].each do |method|
|
38
|
+
it "delegates #{method} to @tempfile" do
|
39
|
+
subject.tempfile.stubs(method)
|
40
|
+
subject.public_send(method)
|
41
|
+
assert_received subject.tempfile, method
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
46
|
+
it 'gets rid of slashes and colons in filenames' do
|
47
|
+
subject.original_filename = "awesome/file:name.png"
|
48
|
+
|
49
|
+
assert_equal "awesome_file_name.png", subject.original_filename
|
50
|
+
end
|
51
|
+
|
52
|
+
it 'is an assignment' do
|
53
|
+
assert subject.assignment?
|
54
|
+
end
|
55
|
+
|
56
|
+
it 'is not nil' do
|
57
|
+
assert !subject.nil?
|
58
|
+
end
|
59
|
+
|
60
|
+
it "generates a destination filename with no original filename" do
|
61
|
+
expect(subject.send(:destination).path).to_not be_nil
|
62
|
+
end
|
63
|
+
|
64
|
+
it 'uses the original filename to generate the tempfile' do
|
65
|
+
subject.original_filename = "file.png"
|
66
|
+
expect(subject.send(:destination).path).to end_with(".png")
|
67
|
+
end
|
68
|
+
|
69
|
+
context "generates a fingerprint" do
|
70
|
+
subject { TestAdapter.new(nil, options) }
|
71
|
+
|
72
|
+
before do
|
73
|
+
subject.stubs(:path).returns(fixture_file("50x50.png"))
|
74
|
+
end
|
75
|
+
|
76
|
+
context "MD5" do
|
77
|
+
let(:options) { { hash_digest: Digest::MD5 } }
|
78
|
+
|
79
|
+
it "returns a fingerprint" do
|
80
|
+
expect(subject.fingerprint).to be_a String
|
81
|
+
expect(subject.fingerprint).to eq "a790b00c9b5d58a8fd17a1ec5a187129"
|
82
|
+
end
|
83
|
+
end
|
84
|
+
|
85
|
+
context "SHA256" do
|
86
|
+
let(:options) { { hash_digest: Digest::SHA256 } }
|
87
|
+
|
88
|
+
it "returns a fingerprint" do
|
89
|
+
expect(subject.fingerprint).to be_a String
|
90
|
+
expect(subject.fingerprint).
|
91
|
+
to eq "243d7ce1099719df25f600f1c369c629fb979f88d5a01dbe7d0d48c8e6715bb1"
|
92
|
+
end
|
93
|
+
end
|
94
|
+
end
|
95
|
+
|
96
|
+
context "#original_filename=" do
|
97
|
+
it "should not fail with a nil original filename" do
|
98
|
+
expect { subject.original_filename = nil }.not_to raise_error
|
99
|
+
end
|
100
|
+
end
|
101
|
+
end
|
@@ -1,52 +1,53 @@
|
|
1
|
-
require '
|
1
|
+
require 'spec_helper'
|
2
2
|
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
rebuild_model :path => "tmp/:class/:attachment/:style/:filename", :styles => {:thumb => '50x50'}
|
3
|
+
describe Paperclip::AttachmentAdapter do
|
4
|
+
before do
|
5
|
+
rebuild_model path: "tmp/:class/:attachment/:style/:filename", styles: {thumb: '50x50'}
|
7
6
|
@attachment = Dummy.new.avatar
|
8
7
|
end
|
9
8
|
|
10
9
|
context "for an attachment" do
|
11
|
-
|
10
|
+
before do
|
12
11
|
@file = File.new(fixture_file("5k.png"))
|
13
12
|
@file.binmode
|
14
13
|
|
15
14
|
@attachment.assign(@file)
|
16
15
|
@attachment.save
|
17
|
-
@subject = Paperclip.io_adapters.for(@attachment
|
16
|
+
@subject = Paperclip.io_adapters.for(@attachment,
|
17
|
+
hash_digest: Digest::MD5)
|
18
18
|
end
|
19
19
|
|
20
|
-
|
20
|
+
after do
|
21
21
|
@file.close
|
22
|
+
@subject.close
|
22
23
|
end
|
23
24
|
|
24
|
-
|
25
|
+
it "gets the right filename" do
|
25
26
|
assert_equal "5k.png", @subject.original_filename
|
26
27
|
end
|
27
28
|
|
28
|
-
|
29
|
+
it "forces binmode on tempfile" do
|
29
30
|
assert @subject.instance_variable_get("@tempfile").binmode?
|
30
31
|
end
|
31
32
|
|
32
|
-
|
33
|
+
it "gets the content type" do
|
33
34
|
assert_equal "image/png", @subject.content_type
|
34
35
|
end
|
35
36
|
|
36
|
-
|
37
|
+
it "gets the file's size" do
|
37
38
|
assert_equal 4456, @subject.size
|
38
39
|
end
|
39
40
|
|
40
|
-
|
41
|
+
it "returns false for a call to nil?" do
|
41
42
|
assert ! @subject.nil?
|
42
43
|
end
|
43
44
|
|
44
|
-
|
45
|
+
it "generates a MD5 hash of the contents" do
|
45
46
|
expected = Digest::MD5.file(@file.path).to_s
|
46
47
|
assert_equal expected, @subject.fingerprint
|
47
48
|
end
|
48
49
|
|
49
|
-
|
50
|
+
it "reads the contents of the file" do
|
50
51
|
expected = @file.read
|
51
52
|
actual = @subject.read
|
52
53
|
assert expected.length > 0
|
@@ -57,32 +58,33 @@ class AttachmentAdapterTest < Test::Unit::TestCase
|
|
57
58
|
end
|
58
59
|
|
59
60
|
context "for a file with restricted characters in the name" do
|
60
|
-
|
61
|
-
file_contents =
|
62
|
-
@file = StringIO.new(file_contents
|
61
|
+
before do
|
62
|
+
file_contents = IO.read(fixture_file("animated.gif"))
|
63
|
+
@file = StringIO.new(file_contents)
|
63
64
|
@file.stubs(:original_filename).returns('image:restricted.gif')
|
64
65
|
@file.binmode
|
65
66
|
|
66
67
|
@attachment.assign(@file)
|
67
68
|
@attachment.save
|
68
|
-
@subject = Paperclip.io_adapters.for(@attachment
|
69
|
+
@subject = Paperclip.io_adapters.for(@attachment,
|
70
|
+
hash_digest: Digest::MD5)
|
69
71
|
end
|
70
72
|
|
71
|
-
|
72
|
-
@
|
73
|
+
after do
|
74
|
+
@subject.close
|
73
75
|
end
|
74
76
|
|
75
|
-
|
76
|
-
|
77
|
+
it "does not generate paths that include restricted characters" do
|
78
|
+
expect(@subject.path).to_not match(/:/)
|
77
79
|
end
|
78
80
|
|
79
|
-
|
81
|
+
it "does not generate filenames that include restricted characters" do
|
80
82
|
assert_equal 'image_restricted.gif', @subject.original_filename
|
81
83
|
end
|
82
84
|
end
|
83
85
|
|
84
86
|
context "for a style" do
|
85
|
-
|
87
|
+
before do
|
86
88
|
@file = File.new(fixture_file("5k.png"))
|
87
89
|
@file.binmode
|
88
90
|
|
@@ -92,40 +94,42 @@ class AttachmentAdapterTest < Test::Unit::TestCase
|
|
92
94
|
FileUtils.cp @attachment.queued_for_write[:thumb].path, @thumb.path
|
93
95
|
|
94
96
|
@attachment.save
|
95
|
-
@subject = Paperclip.io_adapters.for(@attachment.styles[:thumb]
|
97
|
+
@subject = Paperclip.io_adapters.for(@attachment.styles[:thumb],
|
98
|
+
hash_digest: Digest::MD5)
|
96
99
|
end
|
97
100
|
|
98
|
-
|
101
|
+
after do
|
99
102
|
@file.close
|
100
103
|
@thumb.close
|
104
|
+
@subject.close
|
101
105
|
end
|
102
106
|
|
103
|
-
|
107
|
+
it "gets the original filename" do
|
104
108
|
assert_equal "5k.png", @subject.original_filename
|
105
109
|
end
|
106
110
|
|
107
|
-
|
111
|
+
it "forces binmode on tempfile" do
|
108
112
|
assert @subject.instance_variable_get("@tempfile").binmode?
|
109
113
|
end
|
110
114
|
|
111
|
-
|
115
|
+
it "gets the content type" do
|
112
116
|
assert_equal "image/png", @subject.content_type
|
113
117
|
end
|
114
118
|
|
115
|
-
|
119
|
+
it "gets the thumbnail's file size" do
|
116
120
|
assert_equal @thumb.size, @subject.size
|
117
121
|
end
|
118
122
|
|
119
|
-
|
123
|
+
it "returns false for a call to nil?" do
|
120
124
|
assert ! @subject.nil?
|
121
125
|
end
|
122
126
|
|
123
|
-
|
127
|
+
it "generates a MD5 hash of the contents" do
|
124
128
|
expected = Digest::MD5.file(@thumb.path).to_s
|
125
129
|
assert_equal expected, @subject.fingerprint
|
126
130
|
end
|
127
131
|
|
128
|
-
|
132
|
+
it "reads the contents of the thumbnail" do
|
129
133
|
@thumb.rewind
|
130
134
|
expected = @thumb.read
|
131
135
|
actual = @subject.read
|
@@ -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
|