Merge lp:~benji/charmworld/missing-head into lp:~juju-jitsu/charmworld/trunk

[Benji York]

Add handling for "-HEAD" revisions to API2

https://codereview.appspot.com/16950043/

[Brad Crittenden (bac)]

LGTM

https://codereview.appspot.com/16950043/

[Brad Crittenden (bac)]

LGTM

https://codereview.appspot.com/16950043/

=== modified file 'charmworld/views/api/__init__.py'
--- charmworld/views/api/__init__.py	2013-10-22 21:02:10 +0000
+++ charmworld/views/api/__init__.py	2013-10-25 00:46:20 +0000
@@ -749,10 +749,12 @@
     def _find_charm(self, path):
         charm_id, trailing = self._extract_charm_id(path)
         try:
-            owner, series, name, revision = self._parse_charm_id(charm_id)
+            owner, series, name, _ = self._parse_charm_id(charm_id)
         except ValueError:
             charm = None
         else:
+            if name.endswith('-HEAD'):
+                name = name[:-5]
             if owner is None:
                 charm = self.request.db.charms.find_one({
                     'promulgated': True,

=== modified file 'charmworld/views/tests/test_api.py'
--- charmworld/views/tests/test_api.py	2013-10-24 17:24:43 +0000
+++ charmworld/views/tests/test_api.py	2013-10-25 00:46:20 +0000
@@ -1641,6 +1641,15 @@
                 u'type': u'no_such_charm',
             })
 
+    def test_latest_revision_not_fetchable_with_HEAD_revision(self):
+        # API2 understands a revision named "HEAD", API3 does not.
+        kwargs = dict(owner='foo', series='bar', name='baz', promulgated=True)
+        self.use_index_client()
+        old_id, old_charm = self.make_charm(store_revision=1, **kwargs)
+        new_id, new_charm = self.make_charm(store_revision=2, **kwargs)
+        response = self.get_response('charm', remainder='bar/baz-HEAD')
+        self.assertEqual(404, response.status_code)
+
     def test_charm_no_revision(self):
         # Retrieving a charm with no revision results in the latest one.
         self.use_index_client()
@@ -1754,6 +1763,16 @@
         response = self.get_response('charm', remainder=old_id)
         self.assertEqual(response.json['charm']['id'], new_id)
 
+    def test_latest_revision_fetchable_with_HEAD_revision(self):
+        # If the charm_id specifies the name "HEAD" API2 should return the
+        # latest revision.
+        kwargs = dict(owner='foo', series='bar', name='baz', promulgated=True)
+        self.use_index_client()
+        old_id, old_charm = self.make_charm(store_revision=1, **kwargs)
+        new_id, new_charm = self.make_charm(store_revision=2, **kwargs)
+        response = self.get_response('charm', remainder='bar/baz-HEAD')
+        self.assertEqual(response.json['charm']['id'], new_id)
+
     def test_charms_interesting_only_contain_charms(self):
         self.use_index_client()
         bundle = self.make_indexed_bundle()