resque_spec 0.3.0 → 0.3.1

data/README.md

@@ -2,7 +2,7 @@ ResqueSpec
 ==========
 
 A simple RSpec and Cucumber matcher for Resque.enqueue and Resque.enqueue_at (from `ResqueScheduler`), loosely based on
-[http://github.com/justinweiss/resque_unit](resque_unit).
+[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.
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/resque_spec/resque_spec.rb

@@ -13,8 +13,9 @@ module ResqueSpec
   end
 
   def queue_name(klass)
-    queue_name = klass.instance_variable_get(:@queue) || klass.respond_to?(:queue) && klass.queue
-    raise ::Resque::NoQueueError.new("Jobs must be placed onto a queue.") unless queue_name
+    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
@@ -30,6 +31,16 @@ module ResqueSpec
       ResqueSpec.queue_for(klass) << {:klass => klass, :args => args}
     end
   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
 
 Resque.extend(ResqueSpec::Resque)

data/resque_spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque_spec}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-06-29}
+  s.date = %q{2010-08-18}
   s.description = %q{RSpec matchers for Resque}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [

data/spec/resque_spec_spec.rb

@@ -37,6 +37,22 @@ describe "ResqueSpec" do
     end
   end
 
+  describe "#queue_name" do
+    it "raises if there is no queue defined for a class" do
+      expect do
+        ResqueSpec.queue_name(Address)
+      end.should raise_error(::Resque::NoQueueError)
+    end
+
+    it "returns the queue name if there is a queue defined as an instance var" do
+      ResqueSpec.queue_name(Person).should == :people
+    end
+
+    it "returns the queue name if there is a queue defined via self.queue" do
+      ResqueSpec.queue_name(Account).should == :people
+    end
+  end
+
   describe "#reset!" do
     it "clears the queues" do
       ResqueSpec.queue_for(Person) << 'queued'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque_spec
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Les Hill
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 -04:00
+date: 2010-08-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency