Merge lp:~michael.nelson/ubuntu-webcatalog/1015505-extras-not-propietary into lp:ubuntu-webcatalog

[Michael Nelson]

Display correct license (from import) on details page.

Overview
========

As per the pre-imp discussion on bug 1015505, this branch adds the Application.license field, and updates the license_type property to be based on that instead of the somewhat confusing Application.for_purchase field.

I also update the template so that it displays a 'buy' button when the price is non-zero, rather than depending on the 'for_purchase' field.

`fab test`

We'll rename for_purchase for bug 1015515 to 'imported_from_sca', as it will need to be used used to determine if the import script should update data.

=== added file 'src/webcatalog/migrations/0023_add_license.py'
--- src/webcatalog/migrations/0023_add_license.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0023_add_license.py	2012-06-26 09:42:20 +0000
@@ -0,0 +1,168 @@
+# 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.license'
+        db.add_column('webcatalog_application', 'license', self.gf('django.db.models.fields.CharField')(default='', max_length=64, blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'Application.license'
+        db.delete_column('webcatalog_application', 'license')
+
+
+    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': {'ordering': "('-wilson_score', 'name')", 'unique_together': "(('distroseries', 'archive_id'),)", 'object_name': 'Application'},
+            'app_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'application_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', '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'}),
+            'license': ('django.db.models.fields.CharField', [], {'max_length': '64', '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', 'blank': 'True'}),
+            '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': {'ordering': "('url',)", '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': "'DpYRwsRbRiwFRbElWgbhSktlpldyjT'", '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'}),
+            'prerelease': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            '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', [], {}),
+            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        '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': "'IXcKPvbbhtCyTSqNVxRwfbaHLczIBwpjofnpaaGKLcnQgLWwBL'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'eAJdlxCXakKtlHCevxWppBNjLyRSuilBBVbhanfmpXeqhpRBLZ'", '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-06-21 11:40:36 +0000
+++ src/webcatalog/models/applications.py	2012-06-26 09:42:20 +0000
@@ -102,6 +102,9 @@
     is_latest = models.BooleanField()
     wilson_score = models.FloatField(null=True, blank=True, db_index=True)
     debtags = models.CharField(max_length=255, blank=True)
+    license = models.CharField(
+        max_length=64, blank=True,
+        help_text=u"The name of the license used for the app.")
 
     # Other desktop fields used by s-c
     # x-gnome-fullname
@@ -174,10 +177,7 @@
         return crumbs
 
     def license_type(self):
-        if self.for_purchase:
-            return "Proprietary"
-        else:
-            return "Open Source"
+        return self.license or "Open Source"
 
     @property
     def architectures_list(self):
 
=== modified file 'src/webcatalog/templates/webcatalog/install_options_snippet.html'
--- src/webcatalog/templates/webcatalog/install_options_snippet.html	2012-03-13 16:25:34 +0000
+++ src/webcatalog/templates/webcatalog/install_options_snippet.html	2012-06-26 09:42:20 +0000
@@ -7,7 +7,7 @@
 {% endif %}
 {% if display_install_button %}
   <a href="apt://{{ application.package_name }}">
-  {% if application.for_purchase %}
+  {% if application.price %}
 <img class="fancy-install" width="200" height="60" alt="" src="{{ STATIC_URL }}images/scbutton-non-free-200px.png" title="Buy it from the Ubuntu Software Centre!">
   {% else %}
 <img class="fancy-install" width="200" height="60" alt="" src="{{ STATIC_URL }}images/scbutton-free-200px.png" title="Get it from the Ubuntu Software Centre!">
 
=== modified file 'src/webcatalog/tests/factory.py'
--- src/webcatalog/tests/factory.py	2012-06-21 11:40:36 +0000
+++ src/webcatalog/tests/factory.py	2012-06-26 09:42:20 +0000
@@ -104,7 +104,7 @@
                          ratings_histogram='', screenshot_url='',
                          archive_id=None, version='', is_latest=False,
                          wilson_score=0.0, debtags=[], application_id=None,
-                         departments=None):
+                         departments=None, license='', price=None):
         if name is None:
             name = self.get_unique_string(prefix='Readable Name')
         if package_name is None:
@@ -124,7 +124,7 @@
             ratings_histogram=ratings_histogram,
             archive_id=archive_id, version=version, is_latest=is_latest,
             wilson_score=wilson_score, debtags=debtags,
-            application_id=application_id)
+            application_id=application_id, license=license, price=price)
 
         if departments is not None:
             for d in departments:
 
=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2012-06-21 20:18:44 +0000
+++ src/webcatalog/tests/test_commands.py	2012-06-26 09:42:20 +0000
@@ -587,6 +587,7 @@
                                                    distroseries=self.natty)
         self.assertEqual(True, app_for_purchase.for_purchase)
         self.assertTrue(app_for_purchase.description.find('hello') > -1)
+        self.assertEqual("Proprietary", app_for_purchase.license)
 
     def test_app_gets_distroseries(self):
         with patch_settings(UBUNTU_SERIES_FOR_VERSIONS=TEST_VERSIONS):
 
=== modified file 'src/webcatalog/tests/test_data/sca_apps.txt'
--- src/webcatalog/tests/test_data/sca_apps.txt	2012-05-03 12:13:00 +0000
+++ src/webcatalog/tests/test_data/sca_apps.txt	2012-06-26 09:42:20 +0000
@@ -18,7 +18,8 @@
         "tos_url": "",
         "icon_url": "http://localhost:8000/site_media/icons/2011/06/eg_64x64.png",
         "categories": "Audio",
-        "name": "MyApp"
+        "name": "MyApp",
+        "license": "Proprietary"
     },
     {
         "package_name": "eg_arb_app",
 
=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-06-21 11:44:00 +0000
+++ src/webcatalog/tests/test_views.py	2012-06-26 09:42:20 +0000
@@ -76,6 +76,18 @@
         return reverse('wc-package-detail',
                        args=[app.distroseries.code_name, app.package_name])
 
+    def get_package_details_response(self, package_name,
+                                     useragent=UBUNTU_USERAGENT, distro=None):
+        kwargs = dict(package_name=package_name)
+        if distro:
+            kwargs['distro'] = distro
+        url = reverse('wc-package-detail', kwargs=kwargs)
+
+        if useragent:
+            return self.client.get(url, HTTP_USER_AGENT=useragent)
+        else:
+            return self.client.get(url)
+
     def get_app_and_response(self, code_name='natty', version='11.04',
                              arch='x86_64', name=None, comment=None,
                              description=None, detail_distro=None,
@@ -96,13 +108,8 @@
         if not detail_package:
             detail_package = app.package_name
 
-        url = reverse('wc-package-detail',
-                      args=[detail_distro, detail_package])
-
-        if useragent:
-            response = self.client.get(url, HTTP_USER_AGENT=useragent)
-        else:
-            response = self.client.get(url)
+        response = self.get_package_details_response(
+            detail_package, distro=detail_distro, useragent=useragent)
         return response, app
 
     def test_renders_correct_template(self):
@@ -160,14 +167,20 @@
         self.assertNotContains(response, '<div class="recommendations">')
 
     def test_button_for_non_puchase_app(self):
-        response, app = self.get_app_and_response()
+        self.factory.make_application(package_name='pkgfoo',
+                                            price=None)
+
+        response = self.get_package_details_response('pkgfoo')
 
         self.assertContains(response, '/assets/images/scbutton-free-200px.png')
         self.assertNotContains(response,
                                '/assets/images/scbutton-non-free-200px.png')
 
     def test_button_for_for_puchase_app(self):
-        response, app = self.get_app_and_response(for_purchase=True)
+        self.factory.make_application(package_name='pkgfoo',
+                                            price=Decimal('12.99'))
+
+        response = self.get_package_details_response('pkgfoo')
 
         self.assertNotContains(response,
                                '/assets/images/scbutton-free-200px.png')
@@ -284,15 +297,22 @@
         self.assertContains(response, "Ubuntu Quantal")
 
     def test_includes_right_license_type(self):
-        response, app = self.get_app_and_response(for_purchase=False)
+        self.factory.make_application(license="Foo GNL V1",
+                                      package_name='pkgfoo')
+
+        response = self.client.get(
+            reverse('wc-package-detail', args=['pkgfoo']))
+
+        self.assertContains(response, '<td>Foo GNL V1</td>')
+
+    def test_no_license_assumes_OSS(self):
+        self.factory.make_application(license="",
+                                      package_name='pkgfoo')
+
+        response = self.client.get(
+            reverse('wc-package-detail', args=['pkgfoo']))
+
         self.assertContains(response, '<td>Open Source</td>')
-        self.assertNotContains(response, '<td>Proprietary</td>')
-
-        app.for_purchase = True
-        app.save()
-        response = self.client.get(self.get_app_details_url(app))
-        self.assertContains(response, '<td>Proprietary</td>')
-        self.assertNotContains(response, '<td>Open Source</td>')
 
     def test_response_includes_rating_summary(self):
         distro = self.factory.make_distroseries(code_name='lucid')