Extract the connection-creating mechanics into an object that the user can override via the options.

.travis.yml

@@ -1,10 +1,18 @@
+sudo: false
 language: ruby
 
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
   - jruby-19mode
-  - rbx-19mode
+  - jruby-9
+
+services:
+  - redis-server
 
 before_script:
   - git submodule update --init --recursive
@@ -12,4 +20,3 @@ before_script:
 script: bundle exec rspec -c spec/
 
 env: TRAVIS=1
-

CODE_OF_CONDUCT.md

@@ -0,0 +1,4 @@
+# Code of Conduct
+
+All projects under the [Faye](https://github.com/faye) umbrella are covered by
+the [Code of Conduct](https://github.com/faye/code-of-conduct).

Gemfile

@@ -1,2 +1,2 @@
-source "https://rubygems.org/"
+source 'https://rubygems.org/'
 gemspec

README.md

@@ -1,4 +1,4 @@
-# Faye::Redis [![Build Status](https://travis-ci.org/faye/faye-redis-ruby.png)](https://travis-ci.org/faye/faye-redis-ruby)
+# Faye::Redis [![Build Status](https://travis-ci.org/faye/faye-redis-ruby.svg)](https://travis-ci.org/faye/faye-redis-ruby)
 
 This plugin provides a Redis-based backend for the
 [Faye](http://faye.jcoglan.com) messaging server. It allows a single Faye
@@ -58,4 +58,3 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

faye-redis.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'multi_json', '>= 1.0.0'
 
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec-eventmachine'
   s.add_development_dependency 'websocket-driver'
 end

lib/faye/redis.rb

@@ -1,14 +1,13 @@
 require 'em-hiredis'
 require 'multi_json'
 
+require File.expand_path('../redis_factory', __FILE__)
+
 module Faye
   class Redis
 
-    DEFAULT_HOST     = 'localhost'
-    DEFAULT_PORT     = 6379
-    DEFAULT_DATABASE = 0
-    DEFAULT_GC       = 60
-    LOCK_TIMEOUT     = 120
+    DEFAULT_GC   = 60
+    LOCK_TIMEOUT = 120
 
     def self.create(server, options)
       new(server, options)
@@ -17,27 +16,18 @@ module Faye
     def initialize(server, options)
       @server  = server
       @options = options
+      @factory = options[:factory] || RedisFactory.new(options)
+
+      init
     end
 
     def init
-      return if @redis
+      return if @redis or !EventMachine.reactor_running?
 
-      uri    = @options[:uri]       || nil
-      host   = @options[:host]      || DEFAULT_HOST
-      port   = @options[:port]      || DEFAULT_PORT
-      db     = @options[:database]  || DEFAULT_DATABASE
-      auth   = @options[:password]  || nil
       gc     = @options[:gc]        || DEFAULT_GC
       @ns    = @options[:namespace] || ''
-      socket = @options[:socket]    || nil
+      @redis = @factory.call
 
-      if uri
-        @redis = EventMachine::Hiredis.connect(uri)
-      elsif socket
-        @redis = EventMachine::Hiredis::Client.new(socket, nil, auth, db).connect
-      else
-        @redis = EventMachine::Hiredis::Client.new(host, port, auth, db).connect
-      end
       @subscriber = @redis.pubsub
 
       @message_channel = @ns + '/notifications/messages'
@@ -235,4 +225,3 @@ module Faye
 
   end
 end
-

lib/faye/redis_factory.rb

@@ -0,0 +1,30 @@
+module Faye
+  class RedisFactory
+
+    DEFAULT_HOST     = '0.0.0.0'
+    DEFAULT_PORT     = 6379
+    DEFAULT_DATABASE = 0
+
+    def initialize(options)
+      @options = options
+    end
+
+    def call
+      uri    = @options[:uri]      || nil
+      socket = @options[:socket]   || nil
+      host   = @options[:host]     || DEFAULT_HOST
+      port   = @options[:port]     || DEFAULT_PORT
+      auth   = @options[:password] || nil
+      db     = @options[:database] || DEFAULT_DATABASE
+
+      if uri
+        EventMachine::Hiredis.connect(uri)
+      elsif socket
+        EventMachine::Hiredis::Client.new(socket, nil, auth, db).connect
+      else
+        EventMachine::Hiredis::Client.new(host, port, auth, db).connect
+      end
+    end
+
+  end
+end

spec/faye_redis_spec.rb

@@ -7,8 +7,8 @@ describe Faye::Redis do
   end
 
   after do
-    engine.disconnect
-    redis = EM::Hiredis::Client.connect('localhost', 6379)
+    disconnect_engine
+    redis = EM::Hiredis::Client.connect('0.0.0.0', 6379)
     redis.auth(engine_opts[:password])
     redis.flushall
   end
@@ -23,4 +23,3 @@ describe Faye::Redis do
     it_should_behave_like "faye engine"
   end
 end
-

spec/redis.conf

@@ -39,4 +39,3 @@ list-max-ziplist-value 64
 set-max-intset-entries 512
 
 activerehashing yes
-

spec/spec_helper.rb

@@ -5,4 +5,3 @@ require File.expand_path('../../vendor/faye/spec/ruby/engine_examples', __FILE__
 class << Faye
   attr_accessor :logger
 end
-