leaderboard 1.0.4 → 1.0.5

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# leaderboard 1.0.5 (2011-05-04)
+
+ * Updated Rakefile to run tests under ruby 1.8.7 and ruby 1.9.2
+ * Added `page_size` parameter to `total_pages_in` to allow for checking what if values in that scenario
+ * Added `page_size` parameter to `leaders` and `around_me` calls
+
 # leaderboard 1.0.4 (2011-04-26)
 
  * Minor bug fix

data/Rakefile

@@ -58,7 +58,7 @@ REDIS_LOCATION = ENV['REDIS_LOCATION']
 task :default => :run
 
 desc "Run tests and manage server start/stop"
-task :run => [:start, :test, :stop]
+task :run => [:start, :test_rubies, :stop]
 
 desc "Run rcov and manage server start/stop"
 task :rcoverage => [:start, :rcov, :stop]
@@ -87,3 +87,7 @@ task :stop do
     FileUtils.rm REDIS_PID
   end
 end
+
+task :test_rubies do
+  system "rvm 1.8.7,1.9.2 rake test"
+end

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/leaderboard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{leaderboard}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Czarnecki"]
-  s.date = %q{2011-04-26}
+  s.date = %q{2011-05-04}
   s.description = %q{Leaderboards backed by Redis in Ruby}
   s.email = %q{dczarnecki@agoragames.com}
   s.extra_rdoc_files = [

data/lib/leaderboard.rb

@@ -1,7 +1,7 @@
 require 'redis'
 
 class Leaderboard
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
   
   DEFAULT_PAGE_SIZE = 25
   DEFAULT_REDIS_HOST = 'localhost'
@@ -60,8 +60,9 @@ class Leaderboard
     total_pages_in(@leaderboard_name)
   end
   
-  def total_pages_in(leaderboard_name)
-    (total_members_in(leaderboard_name) / @page_size.to_f).ceil
+  def total_pages_in(leaderboard_name, page_size = nil)
+    page_size ||= @page_size.to_f
+    (total_members_in(leaderboard_name) / page_size.to_f).ceil
   end
   
   def total_members_in_score_range(min_score, max_score)
@@ -124,27 +125,29 @@ 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)
-    leaders_in(@leaderboard_name, current_page, with_scores, with_rank, use_zero_index_for_rank)
+  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)
   end
 
-  def leaders_in(leaderboard_name, current_page, with_scores = true, with_rank = true, use_zero_index_for_rank = false)
+  def leaders_in(leaderboard_name, current_page, with_scores = true, with_rank = true, use_zero_index_for_rank = false, page_size = nil)
     if current_page < 1
       current_page = 1
     end
     
-    if current_page > total_pages_in(leaderboard_name)
-      current_page = total_pages_in(leaderboard_name)
+    page_size ||= @page_size
+
+    if current_page > total_pages_in(leaderboard_name, page_size)
+      current_page = total_pages_in(leaderboard_name, page_size)
     end
     
     index_for_redis = current_page - 1
 
-    starting_offset = (index_for_redis * @page_size)
+    starting_offset = (index_for_redis * page_size)
     if starting_offset < 0
       starting_offset = 0
     end
     
-    ending_offset = (starting_offset + @page_size) - 1
+    ending_offset = (starting_offset + page_size) - 1
     
     raw_leader_data = @redis_connection.zrevrange(leaderboard_name, starting_offset, ending_offset, :with_scores => with_scores)
     if raw_leader_data
@@ -154,19 +157,21 @@ class Leaderboard
     end
   end
   
-  def around_me(member, with_scores = true, with_rank = true, use_zero_index_for_rank = false)
-    around_me_in(@leaderboard_name, member, with_scores, with_rank, use_zero_index_for_rank)
+  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)
   end
   
-  def around_me_in(leaderboard_name, member, with_scores = true, with_rank = true, use_zero_index_for_rank = false)
+  def around_me_in(leaderboard_name, member, with_scores = true, with_rank = true, use_zero_index_for_rank = false, page_size = nil)
     reverse_rank_for_member = @redis_connection.zrevrank(leaderboard_name, member)
     
-    starting_offset = reverse_rank_for_member - (@page_size / 2)
+    page_size ||= @page_size
+    
+    starting_offset = reverse_rank_for_member - (page_size / 2)
     if starting_offset < 0
       starting_offset = 0
     end
-    
-    ending_offset = (starting_offset + @page_size) - 1
+        
+    ending_offset = (starting_offset + page_size) - 1
     
     raw_leader_data = @redis_connection.zrevrange(leaderboard_name, starting_offset, ending_offset, :with_scores => with_scores)
     if raw_leader_data

data/test/test_leaderboard.rb

@@ -11,7 +11,7 @@ class TestLeaderboard < Test::Unit::TestCase
   end
   
   def test_version
-    assert_equal '1.0.4', Leaderboard::VERSION
+    assert_equal '1.0.5', Leaderboard::VERSION
   end
   
   def test_initialize_with_defaults  
@@ -274,6 +274,31 @@ class TestLeaderboard < Test::Unit::TestCase
     assert_equal 25, leaders.size
   end
   
+  def test_total_pages_in_with_new_page_size
+    add_members_to_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)
+    
+    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
+  end
+  
+  def test_around_me_call_with_new_page_size
+    add_members_to_leaderboard(Leaderboard::DEFAULT_PAGE_SIZE * 3 + 1)
+    
+    leaders_around_me = @leaderboard.around_me('member_30', true, true, false, 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]
+  end
+  
   private
   
   def add_members_to_leaderboard(members_to_add = 5)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leaderboard
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - David Czarnecki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -04:00
+date: 2011-05-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency