Merge lp:~facundo/ubuntu-rest-scopes/fix-openlibrary-nodocs into lp:ubuntu-rest-scopes

[Facundo Batista]

Support no-docs case in the OpenLibrary search.

Support no-docs case in the OpenLibrary search.

[Bret Barker (noise)]

+1

review: Approve

=== modified file 'src/scopes/openlibrary.py'
--- src/scopes/openlibrary.py	2015-03-03 20:38:27 +0000
+++ src/scopes/openlibrary.py	2016-04-29 16:02:40 +0000
@@ -109,11 +109,9 @@
 def _get_book_cover(d):
     """Get book cover."""
     if d.get('cover_i'):
-        cover = 'http://covers.openlibrary.org/b/id/' \
-            + str(d['cover_i'])+'-M.jpg'
+        cover = 'http://covers.openlibrary.org/b/id/' + str(d['cover_i']) + '-M.jpg'
     elif d.get('cover_id'):
-        cover = 'http://covers.openlibrary.org/b/id/' \
-            + str(d['cover_id'])+'-M.jpg'
+        cover = 'http://covers.openlibrary.org/b/id/' + str(d['cover_id']) + '-M.jpg'
     else:
         cover = None
     return cover
@@ -190,6 +188,8 @@
             subject = choice(SURFACING_SUBJECTS)
             resp = self._hit_backend('subject', subject=subject, limit=limit)
             docs = resp['docs']
+            if not docs:
+                return
             cat_books = BOOKS_CATEGORY.copy()
             cat_books['title'] = translator(subject, locale)
             yield dict(category=cat_books)
@@ -206,13 +206,15 @@
             featured_author = None
             resp = self._hit_backend('search', query=query, limit=limit)
             docs = resp['docs']
+            if not docs:
+                return
             yield dict(category=localized_category(BOOKS_SEARCH_CATEGORY,
                                                    locale))
         parsed_books = []
         for d in docs:
             cover = _get_book_cover(d)
             author = _get_book_author(d)
-            if author+d['title'] in parsed_books or not cover:
+            if author + d['title'] in parsed_books or not cover:
                 continue
             first_sentence = d.get('first_sentence', [None])[0]
             first_published = d.get('first_publish_year')
@@ -245,7 +247,7 @@
                 'editions': editions,
                 'has_fulltext': d['has_fulltext'],
             })
-            parsed_books.append(author+d['title'])
+            parsed_books.append(author + d['title'])
 
     def preview(self, **kwargs):
         """Do the preview."""
@@ -267,7 +269,7 @@
         desc = _get_description(data)
         if not desc:
             if result['first_sentence']:
-                desc = '\"'+result['first_sentence']+'\"'
+                desc = '"' + result['first_sentence'] + '"'
             else:
                 desc = None
 

=== added file 'src/scopes/tests/fixtures/openlibrary-search-nodocs.json'
--- src/scopes/tests/fixtures/openlibrary-search-nodocs.json	1970-01-01 00:00:00 +0000
+++ src/scopes/tests/fixtures/openlibrary-search-nodocs.json	2016-04-29 16:02:40 +0000
@@ -0,0 +1,6 @@
+{
+ "start": 0, 
+ "num_found": 22630, 
+ "numFound": 22630, 
+ "docs": []
+}

=== modified file 'src/scopes/tests/test_openlibrary.py'
--- src/scopes/tests/test_openlibrary.py	2015-03-03 20:38:27 +0000
+++ src/scopes/tests/test_openlibrary.py	2016-04-29 16:02:40 +0000
@@ -121,6 +121,14 @@
         self.maxDiff = None
         self.assertEqual(response[2], should_res)
 
+    def test_search_no_authors(self):
+        app = openlibrary.App(CONFIG)
+        with patch.object(app, '_hit_backend') as mock:
+            mock.return_value = json.loads(get_fixture(
+                'openlibrary-search-nodocs.json'))
+            response = list(app.search(query='alice', platform='desktop', limit=5, locale='C'))
+        self.assertEqual(response, [])
+
 
 class PreviewTestCase(TestCase):
     """Tests for the preview function."""