Merge lp:~elachuni/ubuntu-webcatalog/import-backports-no-ajax into lp:ubuntu-webcatalog

[Anthony Lenton]

Import bckports together with app-install-data, and removed vary_on_header decorators

This branch implements two fixes for the current staging deploy:
 - Removed the use of vary_on_headers
 - Added backports to the list of imported repos.

[Natalia Bidart (nataliabidart)]

Looks goods!

review: Approve

=== modified file 'src/webcatalog/management/commands/import_app_install_data.py'
--- src/webcatalog/management/commands/import_app_install_data.py	2012-04-20 06:41:56 +0000
+++ src/webcatalog/management/commands/import_app_install_data.py	2012-04-20 17:03:19 +0000
@@ -55,6 +55,7 @@
     sources = """
 deb http://archive.ubuntu.com/ubuntu {distroseries} main universe
 deb http://archive.ubuntu.com/ubuntu {distroseries}-updates main universe
+deb http://archive.ubuntu.com/ubuntu {distroseries}-backports main universe
 deb http://archive.canonical.com/ubuntu {distroseries} partner
 deb http://extras.ubuntu.com/ubuntu {distroseries} main
 """
 
=== removed file 'src/webcatalog/templates/webcatalog/recommended_apps.html'
--- src/webcatalog/templates/webcatalog/recommended_apps.html	2012-04-19 21:13:41 +0000
+++ src/webcatalog/templates/webcatalog/recommended_apps.html	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-{% extends "webcatalog/base.html" %}
-{% load i18n %}
-{% load webcatalog %}
-
-{% block head_extra %}
-    <link rel="stylesheet" type="text/css" href="{% url wc-combo %}?light/css/reset.css&light/css/styles.css&css/webcatalog.css&light/css/forms.css&css/carousel.css"/>
-    <script src="{% url wc-combo %}?yui/3.4.0/build/yui/yui-min.js&js/carousel.js"></script>
-{% endblock %}
-
-{% block title %}Recommended apps for {{ application.name }}{% endblock %}
-{% block header %}Recommended apps for {{ application.name }}{% endblock %}
-
-{% block content %}
-    {% include "webcatalog/breadcrumbs_snippet.html" %}
-  <div id="sc-mockup">
-    <div class="header">
-      {% rating_summary application.ratings_average 'large' application.ratings_total %}
-      <img class="icon64" src="{{ application.icon_url_or_default }}"/>
-      <h2>{{ application.name }}</h2>
-      <p>{{ application.comment }}</p>
-    </div>
-  </div>
-<div class="featured-widget">
-    {% include "webcatalog/recommended_apps_widget.html" %}
-</div>
-<script type="text/javascript">
-YUI({combine: true, comboBase: '{% url wc-combo %}?', root: 'yui/3.4.0/build/'}).use('uwc-carousel', function(Y) {
-    var caro = new Y.uwc.Carousel({
-        nodeContainer: ".featured-widget .carousel",
-        controlsContainer: ".featured-widget .carousel-controls",
-        containerHeight: 200,
-        containerWidth: 912,
-        autoPlay: false
-    });
-    Y.all('.slide').removeClass('disabled');
-});
-</script>
-{% endblock %}
-
 
=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2012-04-19 21:20:32 +0000
+++ src/webcatalog/tests/test_commands.py	2012-04-20 17:03:19 +0000
@@ -341,6 +341,7 @@
         self.assertEqual("""
 deb http://archive.ubuntu.com/ubuntu natty main universe
 deb http://archive.ubuntu.com/ubuntu natty-updates main universe
+deb http://archive.ubuntu.com/ubuntu natty-backports main universe
 deb http://archive.canonical.com/ubuntu natty partner
 deb http://extras.ubuntu.com/ubuntu natty main
 """,
 
=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-04-20 14:38:41 +0000
+++ src/webcatalog/tests/test_views.py	2012-04-20 17:03:19 +0000
@@ -958,16 +958,15 @@
         self.assertContains(response, 'review_summary1')
         self.assertContains(response, 'review_summary2')
 
-    def test_renders_reviews_only_for_json_request(self):
+    def test_renders_reviews_only_for_ajax_request(self):
         app = self.factory.make_application()
         self.mock_get_reviews.return_value = [
             self.make_review_details(summary='review_summary1'),
             self.make_review_details(summary='review_summary2'),
             ]
 
-        response = self.client.get(reverse('wc-package-reviews',
-            args=[app.distroseries.code_name, app.package_name]),
-            HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        response = self.client.get(reverse('wc-package-reviews-ajax',
+            args=[app.distroseries.code_name, app.package_name]))
 
         self.assertTemplateNotUsed(
             response, 'webcatalog/application_review_list.html')
@@ -1015,25 +1014,12 @@
         self.assertEqual(1, mock_urlopen.call_count)
 
     @patch('webcatalog.utilities.WebServices.get_screenshots_for_package')
-    def test_renders_screenshots(self, mock_get_screenshots):
+    def test_renders_json(self, mock_get_screenshots):
         mock_get_screenshots.return_value = self.expected
 
         response = self.client.get(reverse('wc-package-screenshots',
             args=[self.app.package_name]))
 
-        self.assertTemplateUsed(
-            response, 'webcatalog/application_screenshots.html')
-        for url in self.expected:
-            self.assertContains(response, url)
-
-    @patch('webcatalog.utilities.WebServices.get_screenshots_for_package')
-    def test_renders_json_for_json_request(self, mock_get_screenshots):
-        mock_get_screenshots.return_value = self.expected
-
-        response = self.client.get(reverse('wc-package-screenshots',
-            args=[self.app.package_name]),
-            HTTP_X_REQUESTED_WITH='XMLHttpRequest')
-
         self.assertTemplateNotUsed(
             response, 'webcatalog/application_review_list.html')
         self.assertEqual('application/json', response['content-type'])
@@ -1089,37 +1075,18 @@
 
         self.assertEqual(404, response.status_code)
 
-    def test_renders_recommendations(self):
-        app = self.factory.make_application(package_name='firefox')
-        pkgnames = ['nautilus-gksu', 'tribaltrouble2', 'acm']
-        for pkgname in pkgnames:
-            self.factory.make_application(package_name=pkgname)
+    def test_renders_widget_only(self):
+        self.factory.make_application(package_name='firefox')
 
         response = self.client.get(
             reverse('wc-package-recommends', args=['firefox']))
 
-        self.assertEqual(200, response.status_code)
-        self.assertTemplateUsed(
-            response, 'webcatalog/recommended_apps.html')
-        # Only recommendations for apps that exist in the database are
-        # included.
-        self.assertContains(response, '<div class="top-rated-stars">', 3)
-
-    def test_renders_widget_only_for_json_requests(self):
-        app = self.factory.make_application(package_name='firefox')
-
-        response = self.client.get(
-            reverse('wc-package-recommends', args=['firefox']),
-                HTTP_X_REQUESTED_WITH='XMLHttpRequest')
-
-        self.assertTemplateNotUsed(
-            response, 'webcatalog/recommended_apps.html')
         self.assertTemplateUsed(
             response, 'webcatalog/recommended_apps_widget.html')
 
     def test_handles_multiple_versions_of_app(self):
         # Same app in two distroseries.
-        app = self.factory.make_application(package_name='firefox')
+        self.factory.make_application(package_name='firefox')
         app2 = self.factory.make_application(package_name='firefox')
 
         response = self.client.get(
@@ -1128,6 +1095,7 @@
 
         self.assertEqual(app2, response.context['application'])
 
+
 class ComboViewTestCase(TestCase):
     """Tests for ComboView."""
 
 
=== modified file 'src/webcatalog/urls.py'
--- src/webcatalog/urls.py	2012-04-19 21:55:17 +0000
+++ src/webcatalog/urls.py	2012-04-20 17:03:19 +0000
@@ -46,6 +46,9 @@
     url(r'^applications/(?P<distro>[-.+\w]+)/(?P<package_name>[-.+:\w]+)/'
         r'reviews/$',
         'application_reviews', name="wc-package-reviews"),
+    url(r'^applications/(?P<distro>[-.+\w]+)/(?P<package_name>[-.+:\w]+)/'
+        r'reviews-ajax/$', 'application_reviews', kwargs={'ajax': True},
+        name="wc-package-reviews-ajax"),
     url(r'^recommends/(?P<package_name>[-.+:\w]+)/$',
         'application_recommends', name="wc-package-recommends"),
     url(r'^search/$', 'search', name="wc-search"),
 
=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2012-04-20 14:39:25 +0000
+++ src/webcatalog/views.py	2012-04-20 17:03:19 +0000
@@ -42,7 +42,6 @@
     )
 from django.template import RequestContext
 from django.utils.translation import ugettext as _
-from django.views.decorators.vary import vary_on_headers
 
 from webcatalog.forms import EmailDownloadLinkForm
 from webcatalog.models import (
@@ -194,8 +193,7 @@
             request, atts))
 
 
-@vary_on_headers('X_REQUESTED_WITH')
-def application_reviews(request, package_name, distro, page=1):
+def application_reviews(request, package_name, distro, ajax=False, page=1):
     app = get_object_or_404(Application, package_name=package_name,
                             distroseries__code_name=distro)
     # XXX michaeln 2011-09-15 bug=851662 Better review language options.
@@ -203,7 +201,7 @@
         distroseries=distro, page=page)
 
     context = dict(application=app, reviews=reviews)
-    if request.is_ajax():
+    if ajax:
         template = 'webcatalog/application_review_list_snippet.html'
     else:
         context['distroseries'] = distro
@@ -213,7 +211,6 @@
     return render_to_response(template, RequestContext(request, context))
 
 
-@vary_on_headers('X_REQUESTED_WITH')
 def application_recommends(request, package_name):
     app = Application.objects.find_best_or_404(package_name=package_name)
 
@@ -231,27 +228,16 @@
                 break
 
     context = dict(application=app, recommended_apps=recommended_apps)
-    if request.is_ajax():
-        template = "webcatalog/recommended_apps_widget.html"
-    else:
-        template = "webcatalog/recommended_apps.html"
-        context['breadcrumbs'] = app.crumbs()
+    template = "webcatalog/recommended_apps_widget.html"
     return render_to_response(template, RequestContext(request, context))
 
 
-@vary_on_headers('X_REQUESTED_WITH')
 def application_screenshots(request, package_name):
     app = get_object_or_404(Application, package_name=package_name,
         is_latest=True)
     screenshots = WebServices().get_screenshots_for_package(package_name)
-    if request.is_ajax():
-        return HttpResponse(json.dumps(screenshots),
-            mimetype='application/json')
-    else:
-        context = dict(application=app, screenshots=screenshots,
-            breadcrumbs=app.crumbs())
-        return render_to_response('webcatalog/application_screenshots.html',
-            RequestContext(request, context))
+    return HttpResponse(json.dumps(screenshots),
+        mimetype='application/json')
 
 
 def combo_view(request):