Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added compact notation for dynamic attributes #109

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added compact notation for dynamic attributes #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
678d850
added compact notation for dynamic attributes
andreif Nov 14, 2012
2b1696b
Better error handling and reporting, pep8
andreif Nov 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions hamlpy/elements.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,31 @@ def _escape_attribute_quotes(self, v):

return ''.join(escaped)

def _prepare_dynamic_attributes(self, attribute_dict_string):
try:
import ast
from codegen import to_source
node = ast.parse(attribute_dict_string, mode='eval')
s = []
for k, v in zip(node.body.keys, node.body.values):
if isinstance(k, ast.Name):
#k = '"{{ %s }}"' % k.id # TODO: allow dynamic keys in settings
k = '"%s"' % k.id
else:
k = to_source(k)
if isinstance(v, ast.Str): # TODO: add allowed types
v = to_source(v)
else:
v = '"{{ %s }}"' % to_source(v)
s.append('%s: %s' % (k, v))
attribute_dict_string = '{%s}' % ', '.join(s)
except Exception as e:
import traceback
traceback.print_exc()
print repr(e)
attribute_dict_string = 'error: "%s"' % repr(e).replace('"', "'")
return attribute_dict_string

def _parse_attribute_dictionary(self, attribute_dict_string):
attributes_dict = {}
if (attribute_dict_string):
Expand All @@ -120,6 +145,8 @@ def _parse_attribute_dictionary(self, attribute_dict_string):
attribute_dict_string = re.sub(self.RUBY_HAML_REGEX, '"\g<key>":', attribute_dict_string)
# Put double quotes around key
attribute_dict_string = re.sub(self.ATTRIBUTE_REGEX, '\g<pre>"\g<key>":\g<val>', attribute_dict_string)
# replace short notation for inline expressions
attribute_dict_string = self._prepare_dynamic_attributes(attribute_dict_string)
# Parse string as dictionary
attributes_dict = eval(attribute_dict_string)
for k, v in attributes_dict.items():
Expand All @@ -138,11 +165,12 @@ def _parse_attribute_dictionary(self, attribute_dict_string):

attributes_dict[k] = v
v = v.decode('utf-8')
self.attributes += "%s=%s " % (k, self.attr_wrap(self._escape_attribute_quotes(v)))
if not v.startswith('{{'):
v = self._escape_attribute_quotes(v)
self.attributes += "%s=%s " % (k, self.attr_wrap(v))
self.attributes = self.attributes.strip()
except Exception, e:
raise Exception('failed to decode: %s' % attribute_dict_string)
#raise Exception('failed to decode: %s. Details: %s'%(attribute_dict_string, e))
raise Exception('failed to decode: %s. Error: %r' % (attribute_dict_string, e))

return attributes_dict

Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
url = 'http://github.com/jessemiller/HamlPy',
license = 'MIT',
install_requires = [
'codegen',
'django',
'pygments',
'markdown'
Expand Down