haml-edge 3.1.52 → 3.1.53

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.52
+3.1.53

data/VERSION

@@ -1 +1 @@
-3.1.52
+3.1.53

data/lib/haml/html.rb

@@ -100,6 +100,23 @@ end
 
 require 'hpricot'
 
+# @private
+HAML_TAGS = %w[haml:block haml:loud haml:silent]
+
+Hpricot::ElementContent.keys.each do |k|
+  HAML_TAGS.each do |el|
+    val = Hpricot::ElementContent[k]
+    val[el.hash] = true if val.is_a?(Hash)
+  end
+end
+
+HAML_TAGS.each do |t|
+  Hpricot::ElementContent[t] = {}
+  Hpricot::ElementContent.keys.each do |key|
+    Hpricot::ElementContent[t][key.hash] = true
+  end
+end
+
 module Haml
   # Converts HTML documents into Haml templates.
   # Depends on [Hpricot](http://github.com/whymirror/hpricot) for HTML parsing.

data/test/haml/html2haml/erb_tests.rb

@@ -405,6 +405,22 @@ HAML
 <% ensure %>
   <p>c</p>
 <% end %>
+ERB
+  end
+
+  # Regression
+
+  def test_tag_inside_block
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+%table
+  - foo.each do
+    %tr
+HAML
+<table>
+  <% foo.each do %>
+    <tr></tr>
+  <% end %>
+</table>
 ERB
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 3.1.52
+  version: 3.1.53
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-31 00:00:00 -04:00
+date: 2010-08-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -289,6 +289,7 @@ files:
 - test/sass/scss/test_helper.rb
 - test/sass/templates/_partial.sass
 - test/sass/templates/alt.sass
+- test/sass/templates/basic.sass
 - test/sass/templates/bork1.sass
 - test/sass/templates/bork2.sass
 - test/sass/templates/bork3.sass
@@ -321,7 +322,6 @@ files:
 - test/sass/templates/units.sass
 - test/sass/templates/warn.sass
 - test/sass/templates/warn_imported.sass
-- test/sass/templates/basic.sass
 - test/test_helper.rb
 - extra/haml-mode.el
 - extra/sass-mode.el