simple_queues 1.0.1 → 1.0.2

data/lib/simple_queues/redis.rb

@@ -1,4 +1,4 @@
-autoload :Redis, "redis"
+require "redis"
 require 'json'
 
 module SimpleQueues
@@ -47,8 +47,8 @@ module SimpleQueues
     # @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?
-
-      unserialize(@redis.blpop(queue_name.to_s, timeout))
+      r = @redis.blpop(queue_name.to_s, timeout)
+      unserialize(r && r[1])
     end
   end
 end

data/lib/simple_queues/version.rb

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

data/spec/dequeueing_spec.rb

@@ -48,4 +48,9 @@ describe SimpleQueues::Redis, "dequeue_with_timeout" do
     lambda { queue.dequeue_with_timeout(nil) }.should raise_error(ArgumentError)
     lambda { queue.dequeue_with_timeout("") }.should raise_error(ArgumentError)
   end
+  
+  it "returns the unserialized object" do
+    redis.should_receive(:blpop).with("test", 5).and_return(["test", "{\"hello\":\"world\",\"x\":42}"] )
+    queue.dequeue_with_timeout(:test, 5).should == {"hello" => "world", "x" => 42}
+  end
 end

data/spec/enqueueing_spec.rb

@@ -39,5 +39,8 @@ describe SimpleQueues::Redis, "enqueue" do
 
     redis.should_receive(:rpush).with("ops", '[1,2,3]')
     queue.enqueue :ops, [1, 2, 3]
+
+    redis.should_receive(:rpush).with("ops", "{\"hello\":\"world\",\"x\":42}")
+    queue.enqueue :ops, {:hello => "world", :x => 42}
   end
 end

data/spec/redis_integration_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe SimpleQueues::Redis, "enqueue" do
+  let :queue do
+    SimpleQueues::Redis.new
+  end
+
+  it "communicates with Redis as expected" do
+    obj = {"hello" => 42}
+    queue.enqueue(:test, obj)
+    queue.dequeue_with_timeout(:test, 2).should == obj
+    queue.dequeue_with_timeout(:test, 2).should == nil
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -105,6 +105,7 @@ files:
 - simple_queues.gemspec
 - spec/dequeueing_spec.rb
 - spec/enqueueing_spec.rb
+- spec/redis_integration_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: https://github.com/francois/simple_queues
@@ -141,4 +142,5 @@ summary: Simple enqueue/dequeue API for working with queues
 test_files: 
 - spec/dequeueing_spec.rb
 - spec/enqueueing_spec.rb
+- spec/redis_integration_spec.rb
 - spec/spec_helper.rb