leaderboard 1.0.2 → 1.0.4

data/CHANGELOG.markdown

@@ -1,3 +1,12 @@
+# leaderboard 1.0.4 (2011-04-26)
+
+ * Minor bug fix
+
+# leaderboard 1.0.3 (2011-04-26)
+
+ * Fixing issue using total_pages in leaderboard_in call
+ * Internal `massage_leader_data` method will now respect `with_scores`
+ 
 # leaderboard 1.0.2 (2011-02-25)
 
  * Adding `XXX_to`, `XXX_for`, `XXX_in` and `XXX_from` methods that will allow you to set the leaderboard name to interact with outside of creating a new object

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.4

data/leaderboard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{leaderboard}
-  s.version = "1.0.2"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Czarnecki"]
-  s.date = %q{2011-02-25}
+  s.date = %q{2011-04-26}
   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.2'.freeze
+  VERSION = '1.0.4'.freeze
   
   DEFAULT_PAGE_SIZE = 25
   DEFAULT_REDIS_HOST = 'localhost'
@@ -133,8 +133,8 @@ class Leaderboard
       current_page = 1
     end
     
-    if current_page > total_pages
-      current_page = total_pages
+    if current_page > total_pages_in(leaderboard_name)
+      current_page = total_pages_in(leaderboard_name)
     end
     
     index_for_redis = current_page - 1
@@ -148,7 +148,7 @@ class Leaderboard
     
     raw_leader_data = @redis_connection.zrevrange(leaderboard_name, starting_offset, ending_offset, :with_scores => with_scores)
     if raw_leader_data
-      massage_leader_data(leaderboard_name, raw_leader_data, with_rank, use_zero_index_for_rank)
+      massage_leader_data(leaderboard_name, raw_leader_data, with_scores, with_rank, use_zero_index_for_rank)
     else
       return nil
     end
@@ -170,7 +170,7 @@ class Leaderboard
     
     raw_leader_data = @redis_connection.zrevrange(leaderboard_name, starting_offset, ending_offset, :with_scores => with_scores)
     if raw_leader_data
-      massage_leader_data(leaderboard_name, raw_leader_data, with_rank, use_zero_index_for_rank)
+      massage_leader_data(leaderboard_name, raw_leader_data, with_scores, with_rank, use_zero_index_for_rank)
     else
       return nil
     end
@@ -207,7 +207,7 @@ class Leaderboard
   
   private 
   
-  def massage_leader_data(leaderboard_name, leaders, with_rank, use_zero_index_for_rank)
+  def massage_leader_data(leaderboard_name, leaders, with_scores, with_rank, use_zero_index_for_rank)
     member_attribute = true    
     leader_data = []
     
@@ -221,8 +221,13 @@ class Leaderboard
         leader_data << data
         data = {}     
       end
-            
-      member_attribute = !member_attribute
+
+      if with_scores
+        member_attribute = !member_attribute
+      else
+        leader_data << data
+        data = {}     
+      end        
     end
     
     leader_data

data/test/test_leaderboard.rb

@@ -11,7 +11,7 @@ class TestLeaderboard < Test::Unit::TestCase
   end
   
   def test_version
-    assert_equal '1.0.2', Leaderboard::VERSION
+    assert_equal '1.0.4', Leaderboard::VERSION
   end
   
   def test_initialize_with_defaults  
@@ -249,6 +249,31 @@ class TestLeaderboard < Test::Unit::TestCase
     assert_equal 6, first_leader_in_foobar[:score]
   end
   
+  def test_massage_leader_data_respects_with_scores
+    add_members_to_leaderboard(25)
+    
+    assert_equal 25, @leaderboard.total_members
+
+    leaders = @leaderboard.leaders(1, false, false, 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)
+    assert_equal 25, leaders.size
+
+    @leaderboard.page_size = Leaderboard::DEFAULT_PAGE_SIZE
+    leaders = @leaderboard.leaders(1, true, true, false)
+    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)
+    assert_equal 25, leaders.size
+  end
+  
   private
   
   def add_members_to_leaderboard(members_to_add = 5)
@@ -256,4 +281,4 @@ class TestLeaderboard < Test::Unit::TestCase
       @leaderboard.add_member("member_#{index}", index)
     end
   end
-end
+end

metadata

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