leaderboard 3.6.0 → 3.7.0

data/spec/reverse_tie_ranking_leaderboard_spec.rb

@@ -0,0 +1,141 @@
+require 'spec_helper'
+require 'tie_ranking_leaderboard'
+
+describe 'TieRankingLeaderboard (reverse option)' do
+  before(:each) do
+    @redis_connection = Redis.new(:host => "127.0.0.1", :db => 15)
+  end
+
+  after(:each) do
+    @redis_connection.flushdb
+    @redis_connection.client.disconnect
+  end
+
+  context 'ties' do
+    it 'should delete the ties ranking internal leaderboard when you delete a leaderboard configured for ties' do
+      leaderboard = TieRankingLeaderboard.new('ties', {:reverse => true}, {:host => "127.0.0.1", :db => 15})
+      leaderboard.rank_member('member_1', 50)
+      leaderboard.rank_member('member_2', 50)
+      leaderboard.rank_member('member_3', 30)
+      leaderboard.rank_member('member_4', 30)
+      leaderboard.rank_member('member_5', 10)
+
+      expect(@redis_connection.exists(leaderboard.send(:ties_leaderboard_key, leaderboard.leaderboard_name))).to be_truthy
+      leaderboard.delete_leaderboard
+      expect(@redis_connection.exists(leaderboard.send(:ties_leaderboard_key, leaderboard.leaderboard_name))).to be_falsey
+
+      leaderboard.disconnect
+    end
+
+    it 'should retrieve the correct rankings for #leaders' do
+      leaderboard = TieRankingLeaderboard.new('ties', {:reverse => true}, {:host => "127.0.0.1", :db => 15})
+      leaderboard.rank_member('member_1', 50)
+      leaderboard.rank_member('member_2', 50)
+      leaderboard.rank_member('member_3', 30)
+      leaderboard.rank_member('member_4', 30)
+      leaderboard.rank_member('member_5', 10)
+
+      leaderboard.leaders(1).tap do |leaders|
+        expect(leaders[0][:rank]).to eq(1)
+        expect(leaders[1][:rank]).to eq(2)
+        expect(leaders[2][:rank]).to eq(2)
+        expect(leaders[3][:rank]).to eq(3)
+        expect(leaders[4][:rank]).to eq(3)
+      end
+
+      leaderboard.disconnect
+    end
+
+    it 'should retrieve the correct rankings for #leaders with different page sizes' do
+      leaderboard = TieRankingLeaderboard.new('ties', {:reverse => true}, {:host => "127.0.0.1", :db => 15})
+      leaderboard.rank_member('member_1', 50)
+      leaderboard.rank_member('member_2', 50)
+      leaderboard.rank_member('member_3', 30)
+      leaderboard.rank_member('member_4', 30)
+      leaderboard.rank_member('member_5', 10)
+      leaderboard.rank_member('member_6', 50)
+      leaderboard.rank_member('member_7', 50)
+      leaderboard.rank_member('member_8', 30)
+      leaderboard.rank_member('member_9', 30)
+      leaderboard.rank_member('member_10', 10)
+
+      leaderboard.leaders(1, :page_size => 3).tap do |leaders|
+        expect(leaders[0][:rank]).to eq(1)
+        expect(leaders[1][:rank]).to eq(1)
+        expect(leaders[2][:rank]).to eq(2)
+      end
+
+      leaderboard.leaders(2, :page_size => 3).tap do |leaders|
+        expect(leaders[0][:rank]).to eq(2)
+        expect(leaders[1][:rank]).to eq(2)
+        expect(leaders[2][:rank]).to eq(2)
+      end
+
+      leaderboard.disconnect
+    end
+
+    it 'should retrieve the correct rankings for #around_me' do
+      leaderboard = TieRankingLeaderboard.new('ties', {:reverse => true}, {:host => "127.0.0.1", :db => 15})
+      leaderboard.rank_member('member_1', 50)
+      leaderboard.rank_member('member_2', 50)
+      leaderboard.rank_member('member_3', 30)
+      leaderboard.rank_member('member_4', 30)
+      leaderboard.rank_member('member_5', 10)
+      leaderboard.rank_member('member_6', 50)
+      leaderboard.rank_member('member_7', 50)
+      leaderboard.rank_member('member_8', 30)
+      leaderboard.rank_member('member_9', 30)
+      leaderboard.rank_member('member_10', 10)
+
+      leaderboard.around_me('member_3', :page_size => 3).tap do |leaders|
+        expect(leaders[0][:rank]).to eq(1)
+        expect(leaders[1][:rank]).to eq(2)
+        expect(leaders[2][:rank]).to eq(2)
+      end
+
+      leaderboard.disconnect
+    end
+
+    it 'should support that removing a single member will also remove their score from the tie scores leaderboard when appropriate' do
+      leaderboard = TieRankingLeaderboard.new('ties', {:reverse => true}, {:host => "127.0.0.1", :db => 15})
+      leaderboard.rank_member('member_1', 50)
+      leaderboard.rank_member('member_2', 50)
+      leaderboard.rank_member('member_3', 30)
+
+      leaderboard.remove_member('member_1')
+      expect(leaderboard.total_members_in(leaderboard.send(:ties_leaderboard_key, leaderboard.leaderboard_name))).to eq(2)
+      leaderboard.remove_member('member_2')
+      expect(leaderboard.total_members_in(leaderboard.send(:ties_leaderboard_key, leaderboard.leaderboard_name))).to eq(1)
+      leaderboard.remove_member('member_3')
+      expect(leaderboard.total_members_in(leaderboard.send(:ties_leaderboard_key, leaderboard.leaderboard_name))).to eq(0)
+
+      leaderboard.disconnect
+    end
+
+    it 'should allow you to retrieve the rank of a single member using #rank_for' do
+      leaderboard = TieRankingLeaderboard.new('ties', {:reverse => true}, {:host => "127.0.0.1", :db => 15})
+      leaderboard.rank_member('member_1', 50)
+      leaderboard.rank_member('member_2', 50)
+      leaderboard.rank_member('member_3', 30)
+
+      expect(leaderboard.rank_for('member_1')).to eq(2)
+      expect(leaderboard.rank_for('member_2')).to eq(2)
+      expect(leaderboard.rank_for('member_3')).to eq(1)
+
+      leaderboard.disconnect
+    end
+
+    it 'should allow you to retrieve the score and rank of a single member using #score_and_rank_for' do
+      leaderboard = TieRankingLeaderboard.new('ties', {:reverse => true}, {:host => "127.0.0.1", :db => 15})
+      leaderboard.rank_member('member_1', 50)
+      leaderboard.rank_member('member_2', 50)
+      leaderboard.rank_member('member_3', 30)
+
+      expect(leaderboard.score_and_rank_for('member_1')[:rank]).to eq(2)
+      expect(leaderboard.score_and_rank_for('member_2')[:rank]).to eq(2)
+      expect(leaderboard.score_and_rank_for('member_3')[:rank]).to eq(1)
+
+      leaderboard.disconnect
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
   # Helper method to rank members in a leaderboard
-  # 
+  #
   # @param members_to_add [int] Number of members to add to the leaderboard.
   def rank_members_in_leaderboard(members_to_add = 5)
     1.upto(members_to_add) do |index|

data/spec/tie_ranking_leaderboard_spec.rb

@@ -0,0 +1,207 @@
+require 'spec_helper'
+require 'tie_ranking_leaderboard'
+
+describe 'TieRankingLeaderboard' do
+  before(:each) do
+    @redis_connection = Redis.new(:host => "127.0.0.1", :db => 15)
+  end
+
+  after(:each) do
+    @redis_connection.flushdb
+    @redis_connection.client.disconnect
+  end
+
+  context 'ties' do
+    it 'should delete the ties ranking internal leaderboard when you delete a leaderboard configured for ties' do
+      leaderboard = TieRankingLeaderboard.new('ties', Leaderboard::DEFAULT_OPTIONS, {:host => "127.0.0.1", :db => 15})
+      leaderboard.rank_member('member_1', 50)
+      leaderboard.rank_member('member_2', 50)
+      leaderboard.rank_member('member_3', 30)
+      leaderboard.rank_member('member_4', 30)
+      leaderboard.rank_member('member_5', 10)
+
+      expect(@redis_connection.exists(leaderboard.send(:ties_leaderboard_key, leaderboard.leaderboard_name))).to be_truthy
+      leaderboard.delete_leaderboard
+      expect(@redis_connection.exists(leaderboard.send(:ties_leaderboard_key, leaderboard.leaderboard_name))).to be_falsey
+
+      leaderboard.disconnect
+    end
+
+    it 'should retrieve the correct rankings for #leaders' do
+      leaderboard = TieRankingLeaderboard.new('ties', Leaderboard::DEFAULT_OPTIONS, {:host => "127.0.0.1", :db => 15})
+      leaderboard.rank_member('member_1', 50)
+      leaderboard.rank_member('member_2', 50)
+      leaderboard.rank_member('member_3', 30)
+      leaderboard.rank_member('member_4', 30)
+      leaderboard.rank_member('member_5', 10)
+
+      leaderboard.leaders(1).tap do |leaders|
+        expect(leaders[0][:rank]).to eq(1)
+        expect(leaders[1][:rank]).to eq(1)
+        expect(leaders[2][:rank]).to eq(2)
+        expect(leaders[3][:rank]).to eq(2)
+        expect(leaders[4][:rank]).to eq(3)
+      end
+
+      leaderboard.disconnect
+    end
+
+    it 'should retrieve the correct rankings for #leaders with different page sizes' do
+      leaderboard = TieRankingLeaderboard.new('ties', Leaderboard::DEFAULT_OPTIONS, {:host => "127.0.0.1", :db => 15})
+      leaderboard.rank_member('member_1', 50)
+      leaderboard.rank_member('member_2', 50)
+      leaderboard.rank_member('member_3', 30)
+      leaderboard.rank_member('member_4', 30)
+      leaderboard.rank_member('member_5', 10)
+      leaderboard.rank_member('member_6', 50)
+      leaderboard.rank_member('member_7', 50)
+      leaderboard.rank_member('member_8', 30)
+      leaderboard.rank_member('member_9', 30)
+      leaderboard.rank_member('member_10', 10)
+
+      leaderboard.leaders(1, :page_size => 3).tap do |leaders|
+        expect(leaders[0][:rank]).to eq(1)
+        expect(leaders[1][:rank]).to eq(1)
+        expect(leaders[2][:rank]).to eq(1)
+      end
+
+      leaderboard.leaders(2, :page_size => 3).tap do |leaders|
+        expect(leaders[0][:rank]).to eq(1)
+        expect(leaders[1][:rank]).to eq(2)
+        expect(leaders[2][:rank]).to eq(2)
+      end
+
+      leaderboard.disconnect
+    end
+
+    it 'should retrieve the correct rankings for #around_me' do
+      leaderboard = TieRankingLeaderboard.new('ties', Leaderboard::DEFAULT_OPTIONS, {:host => "127.0.0.1", :db => 15})
+      leaderboard.rank_member('member_1', 50)
+      leaderboard.rank_member('member_2', 50)
+      leaderboard.rank_member('member_3', 30)
+      leaderboard.rank_member('member_4', 30)
+      leaderboard.rank_member('member_5', 10)
+      leaderboard.rank_member('member_6', 50)
+      leaderboard.rank_member('member_7', 50)
+      leaderboard.rank_member('member_8', 30)
+      leaderboard.rank_member('member_9', 30)
+      leaderboard.rank_member('member_10', 10)
+
+      leaderboard.around_me('member_3', :page_size => 3).tap do |leaders|
+        expect(leaders[0][:rank]).to eq(2)
+        expect(leaders[1][:rank]).to eq(2)
+        expect(leaders[2][:rank]).to eq(3)
+      end
+
+      leaderboard.disconnect
+    end
+
+    it 'should support that removing a single member will also remove their score from the tie scores leaderboard when appropriate' do
+      leaderboard = TieRankingLeaderboard.new('ties', Leaderboard::DEFAULT_OPTIONS, {:host => "127.0.0.1", :db => 15})
+      leaderboard.rank_member('member_1', 50)
+      leaderboard.rank_member('member_2', 50)
+      leaderboard.rank_member('member_3', 30)
+
+      leaderboard.remove_member('member_1')
+      expect(leaderboard.total_members_in(leaderboard.send(:ties_leaderboard_key, leaderboard.leaderboard_name))).to eq(2)
+      leaderboard.remove_member('member_2')
+      expect(leaderboard.total_members_in(leaderboard.send(:ties_leaderboard_key, leaderboard.leaderboard_name))).to eq(1)
+      leaderboard.remove_member('member_3')
+      expect(leaderboard.total_members_in(leaderboard.send(:ties_leaderboard_key, leaderboard.leaderboard_name))).to eq(0)
+
+      leaderboard.disconnect
+    end
+
+    it 'should allow you to retrieve the rank of a single member using #rank_for' do
+      leaderboard = TieRankingLeaderboard.new('ties', Leaderboard::DEFAULT_OPTIONS, {:host => "127.0.0.1", :db => 15})
+      leaderboard.rank_member('member_1', 50)
+      leaderboard.rank_member('member_2', 50)
+      leaderboard.rank_member('member_3', 30)
+
+      expect(leaderboard.rank_for('member_1')).to eq(1)
+      expect(leaderboard.rank_for('member_2')).to eq(1)
+      expect(leaderboard.rank_for('member_3')).to eq(2)
+
+      leaderboard.disconnect
+    end
+
+    it 'should allow you to retrieve the score and rank of a single member using #score_and_rank_for' do
+      leaderboard = TieRankingLeaderboard.new('ties', Leaderboard::DEFAULT_OPTIONS, {:host => "127.0.0.1", :db => 15})
+      leaderboard.rank_member('member_1', 50)
+      leaderboard.rank_member('member_2', 50)
+      leaderboard.rank_member('member_3', 30)
+
+      expect(leaderboard.score_and_rank_for('member_1')[:rank]).to eq(1)
+      expect(leaderboard.score_and_rank_for('member_2')[:rank]).to eq(1)
+      expect(leaderboard.score_and_rank_for('member_3')[:rank]).to eq(2)
+
+      leaderboard.disconnect
+    end
+
+    it 'should allow you to remove members in a given score range using #remove_members_in_score_range' do
+      @leaderboard = TieRankingLeaderboard.new('ties', Leaderboard::DEFAULT_OPTIONS, {:host => "127.0.0.1", :db => 15})
+
+      rank_members_in_leaderboard
+
+      expect(@leaderboard.total_members).to be(5)
+
+      @leaderboard.rank_member('cheater_1', 100)
+      @leaderboard.rank_member('cheater_2', 101)
+      @leaderboard.rank_member('cheater_3', 102)
+
+      expect(@leaderboard.total_members).to be(8)
+      expect(@leaderboard.total_members_in(@leaderboard.send(:ties_leaderboard_key, @leaderboard.leaderboard_name))).to be(8)
+
+      @leaderboard.remove_members_in_score_range(100, 102)
+
+      expect(@leaderboard.total_members).to be(5)
+      expect(@leaderboard.total_members_in(@leaderboard.send(:ties_leaderboard_key, @leaderboard.leaderboard_name))).to be(5)
+
+      leaders = @leaderboard.leaders(1)
+      leaders.each do |leader|
+        expect(leader[:score]).to be < 100
+      end
+    end
+
+    it 'should expire the ties leaderboard in a given number of seconds' do
+      @leaderboard = TieRankingLeaderboard.new('ties', Leaderboard::DEFAULT_OPTIONS, {:host => "127.0.0.1", :db => 15})
+
+      rank_members_in_leaderboard
+
+      @leaderboard.expire_leaderboard(3)
+      @redis_connection.ttl(@leaderboard.leaderboard_name).tap do |ttl|
+        expect(ttl).to be > 1
+        expect(ttl).to be <= 3
+      end
+      @redis_connection.ttl(@leaderboard.send(:ties_leaderboard_key, @leaderboard.leaderboard_name)).tap do |ttl|
+        expect(ttl).to be > 1
+        expect(ttl).to be <= 3
+      end
+      @redis_connection.ttl(@leaderboard.send(:member_data_key, @leaderboard.leaderboard_name)).tap do |ttl|
+        expect(ttl).to be > 1
+        expect(ttl).to be <= 3
+      end
+
+    end
+
+    it 'should expire the ties leaderboard at a specific timestamp' do
+      @leaderboard = TieRankingLeaderboard.new('ties', Leaderboard::DEFAULT_OPTIONS, {:host => "127.0.0.1", :db => 15})
+
+      rank_members_in_leaderboard
+
+      @leaderboard.expire_leaderboard_at((Time.now + 10).to_i)
+      @redis_connection.ttl(@leaderboard.leaderboard_name).tap do |ttl|
+        expect(ttl).to be > 1
+        expect(ttl).to be <= 10
+      end
+      @redis_connection.ttl(@leaderboard.send(:ties_leaderboard_key, @leaderboard.leaderboard_name)).tap do |ttl|
+        expect(ttl).to be > 1
+        expect(ttl).to be <= 10
+      end
+      @redis_connection.ttl(@leaderboard.send(:member_data_key, @leaderboard.leaderboard_name)).tap do |ttl|
+        expect(ttl).to be > 1
+        expect(ttl).to be <= 10
+      end
+    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
-    Leaderboard::VERSION.should == '3.6.0'
+    expect(Leaderboard::VERSION).to eq('3.7.0')
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: leaderboard
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - David Czarnecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-15 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Leaderboards backed by Redis in Ruby
@@ -59,22 +59,28 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.markdown
 - Gemfile
 - LICENSE.txt
 - README.markdown
 - Rakefile
 - leaderboard.gemspec
+- lib/competition_ranking_leaderboard.rb
 - lib/leaderboard.rb
 - lib/leaderboard/version.rb
+- lib/tie_ranking_leaderboard.rb
+- spec/competition_ranking_leaderboard_spec.rb
 - spec/leaderboard_spec.rb
+- spec/reverse_competition_ranking_leaderboard_spec.rb
 - spec/reverse_leaderboard_spec.rb
+- spec/reverse_tie_ranking_leaderboard_spec.rb
 - spec/spec_helper.rb
+- spec/tie_ranking_leaderboard_spec.rb
 - spec/version_spec.rb
 homepage: https://github.com/agoragames/leaderboard
 licenses:
@@ -86,22 +92,26 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: leaderboard
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Leaderboards backed by Redis in Ruby
 test_files:
+- spec/competition_ranking_leaderboard_spec.rb
 - spec/leaderboard_spec.rb
+- spec/reverse_competition_ranking_leaderboard_spec.rb
 - spec/reverse_leaderboard_spec.rb
+- spec/reverse_tie_ranking_leaderboard_spec.rb
 - spec/spec_helper.rb
+- spec/tie_ranking_leaderboard_spec.rb
 - spec/version_spec.rb