Merge branch 'issue_27' into development

pystache/template.py

@@ -72,7 +72,9 @@ class Template(object):
             'ctag': re.escape(self.ctag)
         }
 
-        section = r"%(otag)s[\#|^]([^\}]*)%(ctag)s\s*(.+?\s*)%(otag)s/\1%(ctag)s"
+        # The section contents include white space to comply with the spec's
+        # requirement that sections not alter surrounding whitespace.
+        section = r"%(otag)s[\#|^]([^\}]*)%(ctag)s(.+?)%(otag)s/\1%(ctag)s"
         self.section_re = re.compile(section % tags, re.M|re.S)
 
         tag = r"%(otag)s(#|=|&|!|>|\{)?(.+?)\1?%(ctag)s+"

tests/test_pystache.py

@@ -68,12 +68,18 @@ class TestPystache(unittest.TestCase):
         context = { 'users': [ {'name': 'Chris'}, {'name': 'Tom'}, {'name': 'PJ'} ] }
         ret = pystache.render(template, context)
         self.assertEquals(ret, """<ul><li>Chris</li><li>Tom</li><li>PJ</li></ul>""")
-    
+
     def test_implicit_iterator(self):
         template = """<ul>{{#users}}<li>{{.}}</li>{{/users}}</ul>"""
         context = { 'users': [ 'Chris', 'Tom','PJ' ] }
         ret = pystache.render(template, context)
         self.assertEquals(ret, """<ul><li>Chris</li><li>Tom</li><li>PJ</li></ul>""")
 
+    # The spec says that sections should not alter surrounding whitespace.
+    def test_surrounding_whitepace_not_altered(self):
+        template = "first{{#spacing}} second {{/spacing}}third"
+        ret = pystache.render(template, {"spacing": True})
+        self.assertEquals(ret, "first second third")
+
 if __name__ == '__main__':
     unittest.main()