simple_queues 1.1.0 → 1.1.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2009 François Beausoleil (francois@teksol.info)
+Copyright (c) 2011 François Beausoleil (francois@teksol.info)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.textile

@@ -59,7 +59,7 @@ h2. LICENSE
 
 (The MIT License)
 
-Copyright (c) 2008-2009 François Beausoleil (francois@teksol.info)
+Copyright (c) 2011 François Beausoleil (francois@teksol.info)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/simple_queues/redis.rb

@@ -66,7 +66,7 @@ module SimpleQueues
         timeout = args.shift
         raise ArgumentError, "Timeout must not be nil" if timeout.nil? || timeout.to_s.empty?
 
-        queue, result = @redis.blpop(*@queues.keys, timeout.to_i)
+        queue, result = @redis.blpop(*[@queues.keys, timeout.to_i].flatten)
         @queues.fetch(queue).call(deserialize(result)) if queue
         queue
       when 2

data/lib/simple_queues/version.rb

@@ -1,3 +1,3 @@
 module SimpleQueues
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/multi_dequeue_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe SimpleQueues::Redis, "multiple dequeue" do
+  let :queue do
+    SimpleQueues::Redis.new
+  end
+
+  let :redis do
+    Redis.new
+  end
+
+  before(:each) do
+    redis.flushdb
+  end
+
+  it "should accept setting up a dequeue block" do
+    lambda do
+      queue.on_dequeue(:pages_to_crawl) {|message| message}
+    end.should_not raise_error
+  end
+
+  it "should accept setting up multiple dequeue block" do
+    lambda do
+      queue.on_dequeue(:pages_to_crawl)   {|message| message}
+      queue.on_dequeue(:pages_to_analyze) {|message| message}
+    end.should_not raise_error
+  end
+
+  context "#dequeue_with_timeout" do
+    it "should return the queue name when a message was dequeued" do
+      queue.on_dequeue(:a) {|message| message}
+      queue.on_dequeue(:b) {|message| raise "not here"}
+      queue.enqueue(:a, :sent_to => "a")
+      queue.dequeue_with_timeout(1).should == "a"
+    end
+
+    it "should return nil when no queues returned anything" do
+      queue.on_dequeue(:a) {|message| raise "not here"}
+      queue.dequeue_with_timeout(1).should be_nil
+    end
+
+    it "should call into the correct block" do
+      a, b = [], []
+      queue.on_dequeue(:a) {|message| a << message}
+      queue.on_dequeue(:b) {|message| b << message}
+
+      queue.enqueue(:a, "sent_to" => "a", "serial" => 1)
+      queue.enqueue(:b, "sent_to" => "b", "serial" => 1)
+      queue.enqueue(:a, "sent_to" => "a", "serial" => 2)
+      while queue.dequeue_with_timeout(1)
+        # NOP
+      end
+
+      a.should == [{"sent_to" => "a", "serial" => 1}, {"sent_to" => "a", "serial" => 2}]
+      b.should == [{"sent_to" => "b", "serial" => 1}]
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: simple_queues
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 -04:00
+date: 2011-03-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,7 @@ files:
 - simple_queues.gemspec
 - spec/dequeueing_spec.rb
 - spec/enqueueing_spec.rb
+- spec/multi_dequeue_spec.rb
 - spec/redis_integration_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -135,5 +136,6 @@ summary: Simple enqueue/dequeue API for working with queues
 test_files: 
 - spec/dequeueing_spec.rb
 - spec/enqueueing_spec.rb
+- spec/multi_dequeue_spec.rb
 - spec/redis_integration_spec.rb
 - spec/spec_helper.rb