resque_spec 0.6.2 → 0.6.3

data/README.md

@@ -181,13 +181,8 @@ You can turn this behavior on by setting `ResqueSpec.inline = true`.
 Hooks
 -----
 
-Resque will call a hook method on your class after a Job is enqueued. Name your
-class method starting with the string `after_enqueue` (you can stop there if
-you want) and it will be called with the arguments to the Job after it has been
-placed on the queue. When you are using ResqueSpec, your `after_enqueue` hook
-will be called.
-
-The hooks around `perform` are not support by ResqueSpec (contributions welcome!)
+Resque will call a hook method on your class after a Job is enqueued; before, around, and after your Job is performed; and on failure.
+ResqueSpec will fire all of these hooks if you are using `with_resque` or set `ResqueSpec.inline = true`.
 
 Note on Patches/Pull Requests
 =============================

data/lib/resque_spec/matchers.rb

@@ -27,7 +27,7 @@ RSpec::Matchers.define :have_queued do |*expected_args|
   extend InQueueHelper
 
   match do |actual|
-    queue(actual).any? { |entry| entry[:klass].to_s == actual.to_s && entry[:args] == expected_args }
+    queue(actual).any? { |entry| entry[:class].to_s == actual.to_s && entry[:args] == expected_args }
   end
 
   failure_message_for_should do |actual|
@@ -65,7 +65,7 @@ end
 
 RSpec::Matchers.define :have_scheduled do |*expected_args|
   match do |actual|
-    ResqueSpec.schedule_for(actual).any? { |entry| entry[:klass].to_s == actual.to_s && entry[:args] == expected_args }
+    ResqueSpec.schedule_for(actual).any? { |entry| entry[:class].to_s == actual.to_s && entry[:args] == expected_args }
   end
 
   failure_message_for_should do |actual|
@@ -85,7 +85,7 @@ RSpec::Matchers.define :have_scheduled_at do |*expected_args|
   match do |actual|
     time = expected_args.first
     other_args = expected_args[1..-1]
-    ResqueSpec.schedule_for(actual).any? { |entry| entry[:klass].to_s == actual.to_s && entry[:time] == time && entry[:args] == other_args }
+    ResqueSpec.schedule_for(actual).any? { |entry| entry[:class].to_s == actual.to_s && entry[:time] == time && entry[:args] == other_args }
   end
 
   failure_message_for_should do |actual|

data/lib/resque_spec/scheduler.rb

@@ -1,20 +1,25 @@
 require 'resque_spec'
 
 module ResqueSpec
-  def schedule_for(klass)
-    name = "#{queue_name(klass)}_scheduled"
-    queues[name]
-  end
-
   module SchedulerExt
     def enqueue_at(time, klass, *args)
-      if ResqueSpec.inline
-        klass.send(:perform, *args)
-      else
-        ResqueSpec.schedule_for(klass) << {:klass => klass.to_s, :time  => time, :args => args}
-      end
+      ResqueSpec.enqueue_at(time, klass, *args)
     end
   end
+
+  def enqueue_at(time, klass, *args)
+    store(schedule_queue_name(klass), klass, { :class => klass.to_s, :time  => time, :args => args })
+  end
+
+  def schedule_for(klass)
+    queues[schedule_queue_name(klass)]
+  end
+
+  private
+
+  def schedule_queue_name(klass)
+    "#{queue_name(klass)}_scheduled"
+  end
 end
 
 Resque.extend(ResqueSpec::SchedulerExt)

data/lib/resque_spec/version.rb

@@ -1,3 +1,3 @@
 module ResqueSpec
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/lib/resque_spec.rb

@@ -9,16 +9,12 @@ module ResqueSpec
 
   def dequeue(queue_name, klass, *args)
     queue_by_name(queue_name).delete_if do |job|
-      job[:klass] == klass.to_s && args.empty? || job[:args] == args
+      job[:class] == klass.to_s && args.empty? || job[:args] == args
     end
   end
 
   def enqueue(queue_name, klass, *args)
-    if inline
-      klass.send(:perform, *args)
-    else
-      queue_by_name(queue_name) << { :klass => klass.to_s, :args => args }
-    end
+    store(queue_name, klass, { :class => klass.to_s, :args => args })
   end
 
   def queue_by_name(name)
@@ -56,6 +52,21 @@ module ResqueSpec
   def name_from_queue_accessor(klass)
     klass.respond_to?(:queue) and klass.queue
   end
+
+  def store(queue_name, klass, payload)
+    if inline
+      Resque::Job.new(queue_name, payload_with_string_keys(payload)).perform
+    else
+      queue_by_name(queue_name) << payload
+    end
+  end
+
+  def payload_with_string_keys(payload)
+    {
+      'class' => payload[:class],
+      'args' => payload[:args]
+    }
+  end
 end
 
 config = RSpec.configuration

metadata

@@ -2,7 +2,7 @@
 name: resque_spec
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Les Hill
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 -04:00
+date: 2011-04-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency