From 4b8901223cc50f38973ba7e79ddbe4581ceba313 Mon Sep 17 00:00:00 2001 From: "Robert R. Meyer" Date: Wed, 10 Apr 2013 15:07:29 -0500 Subject: [PATCH 1/4] update to allow for password to be sent to redis --- lib/similus/config.rb | 8 ++++++-- lib/similus/redis.rb | 7 ++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/similus/config.rb b/lib/similus/config.rb index 0be9361..007d890 100644 --- a/lib/similus/config.rb +++ b/lib/similus/config.rb @@ -6,13 +6,17 @@ def self.config class Config attr_accessor :backend - attr_accessor :redis_server + attr_accessor :redis_host + attr_accessor :redis_port + attr_accessor :redis_username + attr_accessor :redis_password attr_accessor :redis_db attr_accessor :logfile def initialize #:nodoc: self.backend = :redis - self.redis_server = "localhost:6379" + self.redis_host = "localhost" + self.redis_port = "6379" self.redis_db = 9 self.logfile = STDOUT end diff --git a/lib/similus/redis.rb b/lib/similus/redis.rb index 7fdf5c9..796cda4 100644 --- a/lib/similus/redis.rb +++ b/lib/similus/redis.rb @@ -1,14 +1,15 @@ module Similus def self.redis @redis ||= begin - host, port = config.redis_server.split(':') - ::Redis.new(:host => host, :port => port, :db => config.redis_db) + ::Redis.new(:host => config.redis_host, :port => config.redis_port, + :username => config.redis_username, :password => config.redis_password, + :thread_safe => true) rescue Exception => e config.logger.error "Error connecting redis server: #{e.message}" nil end end - + def self.clear_database! @cache = {} redis.flushdb From a8cc3adbb53c5c52d6b62823ddfb2a4f8605644d Mon Sep 17 00:00:00 2001 From: "Robert R. Meyer" Date: Wed, 10 Apr 2013 15:35:20 -0500 Subject: [PATCH 2/4] update for configuration and readme --- README.rdoc | 8 ++++++-- lib/similus/config.rb | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.rdoc b/README.rdoc index 7f27e59..68c172c 100644 --- a/README.rdoc +++ b/README.rdoc @@ -9,6 +9,7 @@ Examples of usage: == Authors {Horaci Cuevas}[http://github.com/horaci] +{Robert R. Meyer}[Blue-Dog-Archolite] == Quick overview @@ -23,7 +24,10 @@ Before using Similus, you need to setup the redis configuration. In rails this c Similus.config do |config| config.backend = :redis - config.redis_server = "localhost:6379" + config.redis_host = "localhost" + config.redis_port = "6379" + config.redis_username = "myredisuser" + config.redis_password = "Password" config.redis_db = 8 end @@ -73,4 +77,4 @@ Install the Similus gem: Copyright (c) 2010 Horaci Cuevas -See LICENSES for details. \ No newline at end of file +See LICENSES for details. diff --git a/lib/similus/config.rb b/lib/similus/config.rb index 007d890..7518210 100644 --- a/lib/similus/config.rb +++ b/lib/similus/config.rb @@ -3,7 +3,7 @@ def self.config @config ||= Config.new block_given? ? yield(@config) : @config end - + class Config attr_accessor :backend attr_accessor :redis_host From b5b243130dd4ef374b68bd25133562e4636b7675 Mon Sep 17 00:00:00 2001 From: "Robert R. Meyer" Date: Wed, 10 Apr 2013 15:35:52 -0500 Subject: [PATCH 3/4] Bad readme file update --- README.rdoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rdoc b/README.rdoc index 68c172c..61c1766 100644 --- a/README.rdoc +++ b/README.rdoc @@ -9,6 +9,7 @@ Examples of usage: == Authors {Horaci Cuevas}[http://github.com/horaci] + {Robert R. Meyer}[Blue-Dog-Archolite] == Quick overview From d632fdf171cdcd88e5dbb406ec4cc3ec6389d7ff Mon Sep 17 00:00:00 2001 From: "Robert R. Meyer" Date: Wed, 10 Apr 2013 15:36:26 -0500 Subject: [PATCH 4/4] Bad readme file update --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rdoc b/README.rdoc index 61c1766..9fbba50 100644 --- a/README.rdoc +++ b/README.rdoc @@ -10,7 +10,7 @@ Examples of usage: {Horaci Cuevas}[http://github.com/horaci] -{Robert R. Meyer}[Blue-Dog-Archolite] +{Robert R. Meyer}[http://github.com/Blue-Dog-Archolite] == Quick overview