simple_queues 1.0.2 → 1.0.3

data/lib/simple_queues/redis.rb

@@ -25,9 +25,7 @@ module SimpleQueues
     # @return No useful value.
     # @raise ArgumentError Whenever the queue name or the message are nil, or the queue name is empty.
     def enqueue(queue_name, message)
-      raise ArgumentError, "Queue name argument was nil - must not be" if queue_name.nil? || queue_name.to_s.empty?
-      raise ArgumentError, "Message argument was nil - must not be" if message.nil?
-      @redis.rpush(queue_name.to_s, serialize(message))
+      @redis.rpush(q_name(queue_name), serialize(message))
     end
 
     # Dequeues a message, and waits forever for one to arrive.
@@ -39,6 +37,14 @@ module SimpleQueues
       dequeue_with_timeout(queue_name, 0)
     end
 
+    def clear(queue_name)
+      @redis.ltrim(q_name(queue_name), 1, 0)
+    end
+
+    def size(queue_name)
+      @redis.llen(q_name(queue_name))
+    end
+
     # Dequeues a message, or returns +nil+ if the timeout is exceeded.
     #
     # @param queue_name [String, Symbol] The queue name to read from.
@@ -46,9 +52,15 @@ module SimpleQueues
     # @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)
-      raise ArgumentError, "Queue name argument was nil - must not be" if queue_name.nil? || queue_name.to_s.empty?
-      r = @redis.blpop(queue_name.to_s, timeout)
-      unserialize(r && r[1])
+      queue, result = @redis.blpop(q_name(queue_name), timeout)
+      unserialize(result)
+    end
+
+  private
+    def q_name(queue_name)
+      queue_name &&= queue_name.to_s
+      raise ArgumentError, "Queue name argument was nil - must not be" if queue_name.nil? || queue_name.empty?
+      queue_name
     end
   end
 end

data/lib/simple_queues/version.rb

@@ -1,3 +1,3 @@
 module SimpleQueues
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/redis_integration_spec.rb

@@ -12,4 +12,18 @@ describe SimpleQueues::Redis, "enqueue" do
     queue.dequeue_with_timeout(:test, 2).should == nil
   end
 
+  it "clears the queue" do
+    queue.enqueue(:test, 42)
+    queue.clear(:test)
+    queue.dequeue_with_timeout(:test, 1).should == nil
+  end
+
+  it "returns the queue size" do
+    queue.clear(:test)
+    queue.enqueue(:test, 42)
+    queue.enqueue(:test, 42)
+    queue.enqueue(:test, 42)
+    queue.enqueue(:test, 42)
+    queue.size(:test).should == 4
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"