From be18701c454e72f89903b6c8a376bcccc6d77545 Mon Sep 17 00:00:00 2001 From: Kostas Diamantis Date: Tue, 22 Dec 2015 11:56:35 +0200 Subject: [PATCH] Use Redis#new instead of deprecated Redis#connect According to commit: redis/redis-rb@7193c30 in redis gem Redis.connect is deprecated. --- examples/lib/redis_models.rb | 6 +++--- lib/database_cleaner/redis/base.rb | 2 +- spec/database_cleaner/redis/truncation_spec.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/lib/redis_models.rb b/examples/lib/redis_models.rb index d8ee053..0477f7a 100644 --- a/examples/lib/redis_models.rb +++ b/examples/lib/redis_models.rb @@ -3,7 +3,7 @@ require 'redis' class RedisWidget def self.redis - threaded ||= Redis.connect + threaded ||= Redis.new end def self.redis=(connection) @@ -45,7 +45,7 @@ end class RedisWidgetUsingDatabaseOne < RedisWidget def self.redis - threaded[self.class.to_s] ||= Redis.connect :url => ENV['REDIS_URL_ONE'] + threaded[self.class.to_s] ||= Redis.new :url => ENV['REDIS_URL_ONE'] end def self.create! @@ -56,7 +56,7 @@ end class RedisWidgetUsingDatabaseTwo < RedisWidget def self.redis - threaded[self.class.to_s] ||= Redis.connect :url => ENV['REDIS_URL_TWO'] + threaded[self.class.to_s] ||= Redis.new :url => ENV['REDIS_URL_TWO'] end def self.create! diff --git a/lib/database_cleaner/redis/base.rb b/lib/database_cleaner/redis/base.rb index 9bbc7f3..350c89f 100644 --- a/lib/database_cleaner/redis/base.rb +++ b/lib/database_cleaner/redis/base.rb @@ -22,7 +22,7 @@ module DatabaseCleaner private def connection - @connection ||= url == :default ? ::Redis.connect : ::Redis.connect(:url => url) + @connection ||= url == :default ? ::Redis.new : ::Redis.new(:url => url) end end diff --git a/spec/database_cleaner/redis/truncation_spec.rb b/spec/database_cleaner/redis/truncation_spec.rb index b179b77..9083126 100644 --- a/spec/database_cleaner/redis/truncation_spec.rb +++ b/spec/database_cleaner/redis/truncation_spec.rb @@ -9,7 +9,7 @@ module DatabaseCleaner describe Truncation do before(:all) do config = YAML::load(File.open("#{File.dirname(__FILE__)}/../../../examples/config/redis.yml")) - @redis = ::Redis.connect :url => config['test']['url'] + @redis = ::Redis.new :url => config['test']['url'] end before(:each) do