redis 3.0.1 → 3.0.2

data/test/remote_server_control_commands_test.rb

@@ -26,7 +26,7 @@ class TestRemoteServerControlCommands < Test::Unit::TestCase
   end
 
   def test_info_commandstats
-    return if version < "2.9.0"
+    return if version < "2.5.7"
 
     r.config(:resetstat)
     r.ping

data/test/synchrony_driver.rb

@@ -1,12 +1,17 @@
 # encoding: UTF-8
 
 require 'em-synchrony'
+require 'em-synchrony/connection_pool'
 
 require 'redis'
 require 'redis/connection/synchrony'
 
+
 require File.expand_path("./helper", File.dirname(__FILE__))
 
+PORT    = 6381
+OPTIONS = {:port => PORT, :db => 15}
+
 #
 # if running under Eventmachine + Synchrony (Ruby 1.9+), then
 # we can simulate the blocking API while performing the network
@@ -14,7 +19,7 @@ require File.expand_path("./helper", File.dirname(__FILE__))
 #
 
 EM.synchrony do
-  r = Redis.new
+  r = Redis.new OPTIONS
   r.flushdb
 
   r.rpush "foo", "s1"
@@ -53,5 +58,31 @@ EM.synchrony do
   assert_equal "OK", r.client.call(:quit)
   assert_equal "PONG", r.ping
 
+
+  rpool = EM::Synchrony::ConnectionPool.new(size: 5) { Redis.new OPTIONS }
+
+  result = rpool.watch 'foo' do |rd|
+    assert_kind_of Redis, rd
+
+    rd.set "foo", "s1"
+    rd.multi do |multi|
+      multi.set "foo", "s2"
+    end
+  end
+
+  assert_equal nil, result
+  assert_equal "s1", rpool.get("foo")
+
+  result = rpool.watch "foo" do |rd|
+    assert_kind_of Redis, rd
+
+    rd.multi do |multi|
+      multi.set "foo", "s3"
+    end
+  end
+
+  assert_equal ["OK"], result
+  assert_equal "s3", rpool.get("foo")
+
   EM.stop
 end

data/test/transactions_test.rb

@@ -147,6 +147,16 @@ class TestTransactions < Test::Unit::TestCase
     assert_equal "s1", r.get("foo")
   end
 
+  def test_raise_command_error_when_exec_fails
+    redis_mock(:exec => lambda { |*_| "-ERROR" }) do |redis|
+      assert_raise(Redis::CommandError) do
+        redis.multi do |m|
+          m.set "foo", "s1"
+        end
+      end
+    end
+  end
+
   def test_watch_with_an_unmodified_key
     r.watch "foo"
     r.multi do |multi|
@@ -188,8 +198,11 @@ class TestTransactions < Test::Unit::TestCase
   end
 
   def test_watch_with_a_block_and_an_unmodified_key
-    result = r.watch "foo" do
-      r.multi do |multi|
+    result = r.watch "foo" do |rd|
+
+      assert_same r, rd
+
+      rd.multi do |multi|
         multi.set "foo", "s1"
       end
     end
@@ -199,9 +212,12 @@ class TestTransactions < Test::Unit::TestCase
   end
 
   def test_watch_with_a_block_and_a_modified_key
-    result = r.watch "foo" do
-      r.set "foo", "s1"
-      r.multi do |multi|
+    result = r.watch "foo" do |rd|
+
+      assert_same r, rd
+
+      rd.set "foo", "s1"
+      rd.multi do |multi|
         multi.set "foo", "s2"
       end
     end

data/test/url_param_test.rb

@@ -24,6 +24,39 @@ class TestUrlParam < Test::Unit::TestCase
     assert_equal "secr3t", redis.client.password
   end
 
+  def test_allows_to_pass_in_a_url_with_string_key
+    redis = Redis.new "url" => "redis://:secr3t@foo.com:999/2"
+
+    assert_equal "foo.com", redis.client.host
+    assert_equal 999, redis.client.port
+    assert_equal 2, redis.client.db
+    assert_equal "secr3t", redis.client.password
+  end
+
+  def test_unescape_password_from_url
+    redis = Redis.new :url => "redis://:secr3t%3A@foo.com:999/2"
+
+    assert_equal "secr3t:", redis.client.password
+  end
+
+  def test_unescape_password_from_url_with_string_key
+    redis = Redis.new "url" => "redis://:secr3t%3A@foo.com:999/2"
+
+    assert_equal "secr3t:", redis.client.password
+  end
+
+  def test_does_not_unescape_password_when_explicitly_passed
+    redis = Redis.new :url => "redis://:secr3t%3A@foo.com:999/2", :password => "secr3t%3A"
+
+    assert_equal "secr3t%3A", redis.client.password
+  end
+
+  def test_does_not_unescape_password_when_explicitly_passed_with_string_key
+    redis = Redis.new :url => "redis://:secr3t%3A@foo.com:999/2", "password" => "secr3t%3A"
+
+    assert_equal "secr3t%3A", redis.client.password
+  end
+
   def test_override_url_if_path_option_is_passed
     redis = Redis.new :url => "redis://:secr3t@foo.com/foo:999/2", :path => "/tmp/redis.sock"
 
@@ -32,6 +65,14 @@ class TestUrlParam < Test::Unit::TestCase
     assert_equal nil, redis.client.port
   end
 
+  def test_override_url_if_path_option_is_passed_with_string_key
+    redis = Redis.new :url => "redis://:secr3t@foo.com/foo:999/2", "path" => "/tmp/redis.sock"
+
+    assert_equal "/tmp/redis.sock", redis.client.path
+    assert_equal nil, redis.client.host
+    assert_equal nil, redis.client.port
+  end
+
   def test_overrides_url_if_another_connection_option_is_passed
     redis = Redis.new :url => "redis://:secr3t@foo.com:999/2", :port => 1000
 
@@ -41,6 +82,33 @@ class TestUrlParam < Test::Unit::TestCase
     assert_equal "secr3t", redis.client.password
   end
 
+  def test_overrides_url_if_another_connection_option_is_passed_with_string_key
+    redis = Redis.new :url => "redis://:secr3t@foo.com:999/2", "port" => 1000
+
+    assert_equal "foo.com", redis.client.host
+    assert_equal 1000, redis.client.port
+    assert_equal 2, redis.client.db
+    assert_equal "secr3t", redis.client.password
+  end
+
+  def test_does_not_overrides_url_if_a_nil_option_is_passed
+    redis = Redis.new :url => "redis://:secr3t@foo.com:999/2", :port => nil
+
+    assert_equal "foo.com", redis.client.host
+    assert_equal 999, redis.client.port
+    assert_equal 2, redis.client.db
+    assert_equal "secr3t", redis.client.password
+  end
+
+  def test_does_not_overrides_url_if_a_nil_option_is_passed_with_string_key
+    redis = Redis.new :url => "redis://:secr3t@foo.com:999/2", "port" => nil
+
+    assert_equal "foo.com", redis.client.host
+    assert_equal 999, redis.client.port
+    assert_equal 2, redis.client.db
+    assert_equal "secr3t", redis.client.password
+  end
+
   def test_does_not_modify_the_passed_options
     options = { :url => "redis://:secr3t@foo.com:999/2" }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-02 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake