TLS connect support

lib/em-hiredis/base_client.rb

@@ -16,8 +16,8 @@ class BaseClient
 
     attr_reader :host, :port, :password, :db
 
-    def initialize(host = 'localhost', port = 6379, password = nil, db = nil)
-      @host, @port, @password, @db = host, port, password, db
+    def initialize(host = 'localhost', port = 6379, password = nil, db = nil, args={})
+      @host, @port, @password, @db, @args = host, port, password, db, args
       @defs = []
       @command_queue = []
 
@@ -41,18 +41,26 @@ def initialize(host = 'localhost', port = 6379, password = nil, db = nil)
     # In usual operation, the uri should be passed to initialize. This method
     # is useful for example when failing over to a slave connection at runtime
     #
-    def configure(uri_string)
-      uri = URI(uri_string)
+    def configure(options)
+      if options.is_a?(String)
+        uri = URI(options)
 
-      if uri.scheme == "unix"
-        @host = uri.path
-        @port = nil
-      else
-        @host = uri.host
-        @port = uri.port
-        @password = uri.password
-        path = uri.path[1..-1]
-        @db = path.to_i # Empty path => 0
+        if uri.scheme == "unix"
+          @host = uri.path
+          @port = nil
+        else
+          @host = uri.host
+          @port = uri.port
+          @password = uri.password
+          path = uri.path[1..-1]
+          @db = path.to_i # Empty path => 0
+        end
+      elsif options.is_a?(Hash)
+        @host = options[:host]
+        @port = options[:port]
+        @password = options[:password]
+        @db = options[:db].to_i # Empty path => 0
+        @args = options.except(:host, :password, :port, :path, :db)
       end
     end
 
@@ -71,7 +79,7 @@ def reconnect!(new_uri = nil)
 
     def connect
       @auto_reconnect = true
-      @connection = EM.connect(@host, @port, Connection, @host, @port)
+      @connection = EM.connect(@host, @port, Connection, @host, @port, @args)
 
       @connection.on(:closed) do
         cancel_inactivity_checks

lib/em-hiredis/client.rb

@@ -2,8 +2,8 @@
 
 module EventMachine::Hiredis
   class Client < BaseClient
-    def self.connect(host = 'localhost', port = 6379)
-      new(host, port).connect
+    def self.connect(host = 'localhost', port = 6379, args = {})
+      new(host, port, args).connect
     end
 
     def self.load_scripts_from(dir)
@@ -87,7 +87,7 @@ def info_commandstats(&blk)
     #
     def pubsub
       @pubsub ||= begin
-        PubsubClient.new(@host, @port, @password, @db).connect
+        PubsubClient.new(@host, @port, @password, @db, @args).connect
       end
     end
 

lib/em-hiredis/connection.rb

@@ -4,10 +4,18 @@ module EventMachine::Hiredis
   class Connection < EM::Connection
     include EventMachine::Hiredis::EventEmitter
 
-    def initialize(host, port)
+    def initialize(host, port, args={})
       super
       @host, @port = host, port
-      @name = "[em-hiredis #{@host}:#{@port}]"
+      tls = args[:ssl].present?
+      @name = "[em-hiredis #{@host}:#{@port} #{tls}]"
+      @args = args
+    end
+
+    def post_init
+      if @args[:ssl]
+        start_tls(@args[:ssl_params])
+      end
     end
 
     def reconnect(host, port)

lib/em-hiredis/pubsub_client.rb

@@ -4,8 +4,9 @@ class PubsubClient < BaseClient
 
     PING_CHANNEL = '__em-hiredis-ping'
 
-    def initialize(host='localhost', port='6379', password=nil, db=nil)
+    def initialize(host='localhost', port='6379', password=nil, db=nil, args={})
       @subs, @psubs = [], []
+      @args = args
       @pubsub_defs = Hash.new { |h,k| h[k] = [] }
       super
     end