resque_spec 0.14.4 → 0.15.0

data/README.md

@@ -10,7 +10,8 @@ on
 
 ResqueSpec will also fire Resque hooks if you are using them. See below.
 
-The current version works with `Resque v1.19.0` and up and `RSpec v2.5.0` and up.
+The current version works with `Resque >~ v1.19` and up and `RSpec >= v2.5.0`
+(including the RSpec 3 beta).
 
 Install
 -------
@@ -406,7 +407,7 @@ Contributors
 *                    (@dtsiknis)      : Updated removed\_delayed
 * Li Ellis Gallardo  (@lellisga)      : fix inline/disable\_ext bug
 * Jeff Deville       (@jeffdeville)   : Resque.size
-* Frank Wambutt      (@opinel)        : Fix DST problem in `have\_scheduled`
+* Frank Wambutt      (@opinel)        : Fix DST problem in `have_scheduled`
 * Luke Melia         (@lukemelia)     : Add `times` chained matcher
 * Pablo Fernandez    (@heelhook)      : Add `have_queue_size_of_at_least` and `have_schedule_size_of_at_least` matchers
 *                    (@k1w1)          : Add support for enqueue\_at\_with\_queue/enqueue\_in\_with\_queue
@@ -415,9 +416,10 @@ Contributors
 * Andrés Bravo       (@andresbravog)  : Replace `rspec` dependency with explicit dependencies
 * Ben Woosley        (@Empact)        : Loosen rubygems version constraint
 * Jeff Dickey        (@dickeyxxx)     : Remove 2.0 warnings, added Travis
-* Earle Clubb        (@eclubb)        : `be\_queued` matcher
+* Earle Clubb        (@eclubb)        : `be_queued` matcher
+* Erkki Eilonen      (@erkki)         : RSpec 3 support
 
 Copyright
 =========
 
-Copyright (c) 2010-2013 Les Hill. See LICENSE for details.
+Copyright (c) 2010-2014 Les Hill. See LICENSE for details.

data/lib/resque_spec/matchers.rb

@@ -3,18 +3,16 @@ require 'rspec/expectations'
 require 'rspec/mocks'
 
 module InQueueHelper
-  def self.extended(klass)
-    klass.instance_eval do
-      self.queue_name = nil
-      chain :in do |queue_name|
-        self.queue_name = queue_name
-      end
+  def self.included(klass)
+    klass.class_eval do
+      attr_accessor :queue_name
     end
   end
 
-  private
-
-  attr_accessor :queue_name
+  def in(queue_name)
+    self.queue_name = queue_name
+    self
+  end
 
   def queue(actual)
     if @queue_name
@@ -27,14 +25,14 @@ module InQueueHelper
 end
 
 RSpec::Matchers.define :be_queued do |*expected_args|
-  extend InQueueHelper
+  include InQueueHelper
 
   chain :times do |num_times_queued|
     @times = num_times_queued
     @times_info = @times == 1 ? ' once' : " #{@times} times"
   end
 
-  chain :once do |num_times_queued|
+  chain :once do
     @times = 1
     @times_info = ' once'
   end
@@ -67,14 +65,14 @@ RSpec::Matchers.define :be_queued do |*expected_args|
 end
 
 RSpec::Matchers.define :have_queued do |*expected_args|
-  extend InQueueHelper
+  include InQueueHelper
 
   chain :times do |num_times_queued|
     @times = num_times_queued
     @times_info = @times == 1 ? ' once' : " #{@times} times"
   end
 
-  chain :once do |num_times_queued|
+  chain :once do
     @times = 1
     @times_info = ' once'
   end
@@ -107,7 +105,7 @@ RSpec::Matchers.define :have_queued do |*expected_args|
 end
 
 RSpec::Matchers.define :have_queue_size_of do |size|
-  extend InQueueHelper
+  include InQueueHelper
 
   match do |actual|
     queue(actual).size == size
@@ -127,7 +125,7 @@ RSpec::Matchers.define :have_queue_size_of do |size|
 end
 
 RSpec::Matchers.define :have_queue_size_of_at_least do |size|
-  extend InQueueHelper
+  include InQueueHelper
 
   match do |actual|
     queue(actual).size >= size
@@ -147,18 +145,16 @@ RSpec::Matchers.define :have_queue_size_of_at_least do |size|
 end
 
 module ScheduleQueueHelper
-  def self.extended(klass)
-    klass.instance_eval do
-      self.queue_name = nil
-      chain :queue do |queue_name|
-        self.queue_name = queue_name
-      end
+  def self.included(klass)
+    klass.class_eval do
+      attr_accessor :queue_name
     end
   end
 
-  private
-
-  attr_accessor :queue_name
+  def queue(queue_name)
+    self.queue_name = queue_name
+    self
+  end
 
   def schedule_queue_for(actual)
     if @queue_name
@@ -171,7 +167,7 @@ module ScheduleQueueHelper
 end
 
 RSpec::Matchers.define :have_scheduled do |*expected_args|
-  extend ScheduleQueueHelper
+  include ScheduleQueueHelper
 
   chain :at do |timestamp|
     @interval = nil
@@ -216,7 +212,7 @@ RSpec::Matchers.define :have_scheduled do |*expected_args|
 end
 
 RSpec::Matchers.define :have_scheduled_at do |*expected_args|
-  extend ScheduleQueueHelper
+  include ScheduleQueueHelper
   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|
@@ -239,7 +235,7 @@ RSpec::Matchers.define :have_scheduled_at do |*expected_args|
 end
 
 RSpec::Matchers.define :have_schedule_size_of do |size|
-  extend ScheduleQueueHelper
+  include ScheduleQueueHelper
 
   match do |actual|
     schedule_queue_for(actual).size == size
@@ -259,7 +255,7 @@ RSpec::Matchers.define :have_schedule_size_of do |size|
 end
 
 RSpec::Matchers.define :have_schedule_size_of_at_least do |size|
-  extend ScheduleQueueHelper
+  include ScheduleQueueHelper
 
   match do |actual|
     schedule_queue_for(actual).size >= size

data/lib/resque_spec/version.rb

@@ -1,3 +1,3 @@
 module ResqueSpec
-  VERSION = "0.14.4"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_spec
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque