Merge lp:~bac/charmworld/bug-1234780 into lp:~juju-jitsu/charmworld/trunk

[Brad Crittenden]

Make bundle series a top-level property and allow it to be optional.

The page template for bundles was referencing bundle.data.series, which may not exist. It was the only reference to a non-property so I created a bundle.series property and return the value specified or None. The page template now displays the series conditionally.

Even when ingest proofs bundles, the series will remain optional, so this work will still be required.

[Benji York (benji)]

Perfect in every way.

review: Approve

[Juju Gui Bot (juju-gui-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://162.213.35.27:8080/job/charmworld-autoland-lxc/36/
Executed test runs:

review: Needs Fixing (continuous-integration)

[Juju Gui Bot (juju-gui-bot)]

review: Approve (continuous-integration)

=== modified file 'charmworld/models.py'
--- charmworld/models.py	2013-10-10 15:24:30 +0000
+++ charmworld/models.py	2013-10-11 14:05:35 +0000
@@ -1303,7 +1303,7 @@
     def __init__(self, data):
         assert 'inherits' not in data, (
             'inheriting from other bundles is not supported, the bundle '
-            'must be preprocessed to incorporate any inheritance')
+            'must be pre-processed to incorporate any inheritance')
         self._raw_representation = data
         self._representation = dict(self._MONGO_FIELDS)
         self._representation.update(data)
@@ -1394,6 +1394,10 @@
         """The short url for the basket branch on Launchpad."""
         return 'https://code.launchpad.net/{}'.format(self._lp_path)
 
+    @property
+    def series(self):
+        return self.data.get('series')
+
     @staticmethod
     def getfs(db):
         return getfs(db, collection='hashed-files')

=== modified file 'charmworld/templates/bundle.pt'
--- charmworld/templates/bundle.pt	2013-09-16 21:14:06 +0000
+++ charmworld/templates/bundle.pt	2013-10-11 14:05:35 +0000
@@ -40,8 +40,10 @@
           <h4>Description</h4>
           <p>${bundle.description}</p>
         </metal:block>
-        <h4>Series</h4>
-        <p>${bundle.data.series}</p>
+        <metal:series tal:condition="bundle.series">
+          <h4>Series</h4>
+          <p>${bundle.series}</p>
+        </metal:series>
         <h4>Owner</h4>
         <p>${bundle.owner}</p>
         <h4>Branch</h4>

=== modified file 'charmworld/tests/test_models.py'
--- charmworld/tests/test_models.py	2013-10-10 15:24:30 +0000
+++ charmworld/tests/test_models.py	2013-10-11 14:05:35 +0000
@@ -1943,6 +1943,29 @@
         query = _build_charm_query_from_bundle_info(service_data, None)
         self.assertIsNone(query)
 
+    def test_uses_provided_series(self):
+        """If a series is provided in the data, it is returned."""
+        bundle = Bundle(
+            {'name': 'tiny',
+             'owner': 'bac',
+             'basket_name': 'apache',
+             'basket_revision': 7,
+             'data': {'series': 'edgy'},
+             })
+        self.assertEqual(
+            "edgy", bundle.series)
+
+    def test_default_series(self):
+        """If no series is provided in the data, None is returned."""
+        bundle = Bundle(
+            {'name': 'tiny',
+             'owner': 'bac',
+             'basket_name': 'apache',
+             'basket_revision': 7,
+             'data': {},
+             })
+        self.assertIsNone(bundle.series)
+
 
 class TestMakeBundleDoc(TestCase):