Use attribute value of True for boolean attributes, False and None sh…

…ould remove attribute

hamlpy/parser/attributes.py

@@ -13,6 +13,8 @@
 # non-word characters that we allow in attribute keys (in HTML style attribute dicts)
 ATTRIBUTE_KEY_EXTRA_CHARS = {':', '-', '$', '?', '[', ']'}
 
+ATTRIBUTE_VALUE_KEYWORDS = {'none': None, 'true': True, 'false': False}
+
 
 def read_attribute_value(stream, options):
     """
@@ -29,13 +31,15 @@ def read_attribute_value(stream, options):
 
     elif ch.isdigit():
         value = read_number(stream)
-    elif stream.text[stream.ptr:stream.ptr+4].lower() == 'none':
-        stream.ptr += 4
-        value = None
-    elif ch.isalnum():
-        value = '{{ %s }}' % read_word(stream)
     else:
-        raise ParseException("Unexpected \"%s\"." % ch, stream)
+        raw_value = read_word(stream)
+
+        if raw_value.lower() in ATTRIBUTE_VALUE_KEYWORDS:
+            value = ATTRIBUTE_VALUE_KEYWORDS[raw_value.lower()]
+        elif raw_value:
+            value = '{{ %s }}' % raw_value
+        else:
+            raise ParseException("Unexpected \"%s\"." % ch, stream)
 
     return value
 
@@ -146,7 +150,7 @@ def read_ruby_attribute(stream, options):
         else:
             value = read_attribute_value(stream, options)
     else:
-        value = None
+        value = True
 
     return key, value
 
@@ -180,7 +184,7 @@ def read_html_attribute(stream, options):
         else:
             value = read_attribute_value(stream, options)
     else:
-        value = None
+        value = True
 
     return key, value
 

hamlpy/parser/elements.py

@@ -145,10 +145,10 @@ def attr_wrap(val):
         rendered = []
 
         for name, value in self.attributes.items():
-            if name in ('id', 'class'):
+            if name in ('id', 'class') or value in (None, False):
                 continue
 
-            if value is None:
+            if value is True:
                 rendered.append("%s" % name)  # boolean attribute
             else:
                 value = self._escape_attribute_quotes(value, attr_wrapper)

hamlpy/test/test_attributes.py

@@ -39,11 +39,11 @@ def test_read_ruby_style_attribute_dict(self):
         # boolean attributes
         assert dict(self._parse(
             "{disabled, class:'test', data-number : 123,\n foo:\"bar\"}"
-        )) == {'disabled': None, 'class': 'test', 'data-number': '123', 'foo': 'bar'}
+        )) == {'disabled': True, 'class': 'test', 'data-number': '123', 'foo': 'bar'}
 
         assert dict(self._parse(
             "{class:'test', data-number : 123,\n foo:\"bar\",  \t   disabled}"
-        )) == {'disabled': None, 'class': 'test', 'data-number': '123', 'foo': 'bar'}
+        )) == {'disabled': True, 'class': 'test', 'data-number': '123', 'foo': 'bar'}
 
         # attribute name has colon
         assert dict(self._parse("{'xml:lang': 'en'}")) == {'xml:lang': 'en'}
@@ -132,11 +132,11 @@ def test_read_html_style_attribute_dict(self):
         # boolean attributes
         assert dict(self._parse(
             "(disabled class='test' data-number = 123\n foo=\"bar\")"
-        )) == {'disabled': None, 'class': 'test', 'data-number': '123', 'foo': 'bar'}
+        )) == {'disabled': True, 'class': 'test', 'data-number': '123', 'foo': 'bar'}
 
         assert dict(self._parse(
             "(class='test' data-number = 123\n foo=\"bar\"  \t   disabled)"
-        )) == {'disabled': None, 'class': 'test', 'data-number': '123', 'foo': 'bar'}
+        )) == {'disabled': True, 'class': 'test', 'data-number': '123', 'foo': 'bar'}
 
         # attribute name has colon
         assert dict(self._parse('(xml:lang="en")')) == {'xml:lang': 'en'}

hamlpy/test/test_compiler.py

@@ -56,6 +56,7 @@ def test_boolean_attributes(self):
         self._test("%input{a: 'b', required, b: 'c'}", "<input a='b' required b='c'>")
         self._test("%input{a: 'b', required}", "<input a='b' required>")
         self._test("%input{checked, required, visible}", "<input checked required visible>")
+        self._test("%input(checked=true)", "<input checked>")
 
     def test_attribute_values_as_tuples_and_lists(self):
         # id attribute as tuple

hamlpy/test/test_elements.py

@@ -35,7 +35,7 @@ def test_read_element(self):
         self.assertEqual(element.tag, 'input')
         self.assertEqual(element.id, None)
         self.assertEqual(element.classes, [])
-        self.assertEqual(dict(element.attributes), {'required': None})
+        self.assertEqual(dict(element.attributes), {'required': True})
         self.assertEqual(element.nuke_outer_whitespace, False)
         self.assertEqual(element.nuke_inner_whitespace, False)
         self.assertEqual(element.self_close, True)  # input is implicitly self-closing