Allow tabs in partial indentation (Fixes #49?)

This appears to be the underlying issue in #49.

Now tabs or spaces can be used to indent partials.

There is some slight possible API breakage changing padding from int.

If desired, a check could be added to check for an int padding.

diff --git a/chevron/renderer.py b/chevron/renderer.py
index 788e2bb799ebe35de2224aa1b8a0160ccb76e05b..afcaaec32abf8a536d0a45cfd521367f1baddd57 100644 (file)
--- a/chevron/renderer.py
+++ b/chevron/renderer.py
@@ -117,7 +117,7 @@ g_token_cache = {}
 
 
 def render(template='', data={}, partials_path='.', partials_ext='mustache',
-           partials_dict={}, padding=0, def_ldel='{{', def_rdel='}}',
+           partials_dict={}, padding='', def_ldel='{{', def_rdel='}}',
            scopes=None):
     """Render a mustache template.
 
@@ -208,7 +208,7 @@ def render(template='', data={}, partials_path='.', partials_ext='mustache',
             # Add padding to the key and add it to the output
             if not isinstance(key, unicode_type):
                 key = unicode(key, 'utf-8')
-            output += key.replace('\n', '\n' + (' ' * padding))
+            output += key.replace('\n', '\n' + padding)
 
         # If we're a variable tag
         elif tag == 'variable':
@@ -332,11 +332,11 @@ def render(template='', data={}, partials_path='.', partials_ext='mustache',
             partial = _get_partial(key, partials_dict,
                                    partials_path, partials_ext)
 
-            # Find how much to pad the partial
+            # Find what to pad the partial with
             left = output.split('\n')[-1]
             part_padding = padding
             if left.isspace():
-                part_padding += left.count(' ')
+                part_padding += left
 
             # Render the partial
             part_out = render(template=partial, partials_path=partials_path,
@@ -348,7 +348,7 @@ def render(template='', data={}, partials_path='.', partials_ext='mustache',
             # If the partial was indented
             if left.isspace():
                 # then remove the spaces from the end
-                part_out = part_out.rstrip(' ')
+                part_out = part_out.rstrip(' \t')
 
             # Add the partials output to the ouput
             if python3:

diff --git a/test_spec.py b/test_spec.py
index 627e9112460be3b2c91eadfe90559855208d9811..c25fb2013af6c30f700941fa8fcf812d1362f688 100755 (executable)
--- a/test_spec.py
+++ b/test_spec.py
@@ -332,6 +332,20 @@ class ExpandedCoverage(unittest.TestCase):
 
         self.assertEqual(result, expected)
 
+    # https://github.com/noahmorrison/chevron/issues/49
+    def test_partial_indentation(self):
+        args = {
+            'template': '\t{{> count }}',
+            'partials_dict': {
+                'count': '\tone\n\ttwo'
+            }
+        }
+
+        result = chevron.render(**args)
+        expected = '\t\tone\n\t\ttwo'
+
+        self.assertEqual(result, expected)
+
 
 # Run unit tests from command line
 if __name__ == "__main__":