resque-batched-job 0.1.5 → 0.2.0

data/README.markdown

@@ -1,28 +1,32 @@
-Resque Batched Job
-==================
+# Resque Batched Job
 
 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'.
+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'.
 
+## Installation
 
-Installation
-------------
-	gem install resque-batched-job
-	
-Example
--------
-	
-	module Job
-	  extend Resque::Plugins::BatchedJob
+    $ gem install resque-batched-job
 
-	  def self.perform(id, *args)
-	    prime(id, args)
-	  end
+## Example
 
-	  def self.after_batch_heavy_lifting(id, *args)
-	    heavy_lifting(id)
-	  end
+```ruby
+module Job
+  extend Resque::Plugins::BatchedJob
 
-	end
+  def self.perform(id, *args)
+    prime(id, args)
+  end
+
+  def self.after_batch_heavy_lifting(id, *args)
+    heavy_lifting(id)
+  end
+
+end
+```

data/lib/resque/plugins/batched_job.rb

@@ -1,33 +1,30 @@
 module Resque
-  
+
   module Plugin
-    
-    #
+
     # This hook is really the meaning of our adventure.
     def after_batch_hooks(job)
       job.methods.grep(/^after_batch/).sort
     end
-    
+
   end
-  
+
   module Plugins
-    
+
     module BatchedJob
-    
+
       include Resque::Helpers
 
-      #
       # Helper method used to generate the batch key.
       def batch(id)
         "batch:#{id}"
       end
 
-      #
       # 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(args.insert(0, self.name)))
+        redis.sadd(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?
@@ -39,19 +36,15 @@ module Resque
       end
 =end
 
-      # 
-      #   After every job, no matter in the event of success or failure, we need
+      # 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)
-        begin
-          yield
-        ensure
-          redis.srem(batch(id), "#{encode(args.insert(0, self.name))}")
-        end
+        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
+      # After each job is performed, check to see if the job is the last of
       # the given batch.  If so, run after_batch hooks.
       def after_perform_batch(id, *args)
         if batch_complete?(id)
@@ -61,18 +54,17 @@ module Resque
           end
         end
       end
-      
-      #
-      #   Checks to see if the batch key exists.  If the key does exist, is the 
+
+      # 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.
       def batch_complete?(id)
         redis.scard(batch(id)) == 0
       end
       alias :batch_exist? :batch_complete? # => are they?
-      
+
     end
-    
+
   end
-  
+
 end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-batched-job
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-22 00:00:00.000000000Z
+date: 2011-12-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70235562803180 !ruby/object:Gem::Requirement
+  requirement: &70189643729620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70235562803180
+  version_requirements: *70189643729620
 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
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Resque plugin