Mark multiple key separator characters within parenthesis. (Fixes #33)

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Master
+
+  * [Issue #33](https://github.com/netzpirat/haml-coffee/issues/33): Fix tag attributes that contains multiple attribute keys.
+
 # Version 1.2.0, Juli 18, 2012
 
   * [haml_coffee_assets issue #56](https://github.com/netzpirat/haml_coffee_assets/issues/56): Weird behavior when using space before the : of an attribute.

spec/suites/templates/text/attributes.haml

@@ -52,4 +52,6 @@
 
 %span.value{ 'foo' : 'foo', 'bar' : 'bar', baz: 'baz' } Foo
 %span.value{ 'foo': 'foo', 'bar' : 'bar', baz: 'baz' } Foo
-%span.value{ data: { 'foo' : 'foo', 'bar': 'bar' } } Foo
+%span.value{ data: { 'foo' : 'foo', 'bar': 'bar' } } Foo
+
+%tbody.build-row{data-bind: "foreach: { data: xs}"}

spec/suites/templates/text/attributes_html5.html

@@ -32,4 +32,5 @@
 <input class='g-field' id='input-transfer-template-repeat-number' type='text' name='transfer_template[repeat_number]' placeholder='например, 14:50'>
 <span class='value' foo='foo' bar='bar' baz='baz'>Foo</span>
 <span class='value' foo='foo' bar='bar' baz='baz'>Foo</span>
-<span class='value' data-foo='foo' data-bar='bar'>Foo</span>
+<span class='value' data-foo='foo' data-bar='bar'>Foo</span>
+<tbody class='build-row' data-bind='foreach: { data: xs}'></tbody>

spec/suites/templates/text/attributes_xhtml.html

@@ -32,4 +32,5 @@
 <input class='g-field' id='input-transfer-template-repeat-number' type='text' name='transfer_template[repeat_number]' placeholder='например, 14:50' />
 <span class='value' foo='foo' bar='bar' baz='baz'>Foo</span>
 <span class='value' foo='foo' bar='bar' baz='baz'>Foo</span>
-<span class='value' data-foo='foo' data-bar='bar'>Foo</span>
+<span class='value' data-foo='foo' data-bar='bar'>Foo</span>
+<tbody class='build-row' data-bind='foreach: { data: xs}'></tbody>

src/nodes/haml.coffee

@@ -266,7 +266,7 @@ module.exports = class Haml extends Node
 
     # Mark key separator characters within quoted values, so they aren't recognized as keys.
     exp = exp.replace /(=|:|=>)\s*('([^\\']|\\\\|\\')*'|"([^\\"]|\\\\|\\")*")/g, (match, type, value) ->
-      type + value?.replace /(:|=|=>)/, '\u0090$1'
+      type + value?.replace /(:|=|=>)/g, '\u0090$1'
 
     # Mark key separator characters within parenthesis, so they aren't recognized as keys.
     level = 0
@@ -296,7 +296,7 @@ module.exports = class Haml extends Node
           level -= 1
 
     for marker in markers.reverse()
-      exp = exp.substring(0, marker.start) + exp.substring(marker.start, marker.end).replace(/(:|=|=>)/, '\u0090$1') + exp.substring(marker.end)
+      exp = exp.substring(0, marker.start) + exp.substring(marker.start, marker.end).replace(/(:|=|=>)/g, '\u0090$1') + exp.substring(marker.end)
 
     # Detect the used key type
     switch type
@@ -347,7 +347,7 @@ module.exports = class Haml extends Node
       key = quoted[2] if quoted = key.match /^("|')(.*)\1$/
 
       # Trim value, remove succeeding comma and remove markers
-      value = keyValue[1]?.replace(/^\s+|[\s,]+$/g, '').replace(/\u0090/, '')
+      value = keyValue[1]?.replace(/^\s+|[\s,]+$/g, '').replace(/\u0090/g, '')
 
       if key is 'data'
         inDataAttribute = true