simple_queues 1.0.4 → 1.1.0

data/README.textile

@@ -36,7 +36,7 @@ end
 
 h1. Multiple Queues
 
-Sometimes, you want to dequeue from multiple queues simultaneously, and react appropriately. When that happens, you need to use the <code>#on_dequeue</code> method:
+Sometimes, you want to dequeue from multiple queues simultaneously, and react appropriately. When that happens, you need to use <code>#on_dequeue</code>:
 
 <pre><code>require "simple_queues"
 Queues = SimpleQueues::Redis.new

data/lib/simple_queues/redis.rb

@@ -7,7 +7,12 @@ module SimpleQueues
   # Messages are enqueued to the right, dequeued from the left - thus the most recent messages are at the end of the list.
   class Redis
     def initialize(redis = ::Redis.new)
-      @redis = redis
+      @redis  = redis
+      @queues = Hash.new
+    end
+
+    def on_dequeue(queue_name, &block)
+      @queues[q_name(queue_name)] = block
     end
 
     def serialize(message)
@@ -51,13 +56,27 @@ module SimpleQueues
 
     # Dequeues a message, or returns +nil+ if the timeout is exceeded.
     #
-    # @param queue_name [String, Symbol] The queue name to read from.
+    # @param queue_name [String, Symbol] The queue name to read from. Optional if you used #on_dequeue.
     # @param timeout [#to_f] The number of seconds to wait before returning nil.
-    # @return [String, nil] The first message in the queue, or nil if the timeout was exceeded.
-    # @raise ArgumentError If +queue_name+ is nil or the empty String.
-    def dequeue_with_timeout(queue_name, timeout)
-      queue, result = @redis.blpop(q_name(queue_name), timeout.to_i)
-      deserialize(result)
+    # @return [String, nil] When given two arguments, returns the message, or nil if the timeout was exceeded. When given a timeout only, always returns nil.
+    # @raise ArgumentError If +queue_name+ is absent and no #on_dequeue blocks were added.
+    def dequeue_with_timeout(*args)
+      case args.length
+      when 1 # Timeout only
+        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)
+        @queues.fetch(queue).call(deserialize(result)) if queue
+        queue
+      when 2
+        queue_name, timeout = args.shift, args.shift
+        _, result = @redis.blpop(q_name(queue_name), timeout.to_i)
+        deserialize(result)
+      else
+        raise "NOT DONE"
+      end
+
     end
 
   private

data/lib/simple_queues/version.rb

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

data/simple_queues.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'RedCloth'
+  s.add_development_dependency 'ruby-debug19'
 end

metadata

@@ -2,7 +2,7 @@
 name: simple_queues
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -68,6 +68,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: Program to an interface, not an implementation - hides Redis (used as a queue) behind a simple interface
 email: 
 - francois@teksol.info