paperclip 3.5.4 → 5.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (212) hide show
  1. checksums.yaml +4 -4
  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 +17 -20
  7. data/Appraisals +4 -16
  8. data/CONTRIBUTING.md +29 -13
  9. data/Gemfile +11 -3
  10. data/LICENSE +1 -3
  11. data/NEWS +241 -49
  12. data/README.md +471 -166
  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 +9 -3
  31. data/lib/generators/paperclip/templates/paperclip_migration.rb.erb +2 -2
  32. data/lib/paperclip/attachment.rb +151 -46
  33. data/lib/paperclip/attachment_registry.rb +3 -2
  34. data/lib/paperclip/callbacks.rb +13 -1
  35. data/lib/paperclip/content_type_detector.rb +26 -22
  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 +5 -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 +15 -11
  43. data/lib/paperclip/interpolations/plural_cache.rb +6 -5
  44. data/lib/paperclip/interpolations.rb +26 -13
  45. data/lib/paperclip/io_adapters/abstract_adapter.rb +32 -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 +7 -7
  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 +90 -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 +37 -19
  69. data/lib/paperclip/storage/s3.rb +129 -69
  70. data/lib/paperclip/style.rb +8 -2
  71. data/lib/paperclip/tempfile_factory.rb +5 -1
  72. data/lib/paperclip/thumbnail.rb +30 -18
  73. data/lib/paperclip/url_generator.rb +26 -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 +11 -4
  81. data/lib/paperclip/version.rb +3 -1
  82. data/lib/paperclip.rb +30 -11
  83. data/lib/tasks/paperclip.rake +34 -5
  84. data/paperclip.gemspec +21 -16
  85. data/shoulda_macros/paperclip.rb +0 -1
  86. data/spec/paperclip/attachment_definitions_spec.rb +13 -0
  87. data/{test/attachment_processing_test.rb → spec/paperclip/attachment_processing_spec.rb} +17 -20
  88. data/spec/paperclip/attachment_registry_spec.rb +158 -0
  89. data/{test/attachment_test.rb → spec/paperclip/attachment_spec.rb} +502 -407
  90. data/{test/content_type_detector_test.rb → spec/paperclip/content_type_detector_spec.rb} +17 -20
  91. data/spec/paperclip/file_command_content_type_detector_spec.rb +40 -0
  92. data/spec/paperclip/filename_cleaner_spec.rb +14 -0
  93. data/spec/paperclip/geometry_detector_spec.rb +39 -0
  94. data/{test/geometry_parser_test.rb → spec/paperclip/geometry_parser_spec.rb} +27 -27
  95. data/{test/geometry_test.rb → spec/paperclip/geometry_spec.rb} +50 -52
  96. data/spec/paperclip/glue_spec.rb +44 -0
  97. data/spec/paperclip/has_attached_file_spec.rb +158 -0
  98. data/{test/integration_test.rb → spec/paperclip/integration_spec.rb} +137 -128
  99. data/{test/interpolations_test.rb → spec/paperclip/interpolations_spec.rb} +70 -46
  100. data/spec/paperclip/io_adapters/abstract_adapter_spec.rb +132 -0
  101. data/{test/io_adapters/attachment_adapter_test.rb → spec/paperclip/io_adapters/attachment_adapter_spec.rb} +33 -32
  102. data/spec/paperclip/io_adapters/data_uri_adapter_spec.rb +89 -0
  103. data/spec/paperclip/io_adapters/empty_string_adapter_spec.rb +17 -0
  104. data/{test/io_adapters/file_adapter_test.rb → spec/paperclip/io_adapters/file_adapter_spec.rb} +38 -42
  105. data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb +121 -0
  106. data/spec/paperclip/io_adapters/identity_adapter_spec.rb +8 -0
  107. data/{test/io_adapters/nil_adapter_test.rb → spec/paperclip/io_adapters/nil_adapter_spec.rb} +7 -7
  108. data/{test/io_adapters/registry_test.rb → spec/paperclip/io_adapters/registry_spec.rb} +12 -9
  109. data/{test/io_adapters/stringio_adapter_test.rb → spec/paperclip/io_adapters/stringio_adapter_spec.rb} +21 -18
  110. data/{test/io_adapters/uploaded_file_adapter_test.rb → spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb} +46 -46
  111. data/spec/paperclip/io_adapters/uri_adapter_spec.rb +172 -0
  112. data/spec/paperclip/matchers/have_attached_file_matcher_spec.rb +19 -0
  113. data/spec/paperclip/matchers/validate_attachment_content_type_matcher_spec.rb +109 -0
  114. data/spec/paperclip/matchers/validate_attachment_presence_matcher_spec.rb +69 -0
  115. data/spec/paperclip/matchers/validate_attachment_size_matcher_spec.rb +88 -0
  116. data/spec/paperclip/media_type_spoof_detector_spec.rb +94 -0
  117. data/spec/paperclip/meta_class_spec.rb +30 -0
  118. data/spec/paperclip/paperclip_missing_attachment_styles_spec.rb +84 -0
  119. data/spec/paperclip/paperclip_spec.rb +192 -0
  120. data/spec/paperclip/plural_cache_spec.rb +37 -0
  121. data/spec/paperclip/processor_helpers_spec.rb +57 -0
  122. data/{test/processor_test.rb → spec/paperclip/processor_spec.rb} +7 -7
  123. data/spec/paperclip/rails_environment_spec.rb +33 -0
  124. data/{test/rake_test.rb → spec/paperclip/rake_spec.rb} +15 -15
  125. data/spec/paperclip/schema_spec.rb +248 -0
  126. data/{test/storage/filesystem_test.rb → spec/paperclip/storage/filesystem_spec.rb} +18 -18
  127. data/spec/paperclip/storage/fog_spec.rb +566 -0
  128. data/spec/paperclip/storage/s3_live_spec.rb +188 -0
  129. data/spec/paperclip/storage/s3_spec.rb +1693 -0
  130. data/spec/paperclip/style_spec.rb +255 -0
  131. data/spec/paperclip/tempfile_factory_spec.rb +33 -0
  132. data/spec/paperclip/tempfile_spec.rb +35 -0
  133. data/{test/thumbnail_test.rb → spec/paperclip/thumbnail_spec.rb} +153 -134
  134. data/spec/paperclip/url_generator_spec.rb +222 -0
  135. data/spec/paperclip/validators/attachment_content_type_validator_spec.rb +322 -0
  136. data/spec/paperclip/validators/attachment_file_name_validator_spec.rb +160 -0
  137. data/{test/validators/attachment_presence_validator_test.rb → spec/paperclip/validators/attachment_presence_validator_spec.rb} +20 -20
  138. data/{test/validators/attachment_size_validator_test.rb → spec/paperclip/validators/attachment_size_validator_spec.rb} +77 -64
  139. data/spec/paperclip/validators/media_type_spoof_detection_validator_spec.rb +52 -0
  140. data/spec/paperclip/validators_spec.rb +164 -0
  141. data/spec/spec_helper.rb +47 -0
  142. data/spec/support/assertions.rb +82 -0
  143. data/spec/support/conditional_filter_helper.rb +5 -0
  144. data/spec/support/fake_model.rb +25 -0
  145. data/spec/support/fake_rails.rb +12 -0
  146. data/spec/support/fixtures/empty.html +1 -0
  147. data/spec/support/fixtures/empty.xlsx +0 -0
  148. data/spec/support/fixtures/spaced file.jpg +0 -0
  149. data/spec/support/matchers/accept.rb +5 -0
  150. data/spec/support/matchers/exist.rb +5 -0
  151. data/spec/support/matchers/have_column.rb +23 -0
  152. data/{test → spec}/support/mock_attachment.rb +2 -0
  153. data/{test → spec}/support/mock_url_generator_builder.rb +2 -2
  154. data/spec/support/model_reconstruction.rb +68 -0
  155. data/spec/support/reporting.rb +11 -0
  156. data/spec/support/test_data.rb +13 -0
  157. data/spec/support/version_helper.rb +9 -0
  158. metadata +348 -225
  159. data/RUNNING_TESTS.md +0 -4
  160. data/cucumber/paperclip_steps.rb +0 -6
  161. data/gemfiles/3.0.gemfile +0 -11
  162. data/gemfiles/3.1.gemfile +0 -11
  163. data/gemfiles/3.2.gemfile +0 -11
  164. data/gemfiles/4.0.gemfile +0 -11
  165. data/test/attachment_definitions_test.rb +0 -12
  166. data/test/attachment_registry_test.rb +0 -88
  167. data/test/file_command_content_type_detector_test.rb +0 -27
  168. data/test/filename_cleaner_test.rb +0 -14
  169. data/test/generator_test.rb +0 -84
  170. data/test/geometry_detector_test.rb +0 -24
  171. data/test/has_attached_file_test.rb +0 -125
  172. data/test/helper.rb +0 -232
  173. data/test/io_adapters/abstract_adapter_test.rb +0 -58
  174. data/test/io_adapters/data_uri_adapter_test.rb +0 -74
  175. data/test/io_adapters/empty_string_adapter_test.rb +0 -18
  176. data/test/io_adapters/http_url_proxy_adapter_test.rb +0 -102
  177. data/test/io_adapters/identity_adapter_test.rb +0 -8
  178. data/test/io_adapters/uri_adapter_test.rb +0 -102
  179. data/test/matchers/have_attached_file_matcher_test.rb +0 -24
  180. data/test/matchers/validate_attachment_content_type_matcher_test.rb +0 -110
  181. data/test/matchers/validate_attachment_presence_matcher_test.rb +0 -69
  182. data/test/matchers/validate_attachment_size_matcher_test.rb +0 -86
  183. data/test/meta_class_test.rb +0 -32
  184. data/test/paperclip_missing_attachment_styles_test.rb +0 -90
  185. data/test/paperclip_test.rb +0 -217
  186. data/test/plural_cache_test.rb +0 -36
  187. data/test/schema_test.rb +0 -200
  188. data/test/storage/fog_test.rb +0 -473
  189. data/test/storage/s3_live_test.rb +0 -179
  190. data/test/storage/s3_test.rb +0 -1356
  191. data/test/style_test.rb +0 -213
  192. data/test/support/mock_model.rb +0 -2
  193. data/test/tempfile_factory_test.rb +0 -17
  194. data/test/url_generator_test.rb +0 -187
  195. data/test/validators/attachment_content_type_validator_test.rb +0 -324
  196. data/test/validators_test.rb +0 -61
  197. /data/{test → spec}/database.yml +0 -0
  198. /data/{test → spec/support}/fixtures/12k.png +0 -0
  199. /data/{test → spec/support}/fixtures/50x50.png +0 -0
  200. /data/{test → spec/support}/fixtures/5k.png +0 -0
  201. /data/{test → spec/support}/fixtures/animated +0 -0
  202. /data/{test → spec/support}/fixtures/animated.gif +0 -0
  203. /data/{test → spec/support}/fixtures/animated.unknown +0 -0
  204. /data/{test → spec/support}/fixtures/bad.png +0 -0
  205. /data/{test → spec/support}/fixtures/fog.yml +0 -0
  206. /data/{test → spec/support}/fixtures/rotated.jpg +0 -0
  207. /data/{test → spec/support}/fixtures/s3.yml +0 -0
  208. /data/{test → spec/support}/fixtures/spaced file.png +0 -0
  209. /data/{test → spec/support}/fixtures/text.txt +0 -0
  210. /data/{test → spec/support}/fixtures/twopage.pdf +0 -0
  211. /data/{test → spec/support}/fixtures/uppercase.PNG +0 -0
  212. /data/{test → spec}/support/mock_interpolator.rb +0 -0
@@ -0,0 +1,248 @@
1
+ require 'spec_helper'
2
+ require 'paperclip/schema'
3
+ require 'active_support/testing/deprecation'
4
+
5
+ describe Paperclip::Schema do
6
+ include ActiveSupport::Testing::Deprecation
7
+
8
+ before do
9
+ rebuild_class
10
+ end
11
+
12
+ after do
13
+ Dummy.connection.drop_table :dummies rescue nil
14
+ end
15
+
16
+ context "within table definition" do
17
+ context "using #has_attached_file" do
18
+ before do
19
+ ActiveSupport::Deprecation.silenced = false
20
+ end
21
+ it "creates attachment columns" do
22
+ Dummy.connection.create_table :dummies, force: true do |t|
23
+ ActiveSupport::Deprecation.silence do
24
+ t.has_attached_file :avatar
25
+ end
26
+ end
27
+
28
+ columns = Dummy.columns.map{ |column| [column.name, column.type] }
29
+
30
+ expect(columns).to include(['avatar_file_name', :string])
31
+ expect(columns).to include(['avatar_content_type', :string])
32
+ expect(columns).to include(['avatar_file_size', :integer])
33
+ expect(columns).to include(['avatar_updated_at', :datetime])
34
+ end
35
+
36
+ it "displays deprecation warning" do
37
+ Dummy.connection.create_table :dummies, force: true do |t|
38
+ assert_deprecated do
39
+ t.has_attached_file :avatar
40
+ end
41
+ end
42
+ end
43
+ end
44
+
45
+ context "using #attachment" do
46
+ before do
47
+ Dummy.connection.create_table :dummies, force: true do |t|
48
+ t.attachment :avatar
49
+ end
50
+ end
51
+
52
+ it "creates attachment columns" do
53
+ columns = Dummy.columns.map{ |column| [column.name, column.type] }
54
+
55
+ expect(columns).to include(['avatar_file_name', :string])
56
+ expect(columns).to include(['avatar_content_type', :string])
57
+ expect(columns).to include(['avatar_file_size', :integer])
58
+ expect(columns).to include(['avatar_updated_at', :datetime])
59
+ end
60
+ end
61
+
62
+ context "using #attachment with options" do
63
+ before do
64
+ Dummy.connection.create_table :dummies, force: true do |t|
65
+ t.attachment :avatar, default: 1, file_name: { default: 'default' }
66
+ end
67
+ end
68
+
69
+ it "sets defaults on columns" do
70
+ defaults_columns = ["avatar_file_name", "avatar_content_type", "avatar_file_size"]
71
+ columns = Dummy.columns.select { |e| defaults_columns.include? e.name }
72
+
73
+ expect(columns).to have_column("avatar_file_name").with_default("default")
74
+ expect(columns).to have_column("avatar_content_type").with_default("1")
75
+ expect(columns).to have_column("avatar_file_size").with_default(1)
76
+ end
77
+ end
78
+ end
79
+
80
+ context "within schema statement" do
81
+ before do
82
+ Dummy.connection.create_table :dummies, force: true
83
+ end
84
+
85
+ context "migrating up" do
86
+ context "with single attachment" do
87
+ before do
88
+ Dummy.connection.add_attachment :dummies, :avatar
89
+ end
90
+
91
+ it "creates attachment columns" do
92
+ columns = Dummy.columns.map{ |column| [column.name, column.type] }
93
+
94
+ expect(columns).to include(['avatar_file_name', :string])
95
+ expect(columns).to include(['avatar_content_type', :string])
96
+ expect(columns).to include(['avatar_file_size', :integer])
97
+ expect(columns).to include(['avatar_updated_at', :datetime])
98
+ end
99
+ end
100
+
101
+ context "with single attachment and options" do
102
+ before do
103
+ Dummy.connection.add_attachment :dummies, :avatar, default: '1', file_name: { default: 'default' }
104
+ end
105
+
106
+ it "sets defaults on columns" do
107
+ defaults_columns = ["avatar_file_name", "avatar_content_type", "avatar_file_size"]
108
+ columns = Dummy.columns.select { |e| defaults_columns.include? e.name }
109
+
110
+ expect(columns).to have_column("avatar_file_name").with_default("default")
111
+ expect(columns).to have_column("avatar_content_type").with_default("1")
112
+ expect(columns).to have_column("avatar_file_size").with_default(1)
113
+ end
114
+ end
115
+
116
+ context "with multiple attachments" do
117
+ before do
118
+ Dummy.connection.add_attachment :dummies, :avatar, :photo
119
+ end
120
+
121
+ it "creates attachment columns" do
122
+ columns = Dummy.columns.map{ |column| [column.name, column.type] }
123
+
124
+ expect(columns).to include(['avatar_file_name', :string])
125
+ expect(columns).to include(['avatar_content_type', :string])
126
+ expect(columns).to include(['avatar_file_size', :integer])
127
+ expect(columns).to include(['avatar_updated_at', :datetime])
128
+ expect(columns).to include(['photo_file_name', :string])
129
+ expect(columns).to include(['photo_content_type', :string])
130
+ expect(columns).to include(['photo_file_size', :integer])
131
+ expect(columns).to include(['photo_updated_at', :datetime])
132
+ end
133
+ end
134
+
135
+ context "with multiple attachments and options" do
136
+ before do
137
+ Dummy.connection.add_attachment :dummies, :avatar, :photo, default: '1', file_name: { default: 'default' }
138
+ end
139
+
140
+ it "sets defaults on columns" do
141
+ defaults_columns = ["avatar_file_name", "avatar_content_type", "avatar_file_size", "photo_file_name", "photo_content_type", "photo_file_size"]
142
+ columns = Dummy.columns.select { |e| defaults_columns.include? e.name }
143
+
144
+ expect(columns).to have_column("avatar_file_name").with_default("default")
145
+ expect(columns).to have_column("avatar_content_type").with_default("1")
146
+ expect(columns).to have_column("avatar_file_size").with_default(1)
147
+ expect(columns).to have_column("photo_file_name").with_default("default")
148
+ expect(columns).to have_column("photo_content_type").with_default("1")
149
+ expect(columns).to have_column("photo_file_size").with_default(1)
150
+ end
151
+ end
152
+
153
+ context "with no attachment" do
154
+ it "raises an error" do
155
+ assert_raises ArgumentError do
156
+ Dummy.connection.add_attachment :dummies
157
+ end
158
+ end
159
+ end
160
+ end
161
+
162
+ context "migrating down" do
163
+ before do
164
+ Dummy.connection.change_table :dummies do |t|
165
+ t.column :avatar_file_name, :string
166
+ t.column :avatar_content_type, :string
167
+ t.column :avatar_file_size, :integer
168
+ t.column :avatar_updated_at, :datetime
169
+ end
170
+ end
171
+
172
+ context "using #drop_attached_file" do
173
+ before do
174
+ ActiveSupport::Deprecation.silenced = false
175
+ end
176
+ it "removes the attachment columns" do
177
+ ActiveSupport::Deprecation.silence do
178
+ Dummy.connection.drop_attached_file :dummies, :avatar
179
+ end
180
+
181
+ columns = Dummy.columns.map{ |column| [column.name, column.type] }
182
+
183
+ expect(columns).to_not include(['avatar_file_name', :string])
184
+ expect(columns).to_not include(['avatar_content_type', :string])
185
+ expect(columns).to_not include(['avatar_file_size', :integer])
186
+ expect(columns).to_not include(['avatar_updated_at', :datetime])
187
+ end
188
+
189
+ it "displays a deprecation warning" do
190
+ assert_deprecated do
191
+ Dummy.connection.drop_attached_file :dummies, :avatar
192
+ end
193
+ end
194
+ end
195
+
196
+ context "using #remove_attachment" do
197
+ context "with single attachment" do
198
+ before do
199
+ Dummy.connection.remove_attachment :dummies, :avatar
200
+ end
201
+
202
+ it "removes the attachment columns" do
203
+ columns = Dummy.columns.map{ |column| [column.name, column.type] }
204
+
205
+ expect(columns).to_not include(['avatar_file_name', :string])
206
+ expect(columns).to_not include(['avatar_content_type', :string])
207
+ expect(columns).to_not include(['avatar_file_size', :integer])
208
+ expect(columns).to_not include(['avatar_updated_at', :datetime])
209
+ end
210
+ end
211
+
212
+ context "with multiple attachments" do
213
+ before do
214
+ Dummy.connection.change_table :dummies do |t|
215
+ t.column :photo_file_name, :string
216
+ t.column :photo_content_type, :string
217
+ t.column :photo_file_size, :integer
218
+ t.column :photo_updated_at, :datetime
219
+ end
220
+
221
+ Dummy.connection.remove_attachment :dummies, :avatar, :photo
222
+ end
223
+
224
+ it "removes the attachment columns" do
225
+ columns = Dummy.columns.map{ |column| [column.name, column.type] }
226
+
227
+ expect(columns).to_not include(['avatar_file_name', :string])
228
+ expect(columns).to_not include(['avatar_content_type', :string])
229
+ expect(columns).to_not include(['avatar_file_size', :integer])
230
+ expect(columns).to_not include(['avatar_updated_at', :datetime])
231
+ expect(columns).to_not include(['photo_file_name', :string])
232
+ expect(columns).to_not include(['photo_content_type', :string])
233
+ expect(columns).to_not include(['photo_file_size', :integer])
234
+ expect(columns).to_not include(['photo_updated_at', :datetime])
235
+ end
236
+ end
237
+
238
+ context "with no attachment" do
239
+ it "raises an error" do
240
+ assert_raises ArgumentError do
241
+ Dummy.connection.remove_attachment :dummies
242
+ end
243
+ end
244
+ end
245
+ end
246
+ end
247
+ end
248
+ end
@@ -1,33 +1,33 @@
1
- require './test/helper'
1
+ require 'spec_helper'
2
2
 
3
- class FileSystemTest < Test::Unit::TestCase
3
+ describe Paperclip::Storage::Filesystem do
4
4
  context "Filesystem" do
5
5
  context "normal file" do
6
- setup do
7
- rebuild_model :styles => { :thumbnail => "25x25#" }
6
+ before do
7
+ rebuild_model styles: { thumbnail: "25x25#" }
8
8
  @dummy = Dummy.create!
9
9
 
10
10
  @file = File.open(fixture_file('5k.png'))
11
11
  @dummy.avatar = @file
12
12
  end
13
13
 
14
- teardown { @file.close }
14
+ after { @file.close }
15
15
 
16
- should "allow file assignment" do
16
+ it "allows file assignment" do
17
17
  assert @dummy.save
18
18
  end
19
19
 
20
- should "store the original" do
20
+ it "stores the original" do
21
21
  @dummy.save
22
22
  assert_file_exists(@dummy.avatar.path)
23
23
  end
24
24
 
25
- should "store the thumbnail" do
25
+ it "stores the thumbnail" do
26
26
  @dummy.save
27
27
  assert_file_exists(@dummy.avatar.path(:thumbnail))
28
28
  end
29
29
 
30
- should "be rewinded after flush_writes" do
30
+ it "is rewinded after flush_writes" do
31
31
  @dummy.avatar.instance_eval "def after_flush_writes; end"
32
32
 
33
33
  files = @dummy.avatar.queued_for_write.values
@@ -35,14 +35,14 @@ class FileSystemTest < Test::Unit::TestCase
35
35
  assert files.none?(&:eof?), "Expect all the files to be rewinded."
36
36
  end
37
37
 
38
- should "be removed after after_flush_writes" do
38
+ it "is removed after after_flush_writes" do
39
39
  paths = @dummy.avatar.queued_for_write.values.map(&:path)
40
40
  @dummy.save
41
- assert paths.none?{ |path| File.exists?(path) },
41
+ assert paths.none?{ |path| File.exist?(path) },
42
42
  "Expect all the files to be deleted."
43
43
  end
44
44
 
45
- should 'copy the file to a known location with copy_to_local_file' do
45
+ it 'copies the file to a known location with copy_to_local_file' do
46
46
  tempfile = Tempfile.new("known_location")
47
47
  @dummy.avatar.copy_to_local_file(:original, tempfile.path)
48
48
  tempfile.rewind
@@ -52,8 +52,8 @@ class FileSystemTest < Test::Unit::TestCase
52
52
  end
53
53
 
54
54
  context "with file that has space in file name" do
55
- setup do
56
- rebuild_model :styles => { :thumbnail => "25x25#" }
55
+ before do
56
+ rebuild_model styles: { thumbnail: "25x25#" }
57
57
  @dummy = Dummy.create!
58
58
 
59
59
  @file = File.open(fixture_file('spaced file.png'))
@@ -61,17 +61,17 @@ class FileSystemTest < Test::Unit::TestCase
61
61
  @dummy.save
62
62
  end
63
63
 
64
- teardown { @file.close }
64
+ after { @file.close }
65
65
 
66
- should "store the file" do
66
+ it "stores the file" do
67
67
  assert_file_exists(@dummy.avatar.path)
68
68
  end
69
69
 
70
- should "return a replaced version for path" do
70
+ it "returns a replaced version for path" do
71
71
  assert_match /.+\/spaced_file\.png/, @dummy.avatar.path
72
72
  end
73
73
 
74
- should "return a replaced version for url" do
74
+ it "returns a replaced version for url" do
75
75
  assert_match /.+\/spaced_file\.png/, @dummy.avatar.url
76
76
  end
77
77
  end