resque-batched-job 0.1.3 → 0.1.4

data/lib/resque/plugins/batched_job.rb

@@ -21,26 +21,6 @@ module Resque
       def batch(id)
         "batch:#{id}"
       end
-      
-      #
-      #   Use this method to configure batch locking.  By default, all jobs lock
-      # the batch they belong to.  Use 
-      # def lock_batch=(true_or_false)
-      #   @@_lock = true_or_false
-      # end
-      
-      #
-      #   Create the batch lock.  This ensures only one worker is processing a
-      # batch at any given time.
-      def lock(id)
-        "lock:batch:#{id}"
-      end
-            
-      #
-      #
-      def lock!(id)
-        redis.setnx(lock(id))
-      end
 
       #
       # Batch the job.  The first argument of a batched job, is the batch id.
@@ -61,16 +41,12 @@ module Resque
 
       # 
       #   After every job, no matter in the event of success or failure, we need
-      # to remove the job from the batch set.  If batch locking is enabled, remove
-      # the lock key after each job.  This will allow others jobs in a batch to
-      # be processed.
+      # to remove the job from the batch set.
       def around_perform_amend_batch(id, *args)
-        return unless redis.setnx(lock(id), true)
         begin
           yield
         ensure
           redis.srem(batch(id), "#{encode(args)}")
-          redis.del(lock(id))
         end
       end
 

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

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module BatchedJob
-      VERSION = '0.1.3'
+      VERSION = '0.1.4'
     end
   end
 end

data/test/test_batched_job.rb

@@ -1,8 +1,9 @@
-$:.unshift(File.dirname(__FILE__) + '../lib')
-
 require 'rubygems'
 require 'test/unit'
 require 'resque'
+
+$:.unshift(File.dirname(__FILE__) + '../lib')
+
 require 'resque/plugins/batched_job'
 
 class Job
@@ -12,12 +13,12 @@ class Job
   @queue = :test
   
   def self.perform(batch_id)
-    $stdout.puts "perform job"
+    $stdout.puts "perform batch[#{batch_id}]"
     sleep 1
   end
   
   def self.after_batch_hook(batch_id)
-    $stdout.puts "after batch hook"
+    $stdout.puts "after_bactch [#{batch_id}]"
     sleep 1
   end
   
@@ -36,7 +37,7 @@ class BatchedJobTest < Test::Unit::TestCase
   end
   
   def test_batched_job
-    5.times { Resque.enqueue(Job, 1) }
+    5.times { Resque.enqueue(Job, 1, "arg#{rand(100)}") }
     worker = Resque::Worker.new(:test)
     worker.work
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Daniel Johnston
@@ -32,8 +32,8 @@ dependencies:
         version: 1.10.0
   type: :runtime
   version_requirements: *id001
-description: "  Resque plugin that understands individual jobs can belong to something bigger \n\
-  than themselves.\n"
+description: "  Resque plugin for batching jobs. When a batch/group of jobs are complete, \n\
+  additional work can be performed usings batch hooks.\n"
 email: dan@dj-agiledev.com
 executables: []