mloughran-job_queue 0.0.7 → 0.0.8

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 7
+:patch: 8
 :major: 0

data/lib/job_queue/adapters/test_adapter.rb

@@ -1,20 +1,49 @@
+# This adapter is designed for testing purposes.
+#
+# Features supported:
+#
+# named queues: yes
+# priority: no
+# ttr: no
+#
+# Additionally this queue can be inspeced with JobQueue.adapter.queue('name')
+#
 class JobQueue::TestAdapter
   def initialize(options = {})
-    @queue = []
+    @queues = {}
   end
-  
-  def put(string)
-    @queue << string
+
+  def put(string, queue, priority, ttr)
+    @queues[queue] ||= []
+    @queues[queue] << string
   end
-  
-  def subscribe(error_report, &block)
+
+  def subscribe(error_report, cleanup_task, queue, &block)
     loop do
       begin
-        sleep 0.1 if @queue.empty?
-        yield @queue.shift
-      rescue
-        error_report.call(job.body, e)
+        if get_queue(queue).empty?
+          sleep 0.1
+        else
+          job = get_queue(queue).shift
+          yield job
+        end
+      rescue => e
+        error_report.call(job, e)
       end
     end
   end
+
+  # Additional method for TestAdapter to allow easy queue inspection with
+  #
+  # JobQueue.adapter.queue('foo')
+  #
+  def queue(queue = 'default')
+    get_queue(queue)
+  end
+
+  private
+
+  def get_queue(queue)
+    @queues[queue] || []
+  end
 end

data/spec/beanstalk_adapter_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/common_adapter_spec'
 
 describe JobQueue::BeanstalkAdapter do
   before :each do
@@ -215,6 +216,10 @@ describe JobQueue::BeanstalkAdapter do
       JobQueue.adapter = JobQueue::BeanstalkAdapter.new
     end
 
+    describe "common" do
+      it_should_behave_like "JobQueue adapter named queues"
+    end
+
     it "should write onto queue and fetch stuff back off" do
       JobQueue.put("hello")
 
@@ -263,23 +268,6 @@ describe JobQueue::BeanstalkAdapter do
         end
       }
     end
-
-    it "should put jobs onto a named queue and only read off that queue" do
-      JobQueue.put("hello", :queue => "test")
-      lambda {
-        Timeout.timeout(0.1) do
-          JobQueue.subscribe(:queue => "foo") do |job|
-            throw :stop
-          end
-        end
-      }.should raise_error(Timeout::Error)
-      should_not_timeout {
-        JobQueue.subscribe(:queue => "test") do |body|
-          body.should == 'hello'
-          throw :stop
-        end
-      }
-    end
   end
 
   describe "when connecting to multiple instances" do
@@ -327,11 +315,3 @@ describe JobQueue::BeanstalkAdapter do
     end
   end
 end
-
-def should_not_timeout(timeout = 0.1)
-  lambda {
-    Timeout.timeout(timeout) do
-      yield
-    end
-  }.should_not raise_error(Timeout::Error)
-end

data/spec/common_adapter_spec.rb

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+shared_examples_for 'JobQueue adapter basic' do
+  it "should write onto queue and fetch stuff back off" do
+    JobQueue.put("hello")
+
+    JobQueue.subscribe do |job|
+      @job = job
+      throw :stop
+    end
+
+    @job.should == "hello"
+  end
+
+  it "should pull items off in the order the were added" do
+    JobQueue.put("foo")
+    JobQueue.put("bar")
+
+    retrieved_jobs = []
+
+    begin
+      Timeout::timeout(0.5) do
+        JobQueue.subscribe do |job|
+          retrieved_jobs << job
+        end
+      end
+    rescue Timeout::Error
+
+    end
+
+    retrieved_jobs[0].should == "foo"
+    retrieved_jobs[1].should == "bar"
+    retrieved_jobs[2].should == nil
+  end
+end
+
+shared_examples_for "JobQueue adapter named queues" do
+  it "should put jobs onto a named queue and only read off that queue" do
+    JobQueue.put("hello", :queue => "test")
+    lambda {
+      Timeout.timeout(0.1) do
+        JobQueue.subscribe(:queue => "foo") do |job|
+          throw :stop
+        end
+      end
+    }.should raise_error(Timeout::Error)
+    should_not_timeout {
+      JobQueue.subscribe(:queue => "test") do |body|
+        body.should == 'hello'
+        throw :stop
+      end
+    }
+  end
+end

data/spec/spec_helper.rb

@@ -3,3 +3,11 @@ $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'
 require 'job_queue'
+
+def should_not_timeout(timeout = 0.1)
+  lambda {
+    Timeout.timeout(timeout) do
+      yield
+    end
+  }.should_not raise_error(Timeout::Error)
+end

data/spec/test_adapter_spec.rb

@@ -1,39 +1,18 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/common_adapter_spec'
 
 describe JobQueue::TestAdapter do
   before :all do
     JobQueue.adapter = JobQueue::TestAdapter.new
   end
   
-  it "should write onto queue and fetch stuff back off" do
-    JobQueue.put("hello")
-    
-    JobQueue.subscribe do |job|
-      @job = job
-      throw :stop
-    end
-    
-    @job.should == "hello"
-  end
+  it_should_behave_like 'JobQueue adapter basic'
+  
+  it_should_behave_like "JobQueue adapter named queues"
   
-  it "should pull items off in the order the were added" do
-    JobQueue.put("foo")
-    JobQueue.put("bar")
-    
-    retrieved_jobs = []
-    
-    begin
-      Timeout::timeout(0.5) do
-        JobQueue.subscribe do |job|
-          retrieved_jobs << job
-        end
-      end
-    rescue Timeout::Error
-      
-    end
-    
-    retrieved_jobs[0].should == "foo"
-    retrieved_jobs[1].should == "bar"
-    retrieved_jobs[2].should == nil
+  it "should allow queue inspection as a hash" do
+    JobQueue.adapter.queue.should == []
+    JobQueue.put('hello')
+    JobQueue.adapter.queue.should == ['hello']
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mloughran-job_queue
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Martyn Loughran
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-22 00:00:00 -07:00
+date: 2009-06-24 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - lib/job_queue.rb
 - spec/amqp_adapter_spec.rb
 - spec/beanstalk_adapter_spec.rb
+- spec/common_adapter_spec.rb
 - spec/job_queue_spec.rb
 - spec/spec_helper.rb
 - spec/test_adapter_spec.rb