leaderboard 1.0.5 → 2.0.0

data/.rvmrc

@@ -1 +1,2 @@
-rvm 1.8.7
+rvm --create 1.8.7@leaderboard_gem
+rvm --create 1.9.2@leaderboard_gem

data/CHANGELOG.markdown

@@ -1,3 +1,17 @@
+# leaderboard 2.0.0 (2011-08-05)
+ 
+ * Change `add_member` to `rank_member` - https://github.com/agoragames/leaderboard/issues/3
+ * Added `delete_leaderboard` and `delete_leaderboard_named` - https://github.com/agoragames/leaderboard/issues/2
+ * Ability to pass in an existing Redis connection in initializer - https://github.com/agoragames/leaderboard/issues/1
+ * Added transaction support for `score_and_rank_for`, `leaders`, `around_me` and `ranked_in_list`
+ * Updated initializer to take a leaderboard name, `options` hash and `redis_options` hash
+ * Simplified `leaders`, `around_me` and `ranked_in_list` to use an `options` hash with defaults for the previously individual parameters
+ 
+# leaderboard 1.0.6 (unreleased)
+
+ * Added `disconnect` method
+ * Check for invalid page size when changing
+
 # leaderboard 1.0.5 (2011-05-04)
 
  * Updated Rakefile to run tests under ruby 1.8.7 and ruby 1.9.2

data/Gemfile

@@ -8,5 +8,5 @@ group :development do
   gem "rcov", ">= 0"
 end
 
-gem 'redis', "~> 2.1.1"
+gem 'redis', "~> 2.2.0"
 

data/README.rdoc

@@ -8,7 +8,7 @@ Builds off ideas proposed in http://blog.agoragames.com/2011/01/01/creating-high
 
 Install the gem:
 
-	gem install leaderboard
+  gem "leaderboard", "~> 2.0.0"
 	
 Make sure your redis server is running! Redis configuration is outside the scope of this README, but 
 check out the Redis documentation, http://redis.io/documentation.
@@ -21,138 +21,163 @@ The gem has been built and tested under Ruby 1.8.7 and Ruby 1.9.2
 
 Create a new leaderboard or attach to an existing leaderboard named 'highscores':
 
-  ruby-1.8.7-p302 > highscore_lb = Leaderboard.new('highscores')
-   => #<Leaderboard:0x1018e4250 @page_size=25, @port=6379, @host="localhost", @redis_connection=#<Redis client v2.1.1 connected to redis://localhost:6379/0 (Redis v2.1.10)>, @leaderboard_name="highscores"> 
-   
-If you need to pass in options for Redis, you can do this with the redis_options parameter:
+  ruby-1.9.2-p180 :002 > highscore_lb = Leaderboard.new('highscores')
+   => #<Leaderboard:0x0000010307b530 @leaderboard_name="highscores", @page_size=25, @redis_connection=#<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis v2.2.5)>>
+    
+If you need to pass in options for Redis, you can do this in the initializer:
+
+  ruby-1.9.2-p180 :007 > redis_options = {:host => 'localhost', :port => 6379, :db => 1}
+   => {:host=>"localhost", :port=>6379, :db=>1} 
+  ruby-1.9.2-p180 :008 > highscore_lb = Leaderboard.new('highscores', Leaderboard::DEFAULT_OPTIONS, redis_options)
+   => #<Leaderboard:0x00000103095200 @leaderboard_name="highscores", @page_size=25, @redis_connection=#<Redis client v2.2.2 connected to redis://localhost:6379/1 (Redis v2.2.5)>> 
 
-  redis_options = {:host => 'localhost', :port => 6379, :password => 'password', :db => 'some_redis_db'}
-  highscore_lb = Leaderboard.new('highscores', redis_options[:host], redis_options[:port], Leaderboard::DEFAULT_PAGE_SIZE, redis_options))
+You can pass in an existing connection to Redis using :redis_connection in the Redis options hash:
 
+  ruby-1.9.2-p180 :009 > redis = Redis.new
+   => #<Redis client v2.2.2 connected to redis://127.0.0.1:6379/0 (Redis v2.2.5)> 
+  ruby-1.9.2-p180 :010 > redis_options = {:redis_connection => redis}
+   => {:redis_connection=>#<Redis client v2.2.2 connected to redis://127.0.0.1:6379/0 (Redis v2.2.5)>} 
+  ruby-1.9.2-p180 :011 > highscore_lb = Leaderboard.new('highscores', Leaderboard::DEFAULT_OPTIONS, redis_options)
+   => #<Leaderboard:0x000001028791e8 @leaderboard_name="highscores", @page_size=25, @redis_connection=#<Redis client v2.2.2 connected to redis://127.0.0.1:6379/0 (Redis v2.2.5)>> 
+ 
 You can set the page size to something other than the default page size (25):
 
-  ruby-1.8.7-p302 > highscore_lb.page_size = 5
+  ruby-1.9.2-p180 :012 > highscore_lb.page_size = 5
    => 5 
-  ruby-1.8.7-p302 > highscore_lb
-   => #<Leaderboard:0x1018e2130 @leaderboard_name="highscores", @page_size=5, @port=6379, @redis_connection=#<Redis client v2.1.1 connected to redis://localhost:6379/0 (Redis v2.1.10)>, @host="localhost", @redis_options={:host=>"localhost", :port=>6379}>   
+  ruby-1.9.2-p180 :013 > highscore_lb
+   => #<Leaderboard:0x000001028791e8 @leaderboard_name="highscores", @page_size=5, @redis_connection=#<Redis client v2.2.2 connected to redis://127.0.0.1:6379/0 (Redis v2.2.5)>> 
   
-Add members to your leaderboard:
+Add members to your leaderboard using rank_member:
 
-  ruby-1.8.7-p302 > 1.upto(10) do |index|
-  ruby-1.8.7-p302 >     highscore_lb.add_member("member_#{index}", index)
-  ruby-1.8.7-p302 ?>  end
+  ruby-1.9.2-p180 :014 > 1.upto(10) do |index|
+  ruby-1.9.2-p180 :015 >     highscore_lb.rank_member("member_#{index}", index)
+  ruby-1.9.2-p180 :016?>   end
    => 1 
-  
+
+You can call rank_member with the same member and the leaderboard will be updated automatically.
+
 Get some information about your leaderboard:
 
-  ruby-1.8.7-p302 > highscore_lb.total_members
+  ruby-1.9.2-p180 :020 > highscore_lb.total_members
    => 10 
-  ruby-1.8.7-p302 > highscore_lb.total_pages
+  ruby-1.9.2-p180 :021 > highscore_lb.total_pages
    => 1 
   
 Get some information about a specific member(s) in the leaderboard:
 
-  ruby-1.8.7-p302 > highscore_lb.score_for('member_4')
+  ruby-1.9.2-p180 :022 > highscore_lb.score_for('member_4')
    => 4.0 
-  ruby-1.8.7-p302 > highscore_lb.rank_for('member_4')
+  ruby-1.9.2-p180 :023 > highscore_lb.rank_for('member_4')
    => 7 
-  ruby-1.8.7-p302 > highscore_lb.rank_for('member_10')
+  ruby-1.9.2-p180 :024 > highscore_lb.rank_for('member_10')
    => 1 
   
 Get page 1 in the leaderboard:
 
-  ruby-1.8.7-p302 > highscore_lb.leaders(1)
-	 => [{:member=>"member_10", :rank=>1, :score=>"10"}, {:member=>"member_9", :rank=>2, :score=>"9"}, {:member=>"member_8", :rank=>3, :score=>"8"}, {:member=>"member_7", :rank=>4, :score=>"7"}, {:member=>"member_6", :rank=>5, :score=>"6"}, {:member=>"member_5", :rank=>6, :score=>"5"}, {:member=>"member_4", :rank=>7, :score=>"4"}, {:member=>"member_3", :rank=>8, :score=>"3"}, {:member=>"member_2", :rank=>9, :score=>"2"}, {:member=>"member_1", :rank=>10, :score=>"1"}]
+  ruby-1.9.2-p180 :025 > highscore_lb.leaders(1)
+   => [{:member=>"member_10", :rank=>1, :score=>10.0}, {:member=>"member_9", :rank=>2, :score=>9.0}, {:member=>"member_8", :rank=>3, :score=>8.0}, {:member=>"member_7", :rank=>4, :score=>7.0}, {:member=>"member_6", :rank=>5, :score=>6.0}, {:member=>"member_5", :rank=>6, :score=>5.0}, {:member=>"member_4", :rank=>7, :score=>4.0}, {:member=>"member_3", :rank=>8, :score=>3.0}, {:member=>"member_2", :rank=>9, :score=>2.0}, {:member=>"member_1", :rank=>10, :score=>1.0}] 
 	
+You can pass various options to the calls `leaders`, `around_me` and `ranked_in_list`. Valid options are :with_scores, :with_rank, :use_zero_index_for_rank and :page_size. 
+Below is an example of retrieving the first page in the leaderboard without ranks:
+
+  ruby-1.9.2-p180 :026 > highscore_lb.leaders(1, :with_scores => true, :with_rank => false, :use_zero_index_for_rank => false)
+   => [{:member=>"member_10", :score=>9.0}, {:member=>"member_9", :score=>7.0}, {:member=>"member_8", :score=>5.0}, {:member=>"member_7", :score=>3.0}, {:member=>"member_6", :score=>1.0}, {:member=>"member_5", :score=>0.0}, {:member=>"member_4", :score=>0.0}, {:member=>"member_3", :score=>0.0}, {:member=>"member_2", :score=>0.0}, {:member=>"member_1", :score=>0.0}] 
+
+Below is an example of retrieving the first page in the leaderboard without scores or ranks:
+
+  ruby-1.9.2-p180 :028 > highscore_lb.leaders(1, :with_scores => false, :with_rank => false)
+   => [{:member=>"member_10"}, {:member=>"member_9"}, {:member=>"member_8"}, {:member=>"member_7"}, {:member=>"member_6"}, {:member=>"member_5"}, {:member=>"member_4"}, {:member=>"member_3"}, {:member=>"member_2"}, {:member=>"member_1"}] 
+
 Add more members to your leaderboard:
 
-  ruby-1.8.7-p302 > 50.upto(95) do |index|
-  ruby-1.8.7-p302 >     highscore_lb.add_member("member_#{index}", index)
-  ruby-1.8.7-p302 ?>  end
+  ruby-1.9.2-p180 :029 > 50.upto(95) do |index|
+  ruby-1.9.2-p180 :030 >     highscore_lb.rank_member("member_#{index}", index)
+  ruby-1.9.2-p180 :031?>   end
    => 50 
-  ruby-1.8.7-p302 > highscore_lb.total_pages
+  ruby-1.9.2-p180 :032 > highscore_lb.total_pages
    => 3 
   
 Get an "Around Me" leaderboard for a member:
 
-  ruby-1.8.7-p302 > highscore_lb.around_me('member_53')
-	 => [{:member=>"member_65", :rank=>31, :score=>"65"}, {:member=>"member_64", :rank=>32, :score=>"64"}, {:member=>"member_63", :rank=>33, :score=>"63"}, {:member=>"member_62", :rank=>34, :score=>"62"}, {:member=>"member_61", :rank=>35, :score=>"61"}, {:member=>"member_60", :rank=>36, :score=>"60"}, {:member=>"member_59", :rank=>37, :score=>"59"}, {:member=>"member_58", :rank=>38, :score=>"58"}, {:member=>"member_57", :rank=>39, :score=>"57"}, {:member=>"member_56", :rank=>40, :score=>"56"}, {:member=>"member_55", :rank=>41, :score=>"55"}, {:member=>"member_54", :rank=>42, :score=>"54"}, {:member=>"member_53", :rank=>43, :score=>"53"}, {:member=>"member_52", :rank=>44, :score=>"52"}, {:member=>"member_51", :rank=>45, :score=>"51"}, {:member=>"member_50", :rank=>46, :score=>"50"}, {:member=>"member_10", :rank=>47, :score=>"10"}, {:member=>"member_9", :rank=>48, :score=>"9"}, {:member=>"member_8", :rank=>49, :score=>"8"}, {:member=>"member_7", :rank=>50, :score=>"7"}, {:member=>"member_6", :rank=>51, :score=>"6"}, {:member=>"member_5", :rank=>52, :score=>"5"}, {:member=>"member_4", :rank=>53, :score=>"4"}, {:member=>"member_3", :rank=>54, :score=>"3"}, {:member=>"member_2", :rank=>55, :score=>"2"}]	
+  ruby-1.9.2-p180 :033 > highscore_lb.around_me('member_53')
+   => [{:member=>"member_65", :rank=>31, :score=>65.0}, {:member=>"member_64", :rank=>32, :score=>64.0}, {:member=>"member_63", :rank=>33, :score=>63.0}, {:member=>"member_62", :rank=>34, :score=>62.0}, {:member=>"member_61", :rank=>35, :score=>61.0}, {:member=>"member_60", :rank=>36, :score=>60.0}, {:member=>"member_59", :rank=>37, :score=>59.0}, {:member=>"member_58", :rank=>38, :score=>58.0}, {:member=>"member_57", :rank=>39, :score=>57.0}, {:member=>"member_56", :rank=>40, :score=>56.0}, {:member=>"member_55", :rank=>41, :score=>55.0}, {:member=>"member_54", :rank=>42, :score=>54.0}, {:member=>"member_53", :rank=>43, :score=>53.0}, {:member=>"member_52", :rank=>44, :score=>52.0}, {:member=>"member_51", :rank=>45, :score=>51.0}, {:member=>"member_50", :rank=>46, :score=>50.0}, {:member=>"member_10", :rank=>47, :score=>10.0}, {:member=>"member_9", :rank=>48, :score=>9.0}, {:member=>"member_8", :rank=>49, :score=>8.0}, {:member=>"member_7", :rank=>50, :score=>7.0}, {:member=>"member_6", :rank=>51, :score=>6.0}, {:member=>"member_5", :rank=>52, :score=>5.0}, {:member=>"member_4", :rank=>53, :score=>4.0}, {:member=>"member_3", :rank=>54, :score=>3.0}, {:member=>"member_2", :rank=>55, :score=>2.0}] 
 	
 Get rank and score for an arbitrary list of members (e.g. friends):
 
-  ruby-1.8.7-p302 > highscore_lb.ranked_in_list(['member_1', 'member_62', 'member_67'], true)
-   => [{:rank=>55, :member=>"member_1", :score=>1.0}, {:rank=>33, :member=>"member_62", :score=>62.0}, {:rank=>28, :member=>"member_67", :score=>67.0}]   
-
+  ruby-1.9.2-p180 :034 > highscore_lb.ranked_in_list(['member_1', 'member_62', 'member_67'])
+   => [{:member=>"member_1", :rank=>56, :score=>1.0}, {:member=>"member_62", :rank=>34, :score=>62.0}, {:member=>"member_67", :rank=>29, :score=>67.0}]
+   
 === Other useful methods
 
-	remove_member(member): Remove a member from the leaderboard
-	total_members_in_score_range(min_score, max_score): Count the number of members within a score range in the leaderboard
-	change_score_for(member, delta): Change the score for a member by some amount delta (delta could be positive or negative)
-	check_member?(member): Check to see whether member is in the leaderboard
-	score_and_rank_for(member, use_zero_index_for_rank = false): Retrieve the score and rank for a member in a single call
-	remove_members_in_score_range(min_score, max_score): Remove members from the leaderboard within a score range
-	merge_leaderboards(destination, keys, options = {:aggregate => :min}): Merge leaderboards given by keys with this leaderboard into destination
-	intersect_leaderboards(destination, keys, options = {:aggregate => :min}): Intersect leaderboards given by keys with this leaderboard into destination
+  delete_leaderboard: Delete the current leaderboard  
+  remove_member(member): Remove a member from the leaderboard
+  total_members: Total # of members in the leaderboard
+  total_pages: Total # of pages in the leaderboard given the leaderboard's page_size	
+  total_members_in_score_range(min_score, max_score): Count the number of members within a score range in the leaderboard
+  change_score_for(member, delta): Change the score for a member by some amount delta (delta could be positive or negative)
+  rank_for(member): Retrieve the rank for a given member in the leaderboard
+  score_for(member): Retrieve the score for a given member in the leaderboard
+  check_member?(member): Check to see whether member is in the leaderboard
+  score_and_rank_for(member): Retrieve the score and rank for a member in a single call
+  remove_members_in_score_range(min_score, max_score): Remove members from the leaderboard within a score range
+  merge_leaderboards(destination, keys, options = {:aggregate => :min}): Merge leaderboards given by keys with this leaderboard into destination
+  intersect_leaderboards(destination, keys, options = {:aggregate => :min}): Intersect leaderboards given by keys with this leaderboard into destination
+
+Check the online documentation for more detail, http://rubydoc.info/gems/leaderboard/
       
 == Performance Metrics
 
 10 million sequential scores insert:
 
-  ruby-1.8.7-p302 > insert_time = Benchmark.measure do
-  ruby-1.8.7-p302 >       1.upto(10000000) do |index|
-  ruby-1.8.7-p302 >           highscore_lb.add_member("member_#{index}", index)
-  ruby-1.8.7-p302 ?>      end
-  ruby-1.8.7-p302 ?>  end
-   => #<Benchmark::Tms:0x101605660 @label="", @stime=173.61, @total=577.52, @real=911.718175172806, @utime=403.91, @cstime=0.0, @cutime=0.0> 
+  ruby-1.9.2-p180 :003 > highscore_lb = Leaderboard.new('highscores')
+   => #<Leaderboard:0x0000010205fc50 @leaderboard_name="highscores", @page_size=25, @redis_connection=#<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis v2.2.5)>> 
+  ruby-1.9.2-p180 :004 > insert_time = Benchmark.measure do
+  ruby-1.9.2-p180 :005 >     1.upto(10000000) do |index|
+  ruby-1.9.2-p180 :006 >       highscore_lb.rank_member("member_#{index}", index)
+  ruby-1.9.2-p180 :007?>     end
+  ruby-1.9.2-p180 :008?>   end
+   => 323.070000 148.560000 471.630000 (942.068307)
   
 Average time to request an arbitrary page from the leaderboard:
 
-  ruby-1.8.7-p302 > requests_to_make = 50000
+  ruby-1.9.2-p180 :009 > requests_to_make = 50000
    => 50000 
-  ruby-1.8.7-p302 > lb_request_time = 0
+  ruby-1.9.2-p180 :010 > lb_request_time = 0
    => 0 
-  ruby-1.8.7-p302 > 1.upto(requests_to_make) do
-  ruby-1.8.7-p302 >       lb_request_time += Benchmark.measure do
-  ruby-1.8.7-p302 >           highscore_lb.leaders(rand(highscore_lb.total_pages))
-  ruby-1.8.7-p302 ?>      end.total
-  ruby-1.8.7-p302 ?>  end
+  ruby-1.9.2-p180 :011 > 1.upto(requests_to_make) do
+  ruby-1.9.2-p180 :012 >     lb_request_time += Benchmark.measure do
+  ruby-1.9.2-p180 :013 >       highscore_lb.leaders(rand(highscore_lb.total_pages))
+  ruby-1.9.2-p180 :014?>     end.total
+  ruby-1.9.2-p180 :015?>   end
    => 1 
-  ruby-1.8.7-p302 > 
-  ruby-1.8.7-p302 >   p lb_request_time / requests_to_make
-  0.001808
-   => nil 
-  
+  ruby-1.9.2-p180 :016 > p lb_request_time / requests_to_make
+  0.001513999999999998
+   => 0.001513999999999998 
+     
 10 million random scores insert:
 
-  ruby-1.8.7-p302 > insert_time = Benchmark.measure do
-  ruby-1.8.7-p302 >       1.upto(10000000) do |index|
-  ruby-1.8.7-p302 >           highscore_lb.add_member("member_#{index}", rand(50000000))
-  ruby-1.8.7-p302 ?>      end
-  ruby-1.8.7-p302 ?>  end
-   => #<Benchmark::Tms:0x10164ebf8 @label="", @stime=172.94, @total=577.91, @real=1356.57155895233, @utime=404.97, @cstime=0.0, @cutime=0.0> 
+  ruby-1.9.2-p180 :018 > insert_time = Benchmark.measure do
+  ruby-1.9.2-p180 :019 >     1.upto(10000000) do |index|
+  ruby-1.9.2-p180 :020 >       highscore_lb.rank_member("member_#{index}", rand(50000000))
+  ruby-1.9.2-p180 :021?>     end
+  ruby-1.9.2-p180 :022?>   end
+   => 338.480000 155.200000 493.680000 (2188.702475)
   
 Average time to request an arbitrary page from the leaderboard:
 
-  ruby-1.8.7-p302 > requests_to_make = 50000
-   => 50000 
-  ruby-1.8.7-p302 > lb_request_time = 0
-   => 0 
-  ruby-1.8.7-p302 > 1.upto(requests_to_make) do
-  ruby-1.8.7-p302 >       lb_request_time += Benchmark.measure do
-  ruby-1.8.7-p302 >           highscore_lb.leaders(rand(highscore_lb.total_pages))
-  ruby-1.8.7-p302 ?>      end.total
-  ruby-1.8.7-p302 ?>  end
+  ruby-1.9.2-p180 :007 > 1.upto(requests_to_make) do
+  ruby-1.9.2-p180 :008 >     lb_request_time += Benchmark.measure do
+  ruby-1.9.2-p180 :009 >       highscore_lb.leaders(rand(highscore_lb.total_pages))
+  ruby-1.9.2-p180 :010?>     end.total
+  ruby-1.9.2-p180 :011?>   end
    => 1 
-  ruby-1.8.7-p302 > 
-  ruby-1.8.7-p302 >   p lb_request_time / requests_to_make
-  0.00179680000000001
-   => nil 
+  ruby-1.9.2-p180 :012 > p lb_request_time / requests_to_make
+  0.0014615999999999531
+   => 0.0014615999999999531 
 
 == Future Ideas
 
 * Bulk insert
-* Atomicity for various operations?
-* Is nil? OK to return if Redis returns no data or should it be []?
   
 == Contributing to leaderboard
  

data/Rakefile

@@ -89,5 +89,5 @@ task :stop do
 end
 
 task :test_rubies do
-  system "rvm 1.8.7,1.9.2 rake test"
-end
+  system "rvm 1.8.7@leaderboard_gem,1.9.2@leaderboard_gem rake test"
+end

data/VERSION

@@ -1 +1 @@
-1.0.5
+2.0.0

data/leaderboard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{leaderboard}
-  s.version = "1.0.5"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["David Czarnecki"]
-  s.date = %q{2011-05-04}
+  s.authors = [%q{David Czarnecki}]
+  s.date = %q{2011-08-17}
   s.description = %q{Leaderboards backed by Redis in Ruby}
   s.email = %q{dczarnecki@agoragames.com}
   s.extra_rdoc_files = [
@@ -33,9 +33,9 @@ Gem::Specification.new do |s|
     "test/test_leaderboard.rb"
   ]
   s.homepage = %q{http://github.com/agoragames/leaderboard}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Leaderboards backed by Redis in Ruby}
   s.test_files = [
     "test/helper.rb",
@@ -43,22 +43,21 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<redis>, ["~> 2.1.1"])
+      s.add_runtime_dependency(%q<redis>, ["~> 2.2.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<redis>, ["~> 2.1.1"])
+      s.add_dependency(%q<redis>, ["~> 2.2.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<redis>, ["~> 2.1.1"])
+    s.add_dependency(%q<redis>, ["~> 2.2.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/leaderboard.rb

@@ -1,42 +1,69 @@
 require 'redis'
 
 class Leaderboard
-  VERSION = '1.0.5'.freeze
+  VERSION = '2.0.0'.freeze
   
   DEFAULT_PAGE_SIZE = 25
+  DEFAULT_OPTIONS = {
+    :page_size => DEFAULT_PAGE_SIZE
+  }
+
   DEFAULT_REDIS_HOST = 'localhost'
-  DEFAULT_REDIS_PORT = 6379
+  DEFAULT_REDIS_PORT = 6379  
+  DEFAULT_REDIS_OPTIONS = {
+    :host => DEFAULT_REDIS_HOST,
+    :port => DEFAULT_REDIS_PORT
+  }
+  
+  DEFAULT_LEADERBOARD_REQUEST_OPTIONS = {
+    :with_scores => true, 
+    :with_rank => true, 
+    :use_zero_index_for_rank => false,
+    :page_size => nil
+  }
   
-  attr_reader :host
-  attr_reader :port
   attr_reader :leaderboard_name
   attr_accessor :page_size
   
-  def initialize(leaderboard_name, host = DEFAULT_REDIS_HOST, port = DEFAULT_REDIS_PORT, page_size = DEFAULT_PAGE_SIZE, redis_options = {})
+  def initialize(leaderboard_name, options = DEFAULT_OPTIONS, redis_options = DEFAULT_REDIS_OPTIONS)
     @leaderboard_name = leaderboard_name
-    @host = host
-    @port = port
     
-    if page_size < 1
-      page_size = DEFAULT_PAGE_SIZE
+    @page_size = options[:page_size]
+    if @page_size < 1
+      @page_size = DEFAULT_PAGE_SIZE
     end
     
+    @redis_connection = redis_options[:redis_connection]
+    unless @redis_connection.nil?
+      redis_options.delete(:redis_connection)
+    end
+        
+    @redis_connection = Redis.new(redis_options) if @redis_connection.nil?
+  end
+      
+  def page_size=(page_size)
+    page_size = DEFAULT_PAGE_SIZE if page_size < 1
+
     @page_size = page_size
-    
-    redis_options = redis_options.dup
-    redis_options[:host] ||= @host
-    redis_options[:port] ||= @port
-    
-    @redis_options = redis_options
-    
-    @redis_connection = Redis.new(@redis_options)
+  end
+  
+  def disconnect
+    @redis_connection.client.disconnect
+  end
+  
+  def delete_leaderboard
+    delete_leaderboard_named(@leaderboard_name)
+  end
+  
+  def delete_leaderboard_named(leaderboard_name)
+    @redis_connection.del(leaderboard_name)
   end
       
-  def add_member(member, score)
-    add_member_to(@leaderboard_name, member, score)
+  def rank_member(member, score)
+    rank_member_in(@leaderboard_name, member, score)
   end
 
-  def add_member_to(leaderboard_name, member, score)
+  def rank_member_in(leaderboard_name, member, score)
     @redis_connection.zadd(leaderboard_name, score, member)
   end
   
@@ -114,7 +141,17 @@ class Leaderboard
   end
 
   def score_and_rank_for_in(leaderboard_name, member, use_zero_index_for_rank = false)
-    {:member => member, :score => score_for_in(leaderboard_name, member), :rank => rank_for_in(leaderboard_name, member, use_zero_index_for_rank)}    
+    responses = @redis_connection.multi do |transaction|
+      transaction.zscore(leaderboard_name, member)
+      transaction.zrevrank(leaderboard_name, member)
+    end
+    
+    responses[0] = responses[0].to_f
+    if !use_zero_index_for_rank
+      responses[1] = responses[1] + 1 rescue nil
+    end
+    
+    {:member => member, :score => responses[0], :rank => responses[1]}    
   end
   
   def remove_members_in_score_range(min_score, max_score)
@@ -125,17 +162,17 @@ class Leaderboard
     @redis_connection.zremrangebyscore(leaderboard_name, min_score, max_score)
   end
   
-  def leaders(current_page, with_scores = true, with_rank = true, use_zero_index_for_rank = false, page_size = nil)
-    leaders_in(@leaderboard_name, current_page, with_scores, with_rank, use_zero_index_for_rank, page_size)
+  def leaders(current_page, options = DEFAULT_LEADERBOARD_REQUEST_OPTIONS)
+    leaders_in(@leaderboard_name, current_page, options)
   end
 
-  def leaders_in(leaderboard_name, current_page, with_scores = true, with_rank = true, use_zero_index_for_rank = false, page_size = nil)
+  def leaders_in(leaderboard_name, current_page, options = DEFAULT_LEADERBOARD_REQUEST_OPTIONS)
     if current_page < 1
       current_page = 1
     end
+        
+    page_size = validate_page_size(options[:page_size]) || @page_size
     
-    page_size ||= @page_size
-
     if current_page > total_pages_in(leaderboard_name, page_size)
       current_page = total_pages_in(leaderboard_name, page_size)
     end
@@ -148,23 +185,23 @@ class Leaderboard
     end
     
     ending_offset = (starting_offset + page_size) - 1
-    
-    raw_leader_data = @redis_connection.zrevrange(leaderboard_name, starting_offset, ending_offset, :with_scores => with_scores)
+        
+    raw_leader_data = @redis_connection.zrevrange(leaderboard_name, starting_offset, ending_offset, :with_scores => false)    
     if raw_leader_data
-      massage_leader_data(leaderboard_name, raw_leader_data, with_scores, with_rank, use_zero_index_for_rank)
+      return ranked_in_list_in(leaderboard_name, raw_leader_data, options)
     else
-      return nil
+      return []
     end
   end
   
-  def around_me(member, with_scores = true, with_rank = true, use_zero_index_for_rank = false, page_size = nil)
-    around_me_in(@leaderboard_name, member, with_scores, with_rank, use_zero_index_for_rank, page_size)
+  def around_me(member, options = DEFAULT_LEADERBOARD_REQUEST_OPTIONS)
+    around_me_in(@leaderboard_name, member, options)
   end
   
-  def around_me_in(leaderboard_name, member, with_scores = true, with_rank = true, use_zero_index_for_rank = false, page_size = nil)
+  def around_me_in(leaderboard_name, member, options = DEFAULT_LEADERBOARD_REQUEST_OPTIONS)
     reverse_rank_for_member = @redis_connection.zrevrank(leaderboard_name, member)
     
-    page_size ||= @page_size
+    page_size = validate_page_size(options[:page_size]) || @page_size
     
     starting_offset = reverse_rank_for_member - (page_size / 2)
     if starting_offset < 0
@@ -173,26 +210,50 @@ class Leaderboard
         
     ending_offset = (starting_offset + page_size) - 1
     
-    raw_leader_data = @redis_connection.zrevrange(leaderboard_name, starting_offset, ending_offset, :with_scores => with_scores)
+    raw_leader_data = @redis_connection.zrevrange(leaderboard_name, starting_offset, ending_offset, :with_scores => false)
     if raw_leader_data
-      massage_leader_data(leaderboard_name, raw_leader_data, with_scores, with_rank, use_zero_index_for_rank)
+      return ranked_in_list_in(leaderboard_name, raw_leader_data, options)
     else
-      return nil
+      return []
     end
   end
   
-  def ranked_in_list(members, with_scores = true, use_zero_index_for_rank = false)
-    ranked_in_list_in(@leaderboard_name, members, with_scores, use_zero_index_for_rank)
+  def ranked_in_list(members, options = DEFAULT_LEADERBOARD_REQUEST_OPTIONS)
+    ranked_in_list_in(@leaderboard_name, members, options)
   end
   
-  def ranked_in_list_in(leaderboard_name, members, with_scores = true, use_zero_index_for_rank = false)
+  def ranked_in_list_in(leaderboard_name, members, options = DEFAULT_LEADERBOARD_REQUEST_OPTIONS)
     ranks_for_members = []
     
-    members.each do |member|
+    responses = @redis_connection.multi do |transaction|
+      members.each do |member|
+        transaction.zrevrank(leaderboard_name, member) if options[:with_rank]
+        transaction.zscore(leaderboard_name, member) if options[:with_scores]
+      end
+    end
+    
+    members.each_with_index do |member, index|
       data = {}
       data[:member] = member
-      data[:rank] = rank_for_in(leaderboard_name, member, use_zero_index_for_rank)
-      data[:score] = score_for_in(leaderboard_name, member) if with_scores
+      if options[:with_scores]
+        if options[:with_rank]
+          if options[:use_zero_index_for_rank]
+            data[:rank] = responses[index * 2]
+          else
+            data[:rank] = responses[index * 2] + 1
+          end
+        end
+
+        data[:score] = responses[index * 2 + 1].to_f
+      else
+        if options[:with_rank]
+          if options[:use_zero_index_for_rank]
+            data[:rank] = responses[index]
+          else
+            data[:rank] = responses[index] + 1
+          end
+        end
+      end
       
       ranks_for_members << data
     end
@@ -212,29 +273,11 @@ class Leaderboard
   
   private 
   
-  def massage_leader_data(leaderboard_name, leaders, with_scores, with_rank, use_zero_index_for_rank)
-    member_attribute = true    
-    leader_data = []
-    
-    data = {}        
-    leaders.each do |leader_data_item|
-      if member_attribute
-        data[:member] = leader_data_item
-      else
-        data[:score] = leader_data_item.to_f
-        data[:rank] = rank_for_in(leaderboard_name, data[:member], use_zero_index_for_rank) if with_rank
-        leader_data << data
-        data = {}     
-      end
-
-      if with_scores
-        member_attribute = !member_attribute
-      else
-        leader_data << data
-        data = {}     
-      end        
+  def validate_page_size(page_size)
+    if page_size && page_size < 1
+      page_size = DEFAULT_PAGE_SIZE
     end
     
-    leader_data
+    page_size
   end
 end

data/test/test_leaderboard.rb

@@ -8,64 +8,92 @@ class TestLeaderboard < Test::Unit::TestCase
   
   def teardown
     @redis_connection.flushdb
+    @leaderboard.disconnect
+    @redis_connection.client.disconnect
   end
   
   def test_version
-    assert_equal '1.0.5', Leaderboard::VERSION
+    assert_equal '2.0.0', Leaderboard::VERSION
   end
   
   def test_initialize_with_defaults  
     assert_equal 'name', @leaderboard.leaderboard_name
-    assert_equal 'localhost', @leaderboard.host
-    assert_equal 6379, @leaderboard.port
     assert_equal Leaderboard::DEFAULT_PAGE_SIZE, @leaderboard.page_size
   end
   
+  def test_disconnect
+    assert_equal nil, @leaderboard.disconnect
+  end
+  
+  def test_will_automatically_reconnect_after_a_disconnect
+    assert_equal 0, @leaderboard.total_members
+    rank_members_in_leaderboard(5)
+    assert_equal 5, @leaderboard.total_members
+    assert_equal nil, @leaderboard.disconnect
+    assert_equal 5, @leaderboard.total_members
+  end
+  
   def test_page_size_is_default_page_size_if_set_to_invalid_value
-    @leaderboard = Leaderboard.new('name', 'localhost', 6379, 0)
+    some_leaderboard = Leaderboard.new('name', {:page_size => 0})
     
-    assert_equal Leaderboard::DEFAULT_PAGE_SIZE, @leaderboard.page_size
+    assert_equal Leaderboard::DEFAULT_PAGE_SIZE, some_leaderboard.page_size
+    some_leaderboard.disconnect
   end
   
-  def test_add_member_and_total_members
-    @leaderboard.add_member('member', 1)
+  def test_delete_leaderboard
+    rank_members_in_leaderboard
+    
+    assert_equal true, @redis_connection.exists('name')
+    @leaderboard.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_OPTIONS, {:redis_connection => @redis_connection})
+    rank_members_in_leaderboard
+    
+    assert_equal 1, @redis_connection.info["connected_clients"].to_i
+  end
+  
+  def test_rank_member_and_total_members
+    @leaderboard.rank_member('member', 1)
 
     assert_equal 1, @leaderboard.total_members
   end
   
   def test_total_members_in_score_range
-    add_members_to_leaderboard(5)
+    rank_members_in_leaderboard(5)
     
     assert_equal 3, @leaderboard.total_members_in_score_range(2, 4)
   end
   
   def test_rank_for
-    add_members_to_leaderboard(5)
+    rank_members_in_leaderboard(5)
 
     assert_equal 2, @leaderboard.rank_for('member_4')
     assert_equal 1, @leaderboard.rank_for('member_4', true)
   end
   
   def test_score_for
-    add_members_to_leaderboard(5)
+    rank_members_in_leaderboard(5)
     
     assert_equal 4, @leaderboard.score_for('member_4')
   end
   
   def test_total_pages
-    add_members_to_leaderboard(10)
+    rank_members_in_leaderboard(10)
     
     assert_equal 1, @leaderboard.total_pages
     
     @redis_connection.flushdb
     
-    add_members_to_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE + 1)
+    rank_members_in_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE + 1)
     
     assert_equal 2, @leaderboard.total_pages
   end
   
   def test_leaders
-    add_members_to_leaderboard(25)
+    rank_members_in_leaderboard(25)
     
     assert_equal 25, @leaderboard.total_members
 
@@ -79,7 +107,7 @@ class TestLeaderboard < Test::Unit::TestCase
   end
   
   def test_leaders_with_multiple_pages
-    add_members_to_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE * 3 + 1)
+    rank_members_in_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE * 3 + 1)
     
     assert_equal Leaderboard::DEFAULT_PAGE_SIZE * 3 + 1, @leaderboard.total_members
 
@@ -102,8 +130,21 @@ class TestLeaderboard < Test::Unit::TestCase
     assert_equal 1, leaders.size
   end
   
+  def test_leaders_without_retrieving_scores_and_ranks
+    rank_members_in_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE)
+    
+    assert_equal Leaderboard::DEFAULT_PAGE_SIZE, @leaderboard.total_members
+    leaders = @leaderboard.leaders(1, {:with_scores => false, :with_ranks => false})
+
+    member_25 = {:member => 'member_25'}
+    assert_equal member_25, leaders[0]
+    
+    member_1 = {:member => 'member_1'}
+    assert_equal member_1, leaders[24]
+  end
+  
   def test_around_me
-    add_members_to_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE * 3 + 1)
+    rank_members_in_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE * 3 + 1)
 
     assert_equal Leaderboard::DEFAULT_PAGE_SIZE * 3 + 1, @leaderboard.total_members
     
@@ -118,12 +159,12 @@ class TestLeaderboard < Test::Unit::TestCase
   end
   
   def test_ranked_in_list
-    add_members_to_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE)
+    rank_members_in_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE)
     
     assert_equal Leaderboard::DEFAULT_PAGE_SIZE, @leaderboard.total_members
     
     members = ['member_1', 'member_5', 'member_10']
-    ranked_members = @leaderboard.ranked_in_list(members, true)
+    ranked_members = @leaderboard.ranked_in_list(members, Leaderboard::DEFAULT_LEADERBOARD_REQUEST_OPTIONS)
     
     assert_equal 3, ranked_members.size
 
@@ -137,8 +178,25 @@ class TestLeaderboard < Test::Unit::TestCase
     assert_equal 10, ranked_members[2][:score]    
   end
   
+  def test_ranked_in_list_without_scores
+    rank_members_in_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE)
+    
+    assert_equal Leaderboard::DEFAULT_PAGE_SIZE, @leaderboard.total_members
+    
+    members = ['member_1', 'member_5', 'member_10']
+    ranked_members = @leaderboard.ranked_in_list(members, {:with_scores => false, :with_rank => true, :use_zero_index_for_rank => false})
+    
+    assert_equal 3, ranked_members.size
+
+    assert_equal 25, ranked_members[0][:rank]
+
+    assert_equal 21, ranked_members[1][:rank]
+
+    assert_equal 16, ranked_members[2][:rank]
+  end
+  
   def test_remove_member
-    add_members_to_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE)
+    rank_members_in_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE)
     
     assert_equal Leaderboard::DEFAULT_PAGE_SIZE, @leaderboard.total_members
     
@@ -149,7 +207,7 @@ class TestLeaderboard < Test::Unit::TestCase
   end
   
   def test_change_score_for
-    @leaderboard.add_member('member_1', 5)    
+    @leaderboard.rank_member('member_1', 5)    
     assert_equal 5, @leaderboard.score_for('member_1')
 
     @leaderboard.change_score_for('member_1', 5)    
@@ -160,22 +218,31 @@ class TestLeaderboard < Test::Unit::TestCase
   end
   
   def test_check_member
-    @leaderboard.add_member('member_1', 10)
+    @leaderboard.rank_member('member_1', 10)
     
     assert_equal true, @leaderboard.check_member?('member_1')
     assert_equal false, @leaderboard.check_member?('member_2')
   end
   
   def test_can_change_page_size_and_have_it_reflected_in_size_of_result_set
-    add_members_to_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE)
+    rank_members_in_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE)
     
     @leaderboard.page_size = 5
+    
     assert_equal 5, @leaderboard.total_pages
     assert_equal 5, @leaderboard.leaders(1).size
   end
   
+  def test_cannot_set_page_size_to_invalid_page_size
+    rank_members_in_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE)
+    
+    @leaderboard.page_size = 0
+    assert_equal 1, @leaderboard.total_pages
+    assert_equal Leaderboard::DEFAULT_PAGE_SIZE, @leaderboard.leaders(1).size
+  end
+  
   def test_score_and_rank_for
-    add_members_to_leaderboard
+    rank_members_in_leaderboard
     
     data = @leaderboard.score_and_rank_for('member_1')
     assert_equal 'member_1', data[:member]
@@ -184,13 +251,13 @@ class TestLeaderboard < Test::Unit::TestCase
   end
   
   def test_remove_members_in_score_range
-    add_members_to_leaderboard
+    rank_members_in_leaderboard
     
     assert_equal 5, @leaderboard.total_members
     
-    @leaderboard.add_member('cheater_1', 100)
-    @leaderboard.add_member('cheater_2', 101)
-    @leaderboard.add_member('cheater_3', 102)
+    @leaderboard.rank_member('cheater_1', 100)
+    @leaderboard.rank_member('cheater_2', 101)
+    @leaderboard.rank_member('cheater_3', 102)
 
     assert_equal 8, @leaderboard.total_members
 
@@ -205,14 +272,14 @@ class TestLeaderboard < Test::Unit::TestCase
   end
   
   def test_merge_leaderboards
-    foo = Leaderboard.new('foo')
+    foo = Leaderboard.new('foo')    
     bar = Leaderboard.new('bar')
     
-    foo.add_member('foo_1', 1)
-    foo.add_member('foo_2', 2)
-    bar.add_member('bar_1', 3)
-    bar.add_member('bar_2', 4)
-    bar.add_member('bar_3', 5)
+    foo.rank_member('foo_1', 1)
+    foo.rank_member('foo_2', 2)
+    bar.rank_member('bar_1', 3)
+    bar.rank_member('bar_2', 4)
+    bar.rank_member('bar_3', 5)
     
     foobar_keys = foo.merge_leaderboards('foobar', ['bar'])
     assert_equal 5, foobar_keys
@@ -224,18 +291,22 @@ class TestLeaderboard < Test::Unit::TestCase
     assert_equal 1, first_leader_in_foobar[:rank]
     assert_equal 'bar_3', first_leader_in_foobar[:member]
     assert_equal 5, first_leader_in_foobar[:score]
+    
+    foo.disconnect
+    bar.disconnect
+    foobar.disconnect
   end
   
   def test_intersect_leaderboards
     foo = Leaderboard.new('foo')
     bar = Leaderboard.new('bar')
     
-    foo.add_member('foo_1', 1)
-    foo.add_member('foo_2', 2)
-    foo.add_member('bar_3', 6)
-    bar.add_member('bar_1', 3)
-    bar.add_member('foo_1', 4)
-    bar.add_member('bar_3', 5)
+    foo.rank_member('foo_1', 1)
+    foo.rank_member('foo_2', 2)
+    foo.rank_member('bar_3', 6)
+    bar.rank_member('bar_1', 3)
+    bar.rank_member('foo_1', 4)
+    bar.rank_member('bar_3', 5)
     
     foobar_keys = foo.intersect_leaderboards('foobar', ['bar'], {:aggregate => :max})    
     assert_equal 2, foobar_keys
@@ -247,53 +318,57 @@ class TestLeaderboard < Test::Unit::TestCase
     assert_equal 1, first_leader_in_foobar[:rank]
     assert_equal 'bar_3', first_leader_in_foobar[:member]
     assert_equal 6, first_leader_in_foobar[:score]
+    
+    foo.disconnect
+    bar.disconnect
+    foobar.disconnect
   end
   
   def test_massage_leader_data_respects_with_scores
-    add_members_to_leaderboard(25)
+    rank_members_in_leaderboard(25)
     
     assert_equal 25, @leaderboard.total_members
 
-    leaders = @leaderboard.leaders(1, false, false, false)
+    leaders = @leaderboard.leaders(1, {:with_scores => false, :with_rank => false})
     assert_not_nil leaders[0][:member]
     assert_nil leaders[0][:score]
     assert_nil leaders[0][:rank]
     
     @leaderboard.page_size = 25
-    leaders = @leaderboard.leaders(1, false, false, false)
+    leaders = @leaderboard.leaders(1, {:with_scores => false, :with_rank => false})
     assert_equal 25, leaders.size
 
     @leaderboard.page_size = Leaderboard::DEFAULT_PAGE_SIZE
-    leaders = @leaderboard.leaders(1, true, true, false)
+    leaders = @leaderboard.leaders(1, Leaderboard::DEFAULT_LEADERBOARD_REQUEST_OPTIONS)
     assert_not_nil leaders[0][:member]
     assert_not_nil leaders[0][:score]
     assert_not_nil leaders[0][:rank]
     
     @leaderboard.page_size = 25
-    leaders = @leaderboard.leaders(1, true, true, false)
+    leaders = @leaderboard.leaders(1, Leaderboard::DEFAULT_LEADERBOARD_REQUEST_OPTIONS)
     assert_equal 25, leaders.size
   end
   
   def test_total_pages_in_with_new_page_size
-    add_members_to_leaderboard(25)
+    rank_members_in_leaderboard(25)
     
     assert_equal 1, @leaderboard.total_pages_in(@leaderboard.leaderboard_name)
     assert_equal 5, @leaderboard.total_pages_in(@leaderboard.leaderboard_name, 5)
   end
   
   def test_leaders_call_with_new_page_size
-    add_members_to_leaderboard(25)
+    rank_members_in_leaderboard(25)
     
-    assert_equal 5, @leaderboard.leaders(1, true, true, false, 5).size
-    assert_equal 10, @leaderboard.leaders(1, true, true, false, 10).size
-    assert_equal 10, @leaderboard.leaders(2, true, true, false, 10).size
-    assert_equal 5, @leaderboard.leaders(3, true, true, false, 10).size
+    assert_equal 5, @leaderboard.leaders(1, Leaderboard::DEFAULT_LEADERBOARD_REQUEST_OPTIONS.merge({:page_size => 5})).size
+    assert_equal 10, @leaderboard.leaders(1, Leaderboard::DEFAULT_LEADERBOARD_REQUEST_OPTIONS.merge({:page_size => 10})).size
+    assert_equal 10, @leaderboard.leaders(2, Leaderboard::DEFAULT_LEADERBOARD_REQUEST_OPTIONS.merge({:page_size => 10})).size
+    assert_equal 5, @leaderboard.leaders(3, Leaderboard::DEFAULT_LEADERBOARD_REQUEST_OPTIONS.merge({:page_size => 10})).size
   end
   
   def test_around_me_call_with_new_page_size
-    add_members_to_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE * 3 + 1)
+    rank_members_in_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE * 3 + 1)
     
-    leaders_around_me = @leaderboard.around_me('member_30', true, true, false, 3)
+    leaders_around_me = @leaderboard.around_me('member_30', Leaderboard::DEFAULT_LEADERBOARD_REQUEST_OPTIONS.merge({:page_size => 3}))
     assert_equal 3, leaders_around_me.size
     assert_equal 'member_31', leaders_around_me[0][:member]
     assert_equal 'member_29', leaders_around_me[2][:member]
@@ -301,9 +376,9 @@ class TestLeaderboard < Test::Unit::TestCase
   
   private
   
-  def add_members_to_leaderboard(members_to_add = 5)
+  def rank_members_in_leaderboard(members_to_add = 5)
     1.upto(members_to_add) do |index|
-      @leaderboard.add_member("member_#{index}", index)
+      @leaderboard.rank_member("member_#{index}", index)
     end
   end
 end

metadata

@@ -1,95 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: leaderboard
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 5
-  version: 1.0.5
+version: !ruby/object:Gem::Version
+  version: 2.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - David Czarnecki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-04 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
+date: 2011-08-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: redis
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70114074547140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 1
-        - 1
-        version: 2.1.1
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :development
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
   prerelease: false
+  version_requirements: *70114074547140
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70114074545640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *70114074545640
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70114074543920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *70114074543920
+- !ruby/object:Gem::Dependency
   name: rcov
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70114074539440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70114074539440
 description: Leaderboards backed by Redis in Ruby
 email: dczarnecki@agoragames.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rvmrc
 - CHANGELOG.markdown
@@ -104,40 +77,34 @@ files:
 - test/helper.rb
 - test/test.conf
 - test/test_leaderboard.rb
-has_rdoc: true
 homepage: http://github.com/agoragames/leaderboard
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2495258638232902776
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Leaderboards backed by Redis in Ruby
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_leaderboard.rb