Merge lp:~elachuni/ubuntu-webcatalog/search into lp:ubuntu-webcatalog

[Anthony Lenton]

Overview
========
Adds basic search functionality

Details
=======
Currently searches package_name and name, case-insentively.
The app-overview-row class should be useful when we add a couple of general browsing views, coming up next.

[Māris Fogels (mars)]

Hi Anthony,

This branch looks good, r=mars. I can only think of two things:

 * Consider a helper method in the test that checks if a given app (or set of apps) is in the set of applications returned by a page: assertAppInResults('appname') in place of self.assertEquals(expected[q], set(response.context['apps'])). It might increase the test's readability.

 * Does the search input need to be protected in order to protect application performance? Can the search time out, and do you present a nice user page or a 500 error?

Maris

review: Approve

=== modified file 'src/webcatalog/static/css/webcatalog.css'
--- src/webcatalog/static/css/webcatalog.css	2011-04-07 16:02:34 +0000
+++ src/webcatalog/static/css/webcatalog.css	2011-04-12 17:33:22 +0000
@@ -67,5 +67,18 @@
 #sc-mockup .license td {
     border: 0;
 }
+
 /* End software centre mockup */
 
+.app-overview-row {
+    height: 36px;
+    padding: 2px;
+}
+.app-overview-row img {
+    float: left;
+    margin-right: 10px;
+}
+.app-overview-row h3 {
+    padding: 0;
+    margin: 0;
+}
\ No newline at end of file

=== added file 'src/webcatalog/templates/webcatalog/search_results.html'
--- src/webcatalog/templates/webcatalog/search_results.html	1970-01-01 00:00:00 +0000
+++ src/webcatalog/templates/webcatalog/search_results.html	2011-04-12 17:33:22 +0000
@@ -0,0 +1,32 @@
+{% extends "webcatalog/base.html" %}
+{% load i18n %}
+
+{% block title %}Search results{% endblock %}
+
+{% block header %}{% trans "Search results" %}{% endblock %}
+{% block content %}
+
+{% if query %}
+<h3>{% blocktrans %}Searched for "{{query}}"{% endblocktrans %}</h3>
+{% if apps %}
+<p>{% blocktrans with napps=apps|length %}Found {{napps}} applications.{% endblocktrans %}</p>
+{% for app in apps %}
+<div class="app-overview-row">
+    {% if app.icon %}
+        <img src="{{ app.icon.url }}"/>
+    {% else %}
+        <img src="{{ STATIC_URL }}images/noicon_32.png"/>
+    {% endif %}
+    <h3>
+    <a href="{% url wc-package-detail app.package_name %}">{{ app.name }}</a>
+    </h3>
+    <p>{{ app.comment }}</p>
+</div>
+{% endfor %}
+{% else %}
+<p>{% trans "No applications found." %}</p>
+{% endif %}
+{% else %}
+<h3>{% trans "You didn't search for anything!" %}</h3>
+{% endif %}
+{% endblock %}

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2011-04-08 12:25:25 +0000
+++ src/webcatalog/tests/test_views.py	2011-04-12 17:33:22 +0000
@@ -30,6 +30,7 @@
 __metaclass__ = type
 __all__ = [
     'PackageDetailTestCase',
+    'SearchTestCase',
     ]
 
 
@@ -65,3 +66,72 @@
         self.assertContains(
             response, '<img src="http://screenshots.ubuntu.com/'
                       'thumbnail-with-version/pkgfoo/ignored"')
+
+class SearchTestCase(TestCaseWithFactory):
+    def test_no_search_retrieves_no_apps(self):
+        # Ensure there's some data in the DB
+        self.factory.make_application()
+        url = reverse('wc-search')
+        for data in [{'q': ''}, {}]:
+
+            response = self.client.get(url, data=data)
+
+            self.assertEquals(response.context['apps'], [])
+            self.assertContains(response, "You didn't search for anything")
+
+    def test_search_searches_package_name(self):
+        app1 = self.factory.make_application(package_name='foo')
+        app2 = self.factory.make_application(package_name='bar')
+        app3 = self.factory.make_application(package_name='foobar')
+        url = reverse('wc-search')
+        expected = {'foo': set([app1, app3]), 'bar': set([app2, app3])}
+        for q in expected:
+
+            response = self.client.get(url, data={'q': q})
+
+            self.assertEquals(expected[q], set(response.context['apps']))
+
+    def test_search_searches_name(self):
+        app1 = self.factory.make_application(name='foo')
+        app2 = self.factory.make_application(name='bar')
+        app3 = self.factory.make_application(name='foobar')
+        url = reverse('wc-search')
+        expected = {'foo': set([app1, app3]), 'bar': set([app2, app3])}
+        for q in expected:
+
+            response = self.client.get(url, data={'q': q})
+
+            self.assertEquals(expected[q], set(response.context['apps']))
+
+    def test_search_no_apps_found_says_so(self):
+        url = reverse('wc-search')
+
+        response = self.client.get(url, data={'q': 'sarasa'})
+
+        self.assertContains(response, "No applications found")
+
+    def test_response_shows_query_if_no_apps_found(self):
+        query = 'someimprobablequery'
+        url = reverse('wc-search')
+
+        response = self.client.get(url, data={'q': query})
+
+        self.assertContains(response, query)
+
+    def test_response_shows_query_if_some_apps_found(self):
+        query = 'someimprobablequery'
+        self.factory.make_application(package_name=query)
+        url = reverse('wc-search')
+
+        response = self.client.get(url, data={'q': query})
+
+        self.assertContains(response, query)
+
+    def test_response_shows_number_of_apps_found(self):
+        app1 = self.factory.make_application(package_name='foo')
+        app2 = self.factory.make_application(package_name='foobar')
+        url = reverse('wc-search')
+
+        response = self.client.get(url, data={'q': 'foo'})
+
+        self.assertContains(response, "Found 2 applications")

=== modified file 'src/webcatalog/urls.py'
--- src/webcatalog/urls.py	2011-04-07 11:20:48 +0000
+++ src/webcatalog/urls.py	2011-04-12 17:33:22 +0000
@@ -33,7 +33,8 @@
 
 
 urlpatterns = patterns('webcatalog.views',
-    url(r'^applications/(?P<slug>[-\w]+)/$', DetailView.as_view(
+    url(r'^applications/(?P<slug>[-.\w]+)/$', DetailView.as_view(
         model=Application, slug_field='package_name',
         context_object_name='application'), name="wc-package-detail"),
+    url(r'^search$', 'search', name="wc-search"),
 )

=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2011-04-07 10:52:50 +0000
+++ src/webcatalog/views.py	2011-04-12 17:33:22 +0000
@@ -21,8 +21,35 @@
     absolute_import,
     with_statement,
     )
+
+import operator
+from django.db.models import Q
 from django.http import HttpResponse
+from django.template import RequestContext
+from django.shortcuts import render_to_response
+
+from webcatalog.models import Application
 
 __metaclass__ = type
 __all__ = [
+    'search',
     ]
+
+
+def search(request):
+    apps = []
+    query = ''
+    if 'q' in request.GET:
+        query = request.GET.get('q', '')
+        terms = query.split()
+        if terms:
+            ors = [Q(package_name__icontains=term) for term in terms]
+            ors += [Q(name__icontains=term) for term in terms]
+            apps = Application.objects.filter(reduce(operator.or_, ors))
+
+    context = RequestContext(request, dict={
+        'query': query,
+        'apps': apps,
+        })
+    return render_to_response('webcatalog/search_results.html',
+        context_instance=context)