Merge pull request #260 from redis/nil-to-default

Use default when option is not specified or nil

lib/redis/client.rb

@@ -332,7 +332,10 @@ def _parse_options(options)
         end
       end
 
-      options = defaults.merge(options)
+      # Use default when option is not specified or nil
+      defaults.keys.each do |key|
+        options[key] ||= defaults[key]
+      end
 
       if options[:path]
         options[:scheme] = "unix"

test/url_param_test.rb

@@ -67,6 +67,24 @@ def test_overrides_url_if_another_connection_option_is_passed_with_string_key
     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" }