resque_spec 0.4.3 → 0.5.0

data/README.md

@@ -46,6 +46,19 @@ 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)
 
+And I might use the `in` statement to specify the queue:
+
+    describe "#recalculate" do
+      before do
+        ResqueSpec.reset!
+      end
+
+      it "adds person.calculate to the Person queue" do
+        person.recalculate
+        Person.should have_queued(person.id, :calculate).in(:people)
+      end
+    end
+
 And I might write this as a Cucumber step
 
     Then /the (\w?) has (\w?) queued/ do |thing, method|

data/lib/resque_spec.rb

@@ -1,6 +1,7 @@
 require 'resque_spec/resque_spec'
 require 'resque_spec/resque_scheduler_spec'
 require 'resque_spec/helpers'
+require 'resque_spec/matchers'
 
 config = RSpec.configuration
 config.include ResqueSpec::Helpers

data/lib/resque_spec/helpers.rb

@@ -20,7 +20,7 @@ module ResqueSpec
     def disable_perform
       ::Resque.module_eval do
         def self.enqueue(klass, *args)
-          ResqueSpec::Resque.enqueue(klass, *args)
+          ::Resque::Job.create(ResqueSpec.queue_name(klass), klass, *args)
         end
       end
     end

data/lib/resque_spec/matchers.rb

@@ -0,0 +1,81 @@
+require 'rspec'
+
+RSpec::Matchers.define :have_queued do |*expected_args|
+  match do |actual|
+    ResqueSpec.in_queue?(actual, *expected_args, :queue_name => @queue_name)
+  end
+
+  chain :in do |queue_name|
+    @queue_name = queue_name
+  end
+
+  failure_message_for_should do |actual|
+    "expected that #{actual} would have [#{expected_args.join(', ')}] queued"
+  end
+
+  failure_message_for_should_not do |actual|
+    "expected that #{actual} would not have [#{expected_args.join(', ')}] queued"
+  end
+
+  description do
+    "have queued arguments of [#{expected_args.join(', ')}]"
+  end
+end
+
+RSpec::Matchers.define :have_queue_size_of do |size|
+  match do |actual|
+    (@queue ||= ResqueSpec.queue_for(actual)).size == size
+  end
+
+  chain :in do |queue_name|
+    @queue = ResqueSpec.queues[queue_name]
+  end
+
+  failure_message_for_should do |actual|
+    "expected that #{actual} would have #{size} entries queued, but got #{@queue.size} instead"
+  end
+
+  failure_message_for_should_not do |actual|
+    "expected that #{actual} would not have #{size} entries queued, but got #{@queue..size} instead"
+  end
+
+  description do
+    "have a queue size of #{size}"
+  end
+end
+
+RSpec::Matchers.define :have_scheduled do |*expected_args|
+  match do |actual|
+    ResqueSpec.scheduled_anytime?(actual, *expected_args)
+  end
+
+  failure_message_for_should do |actual|
+    "expected that #{actual} would have [#{expected_args.join(', ')}] queued"
+  end
+
+  failure_message_for_should_not do |actual|
+    "expected that #{actual} would not have [#{expected_args.join(', ')}] queued"
+  end
+
+  description do
+    "have scheduled arguments"
+  end
+end
+
+RSpec::Matchers.define :have_scheduled_at do |*expected_args|
+  match do |actual|
+    ResqueSpec.scheduled?(actual, *expected_args)
+  end
+
+  failure_message_for_should do |actual|
+    "expected that #{actual} would have [#{expected_args.join(', ')}] queued"
+  end
+
+  failure_message_for_should_not do |actual|
+    "expected that #{actual} would not have [#{expected_args.join(', ')}] queued"
+  end
+
+  description do
+    "have scheduled at the given time the arguments"
+  end
+end

data/lib/resque_spec/resque_scheduler_spec.rb

@@ -3,11 +3,11 @@ require 'resque_spec'
 module ResqueSpec
 
   def scheduled?(klass, time, *args)
-    schedule_for(klass).any? {|entry| entry[:klass] == klass && entry[:time] == time && entry[:args] == 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] == klass && entry[:args] == args}
+    schedule_for(klass).any? {|entry| entry[:klass].to_s == klass.to_s && entry[:args] == args}
   end
 
   def schedule_for(klass)
@@ -17,46 +17,11 @@ module ResqueSpec
 
   module ResqueScheduler
     def enqueue_at(time, klass, *args)
-      ResqueSpec.schedule_for(klass) << {:klass => klass, :time  => time, :args => args}
+      ResqueSpec.schedule_for(klass) << {:klass => klass.to_s, :time  => time, :args => args}
     end
   end
-end
-
-Resque.extend(ResqueSpec::ResqueScheduler)
-
-RSpec::Matchers.define :have_scheduled do |*expected_args|
-  match do |actual|
-    ResqueSpec.scheduled_anytime?(actual, *expected_args)
-  end
 
-  failure_message_for_should do |actual|
-    "expected that #{actual} would have [#{expected_args.join(', ')}] queued"
-  end
-
-  failure_message_for_should_not do |actual|
-    "expected that #{actual} would not have [#{expected_args.join(', ')}] queued"
-  end
-
-  description do
-    "have scheduled arguments"
-  end
 end
 
-RSpec::Matchers.define :have_scheduled_at do |*expected_args|
-  match do |actual|
-    ResqueSpec.scheduled?(actual, *expected_args)
-  end
-
-  failure_message_for_should do |actual|
-    "expected that #{actual} would have [#{expected_args.join(', ')}] queued"
-  end
-
-  failure_message_for_should_not do |actual|
-    "expected that #{actual} would not have [#{expected_args.join(', ')}] queued"
-  end
-
-  description do
-    "have scheduled at the given time the arguments"
-  end
-end
+Resque.extend(ResqueSpec::ResqueScheduler)
 

data/lib/resque_spec/resque_spec.rb

@@ -1,11 +1,12 @@
-require 'rspec'
 require 'resque'
 
 module ResqueSpec
   extend self
 
   def in_queue?(klass, *args)
-    queue_for(klass).any? {|entry| entry[:klass] == klass && entry[:args] == 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}
   end
 
   def queue_for(klass)
@@ -13,9 +14,13 @@ module ResqueSpec
   end
 
   def queue_name(klass)
+    if klass.is_a?(String)
+      klass = Kernel.const_get(klass) rescue nil
+    end
+
     name_from_instance_var(klass) or
       name_from_queue_accessor(klass) or
-      raise ::Resque::NoQueueError.new("Jobs must be placed onto a queue.")
+        raise ::Resque::NoQueueError.new("Jobs must be placed onto a queue.")
   end
 
   def queue_size(klass)
@@ -30,58 +35,56 @@ module ResqueSpec
     queues.clear
   end
 
-  module Resque
-    extend self
-    def enqueue(klass, *args)
-      ResqueSpec.queue_for(klass) << {:klass => klass, :args => args}
+  private
+
+    def name_from_instance_var(klass)
+      klass.instance_variable_get(:@queue)
     end
-  end
 
-  private
+    def name_from_queue_accessor(klass)
+      klass.respond_to?(:queue) and klass.queue
+    end
 
-  def name_from_instance_var(klass)
-    klass.instance_variable_get(:@queue)
-  end
+  module Resque
+    extend self
 
-  def name_from_queue_accessor(klass)
-    klass.respond_to?(:queue) and klass.queue
-  end
-end
+    def reset!
+      ResqueSpec.reset!
+    end
 
-Resque.extend(ResqueSpec::Resque)
+    module Job
+      extend self
 
-RSpec::Matchers.define :have_queued do |*expected_args|
-  match do |actual|
-    ResqueSpec.in_queue?(actual, *expected_args)
-  end
+      def self.included(base)
+        base.instance_eval do
 
-  failure_message_for_should do |actual|
-    "expected that #{actual} would have [#{expected_args.join(', ')}] queued"
-  end
+          def create(queue, klass, *args)
+            raise ::Resque::NoQueueError.new("Jobs must be placed onto a queue.") if !queue
+            raise ::Resque::NoClassError.new("Jobs must be given a class.") if klass.to_s.empty?
+            ResqueSpec.queues[queue] << {:klass => klass.to_s, :args => args}
+          end
 
-  failure_message_for_should_not do |actual|
-    "expected that #{actual} would not have [#{expected_args.join(', ')}] queued"
-  end
+          def destroy(queue, klass, *args)
+            raise ::Resque::NoQueueError.new("Jobs must have been placed onto a queue.") if !queue
+            raise ::Resque::NoClassError.new("Jobs must have been given a class.") if klass.to_s.empty?
 
-  description do
-    "have queued arguments of [#{expected_args.join(', ')}]"
-  end
-end
+            old_count = ResqueSpec.queues[queue].size
 
-RSpec::Matchers.define :have_queue_size_of do |size|
-  match do |actual|
-    ResqueSpec.queue_size(actual) == size
-  end
+            if args.empty?
+              ResqueSpec.queues[queue].delete_if{ |job| job[:klass] == klass.to_s }
+            else
+              ResqueSpec.queues[queue].delete_if{ |job| job[:klass] == klass.to_s and job[:args].to_a == args.to_a }
+            end
+            old_count - ResqueSpec.queues[queue].size
+          end
 
-  failure_message_for_should do |actual|
-    "expected that #{actual} would have #{size} entries queued"
-  end
+        end
+      end
 
-  failure_message_for_should_not do |actual|
-    "expected that #{actual} would not have #{size} entries queued"
-  end
+    end
 
-  description do
-    "have a queue size of #{size}"
   end
 end
+
+Resque.extend ResqueSpec::Resque
+Resque::Job.send :include, ResqueSpec::Resque::Job

data/lib/resque_spec/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: resque_spec
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors: 
 - Les Hill
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 -05:00
+date: 2011-03-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/resque_spec/helpers.rb
+- lib/resque_spec/matchers.rb
 - lib/resque_spec/resque_scheduler_spec.rb
 - lib/resque_spec/resque_spec.rb
 - lib/resque_spec/version.rb
@@ -76,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: RSpec matchers for Resque