lib/split.rb in split-0.4.5 vs lib/split.rb in split-0.4.6
- old
+ new
@@ -1,10 +1,11 @@
require 'split/experiment'
require 'split/alternative'
require 'split/helper'
require 'split/version'
require 'split/configuration'
+require 'split/engine' if defined?(Rails)
require 'redis/namespace'
module Split
extend self
attr_accessor :configuration
@@ -16,11 +17,11 @@
# 4. A redis URL string 'redis://host:port'
# 5. An instance of `Redis`, `Redis::Client`, `Redis::DistRedis`,
# or `Redis::Namespace`.
def redis=(server)
if server.respond_to? :split
- if server =~ /redis\:\/\//
+ if server["redis://"]
redis = Redis.connect(:url => server, :thread_safe => true)
else
server, namespace = server.split('/', 2)
host, port, db = server.split(':')
redis = Redis.new(:host => host, :port => port,
@@ -54,13 +55,6 @@
self.configuration ||= Configuration.new
yield(configuration)
end
end
-Split.configure {}
-
-if defined?(Rails)
- class ActionController::Base
- ActionController::Base.send :include, Split::Helper
- ActionController::Base.helper Split::Helper
- end
-end
+Split.configure {}
\ No newline at end of file