Merge lp:~elachuni/ubuntu-webcatalog/remove-portlet-if-empty into lp:ubuntu-webcatalog

[Anthony Lenton]

Another two minor fixes:
- Request the ajax version of the reviews from the app details page (not the full version).
- Only include a portlet header for recommended apps if there's at least one recommendation.

[lp:~elachuni/ubuntu-webcatalog/remove-portlet-if-empty]

115. By Anthony Lenton on 2012-04-20

Added missing newline at the end of a template.

116. By Anthony Lenton on 2012-04-20

Handled socket errors and other api issues.

[Natalia Bidart (nataliabidart)]

Branch looks good.

review: Approve

=== modified file 'src/webcatalog/templates/webcatalog/application_detail.html'
--- src/webcatalog/templates/webcatalog/application_detail.html	2012-04-19 23:25:16 +0000
+++ src/webcatalog/templates/webcatalog/application_detail.html	2012-04-20 19:18:18 +0000
@@ -11,7 +11,7 @@
 YUI({combine: true, comboBase: '{% url wc-combo %}?', root: 'yui/3.4.0/build/'}).use('io-base', 'node-base', function (Y) {
 
     // XXX michaeln 2011-09-16 bug=851660 Autoload further batches of results.
-    var reviews_uri = "{% url wc-package-reviews application.distroseries.code_name application.package_name %}";
+    var reviews_uri = "{% url wc-package-reviews-ajax application.distroseries.code_name application.package_name %}";
     Y.io(reviews_uri, {
         on: {
             complete: function(id, obj){
 
=== modified file 'src/webcatalog/templates/webcatalog/recommended_apps_widget.html'
--- src/webcatalog/templates/webcatalog/recommended_apps_widget.html	2012-04-19 23:05:19 +0000
+++ src/webcatalog/templates/webcatalog/recommended_apps_widget.html	2012-04-20 19:18:18 +0000
@@ -1,4 +1,5 @@
 {% load webcatalog %}
+{% if recommended_apps %}
 <div class="portletheader">Other people also downloaded...</div>
 <ul class="portletactions">
 {% for app in recommended_apps %}
@@ -16,3 +17,4 @@
   </li>
 {% endfor %}
 </ul>
+{% endif %}
 
=== modified file 'src/webcatalog/tests/test_utilities.py'
--- src/webcatalog/tests/test_utilities.py	2012-04-19 13:29:35 +0000
+++ src/webcatalog/tests/test_utilities.py	2012-04-20 19:18:18 +0000
@@ -38,6 +38,7 @@
 from django.test import TestCase
 from httplib2 import ServerNotFoundError
 from mock import patch
+from piston_mini_client.failhandlers import APIError
 
 
 class CreatePNGFromFileTestCase(TestCaseWithFactory):
@@ -176,6 +177,13 @@
         self.assertEqual({'foo': 'bar'}, result)
         self.assertEqual(0, self.mock_recommend_app.call_count)
 
+    def test_get_recommends_for_package_socket_error(self):
+        self.mock_recommend_app.side_effect = APIError('500', 'error')
+
+        result = WebServices().get_recommends_for_package('firefox')
+
+        self.assertEqual({'data': [], 'package': 'firefox'}, result)
+
 
 class ScreenshotGetterTestCase(TestCase):
     @patch('webcatalog.utilities.urllib.urlopen')
 
=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-04-20 16:57:50 +0000
+++ src/webcatalog/tests/test_views.py	2012-04-20 19:18:18 +0000
@@ -143,6 +143,15 @@
                 app.package_name,
                 ])))
 
+    def test_link_to_reviews_snippet(self):
+        response, app = self.get_app_and_response()
+
+        self.assertContains(response, 'var reviews_uri = "{0}"'.format(
+            reverse('wc-package-reviews-ajax', args=[
+                app.distroseries.code_name,
+                app.package_name,
+                ])))
+
     def test_link_to_recommended_apps_not_present(self):
         with patch_settings(NUM_RECOMMENDED_APPS=0):
             response, app = self.get_app_and_response()
@@ -1090,11 +1099,19 @@
         app2 = self.factory.make_application(package_name='firefox')
 
         response = self.client.get(
-            reverse('wc-package-recommends', args=['firefox']),
-                HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+            reverse('wc-package-recommends', args=['firefox']))
 
         self.assertEqual(app2, response.context['application'])
 
+    def test_no_recommendations_renders_no_portlet_header(self):
+        self.factory.make_application(package_name='firefox')
+        self.mock_get_recommends.return_value['data'] = []
+
+        response = self.client.get(
+            reverse('wc-package-recommends', args=['firefox']))
+
+        self.assertEqual('', response.content.strip())
+
 
 class ComboViewTestCase(TestCase):
     """Tests for ComboView."""
 
=== modified file 'src/webcatalog/utilities.py'
--- src/webcatalog/utilities.py	2012-04-19 13:29:35 +0000
+++ src/webcatalog/utilities.py	2012-04-20 19:18:18 +0000
@@ -42,6 +42,7 @@
     BasicAuthorizer,
     OAuthAuthorizer,
     )
+from piston_mini_client.failhandlers import APIError
 from piston_mini_client.validators import ValidationException
 from rnrclient import RatingsAndReviewsAPI
 from sreclient import SoftwareCenterRecommenderAPI
@@ -89,8 +90,11 @@
         if cached_recommends is not None:
             return cached_recommends
 
-        fresh_recommends = self.recommender_api.recommend_app(
-            pkgname=package_name)
+        try:
+            fresh_recommends = self.recommender_api.recommend_app(
+                pkgname=package_name)
+        except APIError:
+            fresh_recommends = {'package': package_name, 'data': []}
         cache.set(key, fresh_recommends)
         return fresh_recommends