Commit 5f1c034d by Chris Jerdonek

Added View.load_template() to eliminate some cut-and-paste.

 * Template._render_partial() now calls View.load_template().

 * View.get_template() now calls View.load_template().

 * Added test case test_view.py to test View.load_template().

 * Removed trailing white space from view.py.

 * Removed trailing white space from test_view.py.
parent d8067382
...@@ -159,8 +159,7 @@ class Template(object): ...@@ -159,8 +159,7 @@ class Template(object):
@modifiers.set('>') @modifiers.set('>')
def _render_partial(self, template_name): def _render_partial(self, template_name):
from pystache import Loader markup = self.view.load_template(template_name)
markup = Loader().load_template(template_name, self.view.template_path, encoding=self.view.template_encoding, extension=self.view.template_extension)
template = Template(markup, self.view) template = Template(markup, self.view)
return template.render() return template.render()
......
...@@ -20,33 +20,37 @@ def get_or_attr(context_list, name, default=None): ...@@ -20,33 +20,37 @@ def get_or_attr(context_list, name, default=None):
return default return default
class View(object): class View(object):
template_name = None template_name = None
template_path = None template_path = None
template = None template = None
template_encoding = None template_encoding = None
template_extension = 'mustache' template_extension = 'mustache'
def __init__(self, template=None, context=None, **kwargs): def __init__(self, template=None, context=None, **kwargs):
self.template = template self.template = template
context = context or {} context = context or {}
context.update(**kwargs) context.update(**kwargs)
self.context_list = [context] self.context_list = [context]
def get(self, attr, default=None): def get(self, attr, default=None):
attr = get_or_attr(self.context_list, attr, getattr(self, attr, default)) attr = get_or_attr(self.context_list, attr, getattr(self, attr, default))
if hasattr(attr, '__call__') and type(attr) is UnboundMethodType: if hasattr(attr, '__call__') and type(attr) is UnboundMethodType:
return attr() return attr()
else: else:
return attr return attr
def load_template(self, template_name):
from pystache import Loader
return Loader().load_template(template_name, self.template_path,
encoding=self.template_encoding, extension=self.template_extension)
def get_template(self, template_name): def get_template(self, template_name):
if not self.template: if not self.template:
from pystache import Loader
template_name = self._get_template_name(template_name) template_name = self._get_template_name(template_name)
self.template = Loader().load_template(template_name, self.template_path, encoding=self.template_encoding, extension=self.template_extension) self.template = self.load_template(template_name)
return self.template return self.template
def _get_template_name(self, template_name=None): def _get_template_name(self, template_name=None):
......
...@@ -22,6 +22,14 @@ class TestView(unittest.TestCase): ...@@ -22,6 +22,14 @@ class TestView(unittest.TestCase):
view = Simple(thing='world') view = Simple(thing='world')
self.assertEquals(view.render(), "Hi world!") self.assertEquals(view.render(), "Hi world!")
def test_load_template(self):
"""
Test View.load_template().
"""
template = Simple().load_template("escaped")
self.assertEquals(template, "<h1>{{title}}</h1>")
def test_template_load_from_multiple_path(self): def test_template_load_from_multiple_path(self):
path = Simple.template_path path = Simple.template_path
Simple.template_path = ('examples/nowhere','examples',) Simple.template_path = ('examples/nowhere','examples',)
...@@ -57,7 +65,7 @@ class TestView(unittest.TestCase): ...@@ -57,7 +65,7 @@ class TestView(unittest.TestCase):
self.assertEquals(view.render(), "Hi chris!") self.assertEquals(view.render(), "Hi chris!")
def test_complex(self): def test_complex(self):
self.assertEquals(ComplexView().render(), self.assertEquals(ComplexView().render(),
"""<h1>Colors</h1><ul><li><strong>red</strong></li><li><a href="#Green">green</a></li><li><a href="#Blue">blue</a></li></ul>""") """<h1>Colors</h1><ul><li><strong>red</strong></li><li><a href="#Green">green</a></li><li><a href="#Blue">blue</a></li></ul>""")
def test_higher_order_replace(self): def test_higher_order_replace(self):
...@@ -74,12 +82,12 @@ class TestView(unittest.TestCase): ...@@ -74,12 +82,12 @@ class TestView(unittest.TestCase):
view = Lambdas() view = Lambdas()
view.template = '{{#sort}}zyxwvutsrqponmlkjihgfedcba{{/sort}}' view.template = '{{#sort}}zyxwvutsrqponmlkjihgfedcba{{/sort}}'
self.assertEquals(view.render(), 'abcdefghijklmnopqrstuvwxyz') self.assertEquals(view.render(), 'abcdefghijklmnopqrstuvwxyz')
def test_partials_with_lambda(self): def test_partials_with_lambda(self):
view = Lambdas() view = Lambdas()
view.template = '{{>partial_with_lambda}}' view.template = '{{>partial_with_lambda}}'
self.assertEquals(view.render(), 'nopqrstuvwxyz') self.assertEquals(view.render(), 'nopqrstuvwxyz')
def test_hierarchical_partials_with_lambdas(self): def test_hierarchical_partials_with_lambdas(self):
view = Lambdas() view = Lambdas()
view.template = '{{>partial_with_partial_and_lambda}}' view.template = '{{>partial_with_partial_and_lambda}}'
...@@ -95,7 +103,7 @@ class TestView(unittest.TestCase): ...@@ -95,7 +103,7 @@ class TestView(unittest.TestCase):
parent.children = [Thing()] parent.children = [Thing()]
view = Simple(context={'parent': parent}) view = Simple(context={'parent': parent})
view.template = "{{#parent}}{{#children}}{{this}}{{/children}}{{/parent}}" view.template = "{{#parent}}{{#children}}{{this}}{{/children}}{{/parent}}"
self.assertEquals(view.render(), 'derp') self.assertEquals(view.render(), 'derp')
def test_context_returns_a_flattened_dict(self): def test_context_returns_a_flattened_dict(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment