delayed_paperclip 2.9.1 → 2.9.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (43) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +2 -2
  3. data/.travis.yml +5 -6
  4. data/Appraisals +1 -5
  5. data/CONTRIBUTING +0 -3
  6. data/README.md +43 -11
  7. data/Rakefile +0 -13
  8. data/delayed_paperclip.gemspec +3 -3
  9. data/gemfiles/3.2.gemfile +0 -1
  10. data/gemfiles/4.0.gemfile +0 -1
  11. data/gemfiles/4.1.gemfile +0 -1
  12. data/gemfiles/4.2.gemfile +0 -1
  13. data/lib/delayed_paperclip.rb +6 -7
  14. data/lib/delayed_paperclip/attachment.rb +12 -6
  15. data/lib/delayed_paperclip/jobs/active_job.rb +3 -5
  16. data/lib/delayed_paperclip/jobs/delayed_job.rb +3 -2
  17. data/lib/delayed_paperclip/jobs/resque.rb +2 -3
  18. data/lib/delayed_paperclip/jobs/sidekiq.rb +7 -1
  19. data/lib/delayed_paperclip/railtie.rb +1 -1
  20. data/lib/delayed_paperclip/url_generator.rb +19 -25
  21. data/lib/delayed_paperclip/version.rb +1 -1
  22. data/spec/delayed_paperclip/attachment_spec.rb +98 -26
  23. data/spec/delayed_paperclip/class_methods_spec.rb +20 -12
  24. data/spec/delayed_paperclip/instance_methods_spec.rb +8 -12
  25. data/spec/delayed_paperclip/url_generator_spec.rb +24 -24
  26. data/spec/delayed_paperclip_spec.rb +37 -22
  27. data/spec/integration/active_job_inline_spec.rb +3 -3
  28. data/spec/integration/active_job_resque_spec.rb +4 -7
  29. data/spec/integration/active_job_sidekiq_spec.rb +17 -18
  30. data/spec/integration/base_delayed_paperclip_spec.rb +5 -6
  31. data/spec/integration/delayed_job_spec.rb +3 -4
  32. data/spec/integration/examples/base.rb +33 -25
  33. data/spec/integration/resque_spec.rb +4 -6
  34. data/spec/integration/sidekiq_spec.rb +8 -11
  35. data/spec/spec_helper.rb +15 -0
  36. metadata +23 -19
  37. data/gemfiles/3.2.gemfile.lock +0 -162
  38. data/gemfiles/4.0.gemfile.lock +0 -156
  39. data/gemfiles/4.1.gemfile.lock +0 -156
  40. data/gemfiles/4.2.gemfile.lock +0 -181
  41. data/test/base_delayed_paperclip_test.rb +0 -254
  42. data/test/database.yml +0 -4
  43. data/test/test_helper.rb +0 -106
@@ -6,6 +6,7 @@ require 'active_record/version'
6
6
  require 'active_support'
7
7
  require 'active_support/core_ext'
8
8
  require 'rspec'
9
+ require 'fakeredis/rspec'
9
10
  require 'mocha/api'
10
11
  begin
11
12
  require 'active_job'
@@ -47,8 +48,22 @@ Paperclip.logger = ActiveRecord::Base.logger
47
48
  RSpec.configure do |config|
48
49
  config.mock_with :mocha
49
50
 
51
+ config.order = :random
52
+
50
53
  config.filter_run focus: true
51
54
  config.run_all_when_everything_filtered = true
55
+
56
+ config.before(:each) do
57
+ reset_global_default_options
58
+ end
59
+ end
60
+
61
+ def reset_global_default_options
62
+ DelayedPaperclip.options.merge!({
63
+ :background_job_class => DelayedPaperclip::Jobs::Resque,
64
+ :url_with_processing => true,
65
+ :processing_image_url => nil
66
+ })
52
67
  end
53
68
 
54
69
  # In order to not duplicate code directly from Paperclip's spec support
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: delayed_paperclip
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.9.1
4
+ version: 2.9.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jesse Storimer
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2015-02-06 00:00:00.000000000 Z
14
+ date: 2016-04-27 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: paperclip
@@ -115,16 +115,16 @@ dependencies:
115
115
  name: sidekiq
116
116
  requirement: !ruby/object:Gem::Requirement
117
117
  requirements:
118
- - - "<"
118
+ - - ">="
119
119
  - !ruby/object:Gem::Version
120
- version: '3.0'
120
+ version: '4.0'
121
121
  type: :development
122
122
  prerelease: false
123
123
  version_requirements: !ruby/object:Gem::Requirement
124
124
  requirements:
125
- - - "<"
125
+ - - ">="
126
126
  - !ruby/object:Gem::Version
127
- version: '3.0'
127
+ version: '4.0'
128
128
  - !ruby/object:Gem::Dependency
129
129
  name: appraisal
130
130
  requirement: !ruby/object:Gem::Requirement
@@ -141,6 +141,20 @@ dependencies:
141
141
  version: '0'
142
142
  - !ruby/object:Gem::Dependency
143
143
  name: rake
144
+ requirement: !ruby/object:Gem::Requirement
145
+ requirements:
146
+ - - "~>"
147
+ - !ruby/object:Gem::Version
148
+ version: 10.5.0
149
+ type: :development
150
+ prerelease: false
151
+ version_requirements: !ruby/object:Gem::Requirement
152
+ requirements:
153
+ - - "~>"
154
+ - !ruby/object:Gem::Version
155
+ version: 10.5.0
156
+ - !ruby/object:Gem::Dependency
157
+ name: bundler
144
158
  requirement: !ruby/object:Gem::Requirement
145
159
  requirements:
146
160
  - - ">="
@@ -154,7 +168,7 @@ dependencies:
154
168
  - !ruby/object:Gem::Version
155
169
  version: '0'
156
170
  - !ruby/object:Gem::Dependency
157
- name: bundler
171
+ name: railties
158
172
  requirement: !ruby/object:Gem::Requirement
159
173
  requirements:
160
174
  - - ">="
@@ -168,7 +182,7 @@ dependencies:
168
182
  - !ruby/object:Gem::Version
169
183
  version: '0'
170
184
  - !ruby/object:Gem::Dependency
171
- name: railties
185
+ name: fakeredis
172
186
  requirement: !ruby/object:Gem::Requirement
173
187
  requirements:
174
188
  - - ">="
@@ -201,13 +215,9 @@ files:
201
215
  - Rakefile
202
216
  - delayed_paperclip.gemspec
203
217
  - gemfiles/3.2.gemfile
204
- - gemfiles/3.2.gemfile.lock
205
218
  - gemfiles/4.0.gemfile
206
- - gemfiles/4.0.gemfile.lock
207
219
  - gemfiles/4.1.gemfile
208
- - gemfiles/4.1.gemfile.lock
209
220
  - gemfiles/4.2.gemfile
210
- - gemfiles/4.2.gemfile.lock
211
221
  - init.rb
212
222
  - lib/delayed_paperclip.rb
213
223
  - lib/delayed_paperclip/attachment.rb
@@ -236,9 +246,6 @@ files:
236
246
  - spec/integration/resque_spec.rb
237
247
  - spec/integration/sidekiq_spec.rb
238
248
  - spec/spec_helper.rb
239
- - test/base_delayed_paperclip_test.rb
240
- - test/database.yml
241
- - test/test_helper.rb
242
249
  homepage: http://github.com/jrgifford/delayed_paperclip
243
250
  licenses: []
244
251
  metadata: {}
@@ -258,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
258
265
  version: '0'
259
266
  requirements: []
260
267
  rubyforge_project:
261
- rubygems_version: 2.4.2
268
+ rubygems_version: 2.6.2
262
269
  signing_key:
263
270
  specification_version: 4
264
271
  summary: Process your Paperclip attachments in the background.
@@ -279,6 +286,3 @@ test_files:
279
286
  - spec/integration/resque_spec.rb
280
287
  - spec/integration/sidekiq_spec.rb
281
288
  - spec/spec_helper.rb
282
- - test/base_delayed_paperclip_test.rb
283
- - test/database.yml
284
- - test/test_helper.rb
@@ -1,162 +0,0 @@
1
- PATH
2
- remote: ../
3
- specs:
4
- delayed_paperclip (2.9.1)
5
- paperclip (>= 3.3)
6
-
7
- GEM
8
- remote: http://rubygems.org/
9
- specs:
10
- actionmailer (3.2.17)
11
- actionpack (= 3.2.17)
12
- mail (~> 2.5.4)
13
- actionpack (3.2.17)
14
- activemodel (= 3.2.17)
15
- activesupport (= 3.2.17)
16
- builder (~> 3.0.0)
17
- erubis (~> 2.7.0)
18
- journey (~> 1.0.4)
19
- rack (~> 1.4.5)
20
- rack-cache (~> 1.2)
21
- rack-test (~> 0.6.1)
22
- sprockets (~> 2.2.1)
23
- activemodel (3.2.17)
24
- activesupport (= 3.2.17)
25
- builder (~> 3.0.0)
26
- activerecord (3.2.17)
27
- activemodel (= 3.2.17)
28
- activesupport (= 3.2.17)
29
- arel (~> 3.0.2)
30
- tzinfo (~> 0.3.29)
31
- activeresource (3.2.17)
32
- activemodel (= 3.2.17)
33
- activesupport (= 3.2.17)
34
- activesupport (3.2.17)
35
- i18n (~> 0.6, >= 0.6.4)
36
- multi_json (~> 1.0)
37
- appraisal (1.0.2)
38
- bundler
39
- rake
40
- thor (>= 0.14.0)
41
- arel (3.0.3)
42
- builder (3.0.4)
43
- celluloid (0.15.2)
44
- timers (~> 1.1.0)
45
- climate_control (0.0.3)
46
- activesupport (>= 3.0)
47
- cocaine (0.5.5)
48
- climate_control (>= 0.0.3, < 1.0)
49
- connection_pool (2.1.0)
50
- delayed_job (4.0.6)
51
- activesupport (>= 3.0, < 5.0)
52
- delayed_job_active_record (4.0.3)
53
- activerecord (>= 3.0, < 5.0)
54
- delayed_job (>= 3.0, < 4.1)
55
- diff-lcs (1.2.5)
56
- erubis (2.7.0)
57
- hike (1.2.3)
58
- i18n (0.7.0)
59
- journey (1.0.4)
60
- json (1.8.1)
61
- mail (2.5.4)
62
- mime-types (~> 1.16)
63
- treetop (~> 1.4.8)
64
- metaclass (0.0.4)
65
- mime-types (1.25.1)
66
- mocha (1.1.0)
67
- metaclass (~> 0.0.1)
68
- mono_logger (1.1.0)
69
- multi_json (1.10.1)
70
- paperclip (4.2.1)
71
- activemodel (>= 3.0.0)
72
- activesupport (>= 3.0.0)
73
- cocaine (~> 0.5.3)
74
- mime-types
75
- polyglot (0.3.4)
76
- rack (1.4.5)
77
- rack-cache (1.2)
78
- rack (>= 0.4)
79
- rack-protection (1.5.3)
80
- rack
81
- rack-ssl (1.3.3)
82
- rack
83
- rack-test (0.6.2)
84
- rack (>= 1.0)
85
- rails (3.2.17)
86
- actionmailer (= 3.2.17)
87
- actionpack (= 3.2.17)
88
- activerecord (= 3.2.17)
89
- activeresource (= 3.2.17)
90
- activesupport (= 3.2.17)
91
- bundler (~> 1.0)
92
- railties (= 3.2.17)
93
- railties (3.2.17)
94
- actionpack (= 3.2.17)
95
- activesupport (= 3.2.17)
96
- rack-ssl (~> 1.3.2)
97
- rake (>= 0.8.7)
98
- rdoc (~> 3.4)
99
- thor (>= 0.14.6, < 2.0)
100
- rake (10.4.2)
101
- rdoc (3.12.2)
102
- json (~> 1.4)
103
- redis (3.2.0)
104
- redis-namespace (1.5.1)
105
- redis (~> 3.0, >= 3.0.4)
106
- resque (1.25.2)
107
- mono_logger (~> 1.0)
108
- multi_json (~> 1.0)
109
- redis-namespace (~> 1.3)
110
- sinatra (>= 0.9.2)
111
- vegas (~> 0.1.2)
112
- rspec (2.99.0)
113
- rspec-core (~> 2.99.0)
114
- rspec-expectations (~> 2.99.0)
115
- rspec-mocks (~> 2.99.0)
116
- rspec-core (2.99.2)
117
- rspec-expectations (2.99.2)
118
- diff-lcs (>= 1.1.3, < 2.0)
119
- rspec-mocks (2.99.2)
120
- sidekiq (2.17.8)
121
- celluloid (= 0.15.2)
122
- connection_pool (~> 2.0)
123
- json
124
- redis (~> 3.1)
125
- redis-namespace (~> 1.3)
126
- sinatra (1.4.5)
127
- rack (~> 1.4)
128
- rack-protection (~> 1.4)
129
- tilt (~> 1.3, >= 1.3.4)
130
- sprockets (2.2.2)
131
- hike (~> 1.2)
132
- multi_json (~> 1.0)
133
- rack (~> 1.0)
134
- tilt (~> 1.1, != 1.3.0)
135
- sqlite3 (1.3.10)
136
- thor (0.19.1)
137
- tilt (1.4.1)
138
- timers (1.1.0)
139
- treetop (1.4.15)
140
- polyglot
141
- polyglot (>= 0.3.1)
142
- tzinfo (0.3.38)
143
- vegas (0.1.11)
144
- rack (>= 1.0.0)
145
-
146
- PLATFORMS
147
- ruby
148
-
149
- DEPENDENCIES
150
- appraisal
151
- bundler
152
- delayed_job
153
- delayed_job_active_record
154
- delayed_paperclip!
155
- mocha
156
- rails (~> 3.2.15)
157
- railties
158
- rake
159
- resque
160
- rspec (< 3.0)
161
- sidekiq (< 3.0)
162
- sqlite3
@@ -1,156 +0,0 @@
1
- PATH
2
- remote: ../
3
- specs:
4
- delayed_paperclip (2.9.1)
5
- paperclip (>= 3.3)
6
-
7
- GEM
8
- remote: http://rubygems.org/
9
- specs:
10
- actionmailer (4.0.3)
11
- actionpack (= 4.0.3)
12
- mail (~> 2.5.4)
13
- actionpack (4.0.3)
14
- activesupport (= 4.0.3)
15
- builder (~> 3.1.0)
16
- erubis (~> 2.7.0)
17
- rack (~> 1.5.2)
18
- rack-test (~> 0.6.2)
19
- activemodel (4.0.3)
20
- activesupport (= 4.0.3)
21
- builder (~> 3.1.0)
22
- activerecord (4.0.3)
23
- activemodel (= 4.0.3)
24
- activerecord-deprecated_finders (~> 1.0.2)
25
- activesupport (= 4.0.3)
26
- arel (~> 4.0.0)
27
- activerecord-deprecated_finders (1.0.3)
28
- activesupport (4.0.3)
29
- i18n (~> 0.6, >= 0.6.4)
30
- minitest (~> 4.2)
31
- multi_json (~> 1.3)
32
- thread_safe (~> 0.1)
33
- tzinfo (~> 0.3.37)
34
- appraisal (1.0.2)
35
- bundler
36
- rake
37
- thor (>= 0.14.0)
38
- arel (4.0.2)
39
- builder (3.1.4)
40
- celluloid (0.15.2)
41
- timers (~> 1.1.0)
42
- climate_control (0.0.3)
43
- activesupport (>= 3.0)
44
- cocaine (0.5.5)
45
- climate_control (>= 0.0.3, < 1.0)
46
- connection_pool (2.1.0)
47
- delayed_job (4.0.6)
48
- activesupport (>= 3.0, < 5.0)
49
- delayed_job_active_record (4.0.3)
50
- activerecord (>= 3.0, < 5.0)
51
- delayed_job (>= 3.0, < 4.1)
52
- diff-lcs (1.2.5)
53
- erubis (2.7.0)
54
- hike (1.2.3)
55
- i18n (0.7.0)
56
- json (1.8.1)
57
- mail (2.5.4)
58
- mime-types (~> 1.16)
59
- treetop (~> 1.4.8)
60
- metaclass (0.0.4)
61
- mime-types (1.25.1)
62
- minitest (4.7.5)
63
- mocha (1.1.0)
64
- metaclass (~> 0.0.1)
65
- mono_logger (1.1.0)
66
- multi_json (1.10.1)
67
- paperclip (4.2.1)
68
- activemodel (>= 3.0.0)
69
- activesupport (>= 3.0.0)
70
- cocaine (~> 0.5.3)
71
- mime-types
72
- polyglot (0.3.4)
73
- rack (1.5.2)
74
- rack-protection (1.5.3)
75
- rack
76
- rack-test (0.6.2)
77
- rack (>= 1.0)
78
- rails (4.0.3)
79
- actionmailer (= 4.0.3)
80
- actionpack (= 4.0.3)
81
- activerecord (= 4.0.3)
82
- activesupport (= 4.0.3)
83
- bundler (>= 1.3.0, < 2.0)
84
- railties (= 4.0.3)
85
- sprockets-rails (~> 2.0.0)
86
- railties (4.0.3)
87
- actionpack (= 4.0.3)
88
- activesupport (= 4.0.3)
89
- rake (>= 0.8.7)
90
- thor (>= 0.18.1, < 2.0)
91
- rake (10.4.2)
92
- redis (3.2.0)
93
- redis-namespace (1.5.1)
94
- redis (~> 3.0, >= 3.0.4)
95
- resque (1.25.2)
96
- mono_logger (~> 1.0)
97
- multi_json (~> 1.0)
98
- redis-namespace (~> 1.3)
99
- sinatra (>= 0.9.2)
100
- vegas (~> 0.1.2)
101
- rspec (2.99.0)
102
- rspec-core (~> 2.99.0)
103
- rspec-expectations (~> 2.99.0)
104
- rspec-mocks (~> 2.99.0)
105
- rspec-core (2.99.2)
106
- rspec-expectations (2.99.2)
107
- diff-lcs (>= 1.1.3, < 2.0)
108
- rspec-mocks (2.99.2)
109
- sidekiq (2.17.8)
110
- celluloid (= 0.15.2)
111
- connection_pool (~> 2.0)
112
- json
113
- redis (~> 3.1)
114
- redis-namespace (~> 1.3)
115
- sinatra (1.4.5)
116
- rack (~> 1.4)
117
- rack-protection (~> 1.4)
118
- tilt (~> 1.3, >= 1.3.4)
119
- sprockets (2.12.3)
120
- hike (~> 1.2)
121
- multi_json (~> 1.0)
122
- rack (~> 1.0)
123
- tilt (~> 1.1, != 1.3.0)
124
- sprockets-rails (2.0.1)
125
- actionpack (>= 3.0)
126
- activesupport (>= 3.0)
127
- sprockets (~> 2.8)
128
- sqlite3 (1.3.10)
129
- thor (0.19.1)
130
- thread_safe (0.3.4)
131
- tilt (1.4.1)
132
- timers (1.1.0)
133
- treetop (1.4.15)
134
- polyglot
135
- polyglot (>= 0.3.1)
136
- tzinfo (0.3.38)
137
- vegas (0.1.11)
138
- rack (>= 1.0.0)
139
-
140
- PLATFORMS
141
- ruby
142
-
143
- DEPENDENCIES
144
- appraisal
145
- bundler
146
- delayed_job
147
- delayed_job_active_record
148
- delayed_paperclip!
149
- mocha
150
- rails (~> 4.0.0)
151
- railties
152
- rake
153
- resque
154
- rspec (< 3.0)
155
- sidekiq (< 3.0)
156
- sqlite3