redis-namespace 1.1.1 → 1.2.0

data/README.md

@@ -35,3 +35,4 @@ Author
 =====
 
 Chris Wanstrath :: chris@ozmm.org
+Terence Lee :: hone02@gmail.com

data/lib/redis/namespace.rb

@@ -25,6 +25,11 @@ class Redis
     #     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 =>
@@ -39,11 +44,14 @@ class Redis
     #     Add the namespace to all elements returned, e.g.
     #       key1 key2 => namespace:key1 namespace:key2
     COMMANDS = {
+      "append"           => [:first],
       "auth"             => [],
       "bgrewriteaof"     => [],
       "bgsave"           => [],
-      "blpop"            => [ :exclude_last ],
+      "blpop"            => [ :exclude_last, :first ],
       "brpop"            => [ :exclude_last ],
+      "brpoplpush"       => [ :exclude_last ],
+      "config"           => [],
       "dbsize"           => [],
       "debug"            => [ :exclude_first ],
       "decr"             => [ :first ],
@@ -51,9 +59,12 @@ class Redis
       "del"              => [ :all   ],
       "exists"           => [ :first ],
       "expire"           => [ :first ],
+      "expireat"         => [ :first ],
       "flushall"         => [],
       "flushdb"          => [],
       "get"              => [ :first ],
+      "getbit"           => [ :first ],
+      "getrange"         => [ :first ],
       "getset"           => [ :first ],
       "hset"             => [ :first ],
       "hsetnx"           => [ :first ],
@@ -73,20 +84,24 @@ class Redis
       "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 ],
+      "ping"             => [],
       "psubscribe"       => [ :all ],
       "publish"          => [ :first ],
       "punsubscribe"     => [ :all ],
@@ -97,6 +112,7 @@ class Redis
       "rpop"             => [ :first ],
       "rpoplpush"        => [ :all ],
       "rpush"            => [ :first ],
+      "rpushx"           => [ :first ],
       "sadd"             => [ :first ],
       "save"             => [],
       "scard"            => [ :first ],
@@ -104,8 +120,10 @@ class Redis
       "sdiffstore"       => [ :all ],
       "select"           => [],
       "set"              => [ :first ],
+      "setbit"           => [ :first ],
       "setex"            => [ :first ],
       "setnx"            => [ :first ],
+      "setrange"         => [ :first ],
       "shutdown"         => [],
       "sinter"           => [ :all ],
       "sinterstore"      => [ :all ],
@@ -128,6 +146,7 @@ class Redis
       "zcard"            => [ :first ],
       "zcount"           => [ :first ],
       "zincrby"          => [ :first ],
+      "zinterstore"      => [ :exclude_options ],
       "zrange"           => [ :first ],
       "zrangebyscore"    => [ :first ],
       "zrank"            => [ :first ],
@@ -135,8 +154,10 @@ class Redis
       "zremrangebyrank"  => [ :first ],
       "zremrangebyscore" => [ :first ],
       "zrevrange"        => [ :first ],
+      "zrevrangebyscore" => [ :first ],
       "zrevrank"         => [ :first ],
       "zscore"           => [ :first ],
+      "zunionstore"      => [ :exclude_options ],
       "[]"               => [ :first ],
       "[]="              => [ :first ]
     }
@@ -152,7 +173,7 @@ class Redis
 
     def initialize(namespace, options = {})
       @namespace = namespace
-      @redis = options[:redis]
+      @redis = options[:redis] || Redis.current
     end
 
     # Ruby defines a now deprecated type method so we need to override it here
@@ -163,11 +184,11 @@ class Redis
 
     alias_method :self_respond_to?, :respond_to?
 
-    def respond_to?(*args)
-      if self_respond_to?(*args)
+    def respond_to?(command, include_private=false)
+      if self_respond_to?(command, include_private)
         true
       else
-        @redis.respond_to?(*args)
+        @redis.respond_to?(command, include_private)
       end
     end
 
@@ -175,10 +196,6 @@ class Redis
       query.nil? ? super("*") : super
     end
 
-    def exec
-      method_missing(:exec)
-    end
-
     def method_missing(command, *args, &block)
       handling = COMMANDS[command.to_s] ||
         COMMANDS[ALIASES[command.to_s]]
@@ -205,6 +222,14 @@ class Redis
         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
@@ -218,7 +243,12 @@ class Redis
       result = @redis.send(command, *args, &block)
 
       # Remove the namespace from results that are keys.
-      result = rem_namespace(result) if after == :all
+      case after
+      when :all
+        result = rem_namespace(result)
+      when :first
+        result[0] = rem_namespace(result[0]) if result
+      end
 
       result
     end

data/spec/redis_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe "redis" do
   before(:all) do
-    # use database 15 for testing so we dont accidentally step on you real data
+    # use database 15 for testing so we dont accidentally step on your real data
     @redis = Redis.new :db => 15
   end
 
@@ -37,6 +37,14 @@ describe "redis" do
     @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
@@ -48,6 +56,66 @@ describe "redis" do
     @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
@@ -88,6 +156,7 @@ describe "redis" do
     @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
 
@@ -111,6 +180,26 @@ describe "redis" do
     @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)

metadata

@@ -1,66 +1,119 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: redis-namespace
-version: !ruby/object:Gem::Version
-  version: 1.1.1
+version: !ruby/object:Gem::Version 
+  hash: 31
+  prerelease: 
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
-authors:
+authors: 
 - Chris Wanstrath
+- Terence Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-05-25 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 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.
+
 email: chris@ozmm.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - README.md
 - Rakefile
 - LICENSE
-- lib/redis/namespace.rb
 - lib/redis-namespace.rb
+- lib/redis/namespace.rb
 - spec/redis_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/defunkt/redis-namespace
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.21
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Namespaces Redis commands.
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4e21c69c01d7d32407ce889f986494a8d8bf5d5d
-  data.tar.gz: 29e559ef8ee02ebf2ef626df363b7ce20856d405
-SHA512:
-  metadata.gz: dad2aa13dfce40202b9c4ddb0ac2a7e53596f4d5264ac10e3e6e722c4ce01dc15fb7d37cc27ba47f9c63f44ac4a776f65d2f9c6075db24cccaaf3de048808801
-  data.tar.gz: afcb9eb9c96f1384791c841cfe8bcfcff9e0e2566067c9e295e01e36c22f0442e3a7b395b85f1ce4b71aa781cd72f4ab6ad78a0cc435a15e45c116e43bae6de8