resque_spec 0.8.1 → 0.9.0

data/README.md

@@ -25,8 +25,10 @@ What is ResqueSpec?
 ===================
 
 ResqueSpec implements the *stable API* for Resque 1.19.x (which is `enqueue`,
-`enqueue_to` (*unreleased*), `dequeue`, `reserve`, and the Resque hooks). It
-does not have a test double for Redis, so this may lead to some interesting and
+`enqueue_to` (*unreleased*), `dequeue`, `reserve`, the Resque hooks, and
+because of the way `resque_scheduler` works `Job.create` and `Job.destroy`).
+
+It does not have a test double for Redis, so this may lead to some interesting and
 puzzling behaviour if you use some of the popular Resque plugins (such as
 `resque_lock`).
 
@@ -131,9 +133,51 @@ And I write this spec using the `resque_spec` matcher
       end
     end
 
-(And I take note of the `before` block that is calling `reset!` for every spec)
+And I might use the `at` statement to specify the time:
+
+    describe "#recalculate" do
+      before do
+        ResqueSpec.reset!
+      end
+
+      it "adds person.calculate to the Person queue" do
+        person.recalculate
+
+        # Is it scheduled to be executed at 2010-02-14 06:00:00 ?
+        Person.should have_scheduled(person.id, :calculate).at(Time.mktime(2010,2,14,6,0,0))
+      end
+    end
 
-*(There is also a **have_scheduled_at** matcher)*
+And I might use the `in` statement to specify time interval (in seconds):
+
+  describe "#recalculate" do
+    before do
+      ResqueSpec.reset!
+    end
+
+    it "adds person.calculate to the Person queue" do
+      person.recalculate
+
+      # Is it scheduled to be executed in 5 minutes?
+      Person.should have_scheduled(person.id, :calculate).in(5 * 60)
+    end
+  end
+
+You can also check the size of the schedule:
+
+  describe "#recalculate" do
+    before do
+      ResqueSpec.reset!
+    end
+
+    it "adds person.calculate to the Person queue" do
+      person.recalculate
+
+      Person.should have_schedule_size_of(1)
+    end
+  end
+
+(And I take note of the `before` block that is calling `reset!` for every spec)
 
 And I might write this as a Cucumber step
 

data/lib/resque_spec/ext.rb

@@ -33,6 +33,7 @@ module Resque
       return if run_before_enqueue(klass, *args)
       Job.create(queue, klass, *args)
       run_after_enqueue(klass, *args)
+      true
     end
   end
 

data/lib/resque_spec/matchers.rb

@@ -64,16 +64,41 @@ RSpec::Matchers.define :have_queue_size_of do |size|
 end
 
 RSpec::Matchers.define :have_scheduled do |*expected_args|
+  chain :at do |timestamp|
+    @interval = nil
+    @time = timestamp
+    @time_info = "at #{@time}"
+  end
+
+  chain :in do |interval|
+    @time = nil
+    @interval = interval
+    @time_info = "in #{@interval} seconds"
+  end
+
   match do |actual|
-    ResqueSpec.schedule_for(actual).any? { |entry| entry[:class].to_s == actual.to_s && entry[:args] == expected_args }
+    ResqueSpec.schedule_for(actual).any? do |entry|
+      class_matches = entry[:class].to_s == actual.to_s
+      args_match = entry[:args] == expected_args
+
+      time_matches = if @time
+        entry[:time] == @time
+      elsif @interval
+        entry[:time].to_i == entry[:stored_at].to_i + @interval
+      else
+        true
+      end
+
+      class_matches && args_match && time_matches
+    end
   end
 
   failure_message_for_should do |actual|
-    "expected that #{actual} would have [#{expected_args.join(', ')}] scheduled"
+    ["expected that #{actual} would have [#{expected_args.join(', ')}] scheduled", @time_info].join(' ')
   end
 
   failure_message_for_should_not do |actual|
-    "expected that #{actual} would not have [#{expected_args.join(', ')}] scheduled"
+    ["expected that #{actual} would not have [#{expected_args.join(', ')}] scheduled", @time_info].join(' ')
   end
 
   description do
@@ -82,6 +107,8 @@ RSpec::Matchers.define :have_scheduled do |*expected_args|
 end
 
 RSpec::Matchers.define :have_scheduled_at do |*expected_args|
+  warn "DEPRECATION WARNING: have_scheduled_at(time, *args) is deprecated and will be removed in future. Please use have_scheduled(*args).at(time) instead."
+
   match do |actual|
     time = expected_args.first
     other_args = expected_args[1..-1]

data/lib/resque_spec/scheduler.rb

@@ -16,7 +16,7 @@ module ResqueSpec
   end
 
   def enqueue_at(time, klass, *args)
-    perform_or_store(schedule_queue_name(klass), :class => klass.to_s, :time  => time, :args => args)
+    perform_or_store(schedule_queue_name(klass), :class => klass.to_s, :time  => time, :stored_at => Time.now, :args => args)
   end
 
   def enqueue_in(time, klass, *args)

data/lib/resque_spec/version.rb

@@ -1,3 +1,3 @@
 module ResqueSpec
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

data/lib/resque_spec.rb

@@ -93,7 +93,8 @@ module ResqueSpec
   def payload_with_string_keys(payload)
     {
       'class' => payload[:class],
-      'args' => payload[:args]
+      'args' => payload[:args],
+      'stored_at' => payload[:stored_at]
     }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_spec
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-08 00:00:00.000000000Z
+date: 2012-01-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70309046836280 !ruby/object:Gem::Requirement
+  requirement: &70229397540720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309046836280
+  version_requirements: *70229397540720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70309046834900 !ruby/object:Gem::Requirement
+  requirement: &70229397540220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309046834900
+  version_requirements: *70229397540220
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70309046834260 !ruby/object:Gem::Requirement
+  requirement: &70229397539840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309046834260
+  version_requirements: *70229397539840
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70309046826600 !ruby/object:Gem::Requirement
+  requirement: &70229397539380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309046826600
+  version_requirements: *70229397539380
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70229397538960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70229397538960
 description: RSpec matchers for Resque
 email: leshill@gmail.com
 executables: []