Allow escape_attrs on a per-tag basis

iHiD · Jan 22, 2012 · 19c7668 · 19c7668
1 parent 630b8fe
commit 19c7668
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/lib/haml/compiler.rb b/lib/haml/compiler.rb
@@ -349,6 +349,9 @@ def self.build_attributes(is_html, attr_wrapper, escape_attrs, attributes = {})
       quote_escape = attr_wrapper == '"' ? "&quot;" : "&apos;"
       other_quote_char = attr_wrapper == '"' ? "'" : '"'
 
+      # Allow escape_attrs on a per-tag basis
+      escape_attrs = attributes['escape_attrs'] if attributes.has_key?('escape_attrs')
+
       if attributes['data'].is_a?(Hash)
         attributes = attributes.dup
         attributes =

diff --git a/test/haml/engine_test.rb b/test/haml/engine_test.rb
@@ -636,6 +636,17 @@ def test_escape_attrs_false
   bar
 HAML
   end
+
+  def test_escape_attrs_can_be_overridden_in_tag
+    assert_equal(<<HTML, render(<<HAML, :escape_attrs => true))
+<div class='<?php echo "&quot;" ?>' id='foo'>
+  bar
+</div>
+HTML
+#foo{:class => '<?php echo "&quot;" ?>', :escape_attrs => false}
+  bar
+HAML
+  end
 
   def test_escape_attrs_always
     assert_equal(<<HTML, render(<<HAML, :escape_attrs => :always))