Pass in an existing Redis connection to use that. Fixes #1 - #1

agoragames · Aug 4, 2011 · e4122ab · e4122ab
1 parent 3e5890c
commit e4122ab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/leaderboard.rb b/lib/leaderboard.rb
@@ -23,13 +23,18 @@ def initialize(leaderboard_name, host = DEFAULT_REDIS_HOST, port = DEFAULT_REDIS
 
     @page_size = page_size
 
+    @redis_connection = redis_options[:redis_connection]
+    unless @redis_connection.nil?
+      redis_options.delete(:redis_connection)
+    end
+
     redis_options = redis_options.dup
     redis_options[:host] ||= @host
-    redis_options[:port] ||= @port
+    redis_options[:port] ||= @port    
 
     @redis_options = redis_options
 
-    @redis_connection = Redis.new(@redis_options)
+    @redis_connection = Redis.new(@redis_options) if @redis_connection.nil?
   end
 
   def page_size=(page_size)

diff --git a/test/test_leaderboard.rb b/test/test_leaderboard.rb
@@ -50,6 +50,13 @@ def test_delete_leaderboard
     assert_equal false, @redis_connection.exists('name')    
   end
 
+  def test_can_pass_existing_redis_connection_to_initializer
+    @leaderboard = Leaderboard.new('name', Leaderboard::DEFAULT_REDIS_HOST, Leaderboard::DEFAULT_REDIS_PORT, Leaderboard::DEFAULT_PAGE_SIZE, {:redis_connection => @redis_connection})
+    rank_members_to_leaderboard
+
+    assert_equal 1, @redis_connection.info["connected_clients"].to_i
+  end
+
   def test_rank_member_and_total_members
     @leaderboard.rank_member('member', 1)