dragonfly 0.8.1 → 0.8.2

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of dragonfly might be problematic. Click here for more details.

Files changed (33) hide show
  1. data/Gemfile +9 -3
  2. data/Gemfile.rails.2.3.5 +7 -1
  3. data/History.md +9 -0
  4. data/VERSION +1 -1
  5. data/config.ru +5 -4
  6. data/dragonfly.gemspec +17 -13
  7. data/extra_docs/Index.md +0 -3
  8. data/irbrc.rb +2 -1
  9. data/lib/dragonfly.rb +5 -3
  10. data/lib/dragonfly/active_model_extensions/class_methods.rb +4 -4
  11. data/lib/dragonfly/active_model_extensions/instance_methods.rb +6 -6
  12. data/lib/dragonfly/app.rb +11 -25
  13. data/lib/dragonfly/configurable.rb +10 -2
  14. data/lib/dragonfly/core_ext/array.rb +7 -0
  15. data/lib/dragonfly/core_ext/hash.rb +7 -0
  16. data/lib/dragonfly/core_ext/object.rb +4 -0
  17. data/lib/dragonfly/data_storage/file_data_store.rb +1 -1
  18. data/lib/dragonfly/job.rb +8 -4
  19. data/lib/dragonfly/response.rb +13 -4
  20. data/spec/dragonfly/active_model_extensions/model_spec.rb +1 -1
  21. data/spec/dragonfly/analysis/file_command_analyser_spec.rb +1 -1
  22. data/spec/dragonfly/analysis/r_magick_analyser_spec.rb +24 -20
  23. data/spec/dragonfly/config/r_magick_spec.rb +23 -19
  24. data/spec/dragonfly/core_ext/array_spec.rb +19 -0
  25. data/spec/dragonfly/core_ext/hash_spec.rb +19 -0
  26. data/spec/dragonfly/encoding/r_magick_encoder_spec.rb +31 -27
  27. data/spec/dragonfly/generation/r_magick_generator_spec.rb +20 -16
  28. data/spec/dragonfly/job_endpoint_spec.rb +56 -3
  29. data/spec/dragonfly/job_spec.rb +36 -2
  30. data/spec/dragonfly/processing/r_magick_processor_spec.rb +22 -18
  31. data/spec/spec_helper.rb +3 -0
  32. metadata +93 -111
  33. data/spec/dragonfly/deprecation_spec.rb +0 -20
data/spec/spec_helper.rb CHANGED
@@ -16,6 +16,9 @@ extra_paths = %w(/opt/local/bin)
16
16
  ENV['PATH'] ||= ''
17
17
  ENV['PATH'] += ':' + extra_paths.join(':')
18
18
 
19
+ # If this is jRuby, ignore the rmagick tests
20
+ ENV['IGNORE_RMAGICK'] = 'true' if RUBY_PLATFORM == 'java' || defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
21
+
19
22
  SAMPLES_DIR = File.expand_path(File.dirname(__FILE__) + '/../samples') unless defined?(SAMPLES_DIR)
20
23
 
21
24
  Spec::Runner.configure do |c|
metadata CHANGED
@@ -1,13 +1,12 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dragonfly
3
3
  version: !ruby/object:Gem::Version
4
- hash: 61
5
4
  prerelease: false
6
5
  segments:
7
6
  - 0
8
7
  - 8
9
- - 1
10
- version: 0.8.1
8
+ - 2
9
+ version: 0.8.2
11
10
  platform: ruby
12
11
  authors:
13
12
  - Mark Evans
@@ -15,152 +14,127 @@ autorequire:
15
14
  bindir: bin
16
15
  cert_chain: []
17
16
 
18
- date: 2010-11-22 00:00:00 +00:00
17
+ date: 2011-01-11 00:00:00 +00:00
19
18
  default_executable:
20
19
  dependencies:
21
20
  - !ruby/object:Gem::Dependency
22
- type: :development
23
- prerelease: false
24
21
  name: aws-s3
25
- version_requirements: &id001 !ruby/object:Gem::Requirement
22
+ requirement: &id001 !ruby/object:Gem::Requirement
26
23
  none: false
27
24
  requirements:
28
25
  - - ">="
29
26
  - !ruby/object:Gem::Version
30
- hash: 3
31
27
  segments:
32
28
  - 0
33
29
  version: "0"
34
- requirement: *id001
35
- - !ruby/object:Gem::Dependency
36
30
  type: :development
37
31
  prerelease: false
38
- name: bson_ext
39
- version_requirements: &id002 !ruby/object:Gem::Requirement
40
- none: false
41
- requirements:
42
- - - ">="
43
- - !ruby/object:Gem::Version
44
- hash: 3
45
- segments:
46
- - 0
47
- version: "0"
48
- requirement: *id002
32
+ version_requirements: *id001
49
33
  - !ruby/object:Gem::Dependency
50
- type: :development
51
- prerelease: false
52
34
  name: capybara
53
- version_requirements: &id003 !ruby/object:Gem::Requirement
35
+ requirement: &id002 !ruby/object:Gem::Requirement
54
36
  none: false
55
37
  requirements:
56
38
  - - ">="
57
39
  - !ruby/object:Gem::Version
58
- hash: 3
59
40
  segments:
60
41
  - 0
61
42
  version: "0"
62
- requirement: *id003
63
- - !ruby/object:Gem::Dependency
64
43
  type: :development
65
44
  prerelease: false
45
+ version_requirements: *id002
46
+ - !ruby/object:Gem::Dependency
66
47
  name: cucumber
67
- version_requirements: &id004 !ruby/object:Gem::Requirement
48
+ requirement: &id003 !ruby/object:Gem::Requirement
68
49
  none: false
69
50
  requirements:
70
51
  - - "="
71
52
  - !ruby/object:Gem::Version
72
- hash: 53
73
53
  segments:
74
54
  - 0
75
55
  - 8
76
56
  - 5
77
57
  version: 0.8.5
78
- requirement: *id004
79
- - !ruby/object:Gem::Dependency
80
58
  type: :development
81
59
  prerelease: false
60
+ version_requirements: *id003
61
+ - !ruby/object:Gem::Dependency
82
62
  name: cucumber-rails
83
- version_requirements: &id005 !ruby/object:Gem::Requirement
63
+ requirement: &id004 !ruby/object:Gem::Requirement
84
64
  none: false
85
65
  requirements:
86
66
  - - ">="
87
67
  - !ruby/object:Gem::Version
88
- hash: 3
89
68
  segments:
90
69
  - 0
91
70
  version: "0"
92
- requirement: *id005
93
- - !ruby/object:Gem::Dependency
94
71
  type: :development
95
72
  prerelease: false
73
+ version_requirements: *id004
74
+ - !ruby/object:Gem::Dependency
96
75
  name: database_cleaner
97
- version_requirements: &id006 !ruby/object:Gem::Requirement
76
+ requirement: &id005 !ruby/object:Gem::Requirement
98
77
  none: false
99
78
  requirements:
100
79
  - - ">="
101
80
  - !ruby/object:Gem::Version
102
- hash: 11
103
81
  segments:
104
82
  - 0
105
83
  - 5
106
84
  - 0
107
85
  version: 0.5.0
108
- requirement: *id006
109
- - !ruby/object:Gem::Dependency
110
86
  type: :development
111
87
  prerelease: false
88
+ version_requirements: *id005
89
+ - !ruby/object:Gem::Dependency
112
90
  name: jeweler
113
- version_requirements: &id007 !ruby/object:Gem::Requirement
91
+ requirement: &id006 !ruby/object:Gem::Requirement
114
92
  none: false
115
93
  requirements:
116
94
  - - ~>
117
95
  - !ruby/object:Gem::Version
118
- hash: 7
119
96
  segments:
120
97
  - 1
121
98
  - 4
122
99
  version: "1.4"
123
- requirement: *id007
124
- - !ruby/object:Gem::Dependency
125
100
  type: :development
126
101
  prerelease: false
102
+ version_requirements: *id006
103
+ - !ruby/object:Gem::Dependency
127
104
  name: gherkin
128
- version_requirements: &id008 !ruby/object:Gem::Requirement
105
+ requirement: &id007 !ruby/object:Gem::Requirement
129
106
  none: false
130
107
  requirements:
131
108
  - - "="
132
109
  - !ruby/object:Gem::Version
133
- hash: 3
134
110
  segments:
135
111
  - 2
136
112
  - 1
137
113
  - 4
138
114
  version: 2.1.4
139
- requirement: *id008
140
- - !ruby/object:Gem::Dependency
141
115
  type: :development
142
116
  prerelease: false
117
+ version_requirements: *id007
118
+ - !ruby/object:Gem::Dependency
143
119
  name: mongo
144
- version_requirements: &id009 !ruby/object:Gem::Requirement
120
+ requirement: &id008 !ruby/object:Gem::Requirement
145
121
  none: false
146
122
  requirements:
147
123
  - - ">="
148
124
  - !ruby/object:Gem::Version
149
- hash: 3
150
125
  segments:
151
126
  - 0
152
127
  version: "0"
153
- requirement: *id009
154
- - !ruby/object:Gem::Dependency
155
128
  type: :development
156
129
  prerelease: false
130
+ version_requirements: *id008
131
+ - !ruby/object:Gem::Dependency
157
132
  name: nokogiri
158
- version_requirements: &id010 !ruby/object:Gem::Requirement
133
+ requirement: &id009 !ruby/object:Gem::Requirement
159
134
  none: false
160
135
  requirements:
161
136
  - - "="
162
137
  - !ruby/object:Gem::Version
163
- hash: 62196439
164
138
  segments:
165
139
  - 1
166
140
  - 5
@@ -168,141 +142,147 @@ dependencies:
168
142
  - beta
169
143
  - 2
170
144
  version: 1.5.0.beta.2
171
- requirement: *id010
172
- - !ruby/object:Gem::Dependency
173
145
  type: :development
174
146
  prerelease: false
147
+ version_requirements: *id009
148
+ - !ruby/object:Gem::Dependency
175
149
  name: rack
176
- version_requirements: &id011 !ruby/object:Gem::Requirement
150
+ requirement: &id010 !ruby/object:Gem::Requirement
177
151
  none: false
178
152
  requirements:
179
153
  - - ~>
180
154
  - !ruby/object:Gem::Version
181
- hash: 13
182
155
  segments:
183
156
  - 1
184
157
  - 1
185
158
  version: "1.1"
186
- requirement: *id011
187
- - !ruby/object:Gem::Dependency
188
159
  type: :development
189
160
  prerelease: false
161
+ version_requirements: *id010
162
+ - !ruby/object:Gem::Dependency
190
163
  name: rack-cache
191
- version_requirements: &id012 !ruby/object:Gem::Requirement
164
+ requirement: &id011 !ruby/object:Gem::Requirement
192
165
  none: false
193
166
  requirements:
194
167
  - - ">="
195
168
  - !ruby/object:Gem::Version
196
- hash: 3
197
169
  segments:
198
170
  - 0
199
171
  version: "0"
200
- requirement: *id012
201
- - !ruby/object:Gem::Dependency
202
172
  type: :development
203
173
  prerelease: false
174
+ version_requirements: *id011
175
+ - !ruby/object:Gem::Dependency
204
176
  name: rails
205
- version_requirements: &id013 !ruby/object:Gem::Requirement
177
+ requirement: &id012 !ruby/object:Gem::Requirement
206
178
  none: false
207
179
  requirements:
208
180
  - - "="
209
181
  - !ruby/object:Gem::Version
210
- hash: 1
211
182
  segments:
212
183
  - 3
213
184
  - 0
214
185
  - 3
215
186
  version: 3.0.3
216
- requirement: *id013
217
- - !ruby/object:Gem::Dependency
218
187
  type: :development
219
188
  prerelease: false
189
+ version_requirements: *id012
190
+ - !ruby/object:Gem::Dependency
220
191
  name: rake
221
- version_requirements: &id014 !ruby/object:Gem::Requirement
192
+ requirement: &id013 !ruby/object:Gem::Requirement
222
193
  none: false
223
194
  requirements:
224
195
  - - ">="
225
196
  - !ruby/object:Gem::Version
226
- hash: 3
227
197
  segments:
228
198
  - 0
229
199
  version: "0"
230
- requirement: *id014
231
- - !ruby/object:Gem::Dependency
232
200
  type: :development
233
201
  prerelease: false
234
- name: rmagick
235
- version_requirements: &id015 !ruby/object:Gem::Requirement
236
- none: false
237
- requirements:
238
- - - "="
239
- - !ruby/object:Gem::Version
240
- hash: 59
241
- segments:
242
- - 2
243
- - 12
244
- - 2
245
- version: 2.12.2
246
- requirement: *id015
202
+ version_requirements: *id013
247
203
  - !ruby/object:Gem::Dependency
248
- type: :development
249
- prerelease: false
250
204
  name: rspec
251
- version_requirements: &id016 !ruby/object:Gem::Requirement
205
+ requirement: &id014 !ruby/object:Gem::Requirement
252
206
  none: false
253
207
  requirements:
254
208
  - - ~>
255
209
  - !ruby/object:Gem::Version
256
- hash: 9
257
210
  segments:
258
211
  - 1
259
212
  - 3
260
213
  version: "1.3"
261
- requirement: *id016
262
- - !ruby/object:Gem::Dependency
263
214
  type: :development
264
215
  prerelease: false
265
- name: sqlite3-ruby
266
- version_requirements: &id017 !ruby/object:Gem::Requirement
216
+ version_requirements: *id014
217
+ - !ruby/object:Gem::Dependency
218
+ name: yard
219
+ requirement: &id015 !ruby/object:Gem::Requirement
267
220
  none: false
268
221
  requirements:
269
- - - "="
222
+ - - ">="
270
223
  - !ruby/object:Gem::Version
271
- hash: 27
272
224
  segments:
273
- - 1
274
- - 3
275
225
  - 0
276
- version: 1.3.0
277
- requirement: *id017
278
- - !ruby/object:Gem::Dependency
226
+ version: "0"
279
227
  type: :development
280
228
  prerelease: false
281
- name: yard
282
- version_requirements: &id018 !ruby/object:Gem::Requirement
229
+ version_requirements: *id015
230
+ - !ruby/object:Gem::Dependency
231
+ name: bson_ext
232
+ requirement: &id016 !ruby/object:Gem::Requirement
283
233
  none: false
284
234
  requirements:
285
235
  - - ">="
286
236
  - !ruby/object:Gem::Version
287
- hash: 3
288
237
  segments:
289
238
  - 0
290
239
  version: "0"
291
- requirement: *id018
240
+ type: :development
241
+ prerelease: false
242
+ version_requirements: *id016
292
243
  - !ruby/object:Gem::Dependency
293
- type: :runtime
244
+ name: rmagick
245
+ requirement: &id017 !ruby/object:Gem::Requirement
246
+ none: false
247
+ requirements:
248
+ - - "="
249
+ - !ruby/object:Gem::Version
250
+ segments:
251
+ - 2
252
+ - 12
253
+ - 2
254
+ version: 2.12.2
255
+ type: :development
294
256
  prerelease: false
257
+ version_requirements: *id017
258
+ - !ruby/object:Gem::Dependency
259
+ name: sqlite3-ruby
260
+ requirement: &id018 !ruby/object:Gem::Requirement
261
+ none: false
262
+ requirements:
263
+ - - "="
264
+ - !ruby/object:Gem::Version
265
+ segments:
266
+ - 1
267
+ - 3
268
+ - 0
269
+ version: 1.3.0
270
+ type: :development
271
+ prerelease: false
272
+ version_requirements: *id018
273
+ - !ruby/object:Gem::Dependency
295
274
  name: rack
296
- version_requirements: &id019 !ruby/object:Gem::Requirement
275
+ requirement: &id019 !ruby/object:Gem::Requirement
297
276
  none: false
298
277
  requirements:
299
278
  - - ">="
300
279
  - !ruby/object:Gem::Version
301
- hash: 3
302
280
  segments:
303
281
  - 0
304
282
  version: "0"
305
- requirement: *id019
283
+ type: :runtime
284
+ prerelease: false
285
+ version_requirements: *id019
306
286
  description:
307
287
  email: mark@new-bamboo.co.uk
308
288
  executables: []
@@ -378,6 +358,8 @@ files:
378
358
  - lib/dragonfly/config/r_magick.rb
379
359
  - lib/dragonfly/config/rails.rb
380
360
  - lib/dragonfly/configurable.rb
361
+ - lib/dragonfly/core_ext/array.rb
362
+ - lib/dragonfly/core_ext/hash.rb
381
363
  - lib/dragonfly/core_ext/object.rb
382
364
  - lib/dragonfly/core_ext/string.rb
383
365
  - lib/dragonfly/core_ext/symbol.rb
@@ -429,13 +411,14 @@ files:
429
411
  - spec/dragonfly/app_spec.rb
430
412
  - spec/dragonfly/config/r_magick_spec.rb
431
413
  - spec/dragonfly/configurable_spec.rb
414
+ - spec/dragonfly/core_ext/array_spec.rb
415
+ - spec/dragonfly/core_ext/hash_spec.rb
432
416
  - spec/dragonfly/core_ext/string_spec.rb
433
417
  - spec/dragonfly/core_ext/symbol_spec.rb
434
418
  - spec/dragonfly/data_storage/data_store_spec.rb
435
419
  - spec/dragonfly/data_storage/file_data_store_spec.rb
436
420
  - spec/dragonfly/data_storage/mongo_data_store_spec.rb
437
421
  - spec/dragonfly/data_storage/s3_data_store_spec.rb
438
- - spec/dragonfly/deprecation_spec.rb
439
422
  - spec/dragonfly/encoding/image_magick_encoder_spec.rb
440
423
  - spec/dragonfly/encoding/r_magick_encoder_spec.rb
441
424
  - spec/dragonfly/function_manager_spec.rb
@@ -481,7 +464,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
481
464
  requirements:
482
465
  - - ">="
483
466
  - !ruby/object:Gem::Version
484
- hash: 3
485
467
  segments:
486
468
  - 0
487
469
  version: "0"
@@ -490,7 +472,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
490
472
  requirements:
491
473
  - - ">="
492
474
  - !ruby/object:Gem::Version
493
- hash: 3
494
475
  segments:
495
476
  - 0
496
477
  version: "0"
@@ -515,13 +496,14 @@ test_files:
515
496
  - spec/dragonfly/app_spec.rb
516
497
  - spec/dragonfly/config/r_magick_spec.rb
517
498
  - spec/dragonfly/configurable_spec.rb
499
+ - spec/dragonfly/core_ext/array_spec.rb
500
+ - spec/dragonfly/core_ext/hash_spec.rb
518
501
  - spec/dragonfly/core_ext/string_spec.rb
519
502
  - spec/dragonfly/core_ext/symbol_spec.rb
520
503
  - spec/dragonfly/data_storage/data_store_spec.rb
521
504
  - spec/dragonfly/data_storage/file_data_store_spec.rb
522
505
  - spec/dragonfly/data_storage/mongo_data_store_spec.rb
523
506
  - spec/dragonfly/data_storage/s3_data_store_spec.rb
524
- - spec/dragonfly/deprecation_spec.rb
525
507
  - spec/dragonfly/encoding/image_magick_encoder_spec.rb
526
508
  - spec/dragonfly/encoding/r_magick_encoder_spec.rb
527
509
  - spec/dragonfly/function_manager_spec.rb