resque-batched-job 0.2.0 → 0.6.0

data/{README.markdown → README.md}

@@ -1,14 +1,13 @@
 # Resque Batched Job
 
-A [Resque](http://github.com/defunkt/resque) plugin. Requires Resque 1.10.0
+A [Resque](http://github.com/defunkt/resque) plugin. Requires Resque >= 1.10.0
 
 This plugin adds the ability to batch jobs and run additional hooks after the 
-last job in a batch is performed.  Using the 'after_enqueue' hook, the jobs 
-arguments are stored in a Redis set identified by the batch id provided.  
-By default, the batch keys look like 'batch:<id>'.  After each job is performed, 
-its arguments are removed from the set.  If the last job performed happens to be 
-the last in a set, additional hooks are executed.  These hooks are prefixed with 
-'after_batch'.
+last job in a batch is performed.  Using the '*after_enqueue*' hook, the job
+is encoded and stored in a Redis List identified by the batch id provided.  By default, 
+the batch keys look like '*batch:#{id}*'.  After each job is performed, it's removed
+from the batch list.  If the last job performed happens to be the last in the list, 
+additional hooks are executed.  These hooks are prefixed with '*after_batch*'.
 
 ## Installation
 

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

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module BatchedJob
-      VERSION = '0.2.0'
+      VERSION = '0.6.0'
     end
   end
 end

data/lib/resque/plugins/batched_job.rb

@@ -22,31 +22,14 @@ module Resque
 
       # Batch the job.  The first argument of a batched job, is the batch id.
       def after_enqueue_batch(id, *args)
-        redis.sadd(batch(id), encode(:class => self, :args => args))
+        redis.rpush(batch(id), encode(:class => self, :args => args))
       end
 
-=begin
-  TODO: Determine if it's necessary to double check the jobs existance 
-    before performing it.  If so, do what?
-    
-      def before_perform_audit_batch(id, *args)
-        unless redis.sismember(batch(id), "#{encode(args)}")
-          raise Resque::Job::DontPerform.new("#{args} are not a member of #{batch(id)}")
-        end
-      end
-=end
-
-      # After every job, no matter in the event of success or failure, we need
-      # to remove the job from the batch set.
-      def around_perform_amend_batch(id, *args)
-        yield
-      ensure
-        redis.srem(batch(id), "#{encode(:class => self, :args => args)}")
-      end
-
-      # After each job is performed, check to see if the job is the last of
-      # the given batch.  If so, run after_batch hooks.
+      # After the job is performed, remove it from the batched job list.  If the
+      # current job is the last in the batch to be performed, invoke the after_batch
+      # hooks.
       def after_perform_batch(id, *args)
+        redis.lrem(batch(id), 1, encode(:class => self, :args => args))
         if batch_complete?(id)
           after_batch_hooks = Resque::Plugin.after_batch_hooks(self)
           after_batch_hooks.each do |hook|
@@ -55,13 +38,15 @@ module Resque
         end
       end
 
-      # Checks to see if the batch key exists.  If the key does exist, is the 
-      # set empty?  The Redis srem command deletes the key when the last item 
-      # of a set is removed. Ah, go ahead and check the size.
+      # Checks the size of the batched job list and returns true if the list is
+      # empty or if the key does not exist.
       def batch_complete?(id)
-        redis.scard(batch(id)) == 0
+        redis.llen(batch(id)) == 0
+      end
+
+      def batch_exist?(id)
+        redis.exists(batch(id))
       end
-      alias :batch_exist? :batch_complete? # => are they?
 
     end
 

data/test/test_batched_job.rb

@@ -42,7 +42,8 @@ class BatchedJobTest < Test::Unit::TestCase
   end
   
   def test_batch_size
-    assert_equal(@cnt, redis.smembers(@batch).size)
+    # assert_equal(@cnt, redis.smembers(@batch).size)
+    assert_equal(@cnt, redis.llen(@batch))
   end
   
   def test_batch_hook

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-batched-job
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
+date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70189643729620 !ruby/object:Gem::Requirement
+  requirement: &70335551372100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70189643729620
+  version_requirements: *70335551372100
 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
@@ -31,7 +31,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - Rakefile
-- README.markdown
+- README.md
 - lib/resque/plugins/batched_job/version.rb
 - lib/resque/plugins/batched_job.rb
 - lib/resque-batched-job.rb