Merge lp:~submarine/ubuntu-scopes/github-25-limit into lp:~submarine/ubuntu-scopes/github

[David Callé]

Limit to 25 results for speed and ease of exploration.

Limit to 25 results for speed and ease of exploration.

[James Henstridge (jamesh)]

Won't this limit the number of results to 26? If there are 25 results, then "len(results) <= 25" is true and you'll append another result.

Also, would it be possible to update the tests to show that the results really are limited to 25?

[James Henstridge (jamesh)]

review: Needs Fixing

[lp:~submarine/ubuntu-scopes/github-25-limit]

21. By David Callé on 2013-03-25

Add test for results limit. Limit to 25, not 26.

[David Callé (davidc3)]

Fixed.

[James Henstridge (jamesh)]

Looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/unity_github_daemon.py'
--- src/unity_github_daemon.py	2013-03-19 22:22:31 +0000
+++ src/unity_github_daemon.py	2013-03-25 13:40:27 +0000
@@ -87,9 +87,10 @@
         return results
     if 'repositories' in data:
         for d in data['repositories']:
-            results.append({'uri':'https://github.com/%s/%s' % (d['owner'], d['name']),
-                            'title':'%s/%s' % (d['owner'], d['name']),
-                            'comment':d['description']})
+            if len(results) < 25:
+                results.append({'uri':'https://github.com/%s/%s' % (d['owner'], d['name']),
+                                'title':'%s/%s' % (d['owner'], d['name']),
+                                'comment':d['description']})
 #    elif 'users' in data:
 #        for d in data['users']:
 #            results.append({'uri':'https://github.com/%s' % d['username'],
@@ -98,10 +99,11 @@
 #                            'category':1})
     else:
         for d in data:
-            results.append({'uri':d['html_url'],
-                            'icon':d['owner']['avatar_url'],
-                            'title':'%s/%s' % (d['owner']['login'], d['name']),
-                            'comment':d['description']})
+            if len(results) < 25:
+                results.append({'uri':d['html_url'],
+                                'icon':d['owner']['avatar_url'],
+                                'title':'%s/%s' % (d['owner']['login'], d['name']),
+                                'comment':d['description']})
     return results
 
 

=== modified file 'tests/test_github.py'
--- tests/test_github.py	2013-03-14 00:04:33 +0000
+++ tests/test_github.py	2013-03-25 13:40:27 +0000
@@ -67,6 +67,7 @@
             results.append(result_set.results[0]['title'])
             results.append(result_set.results[0]['comment'])
         self.assertEqual(results, expected_results)
+        self.assertEqual(len(result_set.results), 25)
 
     def test_failing_search(self):
         self.scope_module.SEARCH_URI = 'file:tests/data/mock_github_fail#'