Merge lp:~zematynnad/ubuntu-webcatalog/display_hardware_953286 into lp:ubuntu-webcatalog

[Danny Tamez]

Adds display of hardware requirements to app detail page

Overview
=========
This branch adds a list of hardware requirements for apps to the application detail page.

Details
=========
The requirements are displayed in bullet fashion in the sidebar. Screenshot: http://simplest-image-hosting.net/png-0-qy2199
The requirements are gathered from the degtags. Since the debtags are not currently used in free applications we are not displaying hardware requirements for free apps at this time. Once they are then the import_app_install_data script can be updated. For the purchased apps, the debtags are available and are brought in during the import_for_purchase_apps script.

To Test
=======
$fab bootstrap test

[Łukasz Czyżykowski (lukasz-czyzykowski)]

LGTM

review: Approve

=== modified file 'src/webcatalog/api/handlers.py'
--- src/webcatalog/api/handlers.py	2012-01-06 17:54:47 +0000
+++ src/webcatalog/api/handlers.py	2012-03-26 20:58:01 +0000
@@ -24,9 +24,6 @@
     'ServerStatusHandler',
 ]
 
-import json
-
-from django.contrib.auth.models import User
 from django.http import (
     HttpResponse,
     HttpResponseBadRequest,

=== modified file 'src/webcatalog/forms.py'
--- src/webcatalog/forms.py	2012-03-19 14:38:02 +0000
+++ src/webcatalog/forms.py	2012-03-26 20:58:01 +0000
@@ -23,6 +23,7 @@
     )
 
 import apt
+import json
 from ConfigParser import ConfigParser
 from StringIO import StringIO
 
@@ -32,6 +33,7 @@
 from django.core.validators import URLValidator
 from django.template.loader import render_to_string
 
+from webcatalog.hw import get_hw_short_description
 from webcatalog.models import Application
 
 __metaclass__ = type
@@ -137,6 +139,9 @@
             app_data['description'] = description
         if 'screenshot_urls' in app_data:
             app_data['screenshot_urls'] = ",".join(app_data['screenshot_urls'])
+        if 'debtags' in  app_data and app_data['debtags']:
+            app_data['debtags'] = json.dumps([get_hw_short_description(x)
+                                   for x in app_data['debtags']])
         try:
             instance = Application.objects.get(
                 archive_id=app_data.get('archive_id'),

=== added file 'src/webcatalog/hw.py'
--- src/webcatalog/hw.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/hw.py	2012-03-26 20:58:01 +0000
@@ -0,0 +1,147 @@
+# Copyright (C) 2012 Canonical
+# -*- coding: utf-8 -*-
+#
+# Authors:
+#  Michael Vogt
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+from gettext import gettext as _
+
+# private extension over the debtagshw stuff
+OPENGL_DRIVER_BLACKLIST_TAG = "x-hardware::opengl-driver-blacklist:"
+
+
+TAG_DESCRIPTION = {
+    # normal tags
+    'hardware::webcam': _('webcam'),
+    'hardware::digicam': _('digicam'),
+    'hardware::input:mouse': _('mouse'),
+    'hardware::input:joystick': _('joystick'),
+    'hardware::input:touchscreen': _('touchscreen'),
+    'hardware::gps': _('GPS'),
+    'hardware::laptop': _('notebook computer'),
+    'hardware::printer': _('printer'),
+    'hardware::scanner': _('scanner'),
+    'hardware::storage:cd': _('CD drive'),
+    'hardware::storage:cd-writer': _('CD burner'),
+    'hardware::storage:dvd': _('DVD drive'),
+    'hardware::storage:dvd-writer': _('DVD burner'),
+    'hardware::storage:floppy': _('floppy disk drive'),
+    'hardware::video:opengl': _('OpenGL hardware acceleration'),
+    # "special" private tag extenstion that needs special handling
+    OPENGL_DRIVER_BLACKLIST_TAG: _('Graphics driver that is not %s'),
+}
+
+TAG_MISSING_DESCRIPTION = {
+    'hardware::digicam': _('This software requires a digital camera, but none '
+                           'are currently connected'),
+    'hardware::webcam': _('This software requires a video camera, but none '
+                           'are currently connected'),
+    'hardware::input:mouse': _('This software requires a mouse, '
+                                'but none is currently setup.'),
+    'hardware::input:joystick': _('This software requires a joystick, '
+                                   'but none are currently connected.'),
+    'hardware::input:touchscreen': _('This software requires a touchscreen, '
+                                      'but the computer does not have one.'),
+    'hardware::gps': _('This software requires a GPS, '
+                        'but the computer does not have one.'),
+    'hardware::laptop': _('This software is for notebook computers.'),
+    'hardware::printer': _('This software requires a printer, but none '
+                           'are currently set up.'),
+    'hardware::scanner': _('This software requires a scanner, but none are '
+                            'currently set up.'),
+    'hardware::stoarge:cd': _('This software requires a CD drive, but none '
+                               'are currently connected.'),
+    'hardware::storage:cd-writer': _('This software requires a CD burner, '
+                                      'but none are currently connected.'),
+    'hardware::storage:dvd': _('This software requires a DVD drive, but none '
+                                'are currently connected.'),
+    'hardware::storage:dvd-writer': _('This software requires a DVD burner, '
+                                       'but none are currently connected.'),
+    'hardware::storage:floppy': _('This software requires a floppy disk '
+                                   'drive, but none are currently connected.'),
+    'hardware::video:opengl': _('This computer does not have graphics fast '
+                                 'enough for this software.'),
+    # private extension
+    OPENGL_DRIVER_BLACKLIST_TAG: _(u'This software does not work with the '
+                                   u'\u201c%s\u201D graphics driver this '
+                                   u'computer is using.'),
+}
+
+
+def get_hw_short_description(tag):
+    # FIXME: deal with OPENGL_DRIVER_BLACKLIST_TAG as this needs rsplit(":")
+    #        and a view of all available tags
+    s = TAG_DESCRIPTION.get(tag)
+    return utf8(s)
+
+
+def get_hw_missing_long_description(tags):
+    s = ""
+    # build string
+    for tag, supported in tags.iteritems():
+        if supported == "no":
+            descr = TAG_MISSING_DESCRIPTION.get(tag)
+            if descr:
+                s += "%s\n" % descr
+            else:
+                # deal with generic tags
+                prefix, sep, postfix = tag.rpartition(":")
+                descr = TAG_MISSING_DESCRIPTION.get(prefix + sep)
+                descr = descr % postfix
+                if descr:
+                    s += "%s\n" % descr
+    # ensure that the last \n is gone
+    if s:
+        s = s[:-1]
+    return utf8(s)
+
+
+def get_private_extensions_hardware_support_for_tags(tags):
+    import debtagshw
+    res = {}
+    for tag in tags:
+        if tag.startswith(OPENGL_DRIVER_BLACKLIST_TAG):
+            prefix, sep, driver = tag.rpartition(":")
+            if driver == debtagshw.opengl.get_driver():
+                res[tag] = debtagshw.enums.HardwareSupported.NO
+            else:
+                res[tag] = debtagshw.enums.HardwareSupported.YES
+    return res
+
+
+def get_hardware_support_for_tags(tags):
+    """ wrapper around the DebtagsAvailalbeHW to support adding our own
+        private tag extension (like opengl-driver)
+    """
+    from debtagshw.debtagshw import DebtagsAvailableHW
+    hw = DebtagsAvailableHW()
+    support = hw.get_hardware_support_for_tags(tags)
+    private_extensions = get_private_extensions_hardware_support_for_tags(
+        tags)
+    support.update(private_extensions)
+    return support
+
+
+def utf8(s):
+    """
+    Takes a string or unicode object and returns a utf-8 encoded
+    string, errors are ignored
+    """
+    if s is None:
+        return None
+    if isinstance(s, unicode):
+        return s.encode("utf-8", "ignore")
+    return unicode(s, "utf8", "ignore").encode("utf8")

=== modified file 'src/webcatalog/management/commands/import_app_install_data.py'
--- src/webcatalog/management/commands/import_app_install_data.py	2012-03-13 11:54:51 +0000
+++ src/webcatalog/management/commands/import_app_install_data.py	2012-03-26 20:58:01 +0000
@@ -34,7 +34,6 @@
 from apt_inst import DebFile
 from django.conf import settings
 from django.core.files.images import ImageFile
-from django.forms.models import construct_instance
 from django.core.management.base import LabelCommand
 
 from webcatalog.forms import ApplicationForm

=== added file 'src/webcatalog/migrations/0019_add_debtags_to_application.py'
--- src/webcatalog/migrations/0019_add_debtags_to_application.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0019_add_debtags_to_application.py	2012-03-26 20:58:01 +0000
@@ -0,0 +1,162 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Application.debtags'
+        db.add_column('webcatalog_application', 'debtags', self.gf('django.db.models.fields.CharField')(default='', max_length=255, blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Application.debtags'
+        db.delete_column('webcatalog_application', 'debtags')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'webcatalog.application': {
+            'Meta': {'unique_together': "(('distroseries', 'archive_id'),)", 'object_name': 'Application'},
+            'app_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'architectures': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'archive_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            'categories': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'debtags': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.Department']", 'symmetrical': 'False', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']"}),
+            'for_purchase': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icon': ('django.db.models.fields.files.ImageField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'icon_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_latest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'package_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'popcon': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '7', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '3', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_histogram': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'wilson_score': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        'webcatalog.applicationmedia': {
+            'Meta': {'unique_together': "(('application', 'url'),)", 'object_name': 'ApplicationMedia'},
+            'application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Application']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'media_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'webcatalog.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'secret': ('django.db.models.fields.CharField', [], {'default': "'yzsqToDGmPExFPUjYEAKVLhdKqiBTJ'", 'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'oauth_consumer'", 'unique': 'True', 'to': "orm['auth.User']"})
+        },
+        'webcatalog.department': {
+            'Meta': {'object_name': 'Department'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Department']", 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'})
+        },
+        'webcatalog.distroseries': {
+            'Meta': {'object_name': 'DistroSeries'},
+            'code_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'})
+        },
+        'webcatalog.exhibit': {
+            'Meta': {'object_name': 'Exhibit'},
+            'banner_url': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'display': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.DistroSeries']", 'symmetrical': 'False'}),
+            'html': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package_names': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'sca_id': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'webcatalog.machine': {
+            'Meta': {'unique_together': "(('owner', 'uuid'),)", 'object_name': 'Machine'},
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'package_list': ('django.db.models.fields.TextField', [], {}),
+            'packages_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'})
+        },
+        'webcatalog.nonce': {
+            'Meta': {'object_name': 'Nonce'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nonce': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Token']"})
+        },
+        'webcatalog.reviewstatsimport': {
+            'Meta': {'object_name': 'ReviewStatsImport'},
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']", 'unique': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_import': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        },
+        'webcatalog.token': {
+            'Meta': {'object_name': 'Token'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'token': ('django.db.models.fields.CharField', [], {'default': "'WpQuqCbyDhCIPBHfRBAmMXnzfFswoqprEeBUpnPcqklaYvcxcg'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'JZElFyNGqqPBDSdRJudXfvcSLLCJExZriHUKnZFAGgrJNlLIqV'", 'max_length': '50'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['webcatalog']

=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2012-03-20 14:09:05 +0000
+++ src/webcatalog/models/applications.py	2012-03-26 20:58:01 +0000
@@ -96,6 +96,7 @@
     ratings_histogram = models.CharField(max_length=128, blank=True)
     is_latest = models.BooleanField()
     wilson_score = models.FloatField(null=True, blank=True, db_index=True)
+    debtags = models.CharField(max_length=255, blank=True)
 
     # Other desktop fields used by s-c
     # x-gnome-fullname

=== modified file 'src/webcatalog/static/css/webcatalog.css'
--- src/webcatalog/static/css/webcatalog.css	2012-03-16 17:18:41 +0000
+++ src/webcatalog/static/css/webcatalog.css	2012-03-26 20:58:01 +0000
@@ -359,7 +359,7 @@
     border-bottom: 1px dotted gray;
 }
 
-.emaillinkportlet .portletheader{
+.emaillinkportlet .portletheader, .debtags .portletheader {
     background: #bbb;
     margin-bottom: 8px;
 }
@@ -393,3 +393,10 @@
     line-height: 60px;
     padding-right: 5px;
 }
+.debtags {
+    padding-top: 12px;
+}
+.debtags li {
+    list-style-type: circle;
+    margin-left: 16px;
+}

=== modified file 'src/webcatalog/templates/webcatalog/application_detail.html'
--- src/webcatalog/templates/webcatalog/application_detail.html	2012-03-20 10:04:41 +0000
+++ src/webcatalog/templates/webcatalog/application_detail.html	2012-03-26 20:58:01 +0000
@@ -58,6 +58,16 @@
                 </form>
             </div>
         </div>
+        {% if debtags %}
+        <div class='portlet debtags'>
+            <div class='portletheader'>Hardware requirements:</div>
+            <ul>
+            {% for tag in debtags %}
+            <li>{{ tag }}</li>
+            {% endfor %}
+            </ul>
+        </div>
+        {% endif %}
     </div>
   <div id="sc-mockup">
     <div class="header">

=== modified file 'src/webcatalog/tests/factory.py'
--- src/webcatalog/tests/factory.py	2012-03-20 14:09:05 +0000
+++ src/webcatalog/tests/factory.py	2012-03-26 20:58:01 +0000
@@ -95,7 +95,8 @@
         comment=None, description=None, icon_name='', icon=None,
         distroseries=None, arch='i686', ratings_average=None,
         ratings_total=None, ratings_histogram='', screenshot_url='',
-        archive_id=None, version='', is_latest=False, wilson_score=0.0):
+        archive_id=None, version='', is_latest=False, wilson_score=0.0,
+        debtags=[]):
         if name is None:
             name = self.get_unique_string(prefix='Readable Name')
         if package_name is None:
@@ -114,7 +115,7 @@
             ratings_average=ratings_average, ratings_total=ratings_total,
             ratings_histogram=ratings_histogram,
             archive_id=archive_id, version=version, is_latest=is_latest,
-            wilson_score=wilson_score)
+            wilson_score=wilson_score, debtags=debtags)
 
         if screenshot_url:
             ApplicationMedia.objects.create(

=== modified file 'src/webcatalog/tests/test_forms.py'
--- src/webcatalog/tests/test_forms.py	2012-03-19 12:20:51 +0000
+++ src/webcatalog/tests/test_forms.py	2012-03-26 20:58:01 +0000
@@ -27,6 +27,7 @@
 from webcatalog.forms import (
     ApplicationForm,
     desktop_field_mappings,
+    ForPurchaseApplicationForm,
     )
 from webcatalog.models import Application, ApplicationMedia
 from webcatalog.tests.factory import TestCaseWithFactory
@@ -34,6 +35,7 @@
 __metaclass__ = type
 __all__ = [
     'ApplicationFormTestCase',
+    'ForPurchaseApplicationFormTestCase',
     ]
 
 
@@ -161,3 +163,14 @@
         form = ApplicationForm(dict(screenshot_url='http://foo.com:42/broken',
             section='required', name='required', package_name='required'))
         self.assertTrue(form.is_valid())
+
+
+class ForPurchaseApplicationFormTestCase(TestCaseWithFactory):
+
+    def test_from_json_shortens_debtag(self):
+        app = self.factory.make_application()
+        data = {'debtags': ['hardware::storage:cd-writer']}
+
+        form = ForPurchaseApplicationForm.from_json(data, app.distroseries)
+
+        self.assertEqual(form.data['debtags'], '["CD burner"]')

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-03-26 17:01:37 +0000
+++ src/webcatalog/tests/test_views.py	2012-03-26 20:58:01 +0000
@@ -318,6 +318,21 @@
 
         self.assertContains(response, 'id="screenshots-carousel"')
 
+    def test_debtags_displayed(self):
+        app = self.factory.make_application(debtags='["joystick"]')
+
+        response = self.client.get(self.get_app_details_url(app))
+
+        self.assertContains(response, 'Hardware requirements')
+        self.assertContains(response, 'joystick')
+
+    def test_debtags_not_displayed(self):
+        app = self.factory.make_application(debtags='')
+
+        response = self.client.get(self.get_app_details_url(app))
+
+        self.assertNotContains(response, 'Hardware requirements')
+
 
 class ApplicationDetailNoSeriesTestCase(TestCaseWithFactory):
     def test_renders_latest(self):

=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2012-03-20 22:23:31 +0000
+++ src/webcatalog/views.py	2012-03-26 20:58:01 +0000
@@ -22,6 +22,7 @@
     with_statement,
     )
 
+import json
 import operator
 import os
 from random import shuffle
@@ -176,6 +177,8 @@
     else:
         form = EmailDownloadLinkForm()
 
+    debtags = None if not app.debtags else json.loads(app.debtags)
+
     atts = {'application': app,
         'available_distroseries': app.available_distroseries(),
         'breadcrumbs': app.crumbs(),
@@ -183,6 +186,7 @@
         'absolute_url': request.build_absolute_uri(
             reverse('wc-package-detail', args=[distro, package_name])),
         'email_form': form,
+        'debtags': debtags,
         }
 
     return render_to_response(