resque-batched-job 1.2.0 → 1.3.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Daniel Johnston
+Copyright (c) Daniel Johnston
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -21,12 +21,12 @@ require 'resque/batched_job'
 module Job
   extend Resque::Plugins::BatchedJob
 
-  def self.perform(id, *args)
-    prime(id, args)
+  def self.perform(bid, *args)
+    prime(bid, args)
   end
 
-  def self.after_batch_heavy_lifting(id, *args)
-    heavy_lifting(id)
+  def self.after_batch_heavy_lifting(bid, *args)
+    heavy_lifting(bid)
   end
 
 end

data/Rakefile

@@ -47,6 +47,6 @@ task :changelog do
 
   tags.each_slice(2) do |tags|
     puts "========== #{tags[1]}..#{tags[0]} =========="
-    sh "git log --pretty=format:'%h : %s' --graph #{tags[1]}..#{tags[0]}"
+    `git log --pretty=format:'%h : %s' --graph #{tags[1]}..#{tags[0]}`
   end
 end

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

@@ -0,0 +1,6 @@
+namespace :resque do
+
+
+end
+
+

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

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module BatchedJob
-      VERSION = '1.2.0'
+      VERSION = '1.3.0'
     end
   end
 end

data/lib/resque/plugins/batched_job.rb

@@ -1,5 +1,12 @@
 module Resque
 
+  # This is a small wrapper around Resque.enqueue.
+  # @param [Class] klass Job class.
+  # @param [Object, #to_s] bid Batch identifier.
+  def self.enqueue_batched_job(klass, bid, *args)
+    Resque.enqueue(klass, bid, *args)
+  end
+
   module Plugin
 
     # This hook is really the meaning of our adventure.
@@ -103,6 +110,10 @@ module Resque
         #   and aquired the lock.  This means Job2 has to start from the beginnig.
         # * If the previous timestamp is still expired the lock has been set and
         #   processing can continue safely
+        #
+        # @param id (see Resque::Plugins::BatchedJob#batch)
+        # @yield [bid] Yields the current batch id.
+        # @yieldparam [String] The current batch id.
         def mutex(id, &block)
           is_expired = lambda do |locked_at|
             locked_at.to_f < Time.now.to_f
@@ -130,4 +141,4 @@ module Resque
 
   end
 
-end
+end

data/test/test_batched_job.rb

@@ -75,7 +75,7 @@ class BatchedJobTest < Test::Unit::TestCase
   # Test that jobs with identical args behave properly.
   def test_duplicate_args
     assert_equal(false, Job.batch_exist?(@batch_id))
-    
+
     assert_nothing_raised do
       5.times { Resque.enqueue(JobWithoutArgs, @batch_id) }
     end
@@ -127,7 +127,7 @@ class BatchedJobTest < Test::Unit::TestCase
 
     assert_equal(x * y, Integer(redis.get(@batch)))
   end
-  
+
   def test_remove_batched_job
     Resque.enqueue(JobWithoutArgs, @batch_id)
 
@@ -139,7 +139,7 @@ class BatchedJobTest < Test::Unit::TestCase
     assert_equal(false, $batch_complete)
 
     Resque.enqueue(JobWithoutArgs, @batch_id)
-    
+
     assert_nothing_raised do
       JobWithoutArgs.remove_batched_job!(@batch_id)
     end
@@ -148,6 +148,11 @@ class BatchedJobTest < Test::Unit::TestCase
     assert_equal(false, Job.batch_exist?(@batch_id))
   end
 
+  def test_enqueue_batched_job
+    Resque.enqueue_batched_job(JobWithoutArgs, @batch_id)
+    assert(Job.batch_exist?(@batch_id))
+  end
+
   private
 
     def redis

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-batched-job
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000 Z
+date: 2012-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70323806805200 !ruby/object:Gem::Requirement
+  requirement: &70171540725400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70323806805200
+  version_requirements: *70171540725400
 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
@@ -33,6 +33,7 @@ files:
 - Rakefile
 - README.md
 - lib/resque/batched_job.rb
+- lib/resque/plugins/batched_job/tasks.rb
 - lib/resque/plugins/batched_job/version.rb
 - lib/resque/plugins/batched_job.rb
 - lib/resque-batched-job.rb