Fixed comparison to account for scores or ranks of 0. (agoragames#58)

* Fixed comparison to account for scores or ranks of 0.

* Test added for negative and zero scores alongside missing scores.

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.7.3 (2018-05-04)
+
+* Fix an edge case in the updated comparison for non-members
+
 ## 3.7.2 (2018-05-03)
 
 * Fix running under Python 3 for `ranked_in_list(...)` if `include_missing` is `True` and non-member(s) passed in

leaderboard/leaderboard.py

@@ -16,7 +16,7 @@ def grouper(n, iterable, fillvalue=None):
 
 
 class Leaderboard(object):
-    VERSION = '3.7.2'
+    VERSION = '3.7.3'
     DEFAULT_PAGE_SIZE = 25
     DEFAULT_REDIS_HOST = 'localhost'
     DEFAULT_REDIS_PORT = 6379
@@ -1084,12 +1084,12 @@ def ranked_in_list_in(self, leaderboard_name, members, **options):
             if self.RANK_KEY == options['sort_by']:
                 ranks_for_members = sorted(
                     ranks_for_members,
-                    key=lambda member: member.get(self.RANK_KEY) or sort_value_if_none
+                    key=lambda member: member.get(self.RANK_KEY) if member.get(self.RANK_KEY) is not None else sort_value_if_none
                 )
             elif self.SCORE_KEY == options['sort_by']:
                 ranks_for_members = sorted(
                     ranks_for_members,
-                    key=lambda member: member.get(self.SCORE_KEY) or sort_value_if_none
+                    key=lambda member: member.get(self.SCORE_KEY) if member.get(self.SCORE_KEY) is not None else sort_value_if_none
                 )
 
         return ranks_for_members

setup.py

@@ -9,7 +9,7 @@
 
 setup(
   name = 'leaderboard',
-  version = "3.7.2",
+  version = "3.7.3",
   author = 'David Czarnecki',
   author_email = "[email protected]",
   packages = ['leaderboard'],

test/leaderboard/leaderboard_test.py

@@ -18,7 +18,7 @@ def tearDown(self):
         Leaderboard.MEMBER_DATA_KEY = 'member_data'
 
     def test_version(self):
-        Leaderboard.VERSION.should.equal('3.7.2')
+        Leaderboard.VERSION.should.equal('3.7.3')
 
     def test_init_with_defaults(self):
         'name'.should.equal(self.leaderboard.leaderboard_name)
@@ -676,6 +676,19 @@ def test_ranked_in_list_with_include_missing_sort_by_score_and_missing_members(s
         leaders[1]['member'].should.equal('member_1')
         leaders[2]['member'].should.equal('member_25')
 
+    def test_ranked_in_list_with_include_missing_sort_by_score_and_negative_and_zero_score(self):
+        self.__rank_members_in_leaderboard()
+        self.leaderboard.rank_member('member_-1', -1)
+        self.leaderboard.rank_member('member_0', 0)
+        leaders = self.leaderboard.ranked_in_list(
+            ['member_-1', 'member_0', 'member_1', 'member_3', 'member_200'], sort_by='score')
+        len(leaders).should.equal(5)
+        leaders[0]['member'].should.equal('member_-1')
+        leaders[1]['member'].should.equal('member_0')
+        leaders[2]['member'].should.equal('member_1')
+        leaders[3]['member'].should.equal('member_3')
+        leaders[4]['member'].should.equal('member_200')
+
     def __rank_members_in_leaderboard(self, members_to_add=6):
         for index in range(1, members_to_add):
             self.leaderboard.rank_member(