resque_unit 0.4.0 → 0.4.1

data/lib/resque_unit/plugin.rb

@@ -51,6 +51,11 @@ unless defined?(Resque::Plugin)
       def after_enqueue_hooks(job)
         job.methods.grep(/^after_enqueue/).sort
       end
+
+      # Given an object, returns a list `before_enqueue` hook names.
+      def before_enqueue_hooks(job)
+        job.methods.grep(/^before_enqueue/).sort
+      end
     end
   end
 
@@ -62,4 +67,4 @@ unless defined?(Resque::Job::DontPerform)
       DontPerform = Class.new(StandardError)
     end
   end
-end
+end

data/lib/resque_unit/resque.rb

@@ -71,28 +71,25 @@ module Resque
 
   # Executes all jobs in all queues in an undefined order.
   def run!
-    old_queue = @queue.dup
-    self.reset!
-
-
-    old_queue.each do |queue_name, queue|
-      queue.each do |job_payload|
-        job_payload = decode(job_payload)
-        @hooks_enabled ? perform_with_hooks(job_payload) : perform_without_hooks(job_payload)
-      end
+    payloads = []
+    @queue.each do |queue_name, queue|
+      payloads.concat queue.slice!(0, queue.size)
     end
+    exec_payloads payloads.shuffle
   end
 
-  # Executes all jobs in the given queue in an undefined order.
-  def run_for!(queue_name)
-    jobs_payloads = all(queue_name)
-
-    self.reset!(queue_name)
+  def run_for!(queue_name, limit=false)
+    queue = @queue[queue_name]
+    exec_payloads queue.slice!(0, ( limit ? limit : queue.size) ).shuffle
+  end
 
-    jobs_payloads.each do |job_payload|
+  def exec_payloads(raw_payloads)
+    raw_payloads.each do |raw_payload|
+      job_payload = decode(raw_payload)
       @hooks_enabled ? perform_with_hooks(job_payload) : perform_without_hooks(job_payload)
     end
   end
+  private :exec_payloads
 
   # 1. Execute all jobs in all queues in an undefined order,
   # 2. Check if new jobs were announced, and execute them.
@@ -112,7 +109,11 @@ module Resque
 
   # :nodoc: 
   def enqueue(klass, *args)
-    queue_name = queue_for(klass)
+    enqueue_to( queue_for(klass), klass, *args)
+  end
+
+  # :nodoc:
+  def enqueue_to( queue_name, klass, *args )
     # Behaves like Resque, raise if no queue was specifed
     raise NoQueueError.new("Jobs must be placed onto a queue.") unless queue_name
     enqueue_unit(queue_name, {"class" => klass.name, "args" => args })
@@ -122,6 +123,7 @@ module Resque
   def queue_for(klass)
     klass.instance_variable_get(:@queue) || (klass.respond_to?(:queue) && klass.queue)
   end
+  alias :queue_from_class :queue_for
 
   # :nodoc:
   def empty_queues?
@@ -132,6 +134,12 @@ module Resque
 
   def enqueue_unit(queue_name, hash)
     klass = constantize(hash["class"])
+    if @hooks_enabled
+      before_hooks = Plugin.before_enqueue_hooks(klass).map do |hook|
+        klass.send(hook, *hash["args"])
+      end
+      return nil if before_hooks.any? { |result| result == false }
+    end
     queue(queue_name) << encode(hash)
     if @hooks_enabled
       Plugin.after_enqueue_hooks(klass).each do |hook|

data/test/resque_unit_test.rb

@@ -17,6 +17,40 @@ class ResqueUnitTest < Test::Unit::TestCase
     end
   end
 
+  context "A task that explicitly is queued to a different queue" do
+    setup { Resque.enqueue_to(:a_non_class_determined_queue, MediumPriorityJob) }
+    should "not queue to the class-determined queue" do
+      assert_equal 0, Resque.queue(MediumPriorityJob.queue).length
+    end
+    should "queue to the explicly-stated queue" do
+      assert_equal 1, Resque.queue(:a_non_class_determined_queue).length
+    end
+  end
+  
+  context "A task that spawns multiple jobs on a single queue" do
+    setup do 
+      3.times {Resque.enqueue(HighPriorityJob)}
+    end
+
+    should "allow partial runs with explicit limit" do
+      assert_equal 3, Resque.queue(:high).length, 'failed setup'
+      Resque.run_for!( :high, 1 )
+      assert_equal 2, Resque.queue(:high).length, 'failed to run just single job'
+    end
+
+    should "allow full run with too-large explicit limit" do
+      assert_equal 3, Resque.queue(:high).length, 'failed setup'
+      Resque.run_for!( :high, 50 )
+      assert_equal 0, Resque.queue(:high).length, 'failed to run all jobs'
+    end
+
+    should "allow full run with implicit limit" do
+      assert_equal 3, Resque.queue(:high).length, 'failed setup'
+      Resque.run_for!( :high )
+      assert_equal 0, Resque.queue(:high).length, 'failed to run all jobs'
+    end
+  end
+
   context "A task that schedules a resque job" do
     setup do 
       @returned = Resque.enqueue(LowPriorityJob)
@@ -82,6 +116,11 @@ class ResqueUnitTest < Test::Unit::TestCase
         assert(JobWithHooks.markers[:after_enqueue], 'no after_queue marker set')
       end
 
+      should "have run the before_enqueue hook" do 
+        assert(JobWithHooks.markers[:before_enqueue], 'no before_queue marker set')
+        assert_queued(JobWithHooks)
+      end
+
       should "run the before and after hooks during a run" do 
         Resque.run!
         assert(JobWithHooks.markers[:before], 'no before marker set')
@@ -125,6 +164,18 @@ class ResqueUnitTest < Test::Unit::TestCase
       end
     end
 
+    context "when before_enqueue returns false" do
+      setup do
+        JobWithHooksBeforeBlocks.clear_markers
+      end
+
+      should "not queue" do
+        Resque.enqueue JobWithHooksBeforeBlocks
+        assert_not_queued JobWithHooksBeforeBlocks
+      end
+
+    end
+
     context "but without around" do
       setup do
         JobWithHooksWithoutAround.clear_markers

data/test/sample_jobs.rb

@@ -53,6 +53,10 @@ module HooksMethods
   def after_enqueue_mark(*args)
     markers[:after_enqueue] = true
   end
+
+  def before_enqueue_mark(*args)
+    markers[:before_enqueue] = true
+  end
   
   def after_perform_mark(*args)
     markers[:after] = true
@@ -108,6 +112,13 @@ class JobWithHooks
   end
 end
 
+class JobWithHooksBeforeBlocks < JobWithHooks
+  @queue = :with_hooks
+  def self.before_enqueue_block_enqueueing
+    return false
+  end
+end
+
 class JobWithHooksWithoutBefore
   extend HooksMethods
 

metadata

@@ -1,60 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: resque_unit
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.1
   prerelease: 
-  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Justin Weiss
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-28 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70242270906860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70242270906860
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70242270906100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70242270906100
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70242270904960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *70242270904960
 description: 
 email: justin@uberweiss.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - lib/resque_unit/assertions.rb
 - lib/resque_unit/errors.rb
 - lib/resque_unit/helpers.rb
@@ -70,41 +66,37 @@ files:
 - test/sample_jobs.rb
 - test/test_helper.rb
 - README.md
-has_rdoc: true
 homepage: http://github.com/justinweiss/resque_unit
 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 
-      hash: -1898540308835741897
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2544515951238107368
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1898540308835741897
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2544515951238107368
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: Test::Unit support for resque job queueing
-test_files: 
+test_files:
 - test/resque_test.rb
 - test/resque_unit_scheduler_test.rb
 - test/resque_unit_test.rb