delayed_job 3.0.0.pre → 3.0.0.pre2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/README.textile +1 -1
- data/lib/delayed/command.rb +0 -1
- data/lib/delayed/plugin.rb +2 -0
- data/lib/delayed/psych_ext.rb +7 -5
- data/lib/delayed/serialization/active_record.rb +15 -13
- data/lib/delayed/worker.rb +2 -2
- data/spec/fixtures/bad_alias.yml +1 -0
- data/spec/spec_helper.rb +0 -2
- data/spec/yaml_ext_spec.rb +10 -0
- metadata +25 -20
data/README.textile
CHANGED
@@ -228,7 +228,7 @@ You can invoke @rake jobs:clear@ to delete all jobs in the queue.
|
|
228
228
|
|
229
229
|
h2. Mailing List
|
230
230
|
|
231
|
-
Join us on the mailing list
|
231
|
+
Join us on the "mailing list":http://groups.google.com/group/delayed_job
|
232
232
|
|
233
233
|
h2. How to contribute
|
234
234
|
|
data/lib/delayed/command.rb
CHANGED
data/lib/delayed/plugin.rb
CHANGED
data/lib/delayed/psych_ext.rb
CHANGED
@@ -1,8 +1,10 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
coder
|
5
|
-
|
1
|
+
if defined?(ActiveRecord)
|
2
|
+
class ActiveRecord::Base
|
3
|
+
# serialize to YAML
|
4
|
+
def encode_with(coder)
|
5
|
+
coder["attributes"] = @attributes
|
6
|
+
coder.tag = ['!ruby/ActiveRecord', self.class.name].join(':')
|
7
|
+
end
|
6
8
|
end
|
7
9
|
end
|
8
10
|
|
@@ -1,17 +1,19 @@
|
|
1
|
-
|
2
|
-
|
1
|
+
if defined?(ActiveRecord)
|
2
|
+
class ActiveRecord::Base
|
3
|
+
yaml_as "tag:ruby.yaml.org,2002:ActiveRecord"
|
3
4
|
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
5
|
+
def self.yaml_new(klass, tag, val)
|
6
|
+
if ActiveRecord::VERSION::MAJOR == 3
|
7
|
+
klass.unscoped.find(val['attributes'][klass.primary_key])
|
8
|
+
else # Rails 2
|
9
|
+
klass.with_exclusive_scope { klass.find(val['attributes'][klass.primary_key]) }
|
10
|
+
end
|
11
|
+
rescue ActiveRecord::RecordNotFound
|
12
|
+
raise Delayed::DeserializationError
|
9
13
|
end
|
10
|
-
rescue ActiveRecord::RecordNotFound
|
11
|
-
raise Delayed::DeserializationError
|
12
|
-
end
|
13
14
|
|
14
|
-
|
15
|
-
|
15
|
+
def to_yaml_properties
|
16
|
+
['@attributes']
|
17
|
+
end
|
16
18
|
end
|
17
|
-
end
|
19
|
+
end
|
data/lib/delayed/worker.rb
CHANGED
@@ -165,7 +165,7 @@ module Delayed
|
|
165
165
|
say "#{job.name} completed after %.4f" % runtime
|
166
166
|
return true # did work
|
167
167
|
rescue DeserializationError => error
|
168
|
-
job.last_error = "{#{error.message}\n#{error.backtrace.join(
|
168
|
+
job.last_error = "{#{error.message}\n#{error.backtrace.join("\n")}"
|
169
169
|
failed(job)
|
170
170
|
rescue Exception => error
|
171
171
|
self.class.lifecycle.run_callbacks(:error, self, job){ handle_failed_job(job, error) }
|
@@ -206,7 +206,7 @@ module Delayed
|
|
206
206
|
protected
|
207
207
|
|
208
208
|
def handle_failed_job(job, error)
|
209
|
-
job.last_error = "{#{error.message}\n#{error.backtrace.join(
|
209
|
+
job.last_error = "{#{error.message}\n#{error.backtrace.join("\n")}"
|
210
210
|
say "#{job.name} failed with #{error.class.name}: #{error.message} - #{job.attempts} failed attempts", Logger::ERROR
|
211
211
|
reschedule(job)
|
212
212
|
end
|
@@ -0,0 +1 @@
|
|
1
|
+
foo: *bar
|
data/spec/spec_helper.rb
CHANGED
data/spec/yaml_ext_spec.rb
CHANGED
@@ -28,4 +28,14 @@ describe "YAML" do
|
|
28
28
|
YAML.load(yaml).class.should == Autoloaded::InstanceClazz
|
29
29
|
}.should_not raise_error
|
30
30
|
end
|
31
|
+
|
32
|
+
it "should not throw an uninitialized constant Syck::Syck when using YAML.load_file with poorly formed yaml" do
|
33
|
+
lambda {
|
34
|
+
YAML.load_file(File.expand_path('spec/fixtures/bad_alias.yml'))
|
35
|
+
}.should_not raise_error
|
36
|
+
end
|
37
|
+
|
38
|
+
it "should not throw an uninitialized constant Syck::Syck when using YAML.load with poorly formed yaml" do
|
39
|
+
lambda { YAML.load(YAML.dump("foo: *bar"))}.should_not raise_error
|
40
|
+
end
|
31
41
|
end
|
metadata
CHANGED
@@ -1,32 +1,35 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: delayed_job
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0.0.
|
4
|
+
version: 3.0.0.pre2
|
5
5
|
prerelease: 6
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
|
+
- Matt Griffin
|
9
|
+
- Brian Ryckbost
|
10
|
+
- Steve Richert
|
8
11
|
- Chris Gaffney
|
9
12
|
- Brandon Keepers
|
10
13
|
- Tobias Lütke
|
11
14
|
autorequire:
|
12
15
|
bindir: bin
|
13
16
|
cert_chain: []
|
14
|
-
date: 2011-
|
17
|
+
date: 2011-10-20 00:00:00.000000000Z
|
15
18
|
dependencies:
|
16
19
|
- !ruby/object:Gem::Dependency
|
17
20
|
name: daemons
|
18
|
-
requirement: &
|
21
|
+
requirement: &70297904377440 !ruby/object:Gem::Requirement
|
19
22
|
none: false
|
20
23
|
requirements:
|
21
|
-
- -
|
24
|
+
- - =
|
22
25
|
- !ruby/object:Gem::Version
|
23
|
-
version:
|
26
|
+
version: 1.0.10
|
24
27
|
type: :runtime
|
25
28
|
prerelease: false
|
26
|
-
version_requirements: *
|
29
|
+
version_requirements: *70297904377440
|
27
30
|
- !ruby/object:Gem::Dependency
|
28
31
|
name: activesupport
|
29
|
-
requirement: &
|
32
|
+
requirement: &70297904376800 !ruby/object:Gem::Requirement
|
30
33
|
none: false
|
31
34
|
requirements:
|
32
35
|
- - ~>
|
@@ -34,10 +37,10 @@ dependencies:
|
|
34
37
|
version: '3.0'
|
35
38
|
type: :runtime
|
36
39
|
prerelease: false
|
37
|
-
version_requirements: *
|
40
|
+
version_requirements: *70297904376800
|
38
41
|
- !ruby/object:Gem::Dependency
|
39
42
|
name: activerecord
|
40
|
-
requirement: &
|
43
|
+
requirement: &70297904376300 !ruby/object:Gem::Requirement
|
41
44
|
none: false
|
42
45
|
requirements:
|
43
46
|
- - ~>
|
@@ -45,10 +48,10 @@ dependencies:
|
|
45
48
|
version: '3.0'
|
46
49
|
type: :development
|
47
50
|
prerelease: false
|
48
|
-
version_requirements: *
|
51
|
+
version_requirements: *70297904376300
|
49
52
|
- !ruby/object:Gem::Dependency
|
50
53
|
name: sqlite3
|
51
|
-
requirement: &
|
54
|
+
requirement: &70297904375900 !ruby/object:Gem::Requirement
|
52
55
|
none: false
|
53
56
|
requirements:
|
54
57
|
- - ! '>='
|
@@ -56,10 +59,10 @@ dependencies:
|
|
56
59
|
version: '0'
|
57
60
|
type: :development
|
58
61
|
prerelease: false
|
59
|
-
version_requirements: *
|
62
|
+
version_requirements: *70297904375900
|
60
63
|
- !ruby/object:Gem::Dependency
|
61
64
|
name: rails
|
62
|
-
requirement: &
|
65
|
+
requirement: &70297904375200 !ruby/object:Gem::Requirement
|
63
66
|
none: false
|
64
67
|
requirements:
|
65
68
|
- - ~>
|
@@ -67,10 +70,10 @@ dependencies:
|
|
67
70
|
version: '3.0'
|
68
71
|
type: :development
|
69
72
|
prerelease: false
|
70
|
-
version_requirements: *
|
73
|
+
version_requirements: *70297904375200
|
71
74
|
- !ruby/object:Gem::Dependency
|
72
75
|
name: rspec
|
73
|
-
requirement: &
|
76
|
+
requirement: &70297904374660 !ruby/object:Gem::Requirement
|
74
77
|
none: false
|
75
78
|
requirements:
|
76
79
|
- - ~>
|
@@ -78,10 +81,10 @@ dependencies:
|
|
78
81
|
version: '2.0'
|
79
82
|
type: :development
|
80
83
|
prerelease: false
|
81
|
-
version_requirements: *
|
84
|
+
version_requirements: *70297904374660
|
82
85
|
- !ruby/object:Gem::Dependency
|
83
86
|
name: rake
|
84
|
-
requirement: &
|
87
|
+
requirement: &70297904374280 !ruby/object:Gem::Requirement
|
85
88
|
none: false
|
86
89
|
requirements:
|
87
90
|
- - ! '>='
|
@@ -89,7 +92,7 @@ dependencies:
|
|
89
92
|
version: '0'
|
90
93
|
type: :development
|
91
94
|
prerelease: false
|
92
|
-
version_requirements: *
|
95
|
+
version_requirements: *70297904374280
|
93
96
|
description: ! 'Delayed_job (or DJ) encapsulates the common pattern of asynchronously
|
94
97
|
executing longer tasks in the background. It is a direct extraction from Shopify
|
95
98
|
where the job table is responsible for a multitude of core tasks.
|
@@ -134,6 +137,7 @@ files:
|
|
134
137
|
- spec/autoloaded/struct.rb
|
135
138
|
- spec/delayed/backend/test.rb
|
136
139
|
- spec/delayed/serialization/test.rb
|
140
|
+
- spec/fixtures/bad_alias.yml
|
137
141
|
- spec/lifecycle_spec.rb
|
138
142
|
- spec/message_sending_spec.rb
|
139
143
|
- spec/performable_mailer_spec.rb
|
@@ -163,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
163
167
|
version: '0'
|
164
168
|
segments:
|
165
169
|
- 0
|
166
|
-
hash:
|
170
|
+
hash: 544689823949566531
|
167
171
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
168
172
|
none: false
|
169
173
|
requirements:
|
@@ -172,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
172
176
|
version: 1.3.1
|
173
177
|
requirements: []
|
174
178
|
rubyforge_project:
|
175
|
-
rubygems_version: 1.8.
|
179
|
+
rubygems_version: 1.8.11
|
176
180
|
signing_key:
|
177
181
|
specification_version: 3
|
178
182
|
summary: Database-backed asynchronous priority queue system -- Extracted from Shopify
|
@@ -183,6 +187,7 @@ test_files:
|
|
183
187
|
- spec/autoloaded/struct.rb
|
184
188
|
- spec/delayed/backend/test.rb
|
185
189
|
- spec/delayed/serialization/test.rb
|
190
|
+
- spec/fixtures/bad_alias.yml
|
186
191
|
- spec/lifecycle_spec.rb
|
187
192
|
- spec/message_sending_spec.rb
|
188
193
|
- spec/performable_mailer_spec.rb
|