redis-namespace-with-multi 1.2.1

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Chris Wanstrath
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,38 @@
+redis-namespace
+---------------
+
+Requires the redis gem.
+
+Namespaces all Redis calls.
+
+``` ruby
+r = Redis::Namespace.new(:ns, :redis => @r)
+r['foo'] = 1000
+```
+
+This will perform the equivalent of:
+
+    redis-cli set ns:foo 1000
+
+Useful when you have multiple systems using Redis differently in your app.
+
+
+Installation
+============
+
+    $ gem install redis-namespace
+
+
+
+Testing
+=======
+
+    $ bundle install
+    $ rake
+
+
+Author
+=====
+
+Chris Wanstrath :: chris@ozmm.org
+Terence Lee :: hone02@gmail.com

data/Rakefile

@@ -0,0 +1,7 @@
+task :default => :spec
+task :test    => :spec
+
+desc "Run specs"
+task :spec do
+  exec "rspec spec/redis_spec.rb"
+end

data/lib/redis/namespace.rb

@@ -0,0 +1,316 @@
+require 'redis'
+
+class Redis
+  class Namespace
+    # The following table defines how input parameters and result
+    # values should be modified for the namespace.
+    #
+    # COMMANDS is a hash. Each key is the name of a command and each
+    # value is a two element array.
+    #
+    # The first element in the value array describes how to modify the
+    # arguments passed. It can be one of:
+    #
+    #   nil
+    #     Do nothing.
+    #   :first
+    #     Add the namespace to the first argument passed, e.g.
+    #       GET key => GET namespace:key
+    #   :all
+    #     Add the namespace to all arguments passed, e.g.
+    #       MGET key1 key2 => MGET namespace:key1 namespace:key2
+    #   :exclude_first
+    #     Add the namespace to all arguments but the first, e.g.
+    #   :exclude_last
+    #     Add the namespace to all arguments but the last, e.g.
+    #       BLPOP key1 key2 timeout =>
+    #       BLPOP namespace:key1 namespace:key2 timeout
+    #   :exclude_options
+    #     Add the namespace to all arguments, except the last argument,
+    #     if the last argument is a hash of options.
+    #       ZUNIONSTORE key1 2 key2 key3 WEIGHTS 2 1 =>
+    #       ZUNIONSTORE namespace:key1 2 namespace:key2 namespace:key3 WEIGHTS 2 1
+    #   :alternate
+    #     Add the namespace to every other argument, e.g.
+    #       MSET key1 value1 key2 value2 =>
+    #       MSET namespace:key1 value1 namespace:key2 value2
+    #
+    # The second element in the value array describes how to modify
+    # the return value of the Redis call. It can be one of:
+    #
+    #   nil
+    #     Do nothing.
+    #   :all
+    #     Add the namespace to all elements returned, e.g.
+    #       key1 key2 => namespace:key1 namespace:key2
+    COMMANDS = {
+      "append"           => [:first],
+      "auth"             => [],
+      "bgrewriteaof"     => [],
+      "bgsave"           => [],
+      "bitcount"         => [ :first ],
+      "bitop"            => [ :exclude_first ],
+      "blpop"            => [ :exclude_last, :first ],
+      "brpop"            => [ :exclude_last ],
+      "brpoplpush"       => [ :exclude_last ],
+      "config"           => [],
+      "dbsize"           => [],
+      "debug"            => [ :exclude_first ],
+      "decr"             => [ :first ],
+      "decrby"           => [ :first ],
+      "del"              => [ :all   ],
+      "discard"          => [],
+      "dump"             => [ :first ],
+      "exists"           => [ :first ],
+      "expire"           => [ :first ],
+      "expireat"         => [ :first ],
+      "flushall"         => [],
+      "flushdb"          => [],
+      "get"              => [ :first ],
+      "getbit"           => [ :first ],
+      "getrange"         => [ :first ],
+      "getset"           => [ :first ],
+      "hset"             => [ :first ],
+      "hsetnx"           => [ :first ],
+      "hget"             => [ :first ],
+      "hincrby"          => [ :first ],
+      "hincrbyfloat"     => [ :first ],
+      "hmget"            => [ :first ],
+      "hmset"            => [ :first ],
+      "hdel"             => [ :first ],
+      "hexists"          => [ :first ],
+      "hlen"             => [ :first ],
+      "hkeys"            => [ :first ],
+      "hvals"            => [ :first ],
+      "hgetall"          => [ :first ],
+      "incr"             => [ :first ],
+      "incrby"           => [ :first ],
+      "incrbyfloat"      => [ :first ],
+      "info"             => [],
+      "keys"             => [ :first, :all ],
+      "lastsave"         => [],
+      "lindex"           => [ :first ],
+      "linsert"          => [ :first ],
+      "llen"             => [ :first ],
+      "lpop"             => [ :first ],
+      "lpush"            => [ :first ],
+      "lpushx"           => [ :first ],
+      "lrange"           => [ :first ],
+      "lrem"             => [ :first ],
+      "lset"             => [ :first ],
+      "ltrim"            => [ :first ],
+      "mapped_hmset"     => [ :first ],
+      "mapped_hmget"     => [ :first ],
+      "mapped_mget"      => [ :all, :all ],
+      "mget"             => [ :all ],
+      "monitor"          => [ :monitor ],
+      "move"             => [ :first ],
+      "mset"             => [ :alternate ],
+      "msetnx"           => [ :alternate ],
+      "object"           => [ :exclude_first ],
+      "persist"          => [ :first ],
+      "pexpire"          => [ :first ],
+      "pexpireat"        => [ :first ],
+      "ping"             => [],
+      "psetex"           => [ :first ],
+      "psubscribe"       => [ :all ],
+      "pttl"             => [ :first ],
+      "publish"          => [ :first ],
+      "punsubscribe"     => [ :all ],
+      "quit"             => [],
+      "randomkey"        => [],
+      "rename"           => [ :all ],
+      "renamenx"         => [ :all ],
+      "restore"          => [ :first ],
+      "rpop"             => [ :first ],
+      "rpoplpush"        => [ :all ],
+      "rpush"            => [ :first ],
+      "rpushx"           => [ :first ],
+      "sadd"             => [ :first ],
+      "save"             => [],
+      "scard"            => [ :first ],
+      "sdiff"            => [ :all ],
+      "sdiffstore"       => [ :all ],
+      "select"           => [],
+      "set"              => [ :first ],
+      "setbit"           => [ :first ],
+      "setex"            => [ :first ],
+      "setnx"            => [ :first ],
+      "setrange"         => [ :first ],
+      "shutdown"         => [],
+      "sinter"           => [ :all ],
+      "sinterstore"      => [ :all ],
+      "sismember"        => [ :first ],
+      "slaveof"          => [],
+      "smembers"         => [ :first ],
+      "smove"            => [ :exclude_last ],
+      "sort"             => [ :sort  ],
+      "spop"             => [ :first ],
+      "srandmember"      => [ :first ],
+      "srem"             => [ :first ],
+      "subscribe"        => [ :all ],
+      "sunion"           => [ :all ],
+      "sunionstore"      => [ :all ],
+      "ttl"              => [ :first ],
+      "type"             => [ :first ],
+      "unsubscribe"      => [ :all ],
+      "watch"            => [ :all ],
+      "zadd"             => [ :first ],
+      "zcard"            => [ :first ],
+      "zcount"           => [ :first ],
+      "zincrby"          => [ :first ],
+      "zinterstore"      => [ :exclude_options ],
+      "zrange"           => [ :first ],
+      "zrangebyscore"    => [ :first ],
+      "zrank"            => [ :first ],
+      "zrem"             => [ :first ],
+      "zremrangebyrank"  => [ :first ],
+      "zremrangebyscore" => [ :first ],
+      "zrevrange"        => [ :first ],
+      "zrevrangebyscore" => [ :first ],
+      "zrevrank"         => [ :first ],
+      "zscore"           => [ :first ],
+      "zunionstore"      => [ :exclude_options ],
+      "[]"               => [ :first ],
+      "[]="              => [ :first ]
+    }
+
+    # support previous versions of redis gem
+    ALIASES = case
+              when defined? Redis::Client::ALIASES  then Redis::Client::ALIASES
+              when defined? Redis::ALIASES          then Redis::ALIASES
+              else {}
+              end
+
+    attr_accessor :namespace
+    attr_reader :redis
+
+    def initialize(namespace, options = {})
+      @namespace = namespace
+      @redis = options[:redis] || Redis.current
+    end
+
+    # Ruby defines a now deprecated type method so we need to override it here
+    # since it will never hit method_missing
+    def type(key)
+      method_missing(:type, key)
+    end
+
+    alias_method :self_respond_to?, :respond_to?
+
+    def respond_to?(command, include_private=false)
+      if self_respond_to?(command, include_private)
+        true
+      else
+        @redis.respond_to?(command, include_private)
+      end
+    end
+
+    def keys(query = nil)
+      query.nil? ? super("*") : super
+    end
+
+    def multi(&block)
+      namespaced_block(:multi, &block)
+    end
+
+    def pipelined(&block)
+      namespaced_block(:pipelined, &block)
+    end
+
+    def method_missing(command, *args, &block)
+      handling = COMMANDS[command.to_s] ||
+        COMMANDS[ALIASES[command.to_s]]
+
+      # redis-namespace does not know how to handle this command.
+      # Passing it to @redis as is.
+      if handling.nil?
+        return @redis.send(command, *args, &block)
+      end
+
+      (before, after) = handling
+
+      # Add the namespace to any parameters that are keys.
+      case before
+      when :first
+        args[0] = add_namespace(args[0]) if args[0]
+      when :all
+        args = add_namespace(args)
+      when :exclude_first
+        first = args.shift
+        args = add_namespace(args)
+        args.unshift(first) if first
+      when :exclude_last
+        last = args.pop
+        args = add_namespace(args)
+        args.push(last) if last
+      when :exclude_options
+        if args.last.is_a?(Hash)
+          last = args.pop
+          args = add_namespace(args)
+          args.push(last)
+        else
+          args = add_namespace(args)
+        end
+      when :alternate
+        args.each_with_index { |a, i| args[i] = add_namespace(a) if i.even? }
+      when :sort
+        args[0] = add_namespace(args[0]) if args[0]
+        [:by, :get, :store].each do |key|
+          args[1][key] = add_namespace(args[1][key]) if args[1][key]
+        end if args[1].is_a?(Hash)
+      end
+
+      # Dispatch the command to Redis and store the result.
+      result = @redis.send(command, *args, &block)
+
+      # Remove the namespace from results that are keys.
+      case after
+      when :all
+        result = rem_namespace(result)
+      when :first
+        result[0] = rem_namespace(result[0]) if result
+      end
+
+      result
+    end
+
+  private
+
+    def namespaced_block(command, &block)
+      original = @redis
+      result = redis.send(command) do |r|
+        @redis = r
+        yield self
+      end
+      @redis = original
+      result
+    end
+
+    def add_namespace(key)
+      return key unless key && @namespace
+
+      case key
+      when Array
+        key.map {|k| add_namespace k}
+      when Hash
+        Hash[*key.map {|k, v| [ add_namespace(k), v ]}.flatten]
+      else
+        "#{@namespace}:#{key}"
+      end
+    end
+
+    def rem_namespace(key)
+      return key unless key && @namespace
+
+      case key
+      when Array
+        key.map {|k| rem_namespace k}
+      when Hash
+        Hash[*key.map {|k, v| [ rem_namespace(k), v ]}.flatten]
+      else
+        key.to_s.gsub /^#{@namespace}:/, ""
+      end
+    end
+  end
+end

data/lib/redis-namespace.rb

@@ -0,0 +1 @@
+require 'redis/namespace'

data/spec/redis_spec.rb

@@ -0,0 +1,361 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "redis" do
+  @redis_version = Gem::Version.new(Redis.current.info["redis_version"])
+
+  before(:all) do
+    # use database 15 for testing so we dont accidentally step on your real data
+    @redis = Redis.new :db => 15
+  end
+
+  before(:each) do
+    @namespaced = Redis::Namespace.new(:ns, :redis => @redis)
+    @namespaced.flushdb
+    @redis['foo'] = 'bar'
+  end
+
+  after(:each) do
+    @redis.flushdb
+  end
+
+  after(:all) do
+    @redis.quit
+  end
+
+  it "proxies `client` to the client" do
+    @namespaced.client.should == @redis.client
+  end
+
+  it "should be able to use a namespace" do
+    @namespaced['foo'].should == nil
+    @namespaced['foo'] = 'chris'
+    @namespaced['foo'].should == 'chris'
+    @redis['foo'] = 'bob'
+    @redis['foo'].should == 'bob'
+
+    @namespaced.incrby('counter', 2)
+    @namespaced['counter'].to_i.should == 2
+    @redis['counter'].should == nil
+    @namespaced.type('counter').should == 'string'
+  end
+
+  it "should be able to use a namespace with bpop" do
+    @namespaced.rpush "foo", "string"
+    @namespaced.rpush "foo", "ns:string"
+    @namespaced.blpop("foo", 1).should == ["foo", "string"]
+    @namespaced.blpop("foo", 1).should == ["foo", "ns:string"]
+    @namespaced.blpop("foo", 1).should == nil
+  end
+
+  it "should be able to use a namespace with del" do
+    @namespaced['foo'] = 1000
+    @namespaced['bar'] = 2000
+    @namespaced['baz'] = 3000
+    @namespaced.del 'foo'
+    @namespaced['foo'].should == nil
+    @namespaced.del 'bar', 'baz'
+    @namespaced['bar'].should == nil
+    @namespaced['baz'].should == nil
+  end
+
+  it 'should be able to use a namespace with append' do
+    @namespaced['foo'] = 'bar'
+    @namespaced.append('foo','n').should == 4
+    @namespaced['foo'].should == 'barn'
+    @redis['foo'].should == 'bar'
+  end
+
+  it 'should be able to use a namespace with brpoplpush' do
+    @namespaced.lpush('foo','bar')
+    @namespaced.brpoplpush('foo','bar',0).should == 'bar'
+    @namespaced.lrange('foo',0,-1).should == []
+    @namespaced.lrange('bar',0,-1).should == ['bar']
+  end
+
+  it 'should be able to use a namespace with getbit' do
+    @namespaced.set('foo','bar')
+    @namespaced.getbit('foo',1).should == 1
+  end
+
+  it 'should be able to use a namespace with getrange' do
+    @namespaced.set('foo','bar')
+    @namespaced.getrange('foo',0,-1).should == 'bar'
+  end
+
+  it 'should be able to use a namespace with linsert' do
+    @namespaced.rpush('foo','bar')
+    @namespaced.rpush('foo','barn')
+    @namespaced.rpush('foo','bart')
+    @namespaced.linsert('foo','BEFORE','barn','barf').should == 4
+    @namespaced.lrange('foo',0,-1).should == ['bar','barf','barn','bart']
+  end
+
+  it 'should be able to use a namespace with lpushx' do
+    @namespaced.lpushx('foo','bar').should == 0
+    @namespaced.lpush('foo','boo')
+    @namespaced.lpushx('foo','bar').should == 2
+    @namespaced.lrange('foo',0,-1).should == ['bar','boo']
+  end
+
+  it 'should be able to use a namespace with rpushx' do
+    @namespaced.rpushx('foo','bar').should == 0
+    @namespaced.lpush('foo','boo')
+    @namespaced.rpushx('foo','bar').should == 2
+    @namespaced.lrange('foo',0,-1).should == ['boo','bar']
+  end
+
+  it 'should be able to use a namespace with setbit' do
+    @namespaced.setbit('virgin_key', 1, 1)
+    @namespaced.exists('virgin_key').should be_true
+    @namespaced.get('virgin_key').should == @namespaced.getrange('virgin_key',0,-1)
+  end
+
+  it 'should be able to use a namespace with setrange' do
+    @namespaced.setrange('foo', 0, 'bar')
+    @namespaced['foo'].should == 'bar'
+
+    @namespaced.setrange('bar', 2, 'foo')
+    @namespaced['bar'].should == "\000\000foo"
+  end
+
+  it "should be able to use a namespace with mget" do
+    @namespaced['foo'] = 1000
+    @namespaced['bar'] = 2000
+    @namespaced.mapped_mget('foo', 'bar').should == { 'foo' => '1000', 'bar' => '2000' }
+    @namespaced.mapped_mget('foo', 'baz', 'bar').should == {'foo'=>'1000', 'bar'=>'2000', 'baz' => nil}
+  end
+
+  it "should be able to use a namespace with mset" do
+    @namespaced.mset('foo', '1000', 'bar', '2000')
+    @namespaced.mapped_mget('foo', 'bar').should == { 'foo' => '1000', 'bar' => '2000' }
+    @namespaced.mapped_mget('foo', 'baz', 'bar').should == { 'foo' => '1000', 'bar' => '2000', 'baz' => nil}
+  end
+
+  it "should be able to use a namespace with msetnx" do
+    @namespaced.msetnx('foo', '1000', 'bar', '2000')
+    @namespaced.mapped_mget('foo', 'bar').should == { 'foo' => '1000', 'bar' => '2000' }
+    @namespaced.mapped_mget('foo', 'baz', 'bar').should == { 'foo' => '1000', 'bar' => '2000', 'baz' => nil}
+  end
+
+  it "should be able to use a namespace with hashes" do
+    @namespaced.hset('foo', 'key', 'value')
+    @namespaced.hset('foo', 'key1', 'value1')
+    @namespaced.hget('foo', 'key').should == 'value'
+    @namespaced.hgetall('foo').should == {'key' => 'value', 'key1' => 'value1'}
+    @namespaced.hlen('foo').should == 2
+    @namespaced.hkeys('foo').should == ['key', 'key1']
+    @namespaced.hmset('bar', 'key', 'value', 'key1', 'value1')
+    @namespaced.hmget('bar', 'key', 'key1')
+    @namespaced.hmset('bar', 'a_number', 1)
+    @namespaced.hmget('bar', 'a_number').should == ['1']
+    @namespaced.hincrby('bar', 'a_number', 3)
+    @namespaced.hmget('bar', 'a_number').should == ['4']
+    @namespaced.hgetall('bar').should == {'key' => 'value', 'key1' => 'value1', 'a_number' => '4'}
+
+    @namespaced.hsetnx('foonx','nx',10).should be_true
+    @namespaced.hsetnx('foonx','nx',12).should be_false
+    @namespaced.hget('foonx','nx').should == "10"
+    @namespaced.hkeys('foonx').should     == %w{ nx }
+    @namespaced.hvals('foonx').should     == %w{ 10 }
+    @namespaced.mapped_hmset('baz', {'key' => 'value', 'key1' => 'value1', 'a_number' => 4})
+    @namespaced.mapped_hmget('baz', 'key', 'key1', 'a_number').should == {'key' => 'value', 'key1' => 'value1', 'a_number' => '4'}
+    @namespaced.hgetall('baz').should == {'key' => 'value', 'key1' => 'value1', 'a_number' => '4'}
+  end
+
+  it "should properly intersect three sets" do
+    @namespaced.sadd('foo', 1)
+    @namespaced.sadd('foo', 2)
+    @namespaced.sadd('foo', 3)
+    @namespaced.sadd('bar', 2)
+    @namespaced.sadd('bar', 3)
+    @namespaced.sadd('bar', 4)
+    @namespaced.sadd('baz', 3)
+    @namespaced.sinter('foo', 'bar', 'baz').should == %w( 3 )
+  end
+
+  it "should properly union two sets" do
+    @namespaced.sadd('foo', 1)
+    @namespaced.sadd('foo', 2)
+    @namespaced.sadd('bar', 2)
+    @namespaced.sadd('bar', 3)
+    @namespaced.sadd('bar', 4)
+    @namespaced.sunion('foo', 'bar').sort.should == %w( 1 2 3 4 )
+  end
+
+  it "should properly union two sorted sets with options" do
+    @namespaced.zadd('sort1', 1, 1)
+    @namespaced.zadd('sort1', 2, 2)
+    @namespaced.zadd('sort2', 2, 2)
+    @namespaced.zadd('sort2', 3, 3)
+    @namespaced.zadd('sort2', 4, 4)
+    @namespaced.zunionstore('union', ['sort1', 'sort2'], :weights => [2, 1])
+    @namespaced.zrevrange('union', 0, -1).should == %w( 2 4 3 1 )
+  end
+
+  it "should properly union two sorted sets without options" do
+    @namespaced.zadd('sort1', 1, 1)
+    @namespaced.zadd('sort1', 2, 2)
+    @namespaced.zadd('sort2', 2, 2)
+    @namespaced.zadd('sort2', 3, 3)
+    @namespaced.zadd('sort2', 4, 4)
+    @namespaced.zunionstore('union', ['sort1', 'sort2'])
+    @namespaced.zrevrange('union', 0, -1).should == %w( 4 2 3 1 )
+  end
+
+  it "should add namespace to sort" do
+    @namespaced.sadd('foo', 1)
+    @namespaced.sadd('foo', 2)
+    @namespaced.set('weight_1', 2)
+    @namespaced.set('weight_2', 1)
+    @namespaced.set('value_1', 'a')
+    @namespaced.set('value_2', 'b')
+
+    @namespaced.sort('foo').should == %w( 1 2 )
+    @namespaced.sort('foo', :limit => [0, 1]).should == %w( 1 )
+    @namespaced.sort('foo', :order => 'desc').should == %w( 2 1 )
+    @namespaced.sort('foo', :by => 'weight_*').should == %w( 2 1 )
+    @namespaced.sort('foo', :get => 'value_*').should == %w( a b )
+
+    @namespaced.sort('foo', :store => 'result')
+    @namespaced.lrange('result', 0, -1).should == %w( 1 2 )
+  end
+
+  it "should yield the correct list of keys" do
+    @namespaced["foo"] = 1
+    @namespaced["bar"] = 2
+    @namespaced["baz"] = 3
+    @namespaced.keys("*").sort.should == %w( bar baz foo )
+    @namespaced.keys.sort.should == %w( bar baz foo )
+  end
+
+  it "should add namepsace to multi blocks" do
+    @namespaced.mapped_hmset "a_hash", {"foo" => "bar"}
+    @namespaced.multi do |r|
+      r.del "a_hash"
+      r.mapped_hmset "a_hash", {"yin" => "yang"}
+    end
+    @namespaced.hgetall("a_hash").should == {"yin" => "yang"}
+  end
+
+  it "should add namespace to pipelined blocks" do
+    @namespaced.mapped_hmset "a_hash", {"foo" => "bar"}
+    @namespaced.pipelined do |r|
+      r.del "a_hash"
+      r.mapped_hmset "a_hash", {"yin" => "yang"}
+    end
+    @namespaced.hgetall("a_hash").should == {"yin" => "yang"}
+  end
+
+  it "should returned response array from pipelined block" do
+    @namespaced.mset "foo", "bar", "yin", "yang"
+    result = @namespaced.pipelined do |r|
+      r["foo"]
+      r["yin"]
+    end
+    result.should == ["bar", "yang"]
+  end
+
+  it "can change its namespace" do
+    @namespaced['foo'].should == nil
+    @namespaced['foo'] = 'chris'
+    @namespaced['foo'].should == 'chris'
+
+    @namespaced.namespace.should == :ns
+    @namespaced.namespace = :spec
+    @namespaced.namespace.should == :spec
+
+    @namespaced['foo'].should == nil
+    @namespaced['foo'] = 'chris'
+    @namespaced['foo'].should == 'chris'
+  end
+
+  it "should respond to :namespace=" do
+    @namespaced.respond_to?(:namespace=).should == true
+  end
+
+  if @redis_version >= Gem::Version.new("2.6.0")
+    describe "redis 2.6 commands" do
+      it "should namespace bitcount" do
+        pending "awaiting implementaton of command in redis gem"
+      end
+
+      it "should namespace bitop" do
+        pending "awaiting implementaton of command in redis gem"
+      end
+
+      it "should namespace dump" do
+        pending "awaiting implementaton of command in redis gem"
+      end
+
+      it "should namespace hincrbyfloat" do
+        @namespaced.hset('mykey', 'field', 10.50)
+        @namespaced.hincrbyfloat('mykey', 'field', 0.1).should == 10.6
+      end
+
+      it "should namespace incrbyfloat" do
+        @namespaced.set('mykey', 10.50)
+        @namespaced.incrbyfloat('mykey', 0.1).should == 10.6
+      end
+
+      it "should namespace object" do
+        @namespaced.set('foo', 1000)
+        @namespaced.object('encoding', 'foo').should == 'int'
+      end
+
+      it "should namespace persist" do
+        @namespaced.set('mykey', 'Hello')
+        @namespaced.expire('mykey', 60)
+        @namespaced.persist('mykey').should == true
+        @namespaced.ttl('mykey').should == -1
+      end
+
+      it "should namespace pexpire" do
+        @namespaced.set('mykey', 'Hello')
+        @namespaced.pexpire('mykey', 60000).should == true
+      end
+
+      it "should namespace pexpireat" do
+        @namespaced.set('mykey', 'Hello')
+        @namespaced.pexpire('mykey', 1555555555005).should == true
+      end
+
+      it "should namespace psetex" do
+        @namespaced.psetex('mykey', 10000, 'Hello').should == 'OK'
+        @namespaced.get('mykey').should == 'Hello'
+      end
+
+      it "should namespace pttl" do
+        @namespaced.set('mykey', 'Hello')
+        @namespaced.expire('mykey', 1)
+        @namespaced.pttl('mykey').should == 1000
+      end
+
+      it "should namespace restore" do
+        pending "awaiting implementaton of command in redis gem"
+      end
+    end
+  end
+
+  # Only test aliasing functionality for Redis clients that support aliases.
+  unless Redis::Namespace::ALIASES.empty?
+    it "should support command aliases (delete)" do
+      @namespaced.delete('foo')
+      @redis.should_not have_key('ns:foo')
+    end
+
+    it "should support command aliases (set_add)" do
+      @namespaced.set_add('bar', 'quux')
+      @namespaced.smembers('bar').should include('quux')
+    end
+
+    it "should support command aliases (push_head)" do
+      @namespaced.push_head('bar', 'quux')
+      @redis.llen('ns:bar').should == 1
+    end
+
+    it "should support command aliases (zset_add)" do
+      @namespaced.zset_add('bar', 1, 'quux')
+      @redis.zcard('ns:bar').should == 1
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,18 @@
+require 'rubygems'
+require 'bundler'
+Bundler.setup(:default, :test)
+Bundler.require(:default, :test)
+
+require 'rspec'
+require 'redis'
+require 'logger'
+
+$TESTING=true
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'redis/namespace'
+
+RSpec::Matchers.define :have_key do |expected|
+  match do |redis|
+    redis.exists(expected)
+  end
+end

metadata

@@ -0,0 +1,95 @@
+--- !ruby/object:Gem::Specification
+name: redis-namespace-with-multi
+version: !ruby/object:Gem::Version
+  version: 1.2.1
+  prerelease: 
+platform: ruby
+authors:
+- Chris Wanstrath
+- Terence Lee
+- Carl Zulauf
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-08-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: &70195823091700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70195823091700
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70195823091300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70195823091300
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70195823090840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70195823090840
+description: ! 'Adds a Redis::Namespace class which can be used to namespace calls
+
+  to Redis. This is useful when using a single instance of Redis with
+
+  multiple, different applications.
+
+
+  This fork adds support for the much loved multi and pipelined commands.
+
+'
+email: carl@linkleaf.com
+executables: []
+extensions: []
+extra_rdoc_files: []
+files:
+- README.md
+- Rakefile
+- LICENSE
+- lib/redis/namespace.rb
+- lib/redis-namespace.rb
+- spec/redis_spec.rb
+- spec/spec_helper.rb
+homepage: http://github.com/carlzulauf/redis-namespace
+licenses: []
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 1.8.15
+signing_key: 
+specification_version: 3
+summary: Namespaces Redis commands. Fork with working pipelined/multi.
+test_files: []