Merge lp:~benji/charmworld/bug-1229179 into lp:~juju-jitsu/charmworld/trunk

[Benji York]

Fix bug 1229179 by adding a correct route.

https://codereview.appspot.com/19430043/

[Brad Crittenden (bac)]

LGTM, yo.

https://codereview.appspot.com/19430043/diff/1/charmworld/views/tests/test_bundles.py
File charmworld/views/tests/test_bundles.py (right):

https://codereview.appspot.com/19430043/diff/1/charmworld/views/tests/test_bundles.py#newcode228
charmworld/views/tests/test_bundles.py:228: self.db, name='gigis',
owner='ladonna',
bonus points for identifying the reference here.

https://codereview.appspot.com/19430043/

=== modified file 'charmworld/routes.py'
--- charmworld/routes.py	2013-10-02 15:33:27 +0000
+++ charmworld/routes.py	2013-10-29 20:19:29 +0000
@@ -53,12 +53,14 @@
     config.add_route("interface-collection-map", "/interface-charm-map")
 
     # Personal Bundles
+    config.add_route("personal-bundle-json-revision",
+                     "/~{owner}/bundle/{basket}/{rev}/{bundle}/json")
+    config.add_route("personal-bundle-json",
+                     "/~{owner}/bundle/{basket}/{bundle}/json")
     config.add_route("personal-bundle-revision",
                      "/~{owner}/bundle/{basket}/{rev}/{bundle}")
     config.add_route("personal-bundle",
                      "/~{owner}/bundle/{basket}/{bundle}")
-    config.add_route("personal-bundle-json",
-                     "/~{owner}/bundle/{basket}/{rev}/{bundle}/json")
 
     # Official (promulgated) Bundles
     config.add_route("official-bundle-json",
 
=== modified file 'charmworld/views/bundles.py'
--- charmworld/views/bundles.py	2013-10-24 17:24:43 +0000
+++ charmworld/views/bundles.py	2013-10-29 20:19:29 +0000
@@ -122,6 +122,8 @@
 
 
 @cached_view_config(
+    route_name="personal-bundle-json-revision")
+@cached_view_config(
     route_name="personal-bundle-json")
 def personal_bundle_json(request):
     bundle = find_bundle(request)
@@ -131,7 +133,7 @@
             request.matchdict['owner'],
             request.matchdict['basket'],
             request.matchdict['bundle'],
-            request.matchdict['rev']
+            request.matchdict.get('rev'),
         )
         value = {'type': 'no_such_bundle', 'bundle_id': id_}
     else:
 
=== modified file 'charmworld/views/tests/test_bundles.py'
--- charmworld/views/tests/test_bundles.py	2013-10-10 20:02:51 +0000
+++ charmworld/views/tests/test_bundles.py	2013-10-29 20:19:29 +0000
@@ -221,6 +221,30 @@
         self.assertEqual(response.status_code, 200)
         self.assertEqual(expected, response.json_body)
 
+    def test_personal_bundle_json_with_revision(self):
+        basket = 'ball'
+        rev = '4'
+        bundle, bundle_data = factory.makeBundle(
+            self.db, name='gigis', owner='ladonna',
+            basket_with_rev='/'.join([basket, rev]),
+            series='raring', promulgated=False,
+        )
+        request = self.getRequest()
+        request.matchdict = dict(
+            owner=bundle.owner,
+            basket=basket,
+            rev=None,
+            bundle=bundle.name,
+        )
+        expected = {'gigis': dict(
+            series='raring',
+            relations={},
+            services={},
+        )}
+        response = personal_bundle_json(request)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(expected, response.json_body)
+
     def test_personal_bundle_json_not_found(self):
         owner = 'no-one'
         basket = 'no-basket'
@@ -321,7 +345,9 @@
         path = '/~ladonna/bundle/basket/1/XXX'
         self.app.get(path, status=404)
 
-    def test_personal_bundle_json_route(self):
+    def test_personal_bundle_with_revision_json_route(self):
+        # A JSON-encoded bundle can be requested in which the ID includes both
+        # an owner and a revision.
         bundle, bundle_data = factory.makeBundle(
             self.db, name='gigis', owner='ladonna',
             basket_with_rev='basket/1', series='raring',
@@ -332,6 +358,19 @@
         self.assertIn(str(bundle.data['relations']), resp.body)
         self.assertIn(str(bundle.data['services']), resp.body)
 
+    def test_personal_bundle_without_revision_json_route(self):
+        # A JSON-encoded bundle can be requested in which the ID includes an
+        # owner but no revision.
+        bundle, bundle_data = factory.makeBundle(
+            self.db, name='gigis', owner='lafawnda',
+            basket_with_rev='basket/1', series='raring',
+        )
+        path = '/~lafawnda/bundle/basket/gigis/json'
+        resp = self.app.get(path, status=200)
+        self.assertIn(bundle.data['series'], resp.body)
+        self.assertIn(str(bundle.data['relations']), resp.body)
+        self.assertIn(str(bundle.data['services']), resp.body)
+
     def test_personal_bundle_json_route_404(self):
         bundle, bundle_data = factory.makeBundle(
             self.db, name='gigis', owner='ladonna',