Merge lp:~fabricematrat/charmworld/redirect-interfaces into lp:charmworld

[Fabrice Matrat]

Added redirection for interface, config, hook
R=bac, frankban

Added redirection for interface, config, hook

[Brad Crittenden (bac)]

Code looks good.
QA OK

review: Approve (code + qa)

[Francesco Banconi (frankban)]

Looks good.

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'charmworld/views/charms.py'
--- charmworld/views/charms.py	2015-02-09 18:46:13 +0000
+++ charmworld/views/charms.py	2015-02-13 16:29:40 +0000
@@ -35,7 +35,6 @@
     format_change,
     format_proof,
     found,
-    interfaces,
     name_filter,
 )
 
@@ -356,30 +355,62 @@
     route_name="hook",
     renderer="charmworld:templates/hook.pt")
 def hook(request):
-    charm = Charm(find_charm(request, promulgated=True))
-    return _hook_view(request, charm, request.matchdict["hook"])
+    _reconcile_revision(request)
+    redirect_url = request.registry.settings.get('redirect_jujucharms')
+    match = request.matchdict
+    location = '{url}/{charm}/{series}'.format(
+        url=redirect_url,
+        charm=match['charm'],
+        series=match['series']
+    )
+    raise HTTPMovedPermanently(location=location)
 
 
 @cached_view_config(
     route_name="personal-hook",
     renderer="charmworld:templates/hook.pt")
 def personal_hook(request):
-    charm = Charm(find_charm(request))
-    return _hook_view(request, charm, request.matchdict["hook"])
+    _reconcile_revision(request)
+    redirect_url = request.registry.settings.get('redirect_jujucharms')
+    match = request.matchdict
+    location = '{url}/u/{owner}/{charm}/{series}'.format(
+        url=redirect_url,
+        owner=match['owner'],
+        charm=match['charm'],
+        series=match['series']
+    )
+    raise HTTPMovedPermanently(location=location)
 
 
 @cached_view_config(
     route_name="config",
     renderer="charmworld:templates/config.pt")
 def config(request):
-    return _config_view(find_charm(request, promulgated=True))
+    _reconcile_revision(request)
+    redirect_url = request.registry.settings.get('redirect_jujucharms')
+    match = request.matchdict
+    location = '{url}/{charm}/{series}#configuration'.format(
+        url=redirect_url,
+        charm=match['charm'],
+        series=match['series']
+    )
+    raise HTTPMovedPermanently(location=location)
 
 
 @cached_view_config(
     route_name="personal-config",
     renderer="charmworld:templates/config.pt")
 def personal_config(request):
-    return _config_view(find_charm(request))
+    _reconcile_revision(request)
+    redirect_url = request.registry.settings.get('redirect_jujucharms')
+    match = request.matchdict
+    location = '{url}/u/{owner}/{charm}/{series}#configuration'.format(
+        url=redirect_url,
+        owner=match['owner'],
+        charm=match['charm'],
+        series=match['series']
+    )
+    raise HTTPMovedPermanently(location=location)
 
 
 @cached_view_config(
@@ -389,10 +420,8 @@
     route_name="interface-collection",
     renderer="charmworld:templates/interface-collection-redux.pt")
 def interface_collection(request):
-    return {
-        "interfaces": interfaces(request.db),
-        "project": request.registry.settings.get('project_name', 'Not Set.'),
-    }
+    redirect_url = request.registry.settings.get('redirect_jujucharms')
+    raise HTTPMovedPermanently(location='{}/solutions'.format(redirect_url))
 
 
 @cached_view_config(
@@ -400,16 +429,11 @@
     renderer="charmworld:templates/interface.pt")
 def interface(request):
     iface = request.matchdict["interface"]
-    return {
-        "interface": iface,
-        "providers": [
-            Charm(charm)
-            for charm in find_charms(request.db, {"i_provides": iface},
-                                     sort=[("name", pymongo.ASCENDING)])],
-        "requirers": [
-            Charm(charm)
-            for charm in find_charms(request.db, {"i_requires": iface},
-                                     sort=[("name", pymongo.ASCENDING)])]}
+    redirect_url = request.registry.settings.get('redirect_jujucharms')
+    raise HTTPMovedPermanently(
+        location='{url}/q/{interface}'.format(url=redirect_url,
+                                              interface=iface)
+    )
 
 
 @view_config(

=== modified file 'charmworld/views/tests/test_charms.py'
--- charmworld/views/tests/test_charms.py	2015-02-09 14:16:33 +0000
+++ charmworld/views/tests/test_charms.py	2015-02-13 16:29:40 +0000
@@ -159,64 +159,29 @@
         self.assertIn('/q/me/one', e.exception.location)
 
     def test_interface(self):
-        # interface() returns all charms requiring or providing a given
-        # interface.
-        providing = Charm(factory.makeCharm(
-            self.db, provides={'foo': {'interface': 'httpX'}})[1])
-        requiring = Charm(factory.makeCharm(
-            self.db, requires={'bar': {'interface': 'httpX'}})[1])
-        ignore, other = factory.makeCharm(self.db)
-        request = self.getRequest()
-        request.matchdict = {'interface': 'httpX'}
-        response = interface(request)
-        self.assertEqual('httpX', response['interface'])
-        found_providing = response['providers']
-        self.assertEqual(1, len(found_providing))
-        self.assertEqual(providing, found_providing[0])
-        found_requiring = response['requirers']
-        self.assertEqual(1, len(found_requiring))
-        self.assertEqual(requiring, found_requiring[0])
-
-    def test_interface_charm_with_errors(self):
-        # Charms with errors are not returned by interface().
-        providing = Charm(factory.makeCharm(
-            self.db, provides={'foo': {'interface': 'httpX'}})[1])
-        Charm(factory.makeCharm(
-              self.db, requires={'bar': {'interface': 'httpX'}},
-              charm_error=True)[1])
-        request = self.getRequest()
-        request.matchdict = {'interface': 'httpX'}
-        response = interface(request)
-        self.assertEqual('httpX', response['interface'])
-        found_providing = response['providers']
-        self.assertEqual(1, len(found_providing))
-        self.assertEqual(providing, found_providing[0])
-        found_requiring = response['requirers']
-        self.assertEqual(0, len(found_requiring))
+        request = self.getRequest()
+        request.matchdict = {'interface': 'httpX'}
+        with self.assertRaises(HTTPMovedPermanently) as e:
+            interface(request)
+        self.assertIn('/q/httpX', e.exception.location)
 
     def test_config(self):
-        ignore, charm = factory.makeCharm(
-            self.db, name='foo', owner='bar', series='precise',
-            promulgated=True)
         request = self.getRequest()
         request.matchdict = {'charm': 'foo', 'series': 'precise'}
-        response = config(request)
-        expected = {"charm": Charm(charm), "onload": "prettyPrint()"}
-        self.assertEqual(expected, response)
+        with self.assertRaises(HTTPMovedPermanently) as e:
+            config(request)
+        self.assertIn('/foo/precise#configuration', e.exception.location)
 
     def test_personal_config(self):
-        ignore, charm = factory.makeCharm(
-            self.db, name='foo', owner='bar', series='precise',
-            promulgated=False)
         request = self.getRequest()
         request.matchdict = {
             'charm': 'foo',
             'series': 'precise',
             'owner': 'bar'
         }
-        response = personal_config(request)
-        expected = {"charm": Charm(charm), "onload": "prettyPrint()"}
-        self.assertEqual(expected, response)
+        with self.assertRaises(HTTPMovedPermanently) as e:
+            personal_config(request)
+        self.assertIn('/bar/foo/precise#configuration', e.exception.location)
 
     def make_charm_with_files(self, promulgated):
         ignore, charm = factory.makeCharm(
@@ -232,23 +197,17 @@
         return charm
 
     def test_hook(self):
-        charm = Charm(self.make_charm_with_files(promulgated=True))
         request = self.getRequest()
         request.matchdict = {
             'charm': 'sample_charm',
             'series': 'precise',
             'hook': 'install',
         }
-        response = hook(request)
-        self.assertEqual('Not Set.', response['project'])
-        self.assertEqual('install', response['hook'])
-        self.assertTrue(response['hook_raw'].startswith(
-            '#!/bin/bash\nset -eux\n\n# This PPA is no longer required.'))
-        self.assertEqual(charm, response['charm'])
-        self.assertEqual('prettyPrint()', response['onload'])
+        with self.assertRaises(HTTPMovedPermanently) as e:
+            hook(request)
+        self.assertIn('/sample_charm/precise', e.exception.location)
 
     def test_personal_hook(self):
-        charm = Charm(self.make_charm_with_files(promulgated=False))
         request = self.getRequest()
         request.matchdict = {
             'charm': 'sample_charm',
@@ -256,17 +215,11 @@
             'hook': 'install',
             'owner': 'bar',
         }
-        response = personal_hook(request)
-        self.assertEqual('Not Set.', response['project'])
-        self.assertEqual('install', response['hook'])
-        self.assertTrue(response['hook_raw'].startswith(
-            '#!/bin/bash\nset -eux\n\n# This PPA is no longer required.'))
-        self.assertEqual(charm, response['charm'])
-        self.assertEqual('prettyPrint()', response['onload'])
+        with self.assertRaises(HTTPMovedPermanently) as e:
+            personal_hook(request)
+        self.assertIn('/bar/sample_charm/precise', e.exception.location)
 
     def test_distro_charm(self):
-        self.enable_routes()
-        self.make_charm_with_files(promulgated=True)
         request = self.getRequest()
         request.matchdict = {
             'charm': 'sample_charm',
@@ -377,10 +330,6 @@
 
     def test_charm_collection_with_missing_data(self):
         """Charms with missing data are rendered."""
-        one_id, one = factory.makeCharm(self.db, promulgated=True)
-        two_id, two = factory.makeCharm(self.db, promulgated=True)
-        del two['summary']
-        self.db.charms.save(two)
         response = self.app.get('/charms/precise', status=301)
         self.assertIn('/q/precise', response.body)
 
@@ -388,8 +337,6 @@
         # The route /~owner/series/charm-1 finds charms using owner,
         # series, charm name, and revision. The deploy instruction
         # does not include the revision.
-        ignore, charm = factory.makeCharm(
-            self.db, owner='owner', series='series', name='charm', files={})
         response = self.app.get('/~owner/series/charm-1', status=301)
         self.assertIn('/u/owner/charm/series/1', response.body)
 
@@ -397,17 +344,12 @@
         # /~owner/series/charm-name-1 route find the charm.
         # This is a corner-case where the revision and charm name are
         # ambigous because they are munged.
-        ignore, charm = factory.makeCharm(
-            self.db, owner='owner', series='series', name='charm-name',
-            files={})
         response = self.app.get('/~owner/series/charm-name-1', status=301)
         self.assertIn('/u/owner/charm-name/series/1', response.body)
 
     def test_route_personal_charm_with_head_revision(self):
         # the /~owner/series/charm-name-HEAD route finds the charm.
         # The juju-gui apache rewrite versionless charm urls to help the GUI.
-        ignore, charm = factory.makeCharm(
-            self.db, owner='owner', series='series', name='charm', files={})
         response = self.app.get('/~owner/series/charm-HEAD', status=301)
         self.assertIn('/u/owner/charm/series', response.body)
         self.assertNotIn('HEAD', response.body)
@@ -416,8 +358,6 @@
         # The route /~owner/series/charm route finds the charm using owner
         # series, and charm name. Revision is ignored. The deploy instruction
         # matches the route.
-        ignore, charm = factory.makeCharm(
-            self.db, owner='owner', series='series', name='charm', files={})
         response = self.app.get('/~owner/series/charm', status=301)
         self.assertIn('/u/owner/charm/series', response.body)
 
@@ -443,8 +383,6 @@
         # The route /series/charm-1 route finds promulgated charms using
         # The series, charm name and version. The deploy instruction does not
         # include the version.
-        factory.makeCharm(
-            self.db, promulgated=True, series='series', name='charm', files={})
         response = self.app.get('/series/charm-1', status=301)
         self.assertIn('/charm/series/1', response.body)
 
@@ -452,8 +390,6 @@
         # The route /series/charm-HEAD finds promulgated charms using
         # series, charm name, and head revision. The revision is not included
         # in the deploy instruction.
-        ignore, charm = factory.makeCharm(
-            self.db, promulgated=True, series='series', name='charm', files={})
         response = self.app.get('/series/charm-HEAD', status=301)
         self.assertNotIn('HEAD', response.body)
         self.assertIn('/charm/series', response.body)
@@ -461,8 +397,6 @@
     def test_route_promulgated_charm_without_revision(self):
         # The route /series/charm finds the promulgated charms using just
         # the series and charm name. The deploy instruction matches the route.
-        factory.makeCharm(
-            self.db, promulgated=True, series='series', name='charm', files={})
         self.app.get('/series/charm', status=301)
 
     def test_charm_short_url_route(self):