Sync ZODB tutorial source files with the scaffold

Patricio Paez

2012-12-02 6d1eeedcd341a0468a2567f3034dde4d6dbcc6bd

Sync ZODB tutorial source files with the scaffold

 docs/tutorials/wiki/src/authorization/setup.py

@@ -20,7 +20,7 @@
setup(name='tutorial',
      version='0.0',
      description='tutorial',
      long_description=README + '\n\n' +  CHANGES,
      long_description=README + '\n\n' + CHANGES,
      classifiers=[
        "Programming Language :: Python",
        "Framework :: Pyramid",
@@ -34,12 +34,11 @@
      packages=find_packages(),
      include_package_data=True,
      zip_safe=False,
      install_requires = requires,
      tests_require= requires,
      install_requires=requires,
      tests_require=requires,
      test_suite="tutorial",
      entry_points = """\
      entry_points="""\
      [paste.app_factory]
      main = tutorial:main
      """,
      )


 docs/tutorials/wiki/src/authorization/tutorial/__init__.py

@@ -11,8 +11,9 @@
    conn = get_connection(request)
    return appmaker(conn.root())


def main(global_config, **settings):
    """ This function returns a WSGI application.
    """ This function returns a Pyramid WSGI application.
    """
    authn_policy = AuthTktAuthenticationPolicy(
        'sosecret', callback=groupfinder, hashalg='sha512')

 docs/tutorials/wiki/src/authorization/tutorial/tests.py

@@ -30,6 +30,7 @@
        self.assertEqual(wiki.__name__, None)

class AppmakerTests(unittest.TestCase):

    def _callFUT(self, zodb_root):
        from .models import appmaker
        return appmaker(zodb_root)
@@ -63,7 +64,7 @@
        info = self._callFUT(context, request)
        self.assertEqual(info['page'], context)
        self.assertEqual(
            info['content'], 
            info['content'],
            '<div class="document">\n'
            '<p>Hello <a href="http://example.com/add_page/CruelWorld">'
            'CruelWorld</a> '
@@ -85,9 +86,9 @@
        request.subpath = ['AnotherPage']
        info = self._callFUT(context, request)
        self.assertEqual(info['page'].data,'')
        self.assertEqual(info['save_url'],
                         request.resource_url(
                             context, 'add_page', 'AnotherPage'))
        self.assertEqual(
            info['save_url'],
            request.resource_url(context, 'add_page', 'AnotherPage'))

    def test_it_submitted(self):
        context = testing.DummyResource()

 docs/tutorials/wiki/src/authorization/tutorial/views.py

@@ -64,8 +64,8 @@
    page.__name__ = pagename
    page.__parent__ = context

    return dict(page = page, save_url = save_url,
                logged_in = authenticated_userid(request))
    return dict(page=page, save_url=save_url,
                logged_in=authenticated_userid(request))

@view_config(name='edit_page', context='.models.Page',
             renderer='templates/edit.pt',
@@ -75,9 +75,9 @@
        context.data = request.params['body']
        return HTTPFound(location = request.resource_url(context))

    return dict(page = context,
                save_url = request.resource_url(context, 'edit_page'),
                logged_in = authenticated_userid(request))
    return dict(page=context,
                save_url=request.resource_url(context, 'edit_page'),
                logged_in=authenticated_userid(request))

@view_config(context='.models.Wiki', name='login',
             renderer='templates/login.pt')

 docs/tutorials/wiki/src/basiclayout/setup.py

@@ -19,7 +19,7 @@
setup(name='tutorial',
      version='0.0',
      description='tutorial',
      long_description=README + '\n\n' +  CHANGES,
      long_description=README + '\n\n' + CHANGES,
      classifiers=[
        "Programming Language :: Python",
        "Framework :: Pyramid",
@@ -33,12 +33,11 @@
      packages=find_packages(),
      include_package_data=True,
      zip_safe=False,
      install_requires = requires,
      tests_require= requires,
      install_requires=requires,
      tests_require=requires,
      test_suite="tutorial",
      entry_points = """\
      entry_points="""\
      [paste.app_factory]
      main = tutorial:main
      """,
      )


 docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py

@@ -2,10 +2,12 @@
from pyramid_zodbconn import get_connection
from .models import appmaker


def root_factory(request):
    conn = get_connection(request)
    return appmaker(conn.root())


def main(global_config, **settings):
    """ This function returns a Pyramid WSGI application.
    """

 docs/tutorials/wiki/src/basiclayout/tutorial/models.py

@@ -1,8 +1,10 @@
from persistent.mapping import PersistentMapping


class MyModel(PersistentMapping):
    __parent__ = __name__ = None


def appmaker(zodb_root):
    if not 'app_root' in zodb_root:
        app_root = MyModel()

 docs/tutorials/wiki/src/basiclayout/tutorial/tests.py

@@ -14,4 +14,3 @@
        request = testing.DummyRequest()
        info = my_view(request)
        self.assertEqual(info['project'], 'tutorial')


 docs/tutorials/wiki/src/basiclayout/tutorial/views.py

@@ -1,6 +1,7 @@
from pyramid.view import view_config
from .models import MyModel


@view_config(context=MyModel, renderer='templates/mytemplate.pt')
def my_view(request):
    return {'project':'tutorial'}
    return {'project': 'tutorial'}

 docs/tutorials/wiki/src/models/setup.py

@@ -19,7 +19,7 @@
setup(name='tutorial',
      version='0.0',
      description='tutorial',
      long_description=README + '\n\n' +  CHANGES,
      long_description=README + '\n\n' + CHANGES,
      classifiers=[
        "Programming Language :: Python",
        "Framework :: Pyramid",
@@ -33,12 +33,11 @@
      packages=find_packages(),
      include_package_data=True,
      zip_safe=False,
      install_requires = requires,
      tests_require= requires,
      install_requires=requires,
      tests_require=requires,
      test_suite="tutorial",
      entry_points = """\
      entry_points="""\
      [paste.app_factory]
      main = tutorial:main
      """,
      )


 docs/tutorials/wiki/src/models/tutorial/__init__.py

@@ -2,15 +2,16 @@
from pyramid_zodbconn import get_connection
from .models import appmaker


def root_factory(request):
    conn = get_connection(request)
    return appmaker(conn.root())


def main(global_config, **settings):
    """ This function returns a WSGI application.
    """ This function returns a Pyramid WSGI application.
    """
    config = Configurator(root_factory=root_factory, settings=settings)
    config.add_static_view('static', 'static', cache_max_age=3600)
    config.scan()
    return config.make_wsgi_app()


 docs/tutorials/wiki/src/models/tutorial/views.py

@@ -1,5 +1,7 @@
from pyramid.view import view_config
from .models import MyModel

@view_config(renderer='templates/mytemplate.pt')

@view_config(context=MyModel, renderer='templates/mytemplate.pt')
def my_view(request):
    return {'project':'tutorial'}
    return {'project': 'tutorial'}

 docs/tutorials/wiki/src/tests/setup.py

@@ -21,7 +21,7 @@
setup(name='tutorial',
      version='0.0',
      description='tutorial',
      long_description=README + '\n\n' +  CHANGES,
      long_description=README + '\n\n' + CHANGES,
      classifiers=[
        "Programming Language :: Python",
        "Framework :: Pyramid",
@@ -35,12 +35,11 @@
      packages=find_packages(),
      include_package_data=True,
      zip_safe=False,
      install_requires = requires,
      tests_require= requires,
      install_requires=requires,
      tests_require=requires,
      test_suite="tutorial",
      entry_points = """\
      entry_points="""\
      [paste.app_factory]
      main = tutorial:main
      """,
      )


 docs/tutorials/wiki/src/tests/tutorial/__init__.py

@@ -11,8 +11,9 @@
    conn = get_connection(request)
    return appmaker(conn.root())


def main(global_config, **settings):
    """ This function returns a WSGI application.
    """ This function returns a Pyramid WSGI application.
    """
    authn_policy = AuthTktAuthenticationPolicy(
        'sosecret', callback=groupfinder, hashalg='sha512')

 docs/tutorials/wiki/src/tests/tutorial/tests.py

@@ -30,6 +30,7 @@
        self.assertEqual(wiki.__name__, None)

class AppmakerTests(unittest.TestCase):

    def _callFUT(self, zodb_root):
        from .models import appmaker
        return appmaker(zodb_root)

 docs/tutorials/wiki/src/tests/tutorial/views.py

@@ -64,8 +64,8 @@
    page.__name__ = pagename
    page.__parent__ = context

    return dict(page = page, save_url = save_url,
                logged_in = authenticated_userid(request))
    return dict(page=page, save_url=save_url,
                logged_in=authenticated_userid(request))

@view_config(name='edit_page', context='.models.Page',
             renderer='templates/edit.pt',
@@ -75,9 +75,9 @@
        context.data = request.params['body']
        return HTTPFound(location = request.resource_url(context))

    return dict(page = context,
                save_url = request.resource_url(context, 'edit_page'),
                logged_in = authenticated_userid(request))
    return dict(page=context,
                save_url=request.resource_url(context, 'edit_page'),
                logged_in=authenticated_userid(request))

@view_config(context='.models.Wiki', name='login',
             renderer='templates/login.pt')

 docs/tutorials/wiki/src/views/setup.py

@@ -20,7 +20,7 @@
setup(name='tutorial',
      version='0.0',
      description='tutorial',
      long_description=README + '\n\n' +  CHANGES,
      long_description=README + '\n\n' + CHANGES,
      classifiers=[
        "Programming Language :: Python",
        "Framework :: Pyramid",
@@ -34,12 +34,11 @@
      packages=find_packages(),
      include_package_data=True,
      zip_safe=False,
      install_requires = requires,
      tests_require= requires,
      install_requires=requires,
      tests_require=requires,
      test_suite="tutorial",
      entry_points = """\
      entry_points="""\
      [paste.app_factory]
      main = tutorial:main
      """,
      )


 docs/tutorials/wiki/src/views/tutorial/__init__.py

@@ -1,15 +1,17 @@
from pyramid.config import Configurator
from pyramid_zodbconn import get_connection
from tutorial.models import appmaker
from .models import appmaker


def root_factory(request):
    conn = get_connection(request)
    return appmaker(conn.root())


def main(global_config, **settings):
    """ This function returns a WSGI application.
    """ This function returns a Pyramid WSGI application.
    """
    config = Configurator(root_factory=root_factory, settings=settings)
    config.add_static_view('static', 'static', cache_max_age=3600)
    config.scan('tutorial')
    config.scan()
    return config.make_wsgi_app()

 docs/tutorials/wiki/src/views/tutorial/tests.py

@@ -5,7 +5,7 @@
class PageModelTests(unittest.TestCase):

    def _getTargetClass(self):
        from tutorial.models import Page
        from .models import Page
        return Page

    def _makeOne(self, data=u'some data'):
@@ -14,11 +14,11 @@
    def test_constructor(self):
        instance = self._makeOne()
        self.assertEqual(instance.data, u'some data')
        

class WikiModelTests(unittest.TestCase):

    def _getTargetClass(self):
        from tutorial.models import Wiki
        from .models import Wiki
        return Wiki

    def _makeOne(self):
@@ -30,8 +30,9 @@
        self.assertEqual(wiki.__name__, None)

class AppmakerTests(unittest.TestCase):

    def _callFUT(self, zodb_root):
        from tutorial.models import appmaker
        from .models import appmaker
        return appmaker(zodb_root)

    def test_it(self):
@@ -42,7 +43,7 @@

class ViewWikiTests(unittest.TestCase):
    def test_it(self):
        from tutorial.views import view_wiki
        from .views import view_wiki
        context = testing.DummyResource()
        request = testing.DummyRequest()
        response = view_wiki(context, request)
@@ -50,7 +51,7 @@

class ViewPageTests(unittest.TestCase):
    def _callFUT(self, context, request):
        from tutorial.views import view_page
        from .views import view_page
        return view_page(context, request)

    def test_it(self):
@@ -63,7 +64,7 @@
        info = self._callFUT(context, request)
        self.assertEqual(info['page'], context)
        self.assertEqual(
            info['content'], 
            info['content'],
            '<div class="document">\n'
            '<p>Hello <a href="http://example.com/add_page/CruelWorld">'
            'CruelWorld</a> '
@@ -72,11 +73,11 @@
            '</p>\n</div>\n')
        self.assertEqual(info['edit_url'],
                         'http://example.com/thepage/edit_page')
        
    


class AddPageTests(unittest.TestCase):
    def _callFUT(self, context, request):
        from tutorial.views import add_page
        from .views import add_page
        return add_page(context, request)

    def test_it_notsubmitted(self):
@@ -88,7 +89,7 @@
        self.assertEqual(
            info['save_url'],
            request.resource_url(context, 'add_page', 'AnotherPage'))
        

    def test_it_submitted(self):
        context = testing.DummyResource()
        request = testing.DummyRequest({'form.submitted':True,
@@ -102,7 +103,7 @@

class EditPageTests(unittest.TestCase):
    def _callFUT(self, context, request):
        from tutorial.views import edit_page
        from .views import edit_page
        return edit_page(context, request)

    def test_it_notsubmitted(self):
@@ -112,7 +113,7 @@
        self.assertEqual(info['page'], context)
        self.assertEqual(info['save_url'],
                         request.resource_url(context, 'edit_page'))
        

    def test_it_submitted(self):
        context = testing.DummyResource()
        request = testing.DummyRequest({'form.submitted':True,

 docs/tutorials/wiki/src/views/tutorial/views.py

@@ -56,5 +56,5 @@
        context.data = request.params['body']
        return HTTPFound(location = request.resource_url(context))

    return dict(page = context,
                save_url = request.resource_url(context, 'edit_page'))
    return dict(page=context,
                save_url=request.resource_url(context, 'edit_page'))