Add missing defaults

lib/redis/client.rb

@@ -5,20 +5,27 @@
 class Redis
   class Client
 
+    # Defaults are also used for converting string keys to symbols.
     DEFAULTS = {
       :url => lambda { ENV["REDIS_URL"] },
       :scheme => "redis",
       :host => "127.0.0.1",
       :port => 6379,
       :path => nil,
+      :read_timeout => nil,
+      :write_timeout => nil,
+      :connect_timeout => nil,
       :timeout => 5.0,
       :password => nil,
       :db => 0,
       :driver => nil,
       :id => nil,
       :tcp_keepalive => 0,
       :reconnect_attempts => 1,
-      :inherit_socket => false
+      :inherit_socket => false,
+      :logger => nil,
+      :sentinels => [],
+      :role => nil
     }
 
     def options
@@ -86,7 +93,7 @@ def initialize(options = {})
 
       @pending_reads = 0
 
-      if options.include?(:sentinels)
+      if @options[:sentinels].size > 0
         @connector = Connector::Sentinel.new(@options)
       else
         @connector = Connector.new(@options)
@@ -508,7 +515,7 @@ def initialize(options)
           @options[:db] = DEFAULTS.fetch(:db)
 
           @sentinels = @options.delete(:sentinels).dup
-          @role = @options.fetch(:role, "master").to_s
+          @role = (@options[:role] || "master").to_s
           @master = @options[:host]
         end