From 4c4f08969e64fe6878da0c0ce753d1e3fcdbbb56 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 18 Dec 2010 15:42:07 -0500 Subject: resource/asset normalization --- docs/tutorials/wiki/src/views/tutorial/tests.py | 24 ++++++++++++------------ docs/tutorials/wiki/src/views/tutorial/views.py | 16 ++++++++-------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'docs/tutorials/wiki/src/views') diff --git a/docs/tutorials/wiki/src/views/tutorial/tests.py b/docs/tutorials/wiki/src/views/tutorial/tests.py index c5aafcac5..28e424884 100644 --- a/docs/tutorials/wiki/src/views/tutorial/tests.py +++ b/docs/tutorials/wiki/src/views/tutorial/tests.py @@ -43,7 +43,7 @@ class AppmakerTests(unittest.TestCase): class ViewWikiTests(unittest.TestCase): def test_it(self): from tutorial.views import view_wiki - context = testing.DummyModel() + context = testing.DummyResource() request = testing.DummyRequest() response = view_wiki(context, request) self.assertEqual(response.location, 'http://example.com/FrontPage') @@ -54,9 +54,9 @@ class ViewPageTests(unittest.TestCase): return view_page(context, request) def test_it(self): - wiki = testing.DummyModel() - wiki['IDoExist'] = testing.DummyModel() - context = testing.DummyModel(data='Hello CruelWorld IDoExist') + wiki = testing.DummyResource() + wiki['IDoExist'] = testing.DummyResource() + context = testing.DummyResource(data='Hello CruelWorld IDoExist') context.__parent__ = wiki context.__name__ = 'thepage' request = testing.DummyRequest() @@ -80,18 +80,18 @@ class AddPageTests(unittest.TestCase): return add_page(context, request) def test_it_notsubmitted(self): - from pyramid.url import model_url - context = testing.DummyModel() + from pyramid.url import resource_url + context = testing.DummyResource() request = testing.DummyRequest() request.subpath = ['AnotherPage'] info = self._callFUT(context, request) self.assertEqual(info['page'].data,'') self.assertEqual( info['save_url'], - model_url(context, request, 'add_page', 'AnotherPage')) + resource_url(context, request, 'add_page', 'AnotherPage')) def test_it_submitted(self): - context = testing.DummyModel() + context = testing.DummyResource() request = testing.DummyRequest({'form.submitted':True, 'body':'Hello yo!'}) request.subpath = ['AnotherPage'] @@ -107,16 +107,16 @@ class EditPageTests(unittest.TestCase): return edit_page(context, request) def test_it_notsubmitted(self): - from pyramid.url import model_url - context = testing.DummyModel() + from pyramid.url import resource_url + context = testing.DummyResource() request = testing.DummyRequest() info = self._callFUT(context, request) self.assertEqual(info['page'], context) self.assertEqual(info['save_url'], - model_url(context, request, 'edit_page')) + resource_url(context, request, 'edit_page')) def test_it_submitted(self): - context = testing.DummyModel() + context = testing.DummyResource() request = testing.DummyRequest({'form.submitted':True, 'body':'Hello yo!'}) response = self._callFUT(context, request) diff --git a/docs/tutorials/wiki/src/views/tutorial/views.py b/docs/tutorials/wiki/src/views/tutorial/views.py index acc1bbb57..8437fdc51 100644 --- a/docs/tutorials/wiki/src/views/tutorial/views.py +++ b/docs/tutorials/wiki/src/views/tutorial/views.py @@ -2,7 +2,7 @@ from docutils.core import publish_parts import re from pyramid.httpexceptions import HTTPFound -from pyramid.url import model_url +from pyramid.url import resource_url from tutorial.models import Page @@ -10,7 +10,7 @@ from tutorial.models import Page wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)") def view_wiki(context, request): - return HTTPFound(location = model_url(context, request, 'FrontPage')) + return HTTPFound(location = resource_url(context, request, 'FrontPage')) def view_page(context, request): wiki = context.__parent__ @@ -19,7 +19,7 @@ def view_page(context, request): word = match.group(1) if word in wiki: page = wiki[word] - view_url = model_url(page, request) + view_url = resource_url(page, request) return '%s' % (view_url, word) else: add_url = request.application_url + '/add_page/' + word @@ -27,7 +27,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') + edit_url = resource_url(context, request, 'edit_page') return dict(page = context, content = content, edit_url = edit_url) def add_page(context, request): @@ -38,8 +38,8 @@ def add_page(context, request): page.__name__ = name page.__parent__ = context context[name] = page - return HTTPFound(location = model_url(page, request)) - save_url = model_url(context, request, 'add_page', name) + return HTTPFound(location = resource_url(page, request)) + save_url = resource_url(context, request, 'add_page', name) page = Page('') page.__name__ = name page.__parent__ = context @@ -48,9 +48,9 @@ def add_page(context, request): def edit_page(context, request): if 'form.submitted' in request.params: context.data = request.params['body'] - return HTTPFound(location = model_url(context, request)) + return HTTPFound(location = resource_url(context, request)) return dict(page = context, - save_url = model_url(context, request, 'edit_page')) + save_url = resource_url(context, request, 'edit_page')) -- cgit v1.2.3