Merge lp:~sinzui/charmworld/charm-object-damn-it-3 into lp:~juju-jitsu/charmworld/trunk

[Curtis Hovey]

Always pass charm objects to the hook template.

Always pass charm objects to the hook template.

RULES

    This branch, pre-implementation: no one
    * The hook.pt template is still using the charm dict, but the view
      is working with an object. I neglected to remove the shim after I
      converted all the view code to use the object.

QA

    Verify these pages load.
    * http://staging.jujucharms.com/charms/precise/apache2/hooks/install
    * http://staging.jujucharms.com/~charmers/precise/apache2/hooks/install

[j.c.sackett (jcsackett)]

Looks good, thanks.

review: Approve

=== modified file 'charmworld/templates/hook.pt'
--- charmworld/templates/hook.pt	2013-06-19 20:45:35 +0000
+++ charmworld/templates/hook.pt	2013-07-03 21:39:24 +0000
@@ -14,8 +14,8 @@
 
     <metal:block fill-slot="content">
       <div class="well">
-	<b>Charm</b>: ${charm["store_url"]} &nbsp;
-	<b>Revision</b>: ${charm['revision']} &nbsp;
+	<b>Charm</b>: ${charm.store_url} &nbsp;
+	<b>Revision</b>: ${charm.revision} &nbsp;
 	<b>Hook</b>: ${hook}
       </div>
       <pre class="prettyprint linenums" tal:content="hook_raw">

=== modified file 'charmworld/views/charms.py'
--- charmworld/views/charms.py	2013-07-03 19:58:15 +0000
+++ charmworld/views/charms.py	2013-07-03 21:39:24 +0000
@@ -144,14 +144,13 @@
 
 
 def _hook_view(request, charm, hook):
-    charm_data = charm._representation
     fs = getfs(request.db)
-    fileid = CharmFileSet.gen_fileid(charm_data, 'hooks/' + hook)
+    fileid = CharmFileSet.gen_fileid(charm._representation, 'hooks/' + hook)
 
     data = {
         "project": request.registry.settings.get('project_name', 'Not Set.'),
         "hook_raw": "Hook not found!",
-        "charm": charm_data,
+        "charm": charm,
         "hook": hook,
         "onload": "prettyPrint()"
     }

=== modified file 'charmworld/views/tests/test_charms.py'
--- charmworld/views/tests/test_charms.py	2013-07-03 19:58:15 +0000
+++ charmworld/views/tests/test_charms.py	2013-07-03 21:39:24 +0000
@@ -318,7 +318,7 @@
         return charm
 
     def test_hook(self):
-        charm = self.make_charm_with_files(promulgated=True)
+        charm = Charm(self.make_charm_with_files(promulgated=True))
         request = self.getRequest()
         request.matchdict = {
             'charm': 'sample_charm',
@@ -330,12 +330,11 @@
         self.assertEqual('install', response['hook'])
         self.assertTrue(response['hook_raw'].startswith(
             '#!/bin/bash\nset -eux\n\n# This PPA is no longer required.'))
-        charm_data = dict(Charm(charm)._representation)
-        self.assertEqual(charm_data, response['charm'])
+        self.assertEqual(charm, response['charm'])
         self.assertEqual('prettyPrint()', response['onload'])
 
     def test_personal_hook(self):
-        charm = self.make_charm_with_files(promulgated=False)
+        charm = Charm(self.make_charm_with_files(promulgated=False))
         request = self.getRequest()
         request.matchdict = {
             'charm': 'sample_charm',
@@ -348,8 +347,7 @@
         self.assertEqual('install', response['hook'])
         self.assertTrue(response['hook_raw'].startswith(
             '#!/bin/bash\nset -eux\n\n# This PPA is no longer required.'))
-        charm_data = dict(Charm(charm)._representation)
-        self.assertEqual(charm_data, response['charm'])
+        self.assertEqual(charm, response['charm'])
         self.assertEqual('prettyPrint()', response['onload'])
 
     def test_distro_charm(self):