kennethreitz-archive/pystache
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/pystache.git synced 2026-06-05 23:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring the match handling logic.

Browse Source
This commit is contained in:
Pieter van de Bruggen
2011-02-15 21:47:19 -08:00
parent 50bdc5357c
commit 41c92afceb
1 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pystache/template.py
+39 -34
View File
@@ -43,46 +43,51 @@ class Template(object):
if match is None:
break
# Normalize the captures dictionary.
captures = match.groupdict()
if captures['change'] is not None:
captures.update(tag='=', name=captures['delims'])
elif captures['raw'] is not None:
captures.update(tag='{', name=captures['raw_name'])
# Save the literal text content.
buffer.append(captures['content'])
pos = match.end()
# Standalone (non-interpolation) tags consume the entire line,
# both leading whitespace and trailing newline.
tagBeganLine = (not buffer[-1] or buffer[-1][-1] == '\n')
tagEndedLine = (pos == len(template) or template[pos] == '\n')
interpolationTag = captures['tag'] in ['', '&', '{']
if (tagBeganLine and tagEndedLine and not interpolationTag):
pos += 1
elif captures['whitespace']:
buffer.append(captures['whitespace'])
captures['whitespace'] = ''
# TODO: Process the remaining tag types.
if captures['tag'] == '!':
pass
elif captures['tag'] in ['{', '&']:
def unescapedTag(view):
return view.get(captures['name'])
buffer.append(unescapedTag)
elif captures['tag'] == '':
def escapedTag(view):
return cgi.escape(view.get(captures['name']))
buffer.append(escapedTag)
pos = self._handle_match(template, match, buffer)
# Save the rest of the template.
buffer.append(template[pos:])
return buffer
def _handle_match(self, template, match, buffer):
# Normalize the captures dictionary.
captures = match.groupdict()
if captures['change'] is not None:
captures.update(tag='=', name=captures['delims'])
elif captures['raw'] is not None:
captures.update(tag='{', name=captures['raw_name'])
# Save the literal text content.
buffer.append(captures['content'])
pos = match.end()
# Standalone (non-interpolation) tags consume the entire line,
# both leading whitespace and trailing newline.
tagBeganLine = (not buffer[-1] or buffer[-1][-1] == '\n')
tagEndedLine = (pos == len(template) or template[pos] == '\n')
interpolationTag = captures['tag'] in ['', '&', '{']
if (tagBeganLine and tagEndedLine and not interpolationTag):
pos += 1
elif captures['whitespace']:
buffer.append(captures['whitespace'])
captures['whitespace'] = ''
# TODO: Process the remaining tag types.
print captures['name']
fetch = lambda view: unicode(view.get(captures['name']))
if captures['tag'] == '!':
pass
elif captures['tag'] in ['{', '&']:
buffer.append(fetch)
elif captures['tag'] == '':
buffer.append(lambda view: cgi.escape(fetch(view), True))
else:
print 'Error!'
return pos
def render(self, encoding=None):
parsed = self._parse(self.template)