Merge pull request #136 from ota42y/feature/redis_4

support redis-rb 4.0.0

Author: fw42

lib/redis/namespace.rb

@@ -241,6 +241,7 @@ def initialize(namespace, options = {})
       @deprecations = !!options.fetch(:deprecations) do
                         ENV['REDIS_NAMESPACE_DEPRECATIONS']
                       end
+      @has_new_client_method = @redis.respond_to?(:_client)
     end
 
     def deprecations?
@@ -252,7 +253,13 @@ def warning?
     end
 
     def client
-      @redis.client
+      warn("The client method is deprecated as of redis-rb 4.0.0, please use the new _client" +
+            "method instead. Support for the old method will be removed in redis-namespace 2.0.") if @has_new_client_method
+      _client
+    end
+
+    def _client
+      @has_new_client_method ? @redis._client : @redis.client # for redis-4.0.0
     end
 
     # Ruby defines a now deprecated type method so we need to override it here

redis-namespace.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.files            += Dir.glob("test/**/*")
   s.files            += Dir.glob("spec/**/*")
 
-  s.add_dependency    "redis", "~> 3.0", ">= 3.0.4"
+  s.add_dependency    "redis", ">= 3.0.4"
 
   s.add_development_dependency "rake", "~> 10.1"
   s.add_development_dependency "rspec", "~> 2.14"

spec/redis_spec.rb

@@ -4,6 +4,7 @@
 
 describe "redis" do
   @redis_version = Gem::Version.new(Redis.current.info["redis_version"])
+  let(:redis_client) { @redis.respond_to?(:_client) ? @redis._client : @redis.client}
 
   before(:all) do
     # use database 15 for testing so we dont accidentally step on your real data
@@ -13,7 +14,7 @@
   before(:each) do
     @namespaced = Redis::Namespace.new(:ns, :redis => @redis)
     @redis.flushdb
-    @redis['foo'] = 'bar'
+    @redis.set('foo', 'bar')
   end
 
   after(:each) do
@@ -24,20 +25,24 @@
     @redis.quit
   end
 
-  it "proxies `client` to the client" do
-    @namespaced.client.should eq(@redis.client)
+  it "proxies `client` to the _client and deprecated" do
+    @namespaced.client.should eq(redis_client)
+  end
+
+  it "proxies `_client` to the _client" do
+    @namespaced._client.should eq(redis_client)
   end
 
   it "should be able to use a namespace" do
-    @namespaced['foo'].should eq(nil)
-    @namespaced['foo'] = 'chris'
-    @namespaced['foo'].should eq('chris')
-    @redis['foo'] = 'bob'
-    @redis['foo'].should eq('bob')
+    @namespaced.get('foo').should eq(nil)
+    @namespaced.set('foo', 'chris')
+    @namespaced.get('foo').should eq('chris')
+    @redis.set('foo', 'bob')
+    @redis.get('foo').should eq('bob')
 
     @namespaced.incrby('counter', 2)
-    @namespaced['counter'].to_i.should eq(2)
-    @redis['counter'].should eq(nil)
+    @namespaced.get('counter').to_i.should eq(2)
+    @redis.get('counter').should eq(nil)
     @namespaced.type('counter').should eq('string')
   end
 
@@ -60,21 +65,21 @@
   end
 
   it "should be able to use a namespace with del" do
-    @namespaced['foo'] = 1000
-    @namespaced['bar'] = 2000
-    @namespaced['baz'] = 3000
+    @namespaced.set('foo', 1000)
+    @namespaced.set('bar', 2000)
+    @namespaced.set('baz', 3000)
     @namespaced.del 'foo'
-    @namespaced['foo'].should eq(nil)
+    @namespaced.get('foo').should eq(nil)
     @namespaced.del 'bar', 'baz'
-    @namespaced['bar'].should eq(nil)
-    @namespaced['baz'].should eq(nil)
+    @namespaced.get('bar').should eq(nil)
+    @namespaced.get('baz').should eq(nil)
   end
 
   it 'should be able to use a namespace with append' do
-    @namespaced['foo'] = 'bar'
+    @namespaced.set('foo', 'bar')
     @namespaced.append('foo','n').should eq(4)
-    @namespaced['foo'].should eq('barn')
-    @redis['foo'].should eq('bar')
+    @namespaced.get('foo').should eq('barn')
+    @redis.get('foo').should eq('bar')
   end
 
   it 'should be able to use a namespace with brpoplpush' do
@@ -124,15 +129,15 @@
 
   it 'should be able to use a namespace with setrange' do
     @namespaced.setrange('foo', 0, 'bar')
-    @namespaced['foo'].should eq('bar')
+    @namespaced.get('foo').should eq('bar')
 
     @namespaced.setrange('bar', 2, 'foo')
-    @namespaced['bar'].should eq("\000\000foo")
+    @namespaced.get('bar').should eq("\000\000foo")
   end
 
   it "should be able to use a namespace with mget" do
-    @namespaced['foo'] = 1000
-    @namespaced['bar'] = 2000
+    @namespaced.set('foo', 1000)
+    @namespaced.set('bar', 2000)
     @namespaced.mapped_mget('foo', 'bar').should eq({ 'foo' => '1000', 'bar' => '2000' })
     @namespaced.mapped_mget('foo', 'baz', 'bar').should eq({'foo'=>'1000', 'bar'=>'2000', 'baz' => nil})
   end
@@ -276,9 +281,9 @@
   end
 
   it "should yield the correct list of keys" do
-    @namespaced["foo"] = 1
-    @namespaced["bar"] = 2
-    @namespaced["baz"] = 3
+    @namespaced.set("foo", 1)
+    @namespaced.set("bar", 2)
+    @namespaced.set("baz", 3)
     @namespaced.keys("*").sort.should eq(%w( bar baz foo ))
     @namespaced.keys.sort.should eq(%w( bar baz foo ))
   end
@@ -322,8 +327,8 @@
   it "should returned response array from pipelined block" do
     @namespaced.mset "foo", "bar", "key", "value"
     result = @namespaced.pipelined do |r|
-      r["foo"]
-      r["key"]
+      r.get("foo")
+      r.get("key")
     end
     result.should eq(["bar", "value"])
   end
@@ -344,32 +349,32 @@
   end
 
   it "can change its namespace" do
-    @namespaced['foo'].should eq(nil)
-    @namespaced['foo'] = 'chris'
-    @namespaced['foo'].should eq('chris')
+    @namespaced.get('foo').should eq(nil)
+    @namespaced.set('foo', 'chris')
+    @namespaced.get('foo').should eq('chris')
 
     @namespaced.namespace.should eq(:ns)
     @namespaced.namespace = :spec
     @namespaced.namespace.should eq(:spec)
 
-    @namespaced['foo'].should eq(nil)
-    @namespaced['foo'] = 'chris'
-    @namespaced['foo'].should eq('chris')
+    @namespaced.get('foo').should eq(nil)
+    @namespaced.set('foo', 'chris')
+    @namespaced.get('foo').should eq('chris')
   end
 
   it "can accept a temporary namespace" do
     @namespaced.namespace.should eq(:ns)
-    @namespaced['foo'].should eq(nil)
+    @namespaced.get('foo').should eq(nil)
 
     @namespaced.namespace(:spec) do |temp_ns|
       temp_ns.namespace.should eq(:spec)
-      temp_ns['foo'].should eq(nil)
-      temp_ns['foo'] = 'jake'
-      temp_ns['foo'].should eq('jake')
+      temp_ns.get('foo').should eq(nil)
+      temp_ns.set('foo', 'jake')
+      temp_ns.get('foo').should eq('jake')
     end
 
     @namespaced.namespace.should eq(:ns)
-    @namespaced['foo'].should eq(nil)
+    @namespaced.get('foo').should eq(nil)
   end
 
   it "should respond to :namespace=" do