turnpike 0.0.2 → 0.1.0

data/lib/turnpike/version.rb

@@ -1,3 +1,3 @@
 class Turnpike
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/lib/turnpike.rb

@@ -2,8 +2,14 @@ require 'redis'
 
 # A Redis-backed queue.
 class Turnpike
-  REDIS_VERSION = Redis.current.info['redis_version']
-  TIMEOUT       = ENV['TURNPIKE_TIMEOUT'] || 2
+  class << self
+    # Timeout, in seconds, for blocking `pop` or `shift`.
+    attr_accessor :timeout
+
+    def configure(&block)
+      yield self
+    end
+  end
 
   # The name of the queue.
   attr :name
@@ -31,6 +37,9 @@ class Turnpike
   end
 
   # Iterates the given block for each slice of `n` queued items.
+  #
+  # Takes an optional boolean argument to specify if the command should block
+  # the connection when the queue is empty. This argument defaults to false.
   def each_slice(n, blocking = false, &block)
     slice = []
 
@@ -73,7 +82,7 @@ class Turnpike
   # the connection when the queue is empty. This argument defaults to false.
   def pop(blocking = false)
     if blocking
-      redis.brpop(name, TIMEOUT)[1] rescue nil
+      redis.brpop(name, timeout)[1] rescue nil
     else
       redis.rpop(name)
     end
@@ -81,12 +90,7 @@ class Turnpike
 
   # Pushes items to the end of the queue.
   def push(*items)
-    # Up until Redis 2.3, `rpush` accepts a single value.
-    if REDIS_VERSION < '2.3'
-      items.each { |item| redis.rpush(name, item) }
-    else
-      redis.rpush(name, items)
-    end
+    items.each { |item| redis.rpush(name, item) }
   end
   alias << push
 
@@ -96,7 +100,7 @@ class Turnpike
   # the connection when the queue is empty. This argument defaults to false.
   def shift(blocking = false)
     if blocking
-      redis.blpop(name, TIMEOUT)[1] rescue nil
+      redis.blpop(name, timeout)[1] rescue nil
     else
       redis.lpop(name)
     end
@@ -104,12 +108,7 @@ class Turnpike
 
   # Pushes items to the front of the queue.
   def unshift(*items)
-    # Up until Redis 2.3, `rpush` accepts a single value.
-    if REDIS_VERSION < '2.3'
-      items.each { |item| redis.lpush(name, item) }
-    else
-      redis.lpush(name, items)
-    end
+    items.each { |item| redis.lpush(name, item) }
   end
 
   private
@@ -117,4 +116,9 @@ class Turnpike
   def redis
     Redis.current
   end
+
+  def timeout
+    # Timeout will default to 0, which blocks indefinitely.
+    self.class.timeout.to_i
+  end
 end

data/test/turnpike_test.rb

@@ -10,6 +10,13 @@ class TestTurnpike < Test::Unit::TestCase
     Redis.current.flushall
   end
 
+  def time_out_in(seconds, &block)
+    original_timeout = Turnpike.timeout
+    Turnpike.configure { |c| c.timeout = seconds }
+    block.call
+    Turnpike.configure { |c| c.timeout = original_timeout }
+  end
+
   def test_emptiness
     queue = Turnpike.new
     assert(queue.empty?)
@@ -117,15 +124,17 @@ class TestTurnpike < Test::Unit::TestCase
   end
 
   def test_timeout
-    queue = Turnpike.new
-    thread = Thread.new do
-      sleep(3)
-      queue.push(1)
+    time_out_in 1 do
+      queue = Turnpike.new
+      thread = Thread.new do
+        sleep(2)
+        queue.push(1)
+      end
+      assert_equal(0, queue.length)
+      assert_equal(nil, queue.shift(true))
+
+      thread.join
+      assert_equal(1, queue.length)
     end
-    assert_equal(0, queue.length)
-    assert_equal(nil, queue.shift(true))
-
-    thread.join
-    assert_equal(1, queue.length)
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Paper Cavalier
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 +01:00
+date: 2011-07-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2388371112895755060
+      hash: 1142159480707083776
       segments: 
       - 0
       version: "0"
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2388371112895755060
+      hash: 1142159480707083776
       segments: 
       - 0
       version: "0"