resque-approval 1.2.0 → 1.2.1

data/CHANGELOG.md

@@ -1,8 +1,21 @@
+## 1.2.1 (2012-06-19)
+
+* Bug fixes:
+  * Only schedule job if timeout > 0.
+
+
+## 1.2.0 (2012-06-14)
+
+* Enhancements:
+  * Add ability to approve/reject jobs queued by resque-scheduler.
+
+
 ## 1.0.1 (2012-06-06)
 
 * Bug fixes:
   * Make return values from .approve and .reject more explicit.
 
+
 ## 1.0.0 (2012-06-06)
 
 * Initial release

data/lib/resque-approval.rb

@@ -38,7 +38,7 @@ module Resque
         id = Resque.redis.hlen('pending_jobs')
         key = build_key(id, message, timeout)
 
-        if timeout && Resque.respond_to?(:enqueue_in)
+        if timeout.kind_of?(Numeric) && timeout > 0 && Resque.respond_to?(:enqueue_in)
           approval_args = args.merge(:approval_key => key)
           Resque.enqueue_in(timeout, self, approval_args)
 

data/lib/resque-approval/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module Approval
-      VERSION = '1.2.0'
+      VERSION = '1.2.1'
     end
   end
 end

data/spec/lib/resque-approval_spec.rb

@@ -106,6 +106,31 @@ describe "Resque::Plugins::Approval" do
         Resque.size(:approval_required).should == 0
       end
     end
+
+    context "with a disabled timeout" do
+      it "includes the timeout in the 'pending_jobs' hash entry" do
+        Job.enqueue_for_approval(:approval_timeout => 0)
+
+        key = '{"id":0,"approval_timeout":0}'
+        value = { :class => Job, :args => [{}] }
+        value = Resque.encode(value)
+
+        Resque.redis.hget('pending_jobs', key).should == value
+      end
+
+      it "does not schedule the job" do
+        Resque.count_all_scheduled_jobs.should == 0
+
+        Job.enqueue_for_approval(:approval_timeout => 0)
+
+        Resque.count_all_scheduled_jobs.should == 0
+      end
+
+      it "adds the job to the appoval queue" do
+        Job.enqueue_for_approval(:approval_timeout => 0)
+        Resque.size(:approval_required).should == 1
+      end
+    end
   end
 
   describe ".approve" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-approval
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &11915740 !ruby/object:Gem::Requirement
+  requirement: &12894400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11915740
+  version_requirements: *12894400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11910380 !ruby/object:Gem::Requirement
+  requirement: &12893520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11910380
+  version_requirements: *12893520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11908520 !ruby/object:Gem::Requirement
+  requirement: &12892100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11908520
+  version_requirements: *12892100
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &11907760 !ruby/object:Gem::Requirement
+  requirement: &12891220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11907760
+  version_requirements: *12891220
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &11907160 !ruby/object:Gem::Requirement
+  requirement: &12890660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11907160
+  version_requirements: *12890660
 - !ruby/object:Gem::Dependency
   name: resque-scheduler
-  requirement: &11906580 !ruby/object:Gem::Requirement
+  requirement: &12890100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11906580
+  version_requirements: *12890100
 description: ! "A Resque plugin allowing jobs to be sent to a temporary\n                         queue
   to await approval.  Once the job is approved, it\n                         is placed
   on its normal queue."