Convert bfgwiki to use renderers.

3 files changed, 21 insertions, 29 deletions

diff --git a/docs/tutorials/bfgwiki/src/views/tutorial/configure.zcml b/docs/tutorials/bfgwiki/src/views/tutorial/configure.zcml
index 8fa1a10c9..038677bfc 100644
--- a/docs/tutorials/bfgwiki/src/views/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki/src/views/tutorial/configure.zcml
@@ -17,17 +17,20 @@
      for=".models.Wiki"
      name="add_page"
      view=".views.add_page"
+     renderer="templates/edit.pt"
      />
 
   <view
      for=".models.Page"
      view=".views.view_page"
+     renderer="templates/view.pt"
      />
 
   <view
      for=".models.Page"
      name="edit_page"
      view=".views.edit_page"
+     renderer="templates/edit.pt"
      />
 
 </configure>
diff --git a/docs/tutorials/bfgwiki/src/views/tutorial/tests.py b/docs/tutorials/bfgwiki/src/views/tutorial/tests.py
index 84a3a0f37..888618842 100644
--- a/docs/tutorials/bfgwiki/src/views/tutorial/tests.py
+++ b/docs/tutorials/bfgwiki/src/views/tutorial/tests.py
@@ -72,18 +72,17 @@ class ViewPageTests(unittest.TestCase):
         context.__parent__ = wiki
         context.__name__ = 'thepage'
         request = testing.DummyRequest()
-        renderer = testing.registerDummyRenderer('templates/view.pt')
-        response = self._callFUT(context, request)
-        self.assertEqual(renderer.request, request)
+        info = self._callFUT(context, request)
+        self.assertEqual(info['page'], context)
         self.assertEqual(
-            renderer.content,
+            info['content'], 
             '<div class="document">\n'
             '<p>Hello <a href="http://example.com/add_page/CruelWorld">'
             'CruelWorld</a> '
             '<a href="http://example.com/IDoExist/">'
             'IDoExist</a>'
             '</p>\n</div>\n')
-        self.assertEqual(renderer.edit_url,
+        self.assertEqual(info['edit_url'],
                          'http://example.com/thepage/edit_page')
         
     
@@ -99,13 +98,14 @@ class AddPageTests(unittest.TestCase):
         return add_page(context, request)
 
     def test_it_notsubmitted(self):
+        from repoze.bfg.url import model_url
         context = testing.DummyModel()
         request = testing.DummyRequest()
         request.subpath = ['AnotherPage']
-        renderer = testing.registerDummyRenderer('templates/edit.pt')
-        response = self._callFUT(context, request)
-        self.assertEqual(renderer.request, request)
-        self.assertEqual(renderer.page.data, '')
+        info = self._callFUT(context, request)
+        self.assertEqual(info['page'].data,'')
+        self.assertEqual(info['save_url'],
+                         model_url(context, request, 'add_page', 'AnotherPage'))
         
     def test_it_submitted(self):
         context = testing.DummyModel()
@@ -130,12 +130,13 @@ class EditPageTests(unittest.TestCase):
         return edit_page(context, request)
 
     def test_it_notsubmitted(self):
+        from repoze.bfg.url import model_url
         context = testing.DummyModel()
         request = testing.DummyRequest()
-        renderer = testing.registerDummyRenderer('templates/edit.pt')
-        response = self._callFUT(context, request)
-        self.assertEqual(renderer.request, request)
-        self.assertEqual(renderer.page, context)
+        info = self._callFUT(context, request)
+        self.assertEqual(info['page'], context)
+        self.assertEqual(info['save_url'],
+                         model_url(context, request, 'edit_page'))
         
     def test_it_submitted(self):
         context = testing.DummyModel()
diff --git a/docs/tutorials/bfgwiki/src/views/tutorial/views.py b/docs/tutorials/bfgwiki/src/views/tutorial/views.py
index e99864550..57ca24d1b 100644
--- a/docs/tutorials/bfgwiki/src/views/tutorial/views.py
+++ b/docs/tutorials/bfgwiki/src/views/tutorial/views.py
@@ -3,7 +3,6 @@ import re
 
 from webob.exc import HTTPFound
 from repoze.bfg.url import model_url
-from repoze.bfg.chameleon_zpt import render_template_to_response
 
 from tutorial.models import Page
 
@@ -29,11 +28,7 @@ def view_page(context, request):
     content = publish_parts(context.data, writer_name='html')['html_body']
     content = wikiwords.sub(check, content)
     edit_url = model_url(context, request, 'edit_page')
-    return render_template_to_response('templates/view.pt',
-                                       request = request,
-                                       page = context,
-                                       content = content,
-                                       edit_url = edit_url)
+    return dict(page = context, content = content, edit_url = edit_url)
     
 def add_page(context, request):
     name = request.subpath[0]
@@ -48,21 +43,14 @@ def add_page(context, request):
     page = Page('')
     page.__name__ = name
     page.__parent__ = context
-    return render_template_to_response('templates/edit.pt',
-                                       request = request,
-                                       page = page,
-                                       save_url = save_url)
+    return dict(page = page, save_url = save_url)
     
 def edit_page(context, request):
     if 'form.submitted' in request.params:
         context.data = request.params['body']
         return HTTPFound(location = model_url(context, request))
 
-    return render_template_to_response('templates/edit.pt',
-                                       request = request,
-                                       page = context,
-                                       save_url = model_url(context, request,
-                                                            'edit_page')
-                                       )
+    return dict(page = context,
+                save_url = model_url(context, request, 'edit_page'))