Features

  - Added a ``repoze.bfg.testing`` module to attempt to make it
    slightly easier to write unittest-based automated tests of BFG
    applications.  Information about this class is in the
    documentation.

  - The default template renderer now supports testing better by
    looking for ``ITestingTemplateRenderer`` using a relative
    pathname.  This is exposed indirectly through the API named
    ``registerTemplate`` in ``repoze.bfg.testing``.

  Deprecations

  - The names ``repoze.bfg.interfaces.ITemplate`` ,
    ``repoze.bfg.interfaces.ITemplateFactory`` and
    ``repoze.bfg.interfaces.INodeTemplate`` have been deprecated.
    These should now be imported as
    ``repoze.bfg.interfaces.ITemplateRenderer`` and
    ``repoze.bfg.interfaces.ITemplateRendererFactory``, and
    ``INodeTemplateRenderer`` respectively.

  - The name ``repoze.bfg.chameleon_zpt.ZPTTemplateFactory`` is
    deprecated.  Use ``repoze.bfg.chameleon_zpt.ZPTTemplateRenderer``.

  - The name ``repoze.bfg.chameleon_genshi.GenshiTemplateFactory`` is
    deprecated.  Use
    ``repoze.bfg.chameleon_genshi.GenshiTemplateRenderer``.

  - The name ``repoze.bfg.xslt.XSLTemplateFactory`` is deprecated.
    Use ``repoze.bfg.xslt.XSLTemplateRenderer``.

1 files changed, 27 insertions, 27 deletions

diff --git a/repoze/bfg/tests/test_xslt.py b/repoze/bfg/tests/test_xslt.py
index 0a858e08b..66e268331 100644
--- a/repoze/bfg/tests/test_xslt.py
+++ b/repoze/bfg/tests/test_xslt.py
@@ -19,7 +19,7 @@ class Base(PlacelessSetup):
         here = os.path.abspath(os.path.dirname(__file__))
         return os.path.join(here, 'fixtures', name)
         
-class XSLTemplateFactoryTests(unittest.TestCase, Base):
+class XSLTemplateRendererTests(unittest.TestCase, Base):
     def setUp(self):
         Base.setUp(self)
 
@@ -27,8 +27,8 @@ class XSLTemplateFactoryTests(unittest.TestCase, Base):
         Base.tearDown(self)
 
     def _getTargetClass(self):
-        from repoze.bfg.xslt import XSLTemplateFactory
-        return XSLTemplateFactory
+        from repoze.bfg.xslt import XSLTemplateRenderer
+        return XSLTemplateRenderer
 
     def _makeOne(self, *arg, **kw):
         klass = self._getTargetClass()
@@ -36,14 +36,14 @@ class XSLTemplateFactoryTests(unittest.TestCase, Base):
 
     def test_instance_implements_INodeTemplate(self):
         from zope.interface.verify import verifyObject
-        from repoze.bfg.interfaces import INodeTemplate
+        from repoze.bfg.interfaces import INodeTemplateRenderer
         path = self._getTemplatePath('minimal.xsl')
-        verifyObject(INodeTemplate, self._makeOne(path))
+        verifyObject(INodeTemplateRenderer, self._makeOne(path))
 
     def test_class_implements_INodeTemplate(self):
         from zope.interface.verify import verifyClass
-        from repoze.bfg.interfaces import INodeTemplate
-        verifyClass(INodeTemplate, self._getTargetClass())
+        from repoze.bfg.interfaces import INodeTemplateRenderer
+        verifyClass(INodeTemplateRenderer, self._getTargetClass())
 
     def test_call(self):
         self._zcmlConfigure()
@@ -70,9 +70,9 @@ class RenderTransformToResponseTests(unittest.TestCase, Base):
     def test_nonabs_unregistered(self):
         self._zcmlConfigure()
         from zope.component import queryUtility
-        from repoze.bfg.interfaces import INodeTemplate
+        from repoze.bfg.interfaces import INodeTemplateRenderer
         minimal = self._getTemplatePath('minimal.xsl')
-        self.assertEqual(queryUtility(INodeTemplate, minimal), None)
+        self.assertEqual(queryUtility(INodeTemplateRenderer, minimal), None)
         render = self._getFUT()
         from lxml import etree
         info = etree.Element("info")
@@ -83,20 +83,20 @@ class RenderTransformToResponseTests(unittest.TestCase, Base):
         self.assertEqual(result.app_iter, [resultstr])
         self.assertEqual(result.status, '200 OK')
         self.assertEqual(len(result.headerlist), 2)
-        from repoze.bfg.xslt import XSLTemplateFactory
-        self.failUnless(isinstance(queryUtility(INodeTemplate, minimal),
-                                   XSLTemplateFactory))
+        from repoze.bfg.xslt import XSLTemplateRenderer
+        self.failUnless(isinstance(queryUtility(INodeTemplateRenderer, minimal),
+                                   XSLTemplateRenderer))
 
     def test_nonabs_registered(self):
         self._zcmlConfigure()
         from zope.component import getGlobalSiteManager
         from zope.component import queryUtility
-        from repoze.bfg.xslt import XSLTemplateFactory
-        from repoze.bfg.interfaces import INodeTemplate
+        from repoze.bfg.xslt import XSLTemplateRenderer
+        from repoze.bfg.interfaces import INodeTemplateRenderer
         minimal = self._getTemplatePath('minimal.xsl')
-        utility = XSLTemplateFactory(minimal)
+        utility = XSLTemplateRenderer(minimal)
         gsm = getGlobalSiteManager()
-        gsm.registerUtility(utility, INodeTemplate, name=minimal)
+        gsm.registerUtility(utility, INodeTemplateRenderer, name=minimal)
         render = self._getFUT()
         from lxml import etree
         info = etree.Element("info")
@@ -107,7 +107,7 @@ class RenderTransformToResponseTests(unittest.TestCase, Base):
         self.assertEqual(result.app_iter, [resultstr])
         self.assertEqual(result.status, '200 OK')
         self.assertEqual(len(result.headerlist), 2)
-        self.assertEqual(queryUtility(INodeTemplate, minimal), utility)
+        self.assertEqual(queryUtility(INodeTemplateRenderer, minimal), utility)
 
 class RenderTransformTests(unittest.TestCase, Base):
     def setUp(self):
@@ -123,9 +123,9 @@ class RenderTransformTests(unittest.TestCase, Base):
     def test_nonabs_unregistered(self):
         self._zcmlConfigure()
         from zope.component import queryUtility
-        from repoze.bfg.interfaces import INodeTemplate
+        from repoze.bfg.interfaces import INodeTemplateRenderer
         minimal = self._getTemplatePath('minimal.xsl')
-        self.assertEqual(queryUtility(INodeTemplate, minimal), None)
+        self.assertEqual(queryUtility(INodeTemplateRenderer, minimal), None)
         render = self._getFUT()
         from lxml import etree
         info = etree.Element("info")
@@ -133,20 +133,20 @@ class RenderTransformTests(unittest.TestCase, Base):
         self.failUnless(isinstance(result, str))
         resultstr = """<?xml version="1.0"?>\n<div/>\n"""
         self.assertEqual(result, resultstr)
-        from repoze.bfg.xslt import XSLTemplateFactory
-        self.failUnless(isinstance(queryUtility(INodeTemplate, minimal),
-                                   XSLTemplateFactory))
+        from repoze.bfg.xslt import XSLTemplateRenderer
+        self.failUnless(isinstance(queryUtility(INodeTemplateRenderer, minimal),
+                                   XSLTemplateRenderer))
 
     def test_nonabs_registered(self):
         self._zcmlConfigure()
         from zope.component import getGlobalSiteManager
         from zope.component import queryUtility
-        from repoze.bfg.xslt import XSLTemplateFactory
-        from repoze.bfg.interfaces import INodeTemplate
+        from repoze.bfg.xslt import XSLTemplateRenderer
+        from repoze.bfg.interfaces import INodeTemplateRenderer
         minimal = self._getTemplatePath('minimal.xsl')
-        utility = XSLTemplateFactory(minimal)
+        utility = XSLTemplateRenderer(minimal)
         gsm = getGlobalSiteManager()
-        gsm.registerUtility(utility, INodeTemplate, name=minimal)
+        gsm.registerUtility(utility, INodeTemplateRenderer, name=minimal)
         render = self._getFUT()
         from lxml import etree
         info = etree.Element("info")
@@ -154,5 +154,5 @@ class RenderTransformTests(unittest.TestCase, Base):
         self.failUnless(isinstance(result, str))
         resultstr = """<?xml version="1.0"?>\n<div/>\n"""
         self.assertEqual(result, resultstr)
-        self.assertEqual(queryUtility(INodeTemplate, minimal), utility)
+        self.assertEqual(queryUtility(INodeTemplateRenderer, minimal), utility)