perfectqueue 0.8.2 → 0.8.3

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2012-07-03 version 0.8.3
+
+* Fixed rdb_compat to raise PreemptedError
+* Added PerfectQueue::Application::RouterDSL module for PerfectSched
+
+
 == 2012-06-29 version 0.8.2
 
 * 'process' type multiprocessor supports max_request_per_child option

data/lib/perfectqueue/application.rb

@@ -21,6 +21,7 @@ module PerfectQueue
     {
       :Dispatch => 'application/dispatch',
       :Router => 'application/router',
+      :RouterDSL => 'application/router',
       :Base => 'application/base',
     }.each_pair {|k,v|
       autoload k, File.expand_path(v, File.dirname(__FILE__))

data/lib/perfectqueue/application/dispatch.rb

@@ -42,32 +42,9 @@ module PerfectQueue
       end
 
       # DSL interface
-      class << self
-        def route(options)
-          patterns = options.keys.select {|k| !k.is_a?(Symbol) }
-          klasses = patterns.map {|k| options.delete(k) }
-          patterns.zip(klasses).each {|pattern,sym|
-            add_route(pattern, sym, options)
-          }
-          nil
-        end
-
-        def add_route(pattern, klass, options)
-          router.add(pattern, klass, options)
-        end
-
-        def router=(router)
-          (class<<self;self;end).instance_eval do
-            self.__send__(:define_method, :router) { router }
-          end
-          router
-        end
-
-        def router
-          self.router = Router.new
-        end
-      end
+      extend RouterDSL
     end
+
   end
 end
 

data/lib/perfectqueue/application/router.rb

@@ -19,6 +19,32 @@
 module PerfectQueue
   module Application
 
+    module RouterDSL
+      def route(options)
+        patterns = options.keys.select {|k| !k.is_a?(Symbol) }
+        klasses = patterns.map {|k| options.delete(k) }
+        patterns.zip(klasses).each {|pattern,sym|
+          add_route(pattern, sym, options)
+        }
+        nil
+      end
+
+      def add_route(pattern, klass, options)
+        router.add(pattern, klass, options)
+      end
+
+      def router=(router)
+        (class<<self;self;end).instance_eval do
+          self.__send__(:define_method, :router) { router }
+        end
+        router
+      end
+
+      def router
+        self.router = Router.new
+      end
+    end
+
     class Router
       def initialize
         @patterns = []

data/lib/perfectqueue/backend/rdb_compat.rb

@@ -215,14 +215,14 @@ SQL
           if n <= 0
             row = @db.fetch("SELECT id, timeout, created_at FROM `#{@table}` WHERE id=? LIMIT 1", key).first
             if row == nil
-              raise AlreadyFinishedError, "task key=#{key} does not exist or already finished."
+              raise PreemptedError, "task key=#{key} does not exist or preempted."
             elsif row[:created_at] == -1
               raise CancelRequestedError, "task key=#{key} is cancel requested."
             elsif row[:timeout] == next_timeout
               # ok
             else
               # row[:created_at] == null
-              raise AlreadyFinishedError, "task key=#{key} already finished."
+              raise PreemptedError, "task key=#{key} preempted."
             end
           end
         }

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000Z
+date: 2012-07-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70175585314980 !ruby/object:Gem::Requirement
+  requirement: &70205439745660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.26.0
   type: :runtime
   prerelease: false
-  version_requirements: *70175585314980
+  version_requirements: *70205439745660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70175571565720 !ruby/object:Gem::Requirement
+  requirement: &70205439745160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70175571565720
+  version_requirements: *70205439745160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70175571565260 !ruby/object:Gem::Requirement
+  requirement: &70205439744700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70175571565260
+  version_requirements: *70205439744700
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70175571564800 !ruby/object:Gem::Requirement
+  requirement: &70205439744240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *70175571564800
+  version_requirements: *70205439744240
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70175571564340 !ruby/object:Gem::Requirement
+  requirement: &70205439743780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70175571564340
+  version_requirements: *70205439743780
 description: Highly available distributed cron built on RDBMS
 email: frsyuki@gmail.com
 executables: