haml-edge 2.3.66 → 2.3.67

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.66
+2.3.67

data/VERSION

@@ -1 +1 @@
-2.3.66
+2.3.67

data/lib/haml/precompiler.rb

@@ -476,7 +476,13 @@ END
             attributes['class'] = ""
           end
           attributes['class'] += property
-        when '#'; attributes['id'] = property
+        when '#'
+          if attributes['id']
+            attributes['id'] += "_"
+          else
+            attributes['id'] = ""
+          end
+          attributes['id'] += property
         end
       end
       attributes

data/test/haml/engine_test.rb

@@ -282,6 +282,18 @@ RESULT
 SOURCE
   end
 
+  def test_multiple_ids
+    assert_equal("<p id='bc_ab'></p>\n", render("%p#bc#ab"))
+    assert_equal("<p id='ab_bc'></p>\n", render("%p#ab#bc"))
+    assert_equal("<p id='ab'></p>\n", render("%p(id='bc' id='ab')"))
+    assert_equal("<p id='bc'></p>\n", render("%p(id='ab' id='bc')"))
+    assert_equal("<p id='bc_ab'></p>\n", render("%p#bc(id='ab')"))
+    assert_equal("<p id='ab_bc'></p>\n", render("%p#ab(id='bc')"))
+    assert_equal("<p id='bc_ab'></p>\n", render("%p#bc{:id => 'ab'}"))
+    assert_equal("<p id='ab_bc'></p>\n", render("%p#ab{:id => 'bc'}"))
+    assert_equal("<p id='ab_bc_cd'></p>\n", render("%p#ab{:id => 'bc'}(id='cd')"))
+  end
+
   # Regression tests
 
   def test_whitespace_nuke_with_both_newlines

data/test/haml/results/tag_parsing.xhtml

@@ -12,7 +12,7 @@
   <foo2u>11</foo2u>
 </div>
 <div class='classes'>
-  <p class='foo bar' id='boom'></p>
+  <p class='foo bar' id='baz_boom'></p>
   <div class='fooBar'>a</div>
   <div class='foo-bar'>b</div>
   <div class='foo_bar'>c</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.66
+  version: 2.3.67
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -44,9 +44,9 @@ extensions: []
 
 extra_rdoc_files: 
 - README.md
+- REVISION
 - VERSION
 - VERSION_NAME
-- REVISION
 - CONTRIBUTING
 - MIT-LICENSE
 - EDGE_GEM_VERSION
@@ -262,9 +262,9 @@ files:
 - init.rb
 - .yardopts
 - README.md
+- REVISION
 - VERSION
 - VERSION_NAME
-- REVISION
 - CONTRIBUTING
 - MIT-LICENSE
 - EDGE_GEM_VERSION