perfectqueue 0.8.2 → 0.8.3

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/ChangeLog CHANGED
@@ -1,4 +1,10 @@
1
1
 
2
+ == 2012-07-03 version 0.8.3
3
+
4
+ * Fixed rdb_compat to raise PreemptedError
5
+ * Added PerfectQueue::Application::RouterDSL module for PerfectSched
6
+
7
+
2
8
  == 2012-06-29 version 0.8.2
3
9
 
4
10
  * 'process' type multiprocessor supports max_request_per_child option
@@ -21,6 +21,7 @@ module PerfectQueue
21
21
  {
22
22
  :Dispatch => 'application/dispatch',
23
23
  :Router => 'application/router',
24
+ :RouterDSL => 'application/router',
24
25
  :Base => 'application/base',
25
26
  }.each_pair {|k,v|
26
27
  autoload k, File.expand_path(v, File.dirname(__FILE__))
@@ -42,32 +42,9 @@ module PerfectQueue
42
42
  end
43
43
 
44
44
  # DSL interface
45
- class << self
46
- def route(options)
47
- patterns = options.keys.select {|k| !k.is_a?(Symbol) }
48
- klasses = patterns.map {|k| options.delete(k) }
49
- patterns.zip(klasses).each {|pattern,sym|
50
- add_route(pattern, sym, options)
51
- }
52
- nil
53
- end
54
-
55
- def add_route(pattern, klass, options)
56
- router.add(pattern, klass, options)
57
- end
58
-
59
- def router=(router)
60
- (class<<self;self;end).instance_eval do
61
- self.__send__(:define_method, :router) { router }
62
- end
63
- router
64
- end
65
-
66
- def router
67
- self.router = Router.new
68
- end
69
- end
45
+ extend RouterDSL
70
46
  end
47
+
71
48
  end
72
49
  end
73
50
 
@@ -19,6 +19,32 @@
19
19
  module PerfectQueue
20
20
  module Application
21
21
 
22
+ module RouterDSL
23
+ def route(options)
24
+ patterns = options.keys.select {|k| !k.is_a?(Symbol) }
25
+ klasses = patterns.map {|k| options.delete(k) }
26
+ patterns.zip(klasses).each {|pattern,sym|
27
+ add_route(pattern, sym, options)
28
+ }
29
+ nil
30
+ end
31
+
32
+ def add_route(pattern, klass, options)
33
+ router.add(pattern, klass, options)
34
+ end
35
+
36
+ def router=(router)
37
+ (class<<self;self;end).instance_eval do
38
+ self.__send__(:define_method, :router) { router }
39
+ end
40
+ router
41
+ end
42
+
43
+ def router
44
+ self.router = Router.new
45
+ end
46
+ end
47
+
22
48
  class Router
23
49
  def initialize
24
50
  @patterns = []
@@ -215,14 +215,14 @@ SQL
215
215
  if n <= 0
216
216
  row = @db.fetch("SELECT id, timeout, created_at FROM `#{@table}` WHERE id=? LIMIT 1", key).first
217
217
  if row == nil
218
- raise AlreadyFinishedError, "task key=#{key} does not exist or already finished."
218
+ raise PreemptedError, "task key=#{key} does not exist or preempted."
219
219
  elsif row[:created_at] == -1
220
220
  raise CancelRequestedError, "task key=#{key} is cancel requested."
221
221
  elsif row[:timeout] == next_timeout
222
222
  # ok
223
223
  else
224
224
  # row[:created_at] == null
225
- raise AlreadyFinishedError, "task key=#{key} already finished."
225
+ raise PreemptedError, "task key=#{key} preempted."
226
226
  end
227
227
  end
228
228
  }
@@ -1,3 +1,3 @@
1
1
  module PerfectQueue
2
- VERSION = "0.8.2"
2
+ VERSION = "0.8.3"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: perfectqueue
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.2
4
+ version: 0.8.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-06-29 00:00:00.000000000Z
12
+ date: 2012-07-04 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sequel
16
- requirement: &70175585314980 !ruby/object:Gem::Requirement
16
+ requirement: &70205439745660 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.26.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70175585314980
24
+ version_requirements: *70205439745660
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rake
27
- requirement: &70175571565720 !ruby/object:Gem::Requirement
27
+ requirement: &70205439745160 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 0.9.2
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70175571565720
35
+ version_requirements: *70205439745160
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rspec
38
- requirement: &70175571565260 !ruby/object:Gem::Requirement
38
+ requirement: &70205439744700 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 2.10.0
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70175571565260
46
+ version_requirements: *70205439744700
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: simplecov
49
- requirement: &70175571564800 !ruby/object:Gem::Requirement
49
+ requirement: &70205439744240 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 0.5.4
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70175571564800
57
+ version_requirements: *70205439744240
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: sqlite3
60
- requirement: &70175571564340 !ruby/object:Gem::Requirement
60
+ requirement: &70205439743780 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,7 +65,7 @@ dependencies:
65
65
  version: 1.3.3
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70175571564340
68
+ version_requirements: *70205439743780
69
69
  description: Highly available distributed cron built on RDBMS
70
70
  email: frsyuki@gmail.com
71
71
  executables: