From 353da3daf5a918c9862fe58b6b403d20d99ed2ff Mon Sep 17 00:00:00 2001
From: Ben Leslie <benno@benno.id.au>
Date: Tue, 18 Sep 2012 21:53:53 +1000
Subject: Enable defaults.DELIMITERS to be monkey-patched by module users.

This updates the way in which default.DELIMITERS is used to
enable simple monkey-patching should a user desire.

Monkey-patching isn't the preferred approach however, it can
at times be useful and it simple to support.

Additionally, test cases are added to ensure certain defaults can
be monkey-patched at run-time.
---
 pystache/parser.py              |  4 +--
 pystache/tests/test_defaults.py | 68 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 pystache/tests/test_defaults.py

diff --git a/pystache/parser.py b/pystache/parser.py
index 4c37ec3..8b82776 100644
--- a/pystache/parser.py
+++ b/pystache/parser.py
@@ -7,7 +7,7 @@ Exposes a parse() function to parse template strings.
 
 import re
 
-from pystache.defaults import DELIMITERS
+from pystache import defaults
 from pystache.parsed import ParsedTemplate
 
 
@@ -228,7 +228,7 @@ class _Parser(object):
 
     def __init__(self, delimiters=None):
         if delimiters is None:
-            delimiters = DELIMITERS
+            delimiters = defaults.DELIMITERS
 
         self._delimiters = delimiters
 
diff --git a/pystache/tests/test_defaults.py b/pystache/tests/test_defaults.py
new file mode 100644
index 0000000..cbb68e7
--- /dev/null
+++ b/pystache/tests/test_defaults.py
@@ -0,0 +1,68 @@
+import unittest
+
+import pystache
+import pystache.defaults
+
+from pystache.tests.common import AssertStringMixin
+
+
+class TestDefaults(unittest.TestCase, AssertStringMixin):
+    """Set of tests to ensure that the user can override defaults."""
+
+    def setUp(self):
+        """save all the defaults."""
+        defaults = [
+            'DECODE_ERRORS', 'DELIMITERS',
+            'FILE_ENCODING', 'MISSING_TAGS', 
+            'SEARCH_DIRS', 'STRING_ENCODING',
+            'TAG_ESCAPE', 'TEMPLATE_EXTENSION'
+        ]
+        self.saved = {}
+        for e in defaults:
+            self.saved[e] = getattr(pystache.defaults, e)
+
+    def tearDown(self):
+        for key, value in self.saved.items():
+            setattr(pystache.defaults, key, value)
+
+    def test_tag_escape(self):
+        """Test that TAG_ESCAPE default takes effect."""
+        template = u"{{foo}}"
+        config = {'foo': '<'}
+        actual = pystache.render(template, config)
+        self.assertString(actual, u"&lt;")
+
+        pystache.defaults.TAG_ESCAPE = lambda u: u
+        actual = pystache.render(template, config)
+        self.assertString(actual, u"<")
+
+    def test_delimiters(self):
+        """Test that DELIMITERS default takes effect."""
+        template = u"[[foo]]{{foo}}"
+        config = {'foo': 'FOO'}
+        actual = pystache.render(template, config)
+        self.assertString(actual, u"[[foo]]FOO")
+
+        pystache.defaults.DELIMITERS = ('[[', ']]')
+        actual = pystache.render(template, config)
+        self.assertString(actual, u"FOO{{foo}}")
+
+    def test_missing_tags(self):
+        """Test that MISSING_TAGS default take effect."""
+        template = u"{{foo}}"
+        config = {}
+        actual = pystache.render(template, config)
+        self.assertString(actual, u"")
+
+        pystache.defaults.MISSING_TAGS = 'strict'
+
+        # In theory this should work, but for some reason doesn't,
+        # instead another exception is raised
+        # self.assertRaises(pystache.context.KeyNotFoundError,
+        #                  pystache.render, (template, config))
+        try:
+            pystache.render(template, config)
+        except pystache.context.KeyNotFoundError, e:
+            return
+
+        self.fail()
-- 
cgit v1.2.1