breve/tests/templates/test_render_parameters/index.b @@ -3,5 +3,5 @@ from breve.globals import register_global from breve.flatten import register_flattener from breve.util import Namespace, escape -__version__ = '1.2.3' +__version__ = '1.2.4' breve/__init__.py @@ -116,9 +116,7 @@ class Template ( object ): T.render_path.append ( template ) T.vars [ '__templates__' ] = T.render_path - - namespace = kw.get ( 'namespace', T.namespace ) - T.vars [ '__namespace' ] = namespace + T.vars [ '__namespace' ] = T.namespace if loader: T.loaders.append ( loader ) @@ -131,11 +129,11 @@ class Template ( object ): T.vars._dict.update ( _globals ) _g = { } _g.update ( T.tags ) - if namespace: - if not T.vars.has_key ( namespace ): - T.vars [ namespace ] = Namespace ( ) + if T.namespace: + if not T.vars.has_key ( T.namespace ): + T.vars [ T.namespace ] = Namespace ( ) if vars: - T.vars [ namespace ]._dict.update ( vars ) + T.vars [ T.namespace ]._dict.update ( vars ) else: if vars: T.vars._dict.update ( vars ) breve/template.py @@ -1,6 +1,6 @@ import unittest -def suite ( ): +def testsuite ( ): from breve.tests import tags, templates, tools suite = unittest.TestSuite ( ) @@ -12,3 +12,4 @@ def suite ( ): if __name__ == '__main__': unittest.main ( defaultTest = 'suite' ) + breve/tests/__init__.py @@ -8,6 +8,37 @@ from breve import Template, register_flattener, register_global, escape from breve.tests.lib import diff, template_root, my_name, expected_output class TemplateTestCase ( unittest.TestCase ): + def test_instantiation_parameters ( self ): + '''test instantiation parameters''' + # change the defaults to something else + args = { + 'tidy': True, + 'debug': True, + 'namespace': 'v', + 'mashup_entities': True, + 'extension': '.breve' + } + t = Template ( html, root = template_root ( ), **args ) + for k, v in args.items ( ): + self.failUnless ( getattr ( t, k ) == v ) + + def test_render_parameters ( self ): + '''test render-time parameters''' + + vars = dict ( + message = 'hello, from breve', + title = my_name ( ) + ) + args = { + 'tidy': True, + 'debug': True, + 'namespace': 'v', + 'extension': '.breve' + } + t = Template ( html, root = template_root ( ) ) + t.render ( 'index', vars, **args ) + for k, v in args.items ( ): + self.failUnless ( getattr ( t, k ) == v ) def test_simple_template ( self ): '''simple template''' breve/tests/templates.py @@ -50,6 +50,6 @@ setup ( [python.templating.engines] breve = breve.plugin.buffet:BreveTemplatePlugin ''', - test_suite = 'breve.tests.suite' + test_suite = 'breve.tests.testsuite' ) setup.py 3c286b336d874dea9c6afc0646521ca40496f671 Cliff Wells cliff@develix.com http://github.com/cwells/breve/commit/fcba831f8d7aa153cae65bfa5b6a535cabfdfa54 fcba831f8d7aa153cae65bfa5b6a535cabfdfa54 2008-04-20T00:06:19-07:00 2008-04-20T00:06:19-07:00 version bump to 1.2.4. tests for Template args 73397b82ad7f4645eb6d8822b06831241f53ad86 Cliff Wells cliff@develix.com