turnpike 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bef65c2725cc692f91f86c187db23d3dc7250e7
-  data.tar.gz: 3fddd1e0fc075d820b9ae6c00b006e42bfe0e599
+  metadata.gz: 6ee7b6e304b2d256bc1d0712c8b2bf806cd466b9
+  data.tar.gz: 8d0df7c09cb7e9960ea276f4a08ee50b20274497
 SHA512:
-  metadata.gz: 18f0f8e0481d419b622a86d708850694f6254063a954d4b4523dfeafda8f8fd48eef7699a89419f7675a0f0bde9b881dc43302b0927f8fcdd2050ca9aa234c5b
-  data.tar.gz: d6358963988ee4e42a24c6b7bc887c2d147cd65c776361296746c662a94a2e329c2d6596459966b9b7b76a3d6f543dd948caea8836c418be2d9973cb3f96c87c
+  metadata.gz: 2ab3f5a0ff811be7a0bc8472b84ffcee417b6983c96d32e5399de0656230e5f457c1e26674cf6738432e9ba82166c7de1424ebc5e841558a5287a78bbeb49e99
+  data.tar.gz: e56acce950f90bd741d388a8f2974193ca2aaaaa379162d42ef9e936fb2530aebc6133edf8e4a431b9fb040fcfc715141658d7a5494b02340438bc9923af2bae

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 1.9.3
   - 2.0.0
 services:
   - redis-server

data/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2012 Hakan Ensari
+Copyright (c) 2013 Hakan Ensari
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -24,7 +24,7 @@ Push payload to the front of the queue:
 
 ```ruby
 q.unshift('foo') # => 2
-q.pop # => 'foo"'
+q.pop # => 'foo'
 ```
 
 Use a queue with set-like properties to ensure uniqueness of queued items:

data/lib/turnpike.rb

@@ -2,7 +2,14 @@ require 'turnpike/queue'
 require 'turnpike/unique_queue'
 
 module Turnpike
-  def self.call(name = 'default', unique: false)
-    (unique ? UniqueQueue : Queue).new(name)
+  class << self
+    attr_accessor :namespace
+
+    def call(name = 'default', unique: false)
+      (unique ? UniqueQueue : Queue).new(name)
+    end
+    alias [] call
   end
+
+  @namespace = 'turnpike'
 end

data/lib/turnpike/base.rb

@@ -6,13 +6,13 @@ module Turnpike
   class Base
     extend Forwardable
 
-    def_delegator :Redis, :current, :redis
     def_delegators :MessagePack, :pack, :unpack
 
-    attr :name
+    attr :name, :redis
 
-    def initialize(name)
-      @name = "turnpike:#{name}"
+    def initialize(name, redis: Redis.current)
+      @name = "#{Turnpike.namespace}:#{name}"
+      @redis = redis
     end
 
     def clear
@@ -24,6 +24,7 @@ module Turnpike
     end
 
     def pop(*); raise NotImplementedError; end
+    def bpop(*); raise NotImplementedError; end
     def push(*); raise NotImplementedError; end
     def size; raise NotImplementedError; end
     def unshift(*); raise NotImplementedError; end

data/lib/turnpike/queue.rb

@@ -6,17 +6,26 @@ module Turnpike
     #
     # n - Integer number of items to pop.
     #
-    # Returns a String item, an Array of items, or nil if the queue is empty.
+    # Returns an item, an Array of items, or nil if the queue is empty.
     def pop(n = 1)
-      items = []
-      n.times do
-        break unless item = redis.lpop(name)
-        items << unpack(item)
-      end
+      items = n.times.reduce([]) { |ary, _|
+        break ary unless item = redis.lpop(name)
+        ary << unpack(item)
+      }
 
       n == 1 ? items.first : items
     end
 
+    # Pop one or more items from the queue and block if the queue is empty.
+    #
+    # n - Integer number of items to pop.
+    #
+    # Returns an item or an Array of items.
+    def bpop(n = 1)
+      items = n.times.map { unpack(redis.blpop(name).last) }
+      n == 1 ? items.first : items
+    end
+
     # Push items to the end of the queue.
     #
     # items - A splat Array of items.

data/lib/turnpike/unique_queue.rb

@@ -15,15 +15,9 @@ module Turnpike
     #
     # n - Integer number of items to pop.
     #
-    # Returns a String item, an Array of items, or nil if the queue is empty.
+    # Returns an item, an Array of items, or nil if the queue is empty.
     def pop(n = 1)
-      items = begin
-        redis.evalsha(ZPOP_SHA, [name, n])
-      rescue Redis::CommandError
-        redis.eval(ZPOP, [name, n])
-      end
-      items.map! { |i| unpack(i) }
-
+      items = zpop(n).map { |i| unpack(i) }
       n == 1 ? items.first : items
     end
 
@@ -52,5 +46,13 @@ module Turnpike
       _, score = redis.zrange(name, 0, 0, with_scores: true).pop
       score ? push(*items, score: score - 1) : push(*items)
     end
+
+    private
+
+    def zpop(n)
+      redis.evalsha(ZPOP_SHA, [name, n])
+    rescue Redis::CommandError
+      redis.eval(ZPOP, [name, n])
+    end
   end
 end

data/lib/turnpike/version.rb

@@ -1,3 +1,3 @@
 module Turnpike
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/test/turnpike_test.rb

@@ -4,8 +4,13 @@ require 'minitest/benchmark' if ENV['BENCH']
 require 'turnpike'
 
 class TestTurnpike < MiniTest::Unit::TestCase
-  def test_call
+  def test_lambdalike
     assert_kind_of Turnpike::Queue, Turnpike.call
+    assert_kind_of Turnpike::Queue, Turnpike.()
+    assert_kind_of Turnpike::Queue, Turnpike[]
+  end
+
+  def test_unique_call
     assert_kind_of Turnpike::UniqueQueue, Turnpike.call(unique: true)
   end
 
@@ -14,9 +19,17 @@ class TestTurnpike < MiniTest::Unit::TestCase
     assert_includes queue.name, 'foo'
   end
 
+  def test_namespace
+    orig = Turnpike.namespace
+    Turnpike.namespace = 'foo'
+    queue = Turnpike::Base.new('bar')
+    assert_equal queue.name, 'foo:bar'
+    Turnpike.namespace = orig
+  end
+
   def test_abstract_class
     queue = Turnpike::Base.new('foo')
-    %w(push pop unshift size).each do |mth|
+    %w(push pop bpop unshift size).each do |mth|
       assert_raises(NotImplementedError) { queue.send(mth) }
     end
   end
@@ -109,8 +122,31 @@ class TestQueue < MiniTest::Unit::TestCase
   def peek(queue)
     queue.redis.lrange(queue.name, 0, -1).map { |i| queue.unpack(i) }
   end
-end
 
+  def test_blocking_pop
+    Thread.new {
+      sleep 0.1
+      klass.new('foo', redis: Redis.new).push(3)
+      queue.push(3)
+    }
+    queue.push(1, 2)
+    assert_equal [1, 2], queue.bpop(2)
+    assert_equal 3, queue.bpop
+  end
+
+  def test_non_blocking_enumeration
+    klass.class_eval do
+      include Enumerable
+      def each(&blk)
+        while x = pop
+          blk.call(x)
+        end
+      end
+    end
+    queue.push(1, 2)
+    assert_equal [1, 2], queue.to_a
+  end
+end
 
 class TestUniqueQueue < MiniTest::Unit::TestCase
   include QueueTests
@@ -120,4 +156,8 @@ class TestUniqueQueue < MiniTest::Unit::TestCase
   def peek(queue)
     queue.redis.zrange(queue.name, 0, -1).map { |i| queue.unpack(i) }
   end
+
+  def test_blocking_pop
+    assert_raises(NotImplementedError) { queue.bpop }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turnpike
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Hakan Ensari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: A Redis-backed FIFO queue