turnpike 0.3.2 → 0.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5cc33fb8535559daf70d3901bc2099644bc291b6
+  data.tar.gz: 0a3fd6e3d12dfbbdbf450252eee59b6e31c2c1a9
+SHA512:
+  metadata.gz: 0ea35fe014cf3829a24677a7ab481e58b399355c04661581c2e300c0bc31edf877cf7f6c093df2f0a98ccfeb08477c2d21eee95d907df8151a12be24595fe1ac
+  data.tar.gz: 8a46a54abc67b7ea943f66425d46ccd6825db44e46f4a18fc7b20aa11453b837b3c2704ac17f91e4bdf1fbc1279134dbddbc9d1fa0ec2e6e5e05dbf4624e12c4

data/.travis.yml

@@ -1,5 +1,6 @@
 rvm:
   - 1.9.3
+  - 2.0.0
   - jruby-19mode
   - rbx-19mode
 services:

data/README.md

@@ -2,8 +2,7 @@
 
 [![travis][1]][2]
 
-Turnpike is a Redis-backed queue that wraps a [List][4] and speaks Ruby
-colloquial.
+Turnpike wraps a [Redis List][4] and speaks Ruby colloquial.
 
 ![turnpike][3]
 
@@ -11,22 +10,16 @@ colloquial.
 
 ```ruby
 queue = Turnpike['foo']
-
 queue << 1, 2, 3
 queue.pop # => 1
-queue.peek # => [2, 3]
-
 queue << 4
-queue.peek # => [2, 3, 4]
-
-queue.unshift 1
-queue.peek # => [1, 2, 3, 4]
+queue.unshift(1)
+queue.pop(4) # => [1, 2, 3, 4]
 ```
 
-[Read the API] [5].
+Turnpike requires Redis 2.4 or higher.
 
 [1]: https://secure.travis-ci.org/hakanensari/turnpike.png
 [2]: http://travis-ci.org/hakanensari/turnpike
 [3]: http://f.cl.ly/items/33242X323P3M1t1G400H/turnpike.jpg
 [4]: http://redis.io/topics/data-types
-[5]: https://github.com/hakanensari/turnpike/blob/master/lib/turnpike/queue.rb

data/lib/turnpike/queue.rb

@@ -4,18 +4,18 @@ module Turnpike
     # Returns a String name.
     attr :name
 
-    # Creates a new queue.
+    # Create a new queue.
     #
     # name - A queue name that responds to to_s.
     def initialize(name = 'queue')
       @name = "turnpike:#{name}"
     end
 
-    # Removes all items from the queue.
+    # Remove all items from the queue.
     #
     # Returns Integer number of items that were removed.
     def clear
-      redis.del name
+      redis.del(name)
     end
 
     # Returns whether the queue is empty.
@@ -23,11 +23,6 @@ module Turnpike
       size == 0
     end
 
-    # Return an Array of all queued items.
-    def peek
-      redis.lrange(name, 0, -1).map { |i| Marshal.load i }
-    end
-
     # Pops one or more items from the front of the queue.
     #
     # n - Integer number of items to pop.
@@ -43,17 +38,13 @@ module Turnpike
       n == 1 ? items.first : items
     end
 
-    # Pushes items to the end of the queue.
+    # Push items to the end of the queue.
     #
     # items - A splat Array of items.
     #
     # Returns the Integer size of the queue after the operation.
     def push(*items)
-      if redis_version >= '2.4'
-        redis.rpush name, items.map { |i| Marshal.dump i }
-      else
-        items.each { |i| redis.rpush name, Marshal.dump(i) }
-      end
+      redis.rpush(name, items.map { |i| Marshal.dump(i) })
     end
 
     # Syntactic sugar.
@@ -61,30 +52,22 @@ module Turnpike
 
     # Returns the Integer size of the queue.
     def size
-      redis.llen name
+      redis.llen(name)
     end
 
-    # Pushes items to the front of the queue.
+    # Push items to the front of the queue.
     #
     # items - A splat Array of items.
     #
     # Returns the Integer size of the queue after the operation.
     def unshift(*items)
-      if redis_version >= '2.4'
-        redis.lpush name, items.map { |i| Marshal.dump i }
-      else
-        items.each { |i| redis.lpush name, Marshal.dump(i) }
-      end
+      redis.lpush(name, items.map { |i| Marshal.dump(i) })
     end
 
     private
 
     def redis
-      Redis.current ||= Redis.connect Turnpike.options
-    end
-
-    def redis_version
-      @redis_version ||= redis.info['redis_version']
+      Redis.current ||= Redis.connect(Turnpike.options)
     end
   end
 end

data/lib/turnpike/version.rb

@@ -1,3 +1,3 @@
 module Turnpike
-  VERSION = '0.3.2'
+  VERSION = '0.4.1'
 end

data/lib/turnpike.rb

@@ -11,7 +11,7 @@ module Turnpike
       Queue.new name
     end
 
-    # Sets Redis connection options.
+    # Set Redis connection options.
     #
     # hsh - A Hash of options.
     #

data/test/turnpike_test.rb

@@ -1,12 +1,17 @@
 require 'bundler/setup'
-require 'test/unit'
+require 'minitest/autorun'
 require File.expand_path('../lib/turnpike', File.dirname(__FILE__))
 
-class TestTurnpike < Test::Unit::TestCase
+class TestTurnpike < MiniTest::Unit::TestCase
   def setup
     Redis.current.flushall
   end
 
+  def peek(queue)
+    redis = queue.send(:redis)
+    redis.lrange(queue.name, 0, -1).map { |i| Marshal.load(i) }
+  end
+
   def test_bracket
     queue = Turnpike['foo']
     assert_kind_of Turnpike::Queue, queue
@@ -24,41 +29,41 @@ class TestTurnpike < Test::Unit::TestCase
 
   def test_push
     queue = Turnpike::Queue.new
-    queue.push 1
+    queue.push(1)
     assert_equal 1, queue.size
-    queue.push 2, 3
+    queue.push(2, 3)
     assert_equal 3, queue.size
-    assert_equal [1, 2, 3], queue.peek
+    assert_equal [1, 2, 3], peek(queue)
   end
 
   def test_push_2_2
     queue = Turnpike::Queue.new
     queue.instance_variable_set :@redis_version, '2.2'
-    queue.push 1
-    queue.push 2, 3
-    assert_equal [1, 2, 3], queue.peek
+    queue.push(1)
+    queue.push(2, 3)
+    assert_equal [1, 2, 3], peek(queue)
   end
 
   def test_unshift
     queue = Turnpike::Queue.new
-    queue.unshift 1
+    queue.unshift(1)
     assert_equal 1, queue.size
-    queue.unshift 2, 3
+    queue.unshift(2, 3)
     assert_equal 3, queue.size
-    assert_equal [3, 2, 1], queue.peek
+    assert_equal [3, 2, 1], peek(queue)
   end
 
   def test_unshift_2_2
     queue = Turnpike::Queue.new
     queue.instance_variable_set :@redis_version, '2.2'
-    queue.unshift 1
-    queue.unshift 2, 3
-    assert_equal [3, 2, 1], queue.peek
+    queue.unshift(1)
+    queue.unshift(2, 3)
+    assert_equal [3, 2, 1], peek(queue)
   end
 
   def test_pop
     queue = Turnpike::Queue.new
-    queue.push 1, 2
+    queue.push(1, 2)
     assert_equal 1, queue.pop
     assert_equal 2, queue.pop
     assert_equal nil, queue.pop
@@ -66,7 +71,7 @@ class TestTurnpike < Test::Unit::TestCase
 
   def test_pop_many
     queue = Turnpike::Queue.new
-    queue.push 1, 2, 3
+    queue.push(1, 2, 3)
     assert_equal [1, 2], queue.pop(2)
     assert_equal [3], queue.pop(2)
     assert_equal [], queue.pop(2)
@@ -74,8 +79,8 @@ class TestTurnpike < Test::Unit::TestCase
 
   def test_order
     queue = Turnpike::Queue.new
-    queue.push 1, 2
-    queue.unshift 3
+    queue.push(1, 2)
+    queue.unshift(3)
     assert_equal 3, queue.pop
     assert_equal 1, queue.pop
     assert_equal 2, queue.pop
@@ -84,16 +89,16 @@ class TestTurnpike < Test::Unit::TestCase
   def test_multiple_queues
     queue1 = Turnpike::Queue.new 'foo'
     queue2 = Turnpike::Queue.new 'bar'
-    queue1.push 1
-    queue2.push 2, 3
+    queue1.push(1)
+    queue2.push(2, 3)
     assert_equal 1, queue1.size
     assert_equal 2, queue2.size
   end
 
   def test_peek
     queue = Turnpike::Queue.new
-    assert_equal [], queue.peek
+    assert_equal [], peek(queue)
     queue << 1
-    assert_equal [1], queue.peek
+    assert_equal [1], peek(queue)
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: turnpike
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors:
 - Hakan Ensari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,17 +27,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Turnpike is a Redis-backed queue.
@@ -63,33 +58,27 @@ files:
 - turnpike.gemspec
 homepage: http://github.com/hakanensari/turnpike
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3840254104933730285
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3840254104933730285
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Redis-backed queue
 test_files:
 - test/turnpike_test.rb
+has_rdoc: