Render templates explicitly in views.

5 files changed, 52 insertions, 118 deletions

diff --git a/repoze/bfg/tests/fixtureapp/configure.zcml b/repoze/bfg/tests/fixtureapp/configure.zcml
index 99d0708aa..f08cd58ad 100644
--- a/repoze/bfg/tests/fixtureapp/configure.zcml
+++ b/repoze/bfg/tests/fixtureapp/configure.zcml
@@ -12,7 +12,6 @@
 
   <bfg:view
       for=".models.IFixture"
-      factory=".views.FixtureTemplateView"
       template="templates/fixture.pt"
       permission="repoze.view"
       name="fixture.html"
diff --git a/repoze/bfg/tests/fixtureapp/views.py b/repoze/bfg/tests/fixtureapp/views.py
index 36fe07cc6..b9b9fc7d9 100644
--- a/repoze/bfg/tests/fixtureapp/views.py
+++ b/repoze/bfg/tests/fixtureapp/views.py
@@ -1,5 +1,3 @@
-from repoze.bfg.view import TemplateView
-
 class FixtureView(object):
     def __init__(self, context, request):
         self.context = context
@@ -8,5 +6,3 @@ class FixtureView(object):
     def __call__(self):
         pass
     
-class FixtureTemplateView(TemplateView):
-    pass
diff --git a/repoze/bfg/tests/test_template.py b/repoze/bfg/tests/test_template.py
index 59dce3efa..96129504d 100644
--- a/repoze/bfg/tests/test_template.py
+++ b/repoze/bfg/tests/test_template.py
@@ -78,9 +78,8 @@ class RenderTemplateTests(unittest.TestCase, Base):
         from repoze.bfg.interfaces import IView
         minimal = self._getTemplatePath('minimal.pt')
         self.assertEqual(queryUtility(IView, minimal), None)
-        view = DummyView()
         render = self._getFUT()
-        result = render(view, minimal)
+        result = render(minimal)
         from webob import Response
         self.failUnless(isinstance(result, Response))
         self.assertEqual(result.app_iter, ['<div>\n</div>'])
@@ -100,9 +99,8 @@ class RenderTemplateTests(unittest.TestCase, Base):
         utility = Z3CPTTemplateFactory(minimal)
         gsm = getGlobalSiteManager()
         gsm.registerUtility(utility, IView, name=minimal)
-        view = DummyView()
         render = self._getFUT()
-        result = render(view, minimal)
+        result = render(minimal)
         from webob import Response
         self.failUnless(isinstance(result, Response))
         self.assertEqual(result.app_iter, ['<div>\n</div>'])
diff --git a/repoze/bfg/tests/test_view.py b/repoze/bfg/tests/test_view.py
index 7d87b9c83..b6982f431 100644
--- a/repoze/bfg/tests/test_view.py
+++ b/repoze/bfg/tests/test_view.py
@@ -32,33 +32,3 @@ class ViewTests(unittest.TestCase):
         view = self._makeOne(None, None)
         self.assertRaises(NotImplementedError, view)
 
-class TemplateViewTests(unittest.TestCase, Base):
-    def setUp(self):
-        Base.setUp(self)
-
-    def tearDown(self):
-        Base.tearDown(self)
-
-    def _getTargetClass(self):
-        from repoze.bfg.view import TemplateView
-        return TemplateView
-
-    def _makeOne(self, *arg, **kw):
-        klass = self._getTargetClass()
-        return klass(*arg, **kw)
-
-    def test_call(self):
-        self._zcmlConfigure()
-        view = self._makeOne(None, None)
-        view.template = self._getTemplatePath('minimal.pt')
-        result = view(foo='foo')
-        from webob import Response
-        self.failUnless(isinstance(result, Response))
-        self.assertEqual(result.app_iter, ['<div>\n</div>'])
-        self.assertEqual(result.status, '200 OK')
-        self.assertEqual(len(result.headerlist), 2)
-        
-    def test_call_no_template(self):
-        self._zcmlConfigure()
-        view = self._makeOne(None, None)
-        self.assertRaises(ValueError, view)
diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py
index f87c49424..db826b687 100644
--- a/repoze/bfg/tests/test_zcml.py
+++ b/repoze/bfg/tests/test_zcml.py
@@ -103,101 +103,72 @@ class TestViewDirective(unittest.TestCase, PlacelessSetup):
     def test_template_and_factory(self):
         f = self._getFUT()
         context = DummyContext()
-        class IFoo:
-            pass
-        class DummyView:
-            pass
-        f(context, 'repoze.view', IFoo, factory=DummyView,
-          template='minimal.pt')
-        actions = context.actions
-        from repoze.bfg.interfaces import IView
-        from repoze.bfg.interfaces import IRequest
-        from repoze.bfg.interfaces import IViewFactory
-        from zope.component.zcml import handler
-        from zope.component.interface import provideInterface
-
-        self.assertEqual(len(actions), 3)
-
-        regutil_discriminator = ('utility', IView, context.path('minimal.pt'))
-        regutil = actions[0]
-        self.assertEqual(regutil['discriminator'], regutil_discriminator)
-        self.assertEqual(regutil['callable'], handler)
-        self.assertEqual(regutil['args'][0], 'registerUtility')
-        self.assertEqual(regutil['args'][1].template.filename,
-                         context.path('minimal.pt'))
-        self.assertEqual(regutil['args'][2], IView)
-        self.assertEqual(regutil['args'][3], context.path('minimal.pt'))
-
-        provide = actions[1]
-        self.assertEqual(provide['discriminator'], None)
-        self.assertEqual(provide['callable'], provideInterface)
-        self.assertEqual(provide['args'][0], '')
-        self.assertEqual(provide['args'][1], IFoo)
-        
-        regadapt = actions[2]
-        regadapt_discriminator = ('view', IFoo, '', IRequest, IViewFactory)
-        self.assertEqual(regadapt['discriminator'], regadapt_discriminator)
-        self.assertEqual(regadapt['callable'], handler)
-        self.assertEqual(regadapt['args'][0], 'registerAdapter')
-        self.assertEqual(regadapt['args'][1].template,
-                         context.path('minimal.pt'))
-        self.assertEqual(regadapt['args'][2], (IFoo, IRequest))
-        self.assertEqual(regadapt['args'][3], IViewFactory)
-        self.assertEqual(regadapt['args'][4], '')
-        self.assertEqual(regadapt['args'][5], None)
+        from zope.configuration.exceptions import ConfigurationError
+        self.assertRaises(ConfigurationError, f, context, 'repoze.view',
+                          None, factory=object, template='minimal.pt')
 
-class TestTemplateViewFactory(unittest.TestCase):
+class TestTemplateOnlyViewFactory(unittest.TestCase):
     def _getTargetClass(self):
-        from repoze.bfg.zcml import TemplateViewFactory
-        return TemplateViewFactory
+        from repoze.bfg.zcml import TemplateOnlyViewFactory
+        return TemplateOnlyViewFactory
 
-    def _makeOne(self, template, base=None):
-        return self._getTargetClass()(template, base)
+    def _makeOne(self, template):
+        return self._getTargetClass()(template)
 
     def test_instance_conforms_to_IViewFactory(self):
         from zope.interface.verify import verifyObject
         from repoze.bfg.interfaces import IViewFactory
         verifyObject(IViewFactory, self._makeOne('a'))
 
-    def test_call_templateonly(self):
+    def test_call(self):
         context = DummyContext()
         template = context.path('minimal.pt')
         factory = self._makeOne(template)
         view = factory(None, None)
-        from repoze.bfg.view import TemplateView
-        self.failUnless(isinstance(view, TemplateView))
+        from repoze.bfg.zcml import TemplateOnlyView
+        self.failUnless(isinstance(view, TemplateOnlyView))
         self.assertEqual(view.template, template)
-        
-    def test_call_nonclassbase(self):
-        context = DummyContext()
-        def factory():
-            pass
-        template = context.path('minimal.pt')
-        self.assertRaises(ValueError, self._makeOne, template, factory)
 
-    def test_call_classbase_not_templateview_subclass(self):
-        context = DummyContext()
-        template = context.path('minimal.pt')
-        factory = self._makeOne(template, Dummy)
-        view = factory(None, None)
-        from repoze.bfg.view import TemplateView
-        self.assertEqual(view.__bases__[0], Dummy)
-        self.assertEqual(view.__bases__[1], TemplateView)
-        self.assertEqual(view.__name__, 'DynamicTemplateView_For_Dummy')
-        self.assertEqual(view.template, template)
+class TemplateOnlyViewTests(unittest.TestCase, PlacelessSetup):
+    def setUp(self):
+        PlacelessSetup.setUp(self)
 
-    def test_call_classbase_templateview_subclass(self):
-        context = DummyContext()
-        template = context.path('minimal.pt')
-        from repoze.bfg.view import TemplateView
-        class TemplateViewSubclass(TemplateView):
-            pass
-        factory = self._makeOne(template, TemplateViewSubclass)
-        view = factory(None, None)
-        self.assertEqual(view.__bases__[0], TemplateViewSubclass)
-        self.assertEqual(view.__name__,
-                         'DynamicTemplateView_For_TemplateViewSubclass')
-        self.assertEqual(view.template, template)
+    def tearDown(self):
+        PlacelessSetup.tearDown(self)
+
+    def _getTargetClass(self):
+        from repoze.bfg.zcml import TemplateOnlyView
+        return TemplateOnlyView
+
+    def _zcmlConfigure(self):
+        import repoze.bfg
+        import zope.configuration.xmlconfig
+        zope.configuration.xmlconfig.file('configure.zcml', package=repoze.bfg)
+
+    def _getTemplatePath(self, name):
+        import os
+        here = os.path.abspath(os.path.dirname(__file__))
+        return os.path.join(here, 'fixtures', name)
+
+    def _makeOne(self, *arg, **kw):
+        klass = self._getTargetClass()
+        return klass(*arg, **kw)
+
+    def test_call(self):
+        self._zcmlConfigure()
+        view = self._makeOne(None, None)
+        view.template = self._getTemplatePath('minimal.pt')
+        result = view(foo='foo')
+        from webob import Response
+        self.failUnless(isinstance(result, Response))
+        self.assertEqual(result.app_iter, ['<div>\n</div>'])
+        self.assertEqual(result.status, '200 OK')
+        self.assertEqual(len(result.headerlist), 2)
+        
+    def test_call_no_template(self):
+        self._zcmlConfigure()
+        view = self._makeOne(None, None)
+        self.assertRaises(ValueError, view)
 
 class TestSampleApp(unittest.TestCase, PlacelessSetup):
     def setUp(self):