redis-namespace 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e20a131134003e74cb1b40bcf3ad11c61dae9d9d
-  data.tar.gz: f7718c7e9ea9ce7e8a46889c78bebe9a7d4a09ff
+  metadata.gz: 838bcd2a161520a3d12b854bc1a441005c7a1d71
+  data.tar.gz: ea531ab8ea4ff3fcca0b23bdd98ca9e35eb43755
 SHA512:
-  metadata.gz: 00d8dca8c63810e4029cfc5430bb1507f9a1736320633ab703b049fc249c35160d1018151e7f6825f0eba960e868b82e7bd1836c6130fe850941b2825d5dfafd
-  data.tar.gz: 0fd499ddcf3c019525f6393eb4ba5957ebee559727924ea3c827e20cd57f818cca7e246ace91cea209b3914c7c0dde57e57e334aeab1af4d3e26b88fa7a1a38e
+  metadata.gz: 2af8b6ac91666d5f686d700886637b70fca79374768b076f302540bcc739f1eacd8eec03849bc554e4891b4a99f11a525be481a972eb24fa315ca42b808f1390
+  data.tar.gz: 2cdff48f02a69335dd95a2c5ee5974cb4fff6676ff185e27a5d61de12ba5e00d2dc6da82aecccee538cc6c28e4d33e0e08d13f725afee7529fc5934aa200a298

data/lib/redis/namespace.rb

@@ -61,11 +61,13 @@ class Redis
       "del"              => [ :all   ],
       "discard"          => [],
       "dump"             => [ :first ],
+      "echo"             => [],
       "exists"           => [ :first ],
       "expire"           => [ :first ],
       "expireat"         => [ :first ],
       "eval"             => [ :eval_style ],
       "evalsha"          => [ :eval_style ],
+      "exec"             => [],
       "flushall"         => [],
       "flushdb"          => [],
       "get"              => [ :first ],
@@ -152,6 +154,7 @@ class Redis
       "spop"             => [ :first ],
       "srandmember"      => [ :first ],
       "srem"             => [ :first ],
+      "strlen"           => [ :first ],
       "subscribe"        => [ :all ],
       "sunion"           => [ :all ],
       "sunionstore"      => [ :all ],
@@ -217,7 +220,11 @@ class Redis
     end
 
     def multi(&block)
-      namespaced_block(:multi, &block)
+      if block_given?
+        namespaced_block(:multi, &block)
+      else
+        method_missing(:multi)
+      end
     end
 
     def pipelined(&block)
@@ -233,6 +240,10 @@ class Redis
       @namespace
     end
 
+    def exec
+      method_missing(:exec)
+    end
+
     def method_missing(command, *args, &block)
       handling = COMMANDS[command.to_s] ||
         COMMANDS[ALIASES[command.to_s]]
@@ -305,6 +316,9 @@ class Redis
       # Dispatch the command to Redis and store the result.
       result = @redis.send(command, *args, &block)
 
+      # Don't try to remove namespace from a Redis::Future, you can't.
+      return result if result.is_a?(Redis::Future)
+
       # Remove the namespace from results that are keys.
       case after
       when :all

data/spec/redis_spec.rb

@@ -253,6 +253,24 @@ describe "redis" do
     @namespaced.hgetall("foo").should eq({"key1" => "value1"})
   end
 
+  it "should pass through multi commands without block" do
+    @namespaced.mapped_hmset "foo", {"key" => "value"}
+
+    @namespaced.multi
+    @namespaced.del "foo"
+    @namespaced.mapped_hmset "foo", {"key1" => "value1"}
+    @namespaced.exec
+
+    @namespaced.hgetall("foo").should eq({"key1" => "value1"})
+  end
+
+  it 'should return futures without attempting to remove namespaces' do
+    @namespaced.multi do
+      @future = @namespaced.keys('*')
+    end
+    @future.class.should be(Redis::Future)
+  end
+
   it "should add namespace to pipelined blocks" do
     @namespaced.mapped_hmset "foo", {"key" => "value"}
     @namespaced.pipelined do |r|
@@ -271,6 +289,15 @@ describe "redis" do
     result.should eq(["bar", "value"])
   end
 
+  it "should add namespace to strlen" do
+    @namespaced.set("mykey", "123456")
+    @namespaced.strlen("mykey").should eq(6)
+  end
+
+  it "should not add namespace to echo" do
+    @namespaced.echo(123).should eq("123")
+  end
+
   it "can change its namespace" do
     @namespaced['foo'].should eq(nil)
     @namespaced['foo'] = 'chris'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-namespace
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -92,9 +92,8 @@ 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: Namespaces Redis commands.
 test_files: []
-has_rdoc: false