resque_spec 0.5.0 → 0.5.1

data/README.md

@@ -100,6 +100,8 @@ And I write this spec using the `resque_spec` matcher
 
 (And I take note of the `before` block that is calling `reset!` for every spec)
 
+*(There is also a **have_scheduled_at** matcher)*
+
 And I might write this as a Cucumber step
 
     Then /the (\w?) has (\w?) scheduled/ do |thing, method|

data/lib/resque_spec/matchers.rb

@@ -1,12 +1,33 @@
 require 'rspec'
 
-RSpec::Matchers.define :have_queued do |*expected_args|
-  match do |actual|
-    ResqueSpec.in_queue?(actual, *expected_args, :queue_name => @queue_name)
+module InQueueHelper
+  def self.extended(klass)
+    klass.instance_eval do
+      chain :in do |queue_name|
+        self.queue_name = queue_name
+      end
+    end
   end
 
-  chain :in do |queue_name|
-    @queue_name = queue_name
+  private
+
+  attr_accessor :queue_name
+
+  def queue(actual)
+    if @queue_name
+      ResqueSpec.queue_by_name(@queue_name)
+    else
+      ResqueSpec.queue_for(actual)
+    end
+  end
+
+end
+
+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 }
   end
 
   failure_message_for_should do |actual|
@@ -23,12 +44,10 @@ RSpec::Matchers.define :have_queued do |*expected_args|
 end
 
 RSpec::Matchers.define :have_queue_size_of do |size|
-  match do |actual|
-    (@queue ||= ResqueSpec.queue_for(actual)).size == size
-  end
+  extend InQueueHelper
 
-  chain :in do |queue_name|
-    @queue = ResqueSpec.queues[queue_name]
+  match do |actual|
+    queue(actual).size == size
   end
 
   failure_message_for_should do |actual|
@@ -46,7 +65,7 @@ end
 
 RSpec::Matchers.define :have_scheduled do |*expected_args|
   match do |actual|
-    ResqueSpec.scheduled_anytime?(actual, *expected_args)
+    ResqueSpec.schedule_for(actual).any? { |entry| entry[:klass].to_s == actual.to_s && entry[:args] == expected_args }
   end
 
   failure_message_for_should do |actual|
@@ -64,7 +83,9 @@ end
 
 RSpec::Matchers.define :have_scheduled_at do |*expected_args|
   match do |actual|
-    ResqueSpec.scheduled?(actual, *expected_args)
+    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 }
   end
 
   failure_message_for_should do |actual|

data/lib/resque_spec/resque_scheduler_spec.rb

@@ -2,14 +2,6 @@ require 'resque_spec'
 
 module ResqueSpec
 
-  def scheduled?(klass, time, *args)
-    schedule_for(klass).any? {|entry| entry[:klass].to_s == klass.to_s && entry[:time] == time && entry[:args] == args}
-  end
-
-  def scheduled_anytime?(klass, *args)
-    schedule_for(klass).any? {|entry| entry[:klass].to_s == klass.to_s && entry[:args] == args}
-  end
-
   def schedule_for(klass)
     name = "#{queue_name(klass)}_scheduled"
     queues[name]
@@ -24,4 +16,3 @@ module ResqueSpec
 end
 
 Resque.extend(ResqueSpec::ResqueScheduler)
-

data/lib/resque_spec/resque_spec.rb

@@ -3,14 +3,12 @@ require 'resque'
 module ResqueSpec
   extend self
 
-  def in_queue?(klass, *args)
-    options = args.last.is_a?(Hash) ? args.pop : {}
-    queue = options[:queue_name] ? queues[options[:queue_name]] : queue_for(klass)
-    queue.any? {|entry| entry[:klass].to_s == klass.to_s && entry[:args] == args}
+  def queue_by_name(name)
+    queues[name]
   end
 
   def queue_for(klass)
-    queues[queue_name(klass)]
+    queue_by_name(queue_name(klass))
   end
 
   def queue_name(klass)
@@ -23,10 +21,6 @@ module ResqueSpec
         raise ::Resque::NoQueueError.new("Jobs must be placed onto a queue.")
   end
 
-  def queue_size(klass)
-    queue_for(klass).size
-  end
-
   def queues
     @queues ||= Hash.new {|h,k| h[k] = []}
   end

data/lib/resque_spec/version.rb

@@ -1,3 +1,3 @@
 module ResqueSpec
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque_spec
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: 
-  version: 0.5.0
+  segments: 
+  - 0
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Les Hill
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -04:00
+date: 2011-03-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
         version: 1.6.0
   type: :runtime
   version_requirements: *id001
@@ -32,6 +42,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
   type: :runtime
   version_requirements: *id002
@@ -67,17 +82,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: RSpec matchers for Resque