leaderboard 3.11.0 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f0aeb0cd68034cf6d268f8f1d8d4e8a39c0df66
-  data.tar.gz: 4576a03574ab9f93200d11ab861b9b3203a179dc
+  metadata.gz: 0d3ef8c29d1877020bc95d7a3bad51147aa0eda5
+  data.tar.gz: bd11c053fcd17988950fee87958303c0186c2ee3
 SHA512:
-  metadata.gz: ac3cc4247ea3c1ca634375112b2614dbe18a1d1a8ab818f08c2f27fe1c1167dea897b95eb7014704a81c0a9303ed03865537837f0eb7efed8bd1b34e8990de1e
-  data.tar.gz: 68128561ee0b7d89d929c251d19b5463ca836325d15a1a163a48e370dba1a39e8475106c7575d9ddbc0ea04dcdbeb8c544e88512879ca25805d124f023ae2b6a
+  metadata.gz: c9b8be3c741a3af3c79a88901fef4d131c58436e4402f46423709884106ed2b45c07cee7ea4a17895798e9c7fb5ba71e5189fdfcb138a5fc5bd6ea39b52c1312
+  data.tar.gz: f0d00fc7e09a22e68df13882611bf4599f2d9990552f508e80510176370e1c92b4c02431e634ea97f535fba0c743ec7b626cd8e302d71569c5254329bb6055f2

data/CHANGELOG.markdown

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 3.12.0 (2017-02-03)
+
+* Fixed an error with the `ranked_in_list` method when using certain options [#62](https://github.com/agoragames/leaderboard/pull/62)
+* Added `total_scores` method [#63](https://github.com/agoragames/leaderboard/pull/63)
+
 ## 3.11.0 (2016-09-16)
 
 * More pipelining [#58](https://github.com/agoragames/leaderboard/pull/58).

data/README.markdown

@@ -350,6 +350,7 @@ Competition ranking: The `CompetitionRankingLeaderboard` subclass of `Leaderboar
   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
+  total_scores: Sum of scores for all members in 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

data/lib/leaderboard.rb

@@ -369,6 +369,13 @@ class Leaderboard
     @redis_connection.zcount(leaderboard_name, min_score, max_score)
   end
 
+  # Sum of scores for all members in leaderboard
+  #
+  # @return Sum of scores for all members in leaderboard
+  def total_scores
+    all_leaders.map{|hash| hash[:score] }.inject(0, :+)
+  end
+
   # Change the score for a member in the leaderboard by a score delta which can be positive or negative.
   #
   # @param member [String] Member name.
@@ -988,7 +995,8 @@ class Leaderboard
     end
 
     if leaderboard_options[:with_member_data]
-      members_data_for_in(leaderboard_name, members).each_with_index do |member_data, index|
+      included_members = ranks_for_members.collect { |member| member[@member_key] }
+      members_data_for_in(leaderboard_name, included_members).each_with_index do |member_data, index|
         ranks_for_members[index][@member_data_key] = member_data
       end
     end

data/lib/leaderboard/version.rb

@@ -1,3 +1,3 @@
 class Leaderboard
-  VERSION = '3.11.0'.freeze
+  VERSION = '3.12.0'.freeze
 end

data/lib/tie_ranking_leaderboard.rb

@@ -253,7 +253,8 @@ class TieRankingLeaderboard < Leaderboard
     end
 
     if leaderboard_options[:with_member_data]
-      members_data_for_in(leaderboard_name, members).each_with_index do |member_data, index|
+      included_members = ranks_for_members.collect { |member| member[@member_key] }
+      members_data_for_in(leaderboard_name, included_members).each_with_index do |member_data, index|
         ranks_for_members[index][@member_data_key] = member_data
       end
     end
@@ -278,4 +279,4 @@ class TieRankingLeaderboard < Leaderboard
   def ties_leaderboard_key(leaderboard_name)
     "#{leaderboard_name}:#{@ties_namespace}"
   end
-end
+end

data/spec/leaderboard_spec.rb

@@ -851,5 +851,14 @@ describe 'Leaderboard' do
     expect(leaders[0][:member]).to eql('member_1')
     expect(leaders[1][:member]).to eql('member_15')
     expect(leaders[2][:member]).to eql('member_25')
+
+    leaders = @leaderboard.ranked_in_list(['member_200'], :include_missing => false, :with_member_data => true)
+    expect(leaders.size).to be(0)
+  end
+
+  it 'should return the sum of all scores in the leaderboard' do
+    rank_members_in_leaderboard(25)
+
+    expect(@leaderboard.total_scores()).to eq(325)
   end
 end

data/spec/tie_ranking_leaderboard_spec.rb

@@ -345,6 +345,9 @@ describe 'TieRankingLeaderboard' do
       expect(leaders[0][:member]).to eql('member_1')
       expect(leaders[1][:member]).to eql('member_15')
       expect(leaders[2][:member]).to eql('member_25')
+
+      leaders = @leaderboard.ranked_in_list(['member_200'], :include_missing => false, :with_member_data => true)
+      expect(leaders.size).to be(0)
     end
   end
 end

data/spec/version_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe 'Leaderboard::VERSION' do
   it 'should be the correct version' do
-    expect(Leaderboard::VERSION).to eq('3.11.0')
+    expect(Leaderboard::VERSION).to eq('3.12.0')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leaderboard
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.12.0
 platform: ruby
 authors:
 - David Czarnecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis