diff options
Diffstat (limited to 'docs/tutorials/bfgwiki/src/authorization')
3 files changed, 28 insertions, 44 deletions
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py index 70697ec2e..d9d65bdca 100644 --- a/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py +++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py @@ -1,6 +1,5 @@ from webob.exc import HTTPFound -from repoze.bfg.chameleon_zpt import render_template_to_response from repoze.bfg.view import bfg_view from repoze.bfg.url import model_url @@ -10,7 +9,7 @@ from repoze.bfg.security import forget from tutorial.models import Wiki from tutorial.security import USERS -@bfg_view(for_=Wiki, name='login') +@bfg_view(for_=Wiki, name='login', renderer='templates/login.pt') def login(context, request): login_url = model_url(context, request, 'login') referrer = request.url @@ -29,14 +28,12 @@ def login(context, request): headers = headers) message = 'Failed login' - return render_template_to_response( - 'templates/login.pt', + return dict( message = message, url = request.application_url + '/login', came_from = came_from, login = login, password = password, - request =request, ) @bfg_view(for_=Wiki, name='logout') diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/tests.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/tests.py index 84a3a0f37..cd29d6ff4 100644 --- a/docs/tutorials/bfgwiki/src/authorization/tutorial/tests.py +++ b/docs/tutorials/bfgwiki/src/authorization/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() @@ -145,6 +146,3 @@ class EditPageTests(unittest.TestCase): response = self._callFUT(context, request) self.assertEqual(response.location, 'http://example.com/') self.assertEqual(context.data, 'Hello yo!') - - - diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py index beb52e1b7..26a44fcda 100644 --- a/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py +++ b/docs/tutorials/bfgwiki/src/authorization/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 repoze.bfg.security import authenticated_userid @@ -19,7 +18,7 @@ wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)") def view_wiki(context, request): return HTTPFound(location = model_url(context, request, 'FrontPage')) -@bfg_view(for_=Page, permission='view') +@bfg_view(for_=Page, renderer='templates/view.pt', permission='view') def view_page(context, request): wiki = context.__parent__ @@ -39,14 +38,11 @@ def view_page(context, request): logged_in = authenticated_userid(request) - return render_template_to_response('templates/view.pt', - request = request, - page = context, - content = content, - logged_in = logged_in, - edit_url = edit_url) + return dict(page = context, content = content, edit_url = edit_url, + logged_in = logged_in) -@bfg_view(for_=Wiki, name='add_page', permission='edit') +@bfg_view(for_=Wiki, name='add_page', renderer='templates/edit.pt', + permission='edit') def add_page(context, request): name = request.subpath[0] if 'form.submitted' in request.params: @@ -63,13 +59,10 @@ def add_page(context, request): logged_in = authenticated_userid(request) - return render_template_to_response('templates/edit.pt', - request = request, - page = page, - logged_in = logged_in, - save_url = save_url) + return dict(page = page, save_url = save_url, logged_in = logged_in) -@bfg_view(for_=Page, name='edit_page', permission='edit') +@bfg_view(for_=Page, name='edit_page', renderer='templates/edit.pt', + permission='edit') def edit_page(context, request): if 'form.submitted' in request.params: context.data = request.params['body'] @@ -77,11 +70,7 @@ def edit_page(context, request): logged_in = authenticated_userid(request) - return render_template_to_response('templates/edit.pt', - request = request, - page = context, - logged_in = logged_in, - save_url = model_url(context, request, - 'edit_page') - ) - + return dict(page = context, + save_url = model_url(context, request, 'edit_page'), + logged_in = logged_in) + |