resque-batched-job 0.1.4 → 0.1.5

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Daniel Johnston
+Copyright (c) 2011 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.markdown

@@ -15,15 +15,14 @@ Example
 -------
 	
 	module Job
-	
-		extend Resque::Plugins::BatchedJob
-	
-		def self.perform(id, *args)
-			prime(id, args)
-		end
-		
-		def self.after_batch_heavy_lifting(id, *args)
-			heavy_lifting(id)
-		end
+	  extend Resque::Plugins::BatchedJob
+
+	  def self.perform(id, *args)
+	    prime(id, args)
+	  end
+
+	  def self.after_batch_heavy_lifting(id, *args)
+	    heavy_lifting(id)
+	  end
 
 	end

data/Rakefile

@@ -2,19 +2,16 @@ require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 
-$:.unshift(File.dirname(__FILE__))
-
 task :default => :test
 
 Rake::TestTask.new do |task|
-  task.libs << 'lib'
   task.pattern = 'test/test_*.rb'
   task.verbose = true
 end
 
 desc "Publish gem and source."
 task :publish => :build do
-  require 'lib/resque/plugins/batched_job/version'
+  require File.dirname(__FILE__) + '/lib/resque/plugins/batched_job/version'
   sh "gem push resque-batched-job-#{Resque::Plugins::BatchedJob::VERSION}.gem"
   sh "git tag v#{Resque::Plugins::BatchedJob::VERSION}"
   sh "git push origin v#{Resque::Plugins::BatchedJob::VERSION}"

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

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

data/lib/resque/plugins/batched_job.rb

@@ -25,7 +25,7 @@ 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(args))
+        redis.sadd(batch(id), encode(args.insert(0, self.name)))
       end
       
 =begin
@@ -46,7 +46,7 @@ module Resque
         begin
           yield
         ensure
-          redis.srem(batch(id), "#{encode(args)}")
+          redis.srem(batch(id), "#{encode(args.insert(0, self.name))}")
         end
       end
 

data/test/test_batched_job.rb

@@ -1,45 +1,62 @@
 require 'rubygems'
 require 'test/unit'
 require 'resque'
-
-$:.unshift(File.dirname(__FILE__) + '../lib')
-
-require 'resque/plugins/batched_job'
+require 'resque-batched-job'
 
 class Job
-  
   extend Resque::Plugins::BatchedJob
-  
   @queue = :test
   
-  def self.perform(batch_id)
-    $stdout.puts "perform batch[#{batch_id}]"
-    sleep 1
+  def self.perform(batch_id, arg)
   end
   
-  def self.after_batch_hook(batch_id)
-    $stdout.puts "after_bactch [#{batch_id}]"
-    sleep 1
+  def self.after_batch_hook(batch_id, arg)
+    $batch_complete = true
   end
   
 end
 
 class BatchedJobTest < Test::Unit::TestCase
   
+  def setup
+    $batch_complete = false
+    @batch_id = :foo
+    @batch = "batch:#{@batch_id}"
+    @cnt = 5
+    @cnt.times { Resque.enqueue(Job, @batch_id, "arg#{rand(100)}") }
+  end
+  
+  def teardown
+    redis.del(@batch)
+    redis.del("queue:test")
+  end
+  
   def test_list
     assert_nothing_raised do
       Resque::Plugin.lint(Resque::Plugins::BatchedJob)
     end
   end
   
-  def test_version
-    assert_equal('1.10.0', Resque::Version)
+  def test_batch_key
+    assert_equal(@batch, Job.batch(@batch_id))
   end
   
-  def test_batched_job
-    5.times { Resque.enqueue(Job, 1, "arg#{rand(100)}") }
-    worker = Resque::Worker.new(:test)
-    worker.work
+  def test_batch_size
+    assert_equal(@cnt, redis.smembers(@batch).size)
   end
+  
+  def test_batch_hook
+    assert_nothing_raised do
+      @cnt.times { Resque.reserve(:test).perform }
+    end
+    assert($batch_complete)
+    assert_equal(false, redis.exists(@batch))
+  end
+
+  private
+
+    def redis
+      Resque.redis
+    end
     
 end

metadata

@@ -1,47 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: resque-batched-job
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+version: !ruby/object:Gem::Version
+  version: 0.1.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Daniel Johnston
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-11 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: resque
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70235562803180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 10
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.10.0
   type: :runtime
-  version_requirements: *id001
-description: "  Resque plugin for batching jobs. When a batch/group of jobs are complete, \n\
-  additional work can be performed usings batch hooks.\n"
+  prerelease: false
+  version_requirements: *70235562803180
+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
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - Rakefile
 - README.markdown
@@ -49,37 +36,29 @@ files:
 - lib/resque/plugins/batched_job.rb
 - lib/resque-batched-job.rb
 - test/test_batched_job.rb
-has_rdoc: true
-homepage: http://github.com/djohnston/resque-batched-job
+homepage: https://github.com/drfeelngood/resque-batched-job
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Resque plugin
-test_files: 
+test_files:
 - test/test_batched_job.rb