resque_spec 0.5.1 → 0.6.0

data/README.md

@@ -1,12 +1,14 @@
 ResqueSpec
 ==========
 
-A simple RSpec and Cucumber matcher for Resque.enqueue and Resque.enqueue_at (from `ResqueScheduler`), loosely based on
+A simple RSpec and Cucumber matcher for Resque.enqueue and Resque.enqueue_at
+(from `ResqueScheduler`), loosely based on
 [http://github.com/justinweiss/resque_unit](http://github.com/justinweiss/resque_unit).
 
-This should work with `Resque v1.6.0` and up and `RSpec v2.0.0.beta.12` and up.
+This should work with `Resque v1.15.0` and up and `RSpec v2.5.0` and up.
 
-If you are using `RSpec ~> 1.3.0`, you should use version `~> 0.2.0`.
+If you are using `RSpec ~> 1.3.0`, you should use version `~> 0.2.0`. This
+branch is not actively maintained.
 
 Install
 -------
@@ -172,6 +174,19 @@ Or I write this spec using the `with_resque` helper
       end
     end
 
+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!)
+
 Note on Patches/Pull Requests
 =============================
 
@@ -186,4 +201,4 @@ Note on Patches/Pull Requests
 Copyright
 =========
 
-Copyright (c) 2010 Les Hill. See LICENSE for details.
+Copyright (c) 2010-2011 Les Hill. See LICENSE for details.

data/lib/resque_spec.rb

@@ -1,8 +1,63 @@
-require 'resque_spec/resque_spec'
-require 'resque_spec/resque_scheduler_spec'
+require 'resque_spec/ext'
 require 'resque_spec/helpers'
 require 'resque_spec/matchers'
 
+module ResqueSpec
+  extend self
+
+  attr_accessor :inline
+
+  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
+    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
+  end
+
+  def queue_by_name(name)
+    queues[name]
+  end
+
+  def queue_for(klass)
+    queue_by_name(queue_name(klass))
+  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.")
+  end
+
+  def queues
+    @queues ||= Hash.new {|h,k| h[k] = []}
+  end
+
+  def reset!
+    queues.clear
+  end
+
+  private
+
+  def name_from_instance_var(klass)
+    klass.instance_variable_get(:@queue)
+  end
+
+  def name_from_queue_accessor(klass)
+    klass.respond_to?(:queue) and klass.queue
+  end
+end
+
 config = RSpec.configuration
 config.include ResqueSpec::Helpers
 

data/lib/resque_spec/ext.rb

@@ -0,0 +1,22 @@
+require 'resque'
+
+module Resque
+  class Job
+    def self.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.enqueue(queue, klass, *args)
+    end
+
+    def self.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?
+
+      old_count = ResqueSpec.queues[queue].size
+
+      ResqueSpec.dequeue(queue, klass, *args)
+
+      old_count - ResqueSpec.queues[queue].size
+    end
+  end
+end

data/lib/resque_spec/helpers.rb

@@ -2,26 +2,11 @@ module ResqueSpec
   module Helpers
 
     def with_resque
-      enable_perform
-      yield
-      disable_perform
-    end
-
-    private
-
-    def enable_perform
-      ::Resque.module_eval do
-        def self.enqueue(klass, *args)
-          klass.perform(*args)
-        end
-      end
-    end
-
-    def disable_perform
-      ::Resque.module_eval do
-        def self.enqueue(klass, *args)
-          ::Resque::Job.create(ResqueSpec.queue_name(klass), klass, *args)
-        end
+      begin
+        ResqueSpec.inline = true
+        yield
+      ensure
+        ResqueSpec.inline = false
       end
     end
   end

data/lib/resque_spec/{resque_scheduler_spec.rb → scheduler.rb}

@@ -1,18 +1,16 @@
 require 'resque_spec'
 
 module ResqueSpec
-
   def schedule_for(klass)
     name = "#{queue_name(klass)}_scheduled"
     queues[name]
   end
 
-  module ResqueScheduler
+  module SchedulerExt
     def enqueue_at(time, klass, *args)
       ResqueSpec.schedule_for(klass) << {:klass => klass.to_s, :time  => time, :args => args}
     end
   end
-
 end
 
-Resque.extend(ResqueSpec::ResqueScheduler)
+Resque.extend(ResqueSpec::SchedulerExt)

data/lib/resque_spec/version.rb

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

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: resque_spec
 version: !ruby/object:Gem::Version 
-  hash: 9
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 1
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors: 
 - Les Hill
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 -07:00
+date: 2011-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
-        version: 1.6.0
+        version: 1.15.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
         version: 2.5.0
   type: :runtime
   version_requirements: *id002
@@ -59,10 +44,10 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/resque_spec/ext.rb
 - 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/scheduler.rb
 - lib/resque_spec/version.rb
 - lib/resque_spec.rb
 - LICENSE
@@ -82,20 +67,12 @@ 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: []
 

data/lib/resque_spec/resque_spec.rb

@@ -1,84 +0,0 @@
-require 'resque'
-
-module ResqueSpec
-  extend self
-
-  def queue_by_name(name)
-    queues[name]
-  end
-
-  def queue_for(klass)
-    queue_by_name(queue_name(klass))
-  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.")
-  end
-
-  def queues
-    @queues ||= Hash.new {|h,k| h[k] = []}
-  end
-
-  def reset!
-    queues.clear
-  end
-
-  private
-
-    def name_from_instance_var(klass)
-      klass.instance_variable_get(:@queue)
-    end
-
-    def name_from_queue_accessor(klass)
-      klass.respond_to?(:queue) and klass.queue
-    end
-
-  module Resque
-    extend self
-
-    def reset!
-      ResqueSpec.reset!
-    end
-
-    module Job
-      extend self
-
-      def self.included(base)
-        base.instance_eval do
-
-          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
-
-          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?
-
-            old_count = ResqueSpec.queues[queue].size
-
-            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
-
-        end
-      end
-
-    end
-
-  end
-end
-
-Resque.extend ResqueSpec::Resque
-Resque::Job.send :include, ResqueSpec::Resque::Job