paperclip 3.5.2 → 5.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (211) hide show
  1. checksums.yaml +7 -0
  2. data/.codeclimate.yml +17 -0
  3. data/.gitignore +0 -6
  4. data/.hound.yml +1055 -0
  5. data/.rubocop.yml +1 -0
  6. data/.travis.yml +19 -13
  7. data/Appraisals +4 -16
  8. data/CONTRIBUTING.md +29 -13
  9. data/Gemfile +10 -7
  10. data/LICENSE +1 -3
  11. data/NEWS +226 -23
  12. data/README.md +494 -152
  13. data/RELEASING.md +17 -0
  14. data/Rakefile +6 -8
  15. data/UPGRADING +12 -9
  16. data/features/basic_integration.feature +27 -8
  17. data/features/migration.feature +0 -24
  18. data/features/step_definitions/attachment_steps.rb +36 -28
  19. data/features/step_definitions/html_steps.rb +2 -2
  20. data/features/step_definitions/rails_steps.rb +68 -37
  21. data/features/step_definitions/s3_steps.rb +2 -2
  22. data/features/step_definitions/web_steps.rb +1 -103
  23. data/features/support/env.rb +3 -2
  24. data/features/support/file_helpers.rb +2 -2
  25. data/features/support/fixtures/gemfile.txt +1 -1
  26. data/features/support/paths.rb +1 -1
  27. data/features/support/rails.rb +2 -25
  28. data/gemfiles/4.2.gemfile +17 -0
  29. data/gemfiles/5.0.gemfile +17 -0
  30. data/lib/generators/paperclip/paperclip_generator.rb +0 -2
  31. data/lib/generators/paperclip/templates/paperclip_migration.rb.erb +1 -1
  32. data/lib/paperclip/attachment.rb +160 -47
  33. data/lib/paperclip/attachment_registry.rb +4 -1
  34. data/lib/paperclip/callbacks.rb +13 -1
  35. data/lib/paperclip/content_type_detector.rb +26 -24
  36. data/lib/paperclip/errors.rb +8 -1
  37. data/lib/paperclip/file_command_content_type_detector.rb +6 -8
  38. data/lib/paperclip/geometry_detector_factory.rb +10 -3
  39. data/lib/paperclip/geometry_parser_factory.rb +1 -1
  40. data/lib/paperclip/glue.rb +1 -1
  41. data/lib/paperclip/has_attached_file.rb +17 -1
  42. data/lib/paperclip/helpers.rb +14 -10
  43. data/lib/paperclip/interpolations/plural_cache.rb +6 -5
  44. data/lib/paperclip/interpolations.rb +27 -14
  45. data/lib/paperclip/io_adapters/abstract_adapter.rb +28 -4
  46. data/lib/paperclip/io_adapters/attachment_adapter.rb +13 -8
  47. data/lib/paperclip/io_adapters/data_uri_adapter.rb +11 -16
  48. data/lib/paperclip/io_adapters/empty_string_adapter.rb +5 -4
  49. data/lib/paperclip/io_adapters/file_adapter.rb +12 -6
  50. data/lib/paperclip/io_adapters/http_url_proxy_adapter.rb +8 -8
  51. data/lib/paperclip/io_adapters/identity_adapter.rb +12 -6
  52. data/lib/paperclip/io_adapters/nil_adapter.rb +8 -5
  53. data/lib/paperclip/io_adapters/registry.rb +6 -2
  54. data/lib/paperclip/io_adapters/stringio_adapter.rb +15 -16
  55. data/lib/paperclip/io_adapters/uploaded_file_adapter.rb +10 -6
  56. data/lib/paperclip/io_adapters/uri_adapter.rb +41 -19
  57. data/lib/paperclip/locales/en.yml +1 -0
  58. data/lib/paperclip/matchers/have_attached_file_matcher.rb +2 -1
  59. data/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb +4 -4
  60. data/lib/paperclip/matchers/validate_attachment_presence_matcher.rb +2 -1
  61. data/lib/paperclip/matchers/validate_attachment_size_matcher.rb +2 -1
  62. data/lib/paperclip/media_type_spoof_detector.rb +89 -0
  63. data/lib/paperclip/processor.rb +5 -41
  64. data/lib/paperclip/processor_helpers.rb +50 -0
  65. data/lib/paperclip/rails_environment.rb +25 -0
  66. data/lib/paperclip/schema.rb +9 -7
  67. data/lib/paperclip/storage/filesystem.rb +14 -3
  68. data/lib/paperclip/storage/fog.rb +47 -22
  69. data/lib/paperclip/storage/s3.rb +144 -73
  70. data/lib/paperclip/style.rb +8 -2
  71. data/lib/paperclip/tempfile_factory.rb +6 -4
  72. data/lib/paperclip/thumbnail.rb +26 -14
  73. data/lib/paperclip/url_generator.rb +25 -14
  74. data/lib/paperclip/validators/attachment_content_type_validator.rb +4 -0
  75. data/lib/paperclip/validators/attachment_file_name_validator.rb +80 -0
  76. data/lib/paperclip/validators/attachment_file_type_ignorance_validator.rb +29 -0
  77. data/lib/paperclip/validators/attachment_presence_validator.rb +4 -0
  78. data/lib/paperclip/validators/attachment_size_validator.rb +5 -3
  79. data/lib/paperclip/validators/media_type_spoof_detection_validator.rb +27 -0
  80. data/lib/paperclip/validators.rb +12 -3
  81. data/lib/paperclip/version.rb +3 -1
  82. data/lib/paperclip.rb +31 -11
  83. data/lib/tasks/paperclip.rake +34 -5
  84. data/paperclip.gemspec +18 -17
  85. data/shoulda_macros/paperclip.rb +13 -3
  86. data/{test → spec}/database.yml +0 -0
  87. data/spec/paperclip/attachment_definitions_spec.rb +13 -0
  88. data/{test/attachment_processing_test.rb → spec/paperclip/attachment_processing_spec.rb} +17 -20
  89. data/spec/paperclip/attachment_registry_spec.rb +158 -0
  90. data/{test/attachment_test.rb → spec/paperclip/attachment_spec.rb} +524 -400
  91. data/{test/content_type_detector_test.rb → spec/paperclip/content_type_detector_spec.rb} +17 -19
  92. data/{test/file_command_content_type_detector_test.rb → spec/paperclip/file_command_content_type_detector_spec.rb} +7 -6
  93. data/spec/paperclip/filename_cleaner_spec.rb +14 -0
  94. data/spec/paperclip/geometry_detector_spec.rb +39 -0
  95. data/{test/geometry_parser_test.rb → spec/paperclip/geometry_parser_spec.rb} +27 -27
  96. data/{test/geometry_test.rb → spec/paperclip/geometry_spec.rb} +50 -52
  97. data/spec/paperclip/glue_spec.rb +44 -0
  98. data/spec/paperclip/has_attached_file_spec.rb +158 -0
  99. data/{test/integration_test.rb → spec/paperclip/integration_spec.rb} +141 -133
  100. data/{test/interpolations_test.rb → spec/paperclip/interpolations_spec.rb} +70 -46
  101. data/spec/paperclip/io_adapters/abstract_adapter_spec.rb +101 -0
  102. data/{test/io_adapters/attachment_adapter_test.rb → spec/paperclip/io_adapters/attachment_adapter_spec.rb} +38 -34
  103. data/spec/paperclip/io_adapters/data_uri_adapter_spec.rb +89 -0
  104. data/spec/paperclip/io_adapters/empty_string_adapter_spec.rb +17 -0
  105. data/spec/paperclip/io_adapters/file_adapter_spec.rb +131 -0
  106. data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb +121 -0
  107. data/spec/paperclip/io_adapters/identity_adapter_spec.rb +8 -0
  108. data/{test/io_adapters/nil_adapter_test.rb → spec/paperclip/io_adapters/nil_adapter_spec.rb} +7 -7
  109. data/{test/io_adapters/registry_test.rb → spec/paperclip/io_adapters/registry_spec.rb} +12 -9
  110. data/{test/io_adapters/stringio_adapter_test.rb → spec/paperclip/io_adapters/stringio_adapter_spec.rb} +21 -18
  111. data/{test/io_adapters/uploaded_file_adapter_test.rb → spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb} +46 -46
  112. data/spec/paperclip/io_adapters/uri_adapter_spec.rb +172 -0
  113. data/spec/paperclip/matchers/have_attached_file_matcher_spec.rb +19 -0
  114. data/spec/paperclip/matchers/validate_attachment_content_type_matcher_spec.rb +109 -0
  115. data/spec/paperclip/matchers/validate_attachment_presence_matcher_spec.rb +69 -0
  116. data/spec/paperclip/matchers/validate_attachment_size_matcher_spec.rb +88 -0
  117. data/spec/paperclip/media_type_spoof_detector_spec.rb +79 -0
  118. data/spec/paperclip/meta_class_spec.rb +30 -0
  119. data/spec/paperclip/paperclip_missing_attachment_styles_spec.rb +84 -0
  120. data/{test/paperclip_test.rb → spec/paperclip/paperclip_spec.rb} +46 -71
  121. data/spec/paperclip/plural_cache_spec.rb +37 -0
  122. data/spec/paperclip/processor_helpers_spec.rb +57 -0
  123. data/{test/processor_test.rb → spec/paperclip/processor_spec.rb} +5 -5
  124. data/spec/paperclip/rails_environment_spec.rb +33 -0
  125. data/{test/rake_test.rb → spec/paperclip/rake_spec.rb} +15 -15
  126. data/spec/paperclip/schema_spec.rb +248 -0
  127. data/{test/storage/filesystem_test.rb → spec/paperclip/storage/filesystem_spec.rb} +18 -18
  128. data/spec/paperclip/storage/fog_spec.rb +561 -0
  129. data/spec/paperclip/storage/s3_live_spec.rb +188 -0
  130. data/spec/paperclip/storage/s3_spec.rb +1693 -0
  131. data/spec/paperclip/style_spec.rb +255 -0
  132. data/spec/paperclip/tempfile_factory_spec.rb +33 -0
  133. data/spec/paperclip/tempfile_spec.rb +35 -0
  134. data/{test/thumbnail_test.rb → spec/paperclip/thumbnail_spec.rb} +150 -131
  135. data/spec/paperclip/url_generator_spec.rb +222 -0
  136. data/spec/paperclip/validators/attachment_content_type_validator_spec.rb +322 -0
  137. data/spec/paperclip/validators/attachment_file_name_validator_spec.rb +160 -0
  138. data/{test/validators/attachment_presence_validator_test.rb → spec/paperclip/validators/attachment_presence_validator_spec.rb} +20 -20
  139. data/{test/validators/attachment_size_validator_test.rb → spec/paperclip/validators/attachment_size_validator_spec.rb} +77 -64
  140. data/spec/paperclip/validators/media_type_spoof_detection_validator_spec.rb +52 -0
  141. data/spec/paperclip/validators_spec.rb +164 -0
  142. data/spec/spec_helper.rb +47 -0
  143. data/spec/support/assertions.rb +82 -0
  144. data/spec/support/conditional_filter_helper.rb +5 -0
  145. data/spec/support/fake_model.rb +25 -0
  146. data/spec/support/fake_rails.rb +12 -0
  147. data/{test → spec/support}/fixtures/12k.png +0 -0
  148. data/{test → spec/support}/fixtures/50x50.png +0 -0
  149. data/{test → spec/support}/fixtures/5k.png +0 -0
  150. data/{test → spec/support}/fixtures/animated +0 -0
  151. data/{test → spec/support}/fixtures/animated.gif +0 -0
  152. data/{test → spec/support}/fixtures/animated.unknown +0 -0
  153. data/{test → spec/support}/fixtures/bad.png +0 -0
  154. data/spec/support/fixtures/empty.html +1 -0
  155. data/spec/support/fixtures/empty.xlsx +0 -0
  156. data/{test → spec/support}/fixtures/fog.yml +0 -0
  157. data/{test → spec/support}/fixtures/rotated.jpg +0 -0
  158. data/{test → spec/support}/fixtures/s3.yml +0 -0
  159. data/spec/support/fixtures/spaced file.jpg +0 -0
  160. data/{test → spec/support}/fixtures/spaced file.png +0 -0
  161. data/{test → spec/support}/fixtures/text.txt +0 -0
  162. data/{test → spec/support}/fixtures/twopage.pdf +0 -0
  163. data/{test → spec/support}/fixtures/uppercase.PNG +0 -0
  164. data/spec/support/matchers/accept.rb +5 -0
  165. data/spec/support/matchers/exist.rb +5 -0
  166. data/spec/support/matchers/have_column.rb +23 -0
  167. data/{test → spec}/support/mock_attachment.rb +2 -0
  168. data/{test → spec}/support/mock_interpolator.rb +0 -0
  169. data/{test → spec}/support/mock_url_generator_builder.rb +2 -2
  170. data/spec/support/model_reconstruction.rb +68 -0
  171. data/spec/support/reporting.rb +11 -0
  172. data/spec/support/test_data.rb +13 -0
  173. data/spec/support/version_helper.rb +9 -0
  174. metadata +262 -297
  175. data/RUNNING_TESTS.md +0 -4
  176. data/cucumber/paperclip_steps.rb +0 -6
  177. data/gemfiles/3.0.gemfile +0 -11
  178. data/gemfiles/3.1.gemfile +0 -11
  179. data/gemfiles/3.2.gemfile +0 -11
  180. data/gemfiles/4.0.gemfile +0 -11
  181. data/test/attachment_definitions_test.rb +0 -12
  182. data/test/attachment_registry_test.rb +0 -77
  183. data/test/filename_cleaner_test.rb +0 -14
  184. data/test/generator_test.rb +0 -80
  185. data/test/geometry_detector_test.rb +0 -24
  186. data/test/has_attached_file_test.rb +0 -125
  187. data/test/helper.rb +0 -215
  188. data/test/io_adapters/abstract_adapter_test.rb +0 -58
  189. data/test/io_adapters/data_uri_adapter_test.rb +0 -67
  190. data/test/io_adapters/empty_string_adapter_test.rb +0 -17
  191. data/test/io_adapters/file_adapter_test.rb +0 -119
  192. data/test/io_adapters/http_url_proxy_adapter_test.rb +0 -102
  193. data/test/io_adapters/identity_adapter_test.rb +0 -8
  194. data/test/io_adapters/uri_adapter_test.rb +0 -102
  195. data/test/matchers/have_attached_file_matcher_test.rb +0 -24
  196. data/test/matchers/validate_attachment_content_type_matcher_test.rb +0 -110
  197. data/test/matchers/validate_attachment_presence_matcher_test.rb +0 -69
  198. data/test/matchers/validate_attachment_size_matcher_test.rb +0 -86
  199. data/test/meta_class_test.rb +0 -32
  200. data/test/paperclip_missing_attachment_styles_test.rb +0 -90
  201. data/test/plural_cache_test.rb +0 -36
  202. data/test/schema_test.rb +0 -200
  203. data/test/storage/fog_test.rb +0 -453
  204. data/test/storage/s3_live_test.rb +0 -179
  205. data/test/storage/s3_test.rb +0 -1348
  206. data/test/style_test.rb +0 -213
  207. data/test/support/mock_model.rb +0 -2
  208. data/test/tempfile_factory_test.rb +0 -13
  209. data/test/url_generator_test.rb +0 -187
  210. data/test/validators/attachment_content_type_validator_test.rb +0 -323
  211. data/test/validators_test.rb +0 -32
@@ -0,0 +1,222 @@
1
+ # encoding: utf-8
2
+ require 'spec_helper'
3
+
4
+ describe Paperclip::UrlGenerator do
5
+ it "uses the given interpolator" do
6
+ expected = "the expected result"
7
+ mock_interpolator = MockInterpolator.new(result: expected)
8
+ mock_attachment = MockAttachment.new(interpolator: mock_interpolator)
9
+
10
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
11
+ result = url_generator.for(:style_name, {})
12
+
13
+ assert_equal expected, result
14
+ assert mock_interpolator.has_interpolated_attachment?(mock_attachment)
15
+ assert mock_interpolator.has_interpolated_style_name?(:style_name)
16
+ end
17
+
18
+ it "uses the default URL when no file is assigned" do
19
+ mock_interpolator = MockInterpolator.new
20
+ default_url = "the default url"
21
+ options = { interpolator: mock_interpolator, default_url: default_url }
22
+ mock_attachment = MockAttachment.new(options)
23
+
24
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
25
+ url_generator.for(:style_name, {})
26
+
27
+ assert mock_interpolator.has_interpolated_pattern?(default_url),
28
+ "expected the interpolator to be passed #{default_url.inspect} but it wasn't"
29
+ end
30
+
31
+ it "executes the default URL lambda when no file is assigned" do
32
+ mock_interpolator = MockInterpolator.new
33
+ default_url = lambda {|attachment| "the #{attachment.class.name} default url" }
34
+ options = { interpolator: mock_interpolator, default_url: default_url}
35
+ mock_attachment = MockAttachment.new(options)
36
+
37
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
38
+ url_generator.for(:style_name, {})
39
+
40
+ assert mock_interpolator.has_interpolated_pattern?("the MockAttachment default url"),
41
+ %{expected the interpolator to be passed "the MockAttachment default url", but it wasn't}
42
+ end
43
+
44
+ it "executes the method named by the symbol as the default URL when no file is assigned" do
45
+ mock_model = FakeModel.new
46
+ default_url = :to_s
47
+ mock_interpolator = MockInterpolator.new
48
+ options = {
49
+ interpolator: mock_interpolator,
50
+ default_url: default_url,
51
+ model: mock_model,
52
+ }
53
+ mock_attachment = MockAttachment.new(options)
54
+
55
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
56
+ url_generator.for(:style_name, {})
57
+
58
+ assert mock_interpolator.has_interpolated_pattern?(mock_model.to_s),
59
+ %{expected the interpolator to be passed #{mock_model.to_s}, but it wasn't}
60
+ end
61
+
62
+ it "URL-escapes spaces if asked to" do
63
+ expected = "the expected result"
64
+ mock_interpolator = MockInterpolator.new(result: expected)
65
+ options = { interpolator: mock_interpolator }
66
+ mock_attachment = MockAttachment.new(options)
67
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
68
+
69
+ result = url_generator.for(:style_name, {escape: true})
70
+
71
+ assert_equal "the%20expected%20result", result
72
+ end
73
+
74
+ it "escapes the result of the interpolator using a method on the object, if asked to escape" do
75
+ expected = Class.new do
76
+ def escape
77
+ "the escaped result"
78
+ end
79
+ end.new
80
+ mock_interpolator = MockInterpolator.new(result: expected)
81
+ options = { interpolator: mock_interpolator }
82
+ mock_attachment = MockAttachment.new(options)
83
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
84
+
85
+ result = url_generator.for(:style_name, {escape: true})
86
+
87
+ assert_equal "the escaped result", result
88
+ end
89
+
90
+ it "leaves spaces unescaped as asked to" do
91
+ expected = "the expected result"
92
+ mock_interpolator = MockInterpolator.new(result: expected)
93
+ options = { interpolator: mock_interpolator }
94
+ mock_attachment = MockAttachment.new(options)
95
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
96
+
97
+ result = url_generator.for(:style_name, {escape: false})
98
+
99
+ assert_equal "the expected result", result
100
+ end
101
+
102
+ it "defaults to leaving spaces unescaped" do
103
+ expected = "the expected result"
104
+ mock_interpolator = MockInterpolator.new(result: expected)
105
+ options = { interpolator: mock_interpolator }
106
+ mock_attachment = MockAttachment.new(options)
107
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
108
+
109
+ result = url_generator.for(:style_name, {})
110
+
111
+ assert_equal "the expected result", result
112
+ end
113
+
114
+ it "produces URLs without the updated_at value when the object does not respond to updated_at" do
115
+ expected = "the expected result"
116
+ mock_interpolator = MockInterpolator.new(result: expected)
117
+ options = { interpolator: mock_interpolator, responds_to_updated_at: false }
118
+ mock_attachment = MockAttachment.new(options)
119
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
120
+
121
+ result = url_generator.for(:style_name, {timestamp: true})
122
+
123
+ assert_equal expected, result
124
+ end
125
+
126
+ it "produces URLs without the updated_at value when the updated_at value is nil" do
127
+ expected = "the expected result"
128
+ mock_interpolator = MockInterpolator.new(result: expected)
129
+ options = {
130
+ responds_to_updated_at: true,
131
+ updated_at: nil,
132
+ interpolator: mock_interpolator,
133
+ }
134
+ mock_attachment = MockAttachment.new(options)
135
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
136
+
137
+ result = url_generator.for(:style_name, {timestamp: true})
138
+
139
+ assert_equal expected, result
140
+ end
141
+
142
+ it "produces URLs with the updated_at when it exists" do
143
+ expected = "the expected result"
144
+ updated_at = 1231231234
145
+ mock_interpolator = MockInterpolator.new(result: expected)
146
+ options = { interpolator: mock_interpolator, updated_at: updated_at }
147
+ mock_attachment = MockAttachment.new(options)
148
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
149
+
150
+ result = url_generator.for(:style_name, {timestamp: true})
151
+
152
+ assert_equal "#{expected}?#{updated_at}", result
153
+ end
154
+
155
+ it "produces URLs with the updated_at when it exists, separated with a & if a ? follow by = already exists" do
156
+ expected = "the?expected=result"
157
+ updated_at = 1231231234
158
+ mock_interpolator = MockInterpolator.new(result: expected)
159
+ options = { interpolator: mock_interpolator, updated_at: updated_at }
160
+ mock_attachment = MockAttachment.new(options)
161
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
162
+
163
+ result = url_generator.for(:style_name, {timestamp: true})
164
+
165
+ assert_equal "#{expected}&#{updated_at}", result
166
+ end
167
+
168
+ it "produces URLs without the updated_at when told to do as much" do
169
+ expected = "the expected result"
170
+ updated_at = 1231231234
171
+ mock_interpolator = MockInterpolator.new(result: expected)
172
+ options = { interpolator: mock_interpolator, updated_at: updated_at }
173
+ mock_attachment = MockAttachment.new(options)
174
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
175
+
176
+ result = url_generator.for(:style_name, {timestamp: false})
177
+
178
+ assert_equal expected, result
179
+ end
180
+
181
+ it "produces the correct URL when the instance has a file name" do
182
+ expected = "the expected result"
183
+ mock_interpolator = MockInterpolator.new
184
+ options = {
185
+ interpolator: mock_interpolator,
186
+ url: expected,
187
+ original_filename: "exists",
188
+ }
189
+ mock_attachment = MockAttachment.new(options)
190
+
191
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
192
+ url_generator.for(:style_name, {})
193
+
194
+ assert mock_interpolator.has_interpolated_pattern?(expected),
195
+ "expected the interpolator to be passed #{expected.inspect} but it wasn't"
196
+ end
197
+
198
+ describe "should be able to escape (, ), [, and ]." do
199
+ def generate(expected, updated_at=nil)
200
+ mock_interpolator = MockInterpolator.new(result: expected)
201
+ options = { interpolator: mock_interpolator, updated_at: updated_at }
202
+ mock_attachment = MockAttachment.new(options)
203
+ url_generator = Paperclip::UrlGenerator.new(mock_attachment)
204
+ def url_generator.respond_to(params)
205
+ false if params == :escape
206
+ end
207
+ url_generator.for(:style_name, {escape: true, timestamp: !!updated_at})
208
+ end
209
+
210
+ it "not timestamp" do
211
+ expected = "the(expected)result[]"
212
+ assert_equal "the%28expected%29result%5B%5D", generate(expected)
213
+ end
214
+
215
+ it "timestamp" do
216
+ expected = "the(expected)result[]"
217
+ updated_at = 1231231234
218
+ assert_equal "the%28expected%29result%5B%5D?#{updated_at}",
219
+ generate(expected, updated_at)
220
+ end
221
+ end
222
+ end
@@ -0,0 +1,322 @@
1
+ require 'spec_helper'
2
+
3
+ describe Paperclip::Validators::AttachmentContentTypeValidator do
4
+ before do
5
+ rebuild_model
6
+ @dummy = Dummy.new
7
+ end
8
+
9
+ def build_validator(options)
10
+ @validator = Paperclip::Validators::AttachmentContentTypeValidator.new(options.merge(
11
+ attributes: :avatar
12
+ ))
13
+ end
14
+
15
+ context "with a nil content type" do
16
+ before do
17
+ build_validator content_type: "image/jpg"
18
+ @dummy.stubs(avatar_content_type: nil)
19
+ @validator.validate(@dummy)
20
+ end
21
+
22
+ it "does not set an error message" do
23
+ assert @dummy.errors[:avatar_content_type].blank?
24
+ end
25
+ end
26
+
27
+ context "with :allow_nil option" do
28
+ context "as true" do
29
+ before do
30
+ build_validator content_type: "image/png", allow_nil: true
31
+ @dummy.stubs(avatar_content_type: nil)
32
+ @validator.validate(@dummy)
33
+ end
34
+
35
+ it "allows avatar_content_type as nil" do
36
+ assert @dummy.errors[:avatar_content_type].blank?
37
+ end
38
+ end
39
+
40
+ context "as false" do
41
+ before do
42
+ build_validator content_type: "image/png", allow_nil: false
43
+ @dummy.stubs(avatar_content_type: nil)
44
+ @validator.validate(@dummy)
45
+ end
46
+
47
+ it "does not allow avatar_content_type as nil" do
48
+ assert @dummy.errors[:avatar_content_type].present?
49
+ end
50
+ end
51
+ end
52
+
53
+ context "with a failing validation" do
54
+ before do
55
+ build_validator content_type: "image/png", allow_nil: false
56
+ @dummy.stubs(avatar_content_type: nil)
57
+ @validator.validate(@dummy)
58
+ end
59
+
60
+ it "adds error to the base object" do
61
+ assert @dummy.errors[:avatar].present?,
62
+ "Error not added to base attribute"
63
+ end
64
+
65
+ it "adds error to base object as a string" do
66
+ expect(@dummy.errors[:avatar].first).to be_a String
67
+ end
68
+ end
69
+
70
+ context "with a successful validation" do
71
+ before do
72
+ build_validator content_type: "image/png", allow_nil: false
73
+ @dummy.stubs(avatar_content_type: "image/png")
74
+ @validator.validate(@dummy)
75
+ end
76
+
77
+ it "does not add error to the base object" do
78
+ assert @dummy.errors[:avatar].blank?,
79
+ "Error was added to base attribute"
80
+ end
81
+ end
82
+
83
+ context "with :allow_blank option" do
84
+ context "as true" do
85
+ before do
86
+ build_validator content_type: "image/png", allow_blank: true
87
+ @dummy.stubs(avatar_content_type: "")
88
+ @validator.validate(@dummy)
89
+ end
90
+
91
+ it "allows avatar_content_type as blank" do
92
+ assert @dummy.errors[:avatar_content_type].blank?
93
+ end
94
+ end
95
+
96
+ context "as false" do
97
+ before do
98
+ build_validator content_type: "image/png", allow_blank: false
99
+ @dummy.stubs(avatar_content_type: "")
100
+ @validator.validate(@dummy)
101
+ end
102
+
103
+ it "does not allow avatar_content_type as blank" do
104
+ assert @dummy.errors[:avatar_content_type].present?
105
+ end
106
+ end
107
+ end
108
+
109
+ context "whitelist format" do
110
+ context "with an allowed type" do
111
+ context "as a string" do
112
+ before do
113
+ build_validator content_type: "image/jpg"
114
+ @dummy.stubs(avatar_content_type: "image/jpg")
115
+ @validator.validate(@dummy)
116
+ end
117
+
118
+ it "does not set an error message" do
119
+ assert @dummy.errors[:avatar_content_type].blank?
120
+ end
121
+ end
122
+
123
+ context "as an regexp" do
124
+ before do
125
+ build_validator content_type: /^image\/.*/
126
+ @dummy.stubs(avatar_content_type: "image/jpg")
127
+ @validator.validate(@dummy)
128
+ end
129
+
130
+ it "does not set an error message" do
131
+ assert @dummy.errors[:avatar_content_type].blank?
132
+ end
133
+ end
134
+
135
+ context "as a list" do
136
+ before do
137
+ build_validator content_type: ["image/png", "image/jpg", "image/jpeg"]
138
+ @dummy.stubs(avatar_content_type: "image/jpg")
139
+ @validator.validate(@dummy)
140
+ end
141
+
142
+ it "does not set an error message" do
143
+ assert @dummy.errors[:avatar_content_type].blank?
144
+ end
145
+ end
146
+ end
147
+
148
+ context "with a disallowed type" do
149
+ context "as a string" do
150
+ before do
151
+ build_validator content_type: "image/png"
152
+ @dummy.stubs(avatar_content_type: "image/jpg")
153
+ @validator.validate(@dummy)
154
+ end
155
+
156
+ it "sets a correct default error message" do
157
+ assert @dummy.errors[:avatar_content_type].present?
158
+ expect(@dummy.errors[:avatar_content_type]).to include "is invalid"
159
+ end
160
+ end
161
+
162
+ context "as a regexp" do
163
+ before do
164
+ build_validator content_type: /^text\/.*/
165
+ @dummy.stubs(avatar_content_type: "image/jpg")
166
+ @validator.validate(@dummy)
167
+ end
168
+
169
+ it "sets a correct default error message" do
170
+ assert @dummy.errors[:avatar_content_type].present?
171
+ expect(@dummy.errors[:avatar_content_type]).to include "is invalid"
172
+ end
173
+ end
174
+
175
+ context "with :message option" do
176
+ context "without interpolation" do
177
+ before do
178
+ build_validator content_type: "image/png", message: "should be a PNG image"
179
+ @dummy.stubs(avatar_content_type: "image/jpg")
180
+ @validator.validate(@dummy)
181
+ end
182
+
183
+ it "sets a correct error message" do
184
+ expect(@dummy.errors[:avatar_content_type]).to include "should be a PNG image"
185
+ end
186
+ end
187
+
188
+ context "with interpolation" do
189
+ before do
190
+ build_validator content_type: "image/png", message: "should have content type %{types}"
191
+ @dummy.stubs(avatar_content_type: "image/jpg")
192
+ @validator.validate(@dummy)
193
+ end
194
+
195
+ it "sets a correct error message" do
196
+ expect(@dummy.errors[:avatar_content_type]).to include "should have content type image/png"
197
+ end
198
+ end
199
+ end
200
+ end
201
+ end
202
+
203
+ context "blacklist format" do
204
+ context "with an allowed type" do
205
+ context "as a string" do
206
+ before do
207
+ build_validator not: "image/gif"
208
+ @dummy.stubs(avatar_content_type: "image/jpg")
209
+ @validator.validate(@dummy)
210
+ end
211
+
212
+ it "does not set an error message" do
213
+ assert @dummy.errors[:avatar_content_type].blank?
214
+ end
215
+ end
216
+
217
+ context "as an regexp" do
218
+ before do
219
+ build_validator not: /^text\/.*/
220
+ @dummy.stubs(avatar_content_type: "image/jpg")
221
+ @validator.validate(@dummy)
222
+ end
223
+
224
+ it "does not set an error message" do
225
+ assert @dummy.errors[:avatar_content_type].blank?
226
+ end
227
+ end
228
+
229
+ context "as a list" do
230
+ before do
231
+ build_validator not: ["image/png", "image/jpg", "image/jpeg"]
232
+ @dummy.stubs(avatar_content_type: "image/gif")
233
+ @validator.validate(@dummy)
234
+ end
235
+
236
+ it "does not set an error message" do
237
+ assert @dummy.errors[:avatar_content_type].blank?
238
+ end
239
+ end
240
+ end
241
+
242
+ context "with a disallowed type" do
243
+ context "as a string" do
244
+ before do
245
+ build_validator not: "image/png"
246
+ @dummy.stubs(avatar_content_type: "image/png")
247
+ @validator.validate(@dummy)
248
+ end
249
+
250
+ it "sets a correct default error message" do
251
+ assert @dummy.errors[:avatar_content_type].present?
252
+ expect(@dummy.errors[:avatar_content_type]).to include "is invalid"
253
+ end
254
+ end
255
+
256
+ context "as a regexp" do
257
+ before do
258
+ build_validator not: /^text\/.*/
259
+ @dummy.stubs(avatar_content_type: "text/plain")
260
+ @validator.validate(@dummy)
261
+ end
262
+
263
+ it "sets a correct default error message" do
264
+ assert @dummy.errors[:avatar_content_type].present?
265
+ expect(@dummy.errors[:avatar_content_type]).to include "is invalid"
266
+ end
267
+ end
268
+
269
+ context "with :message option" do
270
+ context "without interpolation" do
271
+ before do
272
+ build_validator not: "image/png", message: "should not be a PNG image"
273
+ @dummy.stubs(avatar_content_type: "image/png")
274
+ @validator.validate(@dummy)
275
+ end
276
+
277
+ it "sets a correct error message" do
278
+ expect(@dummy.errors[:avatar_content_type]).to include "should not be a PNG image"
279
+ end
280
+ end
281
+
282
+ context "with interpolation" do
283
+ before do
284
+ build_validator not: "image/png", message: "should not have content type %{types}"
285
+ @dummy.stubs(avatar_content_type: "image/png")
286
+ @validator.validate(@dummy)
287
+ end
288
+
289
+ it "sets a correct error message" do
290
+ expect(@dummy.errors[:avatar_content_type]).to include "should not have content type image/png"
291
+ end
292
+ end
293
+ end
294
+ end
295
+ end
296
+
297
+ context "using the helper" do
298
+ before do
299
+ Dummy.validates_attachment_content_type :avatar, content_type: "image/jpg"
300
+ end
301
+
302
+ it "adds the validator to the class" do
303
+ assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_content_type }
304
+ end
305
+ end
306
+
307
+ context "given options" do
308
+ it "raises argument error if no required argument was given" do
309
+ assert_raises(ArgumentError) do
310
+ build_validator message: "Some message"
311
+ end
312
+ end
313
+
314
+ it "does not raise argument error if :content_type was given" do
315
+ build_validator content_type: "image/jpg"
316
+ end
317
+
318
+ it "does not raise argument error if :not was given" do
319
+ build_validator not: "image/jpg"
320
+ end
321
+ end
322
+ end
@@ -0,0 +1,160 @@
1
+ require 'spec_helper'
2
+
3
+ describe Paperclip::Validators::AttachmentFileNameValidator do
4
+ before do
5
+ rebuild_model
6
+ @dummy = Dummy.new
7
+ end
8
+
9
+ def build_validator(options)
10
+ @validator = Paperclip::Validators::AttachmentFileNameValidator.new(options.merge(
11
+ attributes: :avatar
12
+ ))
13
+ end
14
+
15
+ context "with a failing validation" do
16
+ before do
17
+ build_validator matches: /.*\.png$/, allow_nil: false
18
+ @dummy.stubs(avatar_file_name: "data.txt")
19
+ @validator.validate(@dummy)
20
+ end
21
+
22
+ it "adds error to the base object" do
23
+ assert @dummy.errors[:avatar].present?,
24
+ "Error not added to base attribute"
25
+ end
26
+
27
+ it "adds error to base object as a string" do
28
+ expect(@dummy.errors[:avatar].first).to be_a String
29
+ end
30
+ end
31
+
32
+ it "does not add error to the base object with a successful validation" do
33
+ build_validator matches: /.*\.png$/, allow_nil: false
34
+ @dummy.stubs(avatar_file_name: "image.png")
35
+ @validator.validate(@dummy)
36
+
37
+ assert @dummy.errors[:avatar].blank?, "Error was added to base attribute"
38
+ end
39
+
40
+ context "whitelist format" do
41
+ context "with an allowed type" do
42
+ context "as a single regexp" do
43
+ before do
44
+ build_validator matches: /.*\.jpg$/
45
+ @dummy.stubs(avatar_file_name: "image.jpg")
46
+ @validator.validate(@dummy)
47
+ end
48
+
49
+ it "does not set an error message" do
50
+ assert @dummy.errors[:avatar_file_name].blank?
51
+ end
52
+ end
53
+
54
+ context "as a list" do
55
+ before do
56
+ build_validator matches: [/.*\.png$/, /.*\.jpe?g$/]
57
+ @dummy.stubs(avatar_file_name: "image.jpg")
58
+ @validator.validate(@dummy)
59
+ end
60
+
61
+ it "does not set an error message" do
62
+ assert @dummy.errors[:avatar_file_name].blank?
63
+ end
64
+ end
65
+ end
66
+
67
+ context "with a disallowed type" do
68
+ it "sets a correct default error message" do
69
+ build_validator matches: /^text\/.*/
70
+ @dummy.stubs(avatar_file_name: "image.jpg")
71
+ @validator.validate(@dummy)
72
+
73
+ assert @dummy.errors[:avatar_file_name].present?
74
+ expect(@dummy.errors[:avatar_file_name]).to include "is invalid"
75
+ end
76
+
77
+ it "sets a correct custom error message" do
78
+ build_validator matches: /.*\.png$/, message: "should be a PNG image"
79
+ @dummy.stubs(avatar_file_name: "image.jpg")
80
+ @validator.validate(@dummy)
81
+
82
+ expect(@dummy.errors[:avatar_file_name]).to include "should be a PNG image"
83
+ end
84
+ end
85
+ end
86
+
87
+ context "blacklist format" do
88
+ context "with an allowed type" do
89
+ context "as a single regexp" do
90
+ before do
91
+ build_validator not: /^text\/.*/
92
+ @dummy.stubs(avatar_file_name: "image.jpg")
93
+ @validator.validate(@dummy)
94
+ end
95
+
96
+ it "does not set an error message" do
97
+ assert @dummy.errors[:avatar_file_name].blank?
98
+ end
99
+ end
100
+
101
+ context "as a list" do
102
+ before do
103
+ build_validator not: [/.*\.png$/, /.*\.jpe?g$/]
104
+ @dummy.stubs(avatar_file_name: "image.gif")
105
+ @validator.validate(@dummy)
106
+ end
107
+
108
+ it "does not set an error message" do
109
+ assert @dummy.errors[:avatar_file_name].blank?
110
+ end
111
+ end
112
+ end
113
+
114
+ context "with a disallowed type" do
115
+ it "sets a correct default error message" do
116
+ build_validator not: /data.*/
117
+ @dummy.stubs(avatar_file_name: "data.txt")
118
+ @validator.validate(@dummy)
119
+
120
+ assert @dummy.errors[:avatar_file_name].present?
121
+ expect(@dummy.errors[:avatar_file_name]).to include "is invalid"
122
+ end
123
+
124
+ it "sets a correct custom error message" do
125
+ build_validator not: /.*\.png$/, message: "should not be a PNG image"
126
+ @dummy.stubs(avatar_file_name: "image.png")
127
+ @validator.validate(@dummy)
128
+
129
+ expect(@dummy.errors[:avatar_file_name]).to include "should not be a PNG image"
130
+ end
131
+ end
132
+ end
133
+
134
+ context "using the helper" do
135
+ before do
136
+ Dummy.validates_attachment_file_name :avatar, matches: /.*\.jpg$/
137
+ end
138
+
139
+ it "adds the validator to the class" do
140
+ assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_file_name }
141
+ end
142
+ end
143
+
144
+ context "given options" do
145
+ it "raises argument error if no required argument was given" do
146
+ assert_raises(ArgumentError) do
147
+ build_validator message: "Some message"
148
+ end
149
+ end
150
+
151
+ it "does not raise argument error if :matches was given" do
152
+ build_validator matches: /.*\.jpg$/
153
+ end
154
+
155
+ it "does not raise argument error if :not was given" do
156
+ build_validator not: /.*\.jpg$/
157
+ end
158
+ end
159
+ end
160
+