kt-paperclip 5.4.0 → 6.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (150) hide show
  1. checksums.yaml +4 -4
  2. data/.github/issue_template.md +3 -0
  3. data/.hound.yml +27 -32
  4. data/.travis.yml +23 -2
  5. data/Appraisals +17 -0
  6. data/Gemfile +9 -7
  7. data/NEWS +21 -0
  8. data/README.md +27 -37
  9. data/Rakefile +29 -21
  10. data/UPGRADING +3 -3
  11. data/features/basic_integration.feature +4 -0
  12. data/features/migration.feature +10 -51
  13. data/features/step_definitions/attachment_steps.rb +12 -12
  14. data/features/step_definitions/html_steps.rb +5 -5
  15. data/features/step_definitions/rails_steps.rb +29 -9
  16. data/features/step_definitions/s3_steps.rb +3 -3
  17. data/features/step_definitions/web_steps.rb +5 -6
  18. data/features/support/env.rb +4 -4
  19. data/features/support/fakeweb.rb +3 -5
  20. data/features/support/file_helpers.rb +2 -2
  21. data/features/support/paths.rb +4 -4
  22. data/features/support/rails.rb +7 -7
  23. data/features/support/selectors.rb +1 -1
  24. data/gemfiles/4.2.gemfile +7 -4
  25. data/gemfiles/5.0.gemfile +7 -4
  26. data/gemfiles/5.1.gemfile +20 -0
  27. data/gemfiles/5.2.gemfile +20 -0
  28. data/gemfiles/6.0.gemfile +20 -0
  29. data/lib/generators/paperclip/paperclip_generator.rb +6 -8
  30. data/lib/paperclip/attachment.rb +102 -104
  31. data/lib/paperclip/attachment_registry.rb +2 -2
  32. data/lib/paperclip/file_command_content_type_detector.rb +1 -3
  33. data/lib/paperclip/filename_cleaner.rb +0 -1
  34. data/lib/paperclip/geometry.rb +18 -19
  35. data/lib/paperclip/geometry_detector_factory.rb +13 -16
  36. data/lib/paperclip/geometry_parser_factory.rb +5 -5
  37. data/lib/paperclip/glue.rb +3 -3
  38. data/lib/paperclip/has_attached_file.rb +5 -4
  39. data/lib/paperclip/helpers.rb +3 -3
  40. data/lib/paperclip/interpolations.rb +42 -38
  41. data/lib/paperclip/io_adapters/abstract_adapter.rb +16 -14
  42. data/lib/paperclip/io_adapters/attachment_adapter.rb +12 -6
  43. data/lib/paperclip/io_adapters/data_uri_adapter.rb +1 -1
  44. data/lib/paperclip/io_adapters/file_adapter.rb +1 -3
  45. data/lib/paperclip/io_adapters/http_url_proxy_adapter.rb +3 -3
  46. data/lib/paperclip/io_adapters/identity_adapter.rb +1 -2
  47. data/lib/paperclip/io_adapters/registry.rb +1 -1
  48. data/lib/paperclip/io_adapters/stringio_adapter.rb +1 -1
  49. data/lib/paperclip/io_adapters/uploaded_file_adapter.rb +6 -8
  50. data/lib/paperclip/io_adapters/uri_adapter.rb +9 -7
  51. data/lib/paperclip/logger.rb +1 -1
  52. data/lib/paperclip/matchers/have_attached_file_matcher.rb +4 -4
  53. data/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb +19 -18
  54. data/lib/paperclip/matchers/validate_attachment_presence_matcher.rb +4 -4
  55. data/lib/paperclip/matchers/validate_attachment_size_matcher.rb +11 -10
  56. data/lib/paperclip/matchers.rb +4 -4
  57. data/lib/paperclip/media_type_spoof_detector.rb +13 -13
  58. data/lib/paperclip/missing_attachment_styles.rb +11 -6
  59. data/lib/paperclip/processor.rb +13 -6
  60. data/lib/paperclip/processor_helpers.rb +3 -1
  61. data/lib/paperclip/rails_environment.rb +1 -5
  62. data/lib/paperclip/railtie.rb +5 -5
  63. data/lib/paperclip/schema.rb +18 -14
  64. data/lib/paperclip/storage/filesystem.rb +5 -7
  65. data/lib/paperclip/storage/fog.rb +36 -32
  66. data/lib/paperclip/storage/s3.rb +67 -75
  67. data/lib/paperclip/style.rb +3 -6
  68. data/lib/paperclip/tempfile.rb +4 -5
  69. data/lib/paperclip/tempfile_factory.rb +0 -1
  70. data/lib/paperclip/thumbnail.rb +11 -11
  71. data/lib/paperclip/url_generator.rb +5 -12
  72. data/lib/paperclip/validators/attachment_content_type_validator.rb +3 -3
  73. data/lib/paperclip/validators/attachment_file_name_validator.rb +5 -10
  74. data/lib/paperclip/validators/attachment_file_type_ignorance_validator.rb +1 -2
  75. data/lib/paperclip/validators/attachment_presence_validator.rb +3 -5
  76. data/lib/paperclip/validators/attachment_size_validator.rb +8 -8
  77. data/lib/paperclip/validators/media_type_spoof_detection_validator.rb +3 -1
  78. data/lib/paperclip/validators.rb +12 -13
  79. data/lib/paperclip/version.rb +1 -3
  80. data/lib/paperclip.rb +49 -48
  81. data/lib/tasks/paperclip.rake +23 -24
  82. data/paperclip.gemspec +29 -33
  83. data/shoulda_macros/paperclip.rb +16 -16
  84. data/spec/paperclip/attachment_definitions_spec.rb +5 -5
  85. data/spec/paperclip/attachment_processing_spec.rb +22 -23
  86. data/spec/paperclip/attachment_registry_spec.rb +15 -15
  87. data/spec/paperclip/attachment_spec.rb +238 -196
  88. data/spec/paperclip/content_type_detector_spec.rb +11 -12
  89. data/spec/paperclip/file_command_content_type_detector_spec.rb +10 -10
  90. data/spec/paperclip/filename_cleaner_spec.rb +3 -4
  91. data/spec/paperclip/geometry_detector_spec.rb +7 -8
  92. data/spec/paperclip/geometry_parser_spec.rb +31 -31
  93. data/spec/paperclip/geometry_spec.rb +24 -24
  94. data/spec/paperclip/glue_spec.rb +3 -5
  95. data/spec/paperclip/has_attached_file_spec.rb +46 -126
  96. data/spec/paperclip/integration_spec.rb +111 -77
  97. data/spec/paperclip/interpolations_spec.rb +101 -93
  98. data/spec/paperclip/io_adapters/abstract_adapter_spec.rb +41 -13
  99. data/spec/paperclip/io_adapters/attachment_adapter_spec.rb +8 -10
  100. data/spec/paperclip/io_adapters/data_uri_adapter_spec.rb +13 -14
  101. data/spec/paperclip/io_adapters/empty_string_adapter_spec.rb +4 -4
  102. data/spec/paperclip/io_adapters/file_adapter_spec.rb +12 -12
  103. data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb +42 -26
  104. data/spec/paperclip/io_adapters/identity_adapter_spec.rb +1 -1
  105. data/spec/paperclip/io_adapters/nil_adapter_spec.rb +2 -2
  106. data/spec/paperclip/io_adapters/registry_spec.rb +4 -4
  107. data/spec/paperclip/io_adapters/stringio_adapter_spec.rb +10 -10
  108. data/spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb +6 -6
  109. data/spec/paperclip/io_adapters/uri_adapter_spec.rb +80 -31
  110. data/spec/paperclip/matchers/have_attached_file_matcher_spec.rb +3 -3
  111. data/spec/paperclip/matchers/validate_attachment_content_type_matcher_spec.rb +4 -5
  112. data/spec/paperclip/matchers/validate_attachment_presence_matcher_spec.rb +4 -4
  113. data/spec/paperclip/matchers/validate_attachment_size_matcher_spec.rb +4 -4
  114. data/spec/paperclip/media_type_spoof_detector_spec.rb +50 -24
  115. data/spec/paperclip/meta_class_spec.rb +3 -3
  116. data/spec/paperclip/paperclip_missing_attachment_styles_spec.rb +28 -24
  117. data/spec/paperclip/paperclip_spec.rb +15 -11
  118. data/spec/paperclip/plural_cache_spec.rb +8 -8
  119. data/spec/paperclip/processor_helpers_spec.rb +35 -35
  120. data/spec/paperclip/processor_spec.rb +8 -8
  121. data/spec/paperclip/rails_environment_spec.rb +7 -10
  122. data/spec/paperclip/rake_spec.rb +39 -39
  123. data/spec/paperclip/schema_spec.rb +57 -53
  124. data/spec/paperclip/storage/filesystem_spec.rb +6 -6
  125. data/spec/paperclip/storage/fog_spec.rb +76 -82
  126. data/spec/paperclip/storage/s3_live_spec.rb +22 -22
  127. data/spec/paperclip/storage/s3_spec.rb +585 -583
  128. data/spec/paperclip/style_spec.rb +67 -71
  129. data/spec/paperclip/tempfile_factory_spec.rb +5 -5
  130. data/spec/paperclip/thumbnail_spec.rb +68 -67
  131. data/spec/paperclip/url_generator_spec.rb +18 -29
  132. data/spec/paperclip/validators/attachment_content_type_validator_spec.rb +27 -27
  133. data/spec/paperclip/validators/attachment_file_name_validator_spec.rb +15 -16
  134. data/spec/paperclip/validators/attachment_presence_validator_spec.rb +5 -5
  135. data/spec/paperclip/validators/attachment_size_validator_spec.rb +21 -21
  136. data/spec/paperclip/validators/media_type_spoof_detection_validator_spec.rb +9 -13
  137. data/spec/paperclip/validators_spec.rb +40 -40
  138. data/spec/spec_helper.rb +21 -23
  139. data/spec/support/assertions.rb +8 -6
  140. data/spec/support/fake_model.rb +1 -2
  141. data/spec/support/fake_rails.rb +1 -1
  142. data/spec/support/matchers/exist.rb +1 -1
  143. data/spec/support/matchers/have_column.rb +1 -1
  144. data/spec/support/mock_url_generator_builder.rb +2 -3
  145. data/spec/support/model_reconstruction.rb +16 -12
  146. data/spec/support/reporting.rb +1 -1
  147. data/spec/support/test_data.rb +2 -2
  148. metadata +49 -105
  149. data/lib/kt-paperclip.rb +0 -1
  150. data/spec/support/conditional_filter_helper.rb +0 -5
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kt-paperclip
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.4.0
4
+ version: 6.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Surendra Singhi
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-02-21 00:00:00.000000000 Z
11
+ date: 2020-01-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemodel
@@ -17,9 +17,6 @@ dependencies:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: 4.2.0
20
- - - "<"
21
- - !ruby/object:Gem::Version
22
- version: '6.0'
23
20
  type: :runtime
24
21
  prerelease: false
25
22
  version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
27
24
  - - ">="
28
25
  - !ruby/object:Gem::Version
29
26
  version: 4.2.0
30
- - - "<"
31
- - !ruby/object:Gem::Version
32
- version: '6.0'
33
27
  - !ruby/object:Gem::Dependency
34
28
  name: activesupport
35
29
  requirement: !ruby/object:Gem::Requirement
@@ -37,9 +31,6 @@ dependencies:
37
31
  - - ">="
38
32
  - !ruby/object:Gem::Version
39
33
  version: 4.2.0
40
- - - "<"
41
- - !ruby/object:Gem::Version
42
- version: '6.0'
43
34
  type: :runtime
44
35
  prerelease: false
45
36
  version_requirements: !ruby/object:Gem::Requirement
@@ -47,51 +38,48 @@ dependencies:
47
38
  - - ">="
48
39
  - !ruby/object:Gem::Version
49
40
  version: 4.2.0
50
- - - "<"
51
- - !ruby/object:Gem::Version
52
- version: '6.0'
53
41
  - !ruby/object:Gem::Dependency
54
- name: terrapin
42
+ name: mime-types
55
43
  requirement: !ruby/object:Gem::Requirement
56
44
  requirements:
57
- - - "~>"
45
+ - - ">="
58
46
  - !ruby/object:Gem::Version
59
- version: 0.6.0
47
+ version: '0'
60
48
  type: :runtime
61
49
  prerelease: false
62
50
  version_requirements: !ruby/object:Gem::Requirement
63
51
  requirements:
64
- - - "~>"
52
+ - - ">="
65
53
  - !ruby/object:Gem::Version
66
- version: 0.6.0
54
+ version: '0'
67
55
  - !ruby/object:Gem::Dependency
68
- name: mime-types
56
+ name: mimemagic
69
57
  requirement: !ruby/object:Gem::Requirement
70
58
  requirements:
71
- - - ">="
59
+ - - "~>"
72
60
  - !ruby/object:Gem::Version
73
- version: '0'
61
+ version: 0.3.0
74
62
  type: :runtime
75
63
  prerelease: false
76
64
  version_requirements: !ruby/object:Gem::Requirement
77
65
  requirements:
78
- - - ">="
66
+ - - "~>"
79
67
  - !ruby/object:Gem::Version
80
- version: '0'
68
+ version: 0.3.0
81
69
  - !ruby/object:Gem::Dependency
82
- name: mimemagic
70
+ name: terrapin
83
71
  requirement: !ruby/object:Gem::Requirement
84
72
  requirements:
85
73
  - - "~>"
86
74
  - !ruby/object:Gem::Version
87
- version: 0.3.8
75
+ version: 0.6.0
88
76
  type: :runtime
89
77
  prerelease: false
90
78
  version_requirements: !ruby/object:Gem::Requirement
91
79
  requirements:
92
80
  - - "~>"
93
81
  - !ruby/object:Gem::Version
94
- version: 0.3.8
82
+ version: 0.6.0
95
83
  - !ruby/object:Gem::Dependency
96
84
  name: activerecord
97
85
  requirement: !ruby/object:Gem::Requirement
@@ -99,9 +87,6 @@ dependencies:
99
87
  - - ">="
100
88
  - !ruby/object:Gem::Version
101
89
  version: 4.2.0
102
- - - "<"
103
- - !ruby/object:Gem::Version
104
- version: '6.0'
105
90
  type: :development
106
91
  prerelease: false
107
92
  version_requirements: !ruby/object:Gem::Requirement
@@ -109,11 +94,8 @@ dependencies:
109
94
  - - ">="
110
95
  - !ruby/object:Gem::Version
111
96
  version: 4.2.0
112
- - - "<"
113
- - !ruby/object:Gem::Version
114
- version: '6.0'
115
97
  - !ruby/object:Gem::Dependency
116
- name: shoulda
98
+ name: appraisal
117
99
  requirement: !ruby/object:Gem::Requirement
118
100
  requirements:
119
101
  - - ">="
@@ -127,21 +109,21 @@ dependencies:
127
109
  - !ruby/object:Gem::Version
128
110
  version: '0'
129
111
  - !ruby/object:Gem::Dependency
130
- name: rspec
112
+ name: aruba
131
113
  requirement: !ruby/object:Gem::Requirement
132
114
  requirements:
133
115
  - - "~>"
134
116
  - !ruby/object:Gem::Version
135
- version: '3.0'
117
+ version: 0.9.0
136
118
  type: :development
137
119
  prerelease: false
138
120
  version_requirements: !ruby/object:Gem::Requirement
139
121
  requirements:
140
122
  - - "~>"
141
123
  - !ruby/object:Gem::Version
142
- version: '3.0'
124
+ version: 0.9.0
143
125
  - !ruby/object:Gem::Dependency
144
- name: appraisal
126
+ name: aws-sdk-s3
145
127
  requirement: !ruby/object:Gem::Requirement
146
128
  requirements:
147
129
  - - ">="
@@ -155,7 +137,7 @@ dependencies:
155
137
  - !ruby/object:Gem::Version
156
138
  version: '0'
157
139
  - !ruby/object:Gem::Dependency
158
- name: mocha
140
+ name: bundler
159
141
  requirement: !ruby/object:Gem::Requirement
160
142
  requirements:
161
143
  - - ">="
@@ -169,41 +151,7 @@ dependencies:
169
151
  - !ruby/object:Gem::Version
170
152
  version: '0'
171
153
  - !ruby/object:Gem::Dependency
172
- name: aws-sdk
173
- requirement: !ruby/object:Gem::Requirement
174
- requirements:
175
- - - ">="
176
- - !ruby/object:Gem::Version
177
- version: 2.3.0
178
- - - "<"
179
- - !ruby/object:Gem::Version
180
- version: '3.0'
181
- type: :development
182
- prerelease: false
183
- version_requirements: !ruby/object:Gem::Requirement
184
- requirements:
185
- - - ">="
186
- - !ruby/object:Gem::Version
187
- version: 2.3.0
188
- - - "<"
189
- - !ruby/object:Gem::Version
190
- version: '3.0'
191
- - !ruby/object:Gem::Dependency
192
- name: bourne
193
- requirement: !ruby/object:Gem::Requirement
194
- requirements:
195
- - - "<"
196
- - !ruby/object:Gem::Version
197
- version: '1.6'
198
- type: :development
199
- prerelease: false
200
- version_requirements: !ruby/object:Gem::Requirement
201
- requirements:
202
- - - "<"
203
- - !ruby/object:Gem::Version
204
- version: '1.6'
205
- - !ruby/object:Gem::Dependency
206
- name: cucumber-rails
154
+ name: capybara
207
155
  requirement: !ruby/object:Gem::Requirement
208
156
  requirements:
209
157
  - - ">="
@@ -231,21 +179,21 @@ dependencies:
231
179
  - !ruby/object:Gem::Version
232
180
  version: 4.0.3
233
181
  - !ruby/object:Gem::Dependency
234
- name: aruba
182
+ name: cucumber-rails
235
183
  requirement: !ruby/object:Gem::Requirement
236
184
  requirements:
237
- - - "~>"
185
+ - - ">="
238
186
  - !ruby/object:Gem::Version
239
- version: 0.9.0
187
+ version: '0'
240
188
  type: :development
241
189
  prerelease: false
242
190
  version_requirements: !ruby/object:Gem::Requirement
243
191
  requirements:
244
- - - "~>"
192
+ - - ">="
245
193
  - !ruby/object:Gem::Version
246
- version: 0.9.0
194
+ version: '0'
247
195
  - !ruby/object:Gem::Dependency
248
- name: nokogiri
196
+ name: fakeweb
249
197
  requirement: !ruby/object:Gem::Requirement
250
198
  requirements:
251
199
  - - ">="
@@ -259,7 +207,7 @@ dependencies:
259
207
  - !ruby/object:Gem::Version
260
208
  version: '0'
261
209
  - !ruby/object:Gem::Dependency
262
- name: capybara
210
+ name: fog-aws
263
211
  requirement: !ruby/object:Gem::Requirement
264
212
  requirements:
265
213
  - - ">="
@@ -273,7 +221,7 @@ dependencies:
273
221
  - !ruby/object:Gem::Version
274
222
  version: '0'
275
223
  - !ruby/object:Gem::Dependency
276
- name: bundler
224
+ name: fog-local
277
225
  requirement: !ruby/object:Gem::Requirement
278
226
  requirements:
279
227
  - - ">="
@@ -287,7 +235,7 @@ dependencies:
287
235
  - !ruby/object:Gem::Version
288
236
  version: '0'
289
237
  - !ruby/object:Gem::Dependency
290
- name: fog-aws
238
+ name: generator_spec
291
239
  requirement: !ruby/object:Gem::Requirement
292
240
  requirements:
293
241
  - - ">="
@@ -301,7 +249,7 @@ dependencies:
301
249
  - !ruby/object:Gem::Version
302
250
  version: '0'
303
251
  - !ruby/object:Gem::Dependency
304
- name: fog-local
252
+ name: launchy
305
253
  requirement: !ruby/object:Gem::Requirement
306
254
  requirements:
307
255
  - - ">="
@@ -315,7 +263,7 @@ dependencies:
315
263
  - !ruby/object:Gem::Version
316
264
  version: '0'
317
265
  - !ruby/object:Gem::Dependency
318
- name: launchy
266
+ name: nokogiri
319
267
  requirement: !ruby/object:Gem::Requirement
320
268
  requirements:
321
269
  - - ">="
@@ -329,7 +277,7 @@ dependencies:
329
277
  - !ruby/object:Gem::Version
330
278
  version: '0'
331
279
  - !ruby/object:Gem::Dependency
332
- name: rake
280
+ name: railties
333
281
  requirement: !ruby/object:Gem::Requirement
334
282
  requirements:
335
283
  - - ">="
@@ -343,7 +291,7 @@ dependencies:
343
291
  - !ruby/object:Gem::Version
344
292
  version: '0'
345
293
  - !ruby/object:Gem::Dependency
346
- name: fakeweb
294
+ name: rake
347
295
  requirement: !ruby/object:Gem::Requirement
348
296
  requirements:
349
297
  - - ">="
@@ -357,27 +305,21 @@ dependencies:
357
305
  - !ruby/object:Gem::Version
358
306
  version: '0'
359
307
  - !ruby/object:Gem::Dependency
360
- name: railties
308
+ name: rspec
361
309
  requirement: !ruby/object:Gem::Requirement
362
310
  requirements:
363
- - - ">="
364
- - !ruby/object:Gem::Version
365
- version: 4.2.0
366
- - - "<"
311
+ - - "~>"
367
312
  - !ruby/object:Gem::Version
368
- version: '6.0'
313
+ version: '3.0'
369
314
  type: :development
370
315
  prerelease: false
371
316
  version_requirements: !ruby/object:Gem::Requirement
372
317
  requirements:
373
- - - ">="
374
- - !ruby/object:Gem::Version
375
- version: 4.2.0
376
- - - "<"
318
+ - - "~>"
377
319
  - !ruby/object:Gem::Version
378
- version: '6.0'
320
+ version: '3.0'
379
321
  - !ruby/object:Gem::Dependency
380
- name: generator_spec
322
+ name: shoulda
381
323
  requirement: !ruby/object:Gem::Requirement
382
324
  requirements:
383
325
  - - ">="
@@ -412,6 +354,7 @@ extensions: []
412
354
  extra_rdoc_files: []
413
355
  files:
414
356
  - ".codeclimate.yml"
357
+ - ".github/issue_template.md"
415
358
  - ".gitignore"
416
359
  - ".hound.yml"
417
360
  - ".rubocop.yml"
@@ -444,10 +387,12 @@ files:
444
387
  - features/support/selectors.rb
445
388
  - gemfiles/4.2.gemfile
446
389
  - gemfiles/5.0.gemfile
390
+ - gemfiles/5.1.gemfile
391
+ - gemfiles/5.2.gemfile
392
+ - gemfiles/6.0.gemfile
447
393
  - lib/generators/paperclip/USAGE
448
394
  - lib/generators/paperclip/paperclip_generator.rb
449
395
  - lib/generators/paperclip/templates/paperclip_migration.rb.erb
450
- - lib/kt-paperclip.rb
451
396
  - lib/paperclip.rb
452
397
  - lib/paperclip/attachment.rb
453
398
  - lib/paperclip/attachment_registry.rb
@@ -568,7 +513,6 @@ files:
568
513
  - spec/paperclip/validators_spec.rb
569
514
  - spec/spec_helper.rb
570
515
  - spec/support/assertions.rb
571
- - spec/support/conditional_filter_helper.rb
572
516
  - spec/support/fake_model.rb
573
517
  - spec/support/fake_rails.rb
574
518
  - spec/support/fixtures/12k.png
@@ -598,7 +542,7 @@ files:
598
542
  - spec/support/reporting.rb
599
543
  - spec/support/test_data.rb
600
544
  - spec/support/version_helper.rb
601
- homepage: https://github.com/kreeti/kt-paperclip
545
+ homepage: https://github.com/kreeti/paperclip
602
546
  licenses:
603
547
  - MIT
604
548
  metadata: {}
@@ -607,9 +551,9 @@ post_install_message: |
607
551
  # NOTE FOR UPGRADING FROM 4.3.0 OR EARLIER #
608
552
  ##################################################
609
553
 
610
- Paperclip is now compatible with aws-sdk >= 2.0.0.
554
+ Paperclip is now compatible with aws-sdk-s3.
611
555
 
612
- If you are using S3 storage, aws-sdk >= 2.0.0 requires you to make a few small
556
+ If you are using S3 storage, aws-sdk-s3 requires you to make a few small
613
557
  changes:
614
558
 
615
559
  * You must set the `s3_region`
@@ -618,7 +562,7 @@ post_install_message: |
618
562
  using a hyphen. For example, `:public_read` needs to be changed to
619
563
  `public-read`.
620
564
 
621
- For a walkthrough of upgrading from 4 to 5 and aws-sdk >= 2.0 you can watch
565
+ For a walkthrough of upgrading from 4 to *5* (not 6) and aws-sdk >= 2.0 you can watch
622
566
  http://rubythursday.com/episodes/ruby-snack-27-upgrade-paperclip-and-aws-sdk-in-prep-for-rails-5
623
567
  rdoc_options: []
624
568
  require_paths:
data/lib/kt-paperclip.rb DELETED
@@ -1 +0,0 @@
1
- require "paperclip"
data/spec/support/conditional_filter_helper.rb DELETED
@@ -1,5 +0,0 @@
1
- module ConditionalFilterHelper
2
- def aws_accelerate_available?
3
- (Gem::Version.new(Aws::VERSION) >= Gem::Version.new("2.3.0"))
4
- end
5
- end