resque-batched-job 1.4.0 → 1.5.0

data/lib/resque/plugins/batched_job/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module BatchedJob
-      VERSION = '1.4.0'
+      VERSION = '1.5.0'
     end
   end
 end

data/lib/resque/plugins/batched_job.rb

@@ -53,6 +53,13 @@ module Resque
         end
       end
 
+      # After a job is removed, also remove it from the batch.
+      #
+      # @param id (see Resque::Plugins::BatchedJob#after_enqueue_batch)
+      def after_dequeue_batch(id, *args)
+        remove_batched_job(id, *args)
+      end
+
       # Checks the size of the batched job list and returns true if the list is
       # empty or if the key does not exist.
       #

data/test/test_batched_job.rb

@@ -44,7 +44,7 @@ class BatchedJobTest < Test::Unit::TestCase
   end
 
   # Make sure the after_batch hook is fired
-  def test_batch_hook
+  def test_batch_hooks
     assert_equal(false, Job.batch_exist?(@batch_id))
 
     assert_nothing_raised do
@@ -158,6 +158,24 @@ class BatchedJobTest < Test::Unit::TestCase
     assert(Job.batch_exist?(@batch_id))
   end
 
+  def test_dequeue
+    assert_nothing_raised do
+      2.times do
+        Resque.enqueue(JobWithoutArgs, @batch_id)
+        Resque.enqueue(Job, @batch_id, "foo")
+      end
+    end
+
+    Resque.dequeue(JobWithoutArgs, @batch_id)
+    assert_equal(3, redis.llen(@batch))
+    Resque.dequeue(Job, @batch_id, "foo")
+    assert_equal(2, redis.llen(@batch))
+    Resque.dequeue(JobWithoutArgs, @batch_id)
+    Resque.dequeue(Job, @batch_id, "foo")
+    assert(Job.batch_complete?(@batch_id))
+    assert_equal(false, Job.batch_exist?(@batch_id))
+  end
+
   private
 
     def redis

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'thread'
-
+require 'turn/autorun'
 require 'resque'
 
 $:.unshift(File.expand_path(File.dirname(__FILE__)) + '/../lib')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-batched-job
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70106096870560 !ruby/object:Gem::Requirement
+  requirement: &70272544091880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: 1.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70106096870560
+  version_requirements: *70272544091880
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: &70272544091120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70272544091120
 description: ! "  Resque plugin for batching jobs. When a batch/group of jobs are
   complete, \nadditional work can be performed usings batch hooks.\n"
 email: dan@dj-agiledev.com