Merge pull request #591 from tgxworld/allow_custom_connectors

Add option to use a different Connector.

Author: byroot

lib/redis.rb

@@ -31,6 +31,7 @@ def self.current=(redis)
   # @option options [Boolean] :inherit_socket (false) Whether to use socket in forked process or not
   # @option options [Array] :sentinels List of sentinels to contact
   # @option options [Symbol] :role (:master) Role to fetch via Sentinel, either `:master` or `:slave`
+  # @option options [Class] :connector Class of custom connector
   #
   # @return [Redis] a new client instance
   def initialize(options = {})

lib/redis/client.rb

@@ -84,11 +84,14 @@ def initialize(options = {})
 
       @pending_reads = 0
 
-      if options.include?(:sentinels)
-        @connector = Connector::Sentinel.new(@options)
-      else
-        @connector = Connector.new(@options)
-      end
+      @connector =
+        if options.include?(:sentinels)
+          Connector::Sentinel.new(@options)
+        elsif options.include?(:connector) && options[:connector].respond_to?(:new)
+          options.delete(:connector).new(@options)
+        else
+          Connector.new(@options)
+        end
     end
 
     def connect

test/client_test.rb

@@ -56,4 +56,21 @@ def test_queue_after_error
 
     assert_equal result, ["OK", 1]
   end
+
+  def test_client_with_custom_connector
+    custom_connector = Class.new(Redis::Client::Connector) do
+      def resolve
+        @options[:host] = '127.0.0.5'
+        @options[:port] = '999'
+        @options
+      end
+    end
+
+    assert_raise_message(
+      'Error connecting to Redis on 127.0.0.5:999 (Errno::ECONNREFUSED)'
+    ) do
+      new_redis = _new_client(connector: custom_connector)
+      new_redis.ping
+    end
+  end
 end