haml-edge 2.3.60 → 2.3.61

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.60
+2.3.61

data/VERSION

@@ -1 +1 @@
-2.3.60
+2.3.61

data/lib/haml/exec.rb

@@ -362,17 +362,7 @@ END
       # @param args [Array<String>] The command-line arguments
       def initialize(args)
         super
-
         @module_opts = {}
-
-        begin
-          require 'haml/html'
-        rescue LoadError => err
-          dep = err.message.scan(/^no such file to load -- (.*)/)[0]
-          raise err if @options[:trace] || dep.nil? || dep.empty?
-          $stderr.puts "Required dependency #{dep} not found!\n  Use --trace for backtrace."
-          exit 1
-        end
       end
 
       # Tells optparse how to parse the arguments.
@@ -415,6 +405,8 @@ END
       def process_result
         super
 
+        require 'haml/html'
+
         input = @options[:input]
         output = @options[:output]
 
@@ -425,6 +417,11 @@ END
       rescue ::Haml::Error => e
         raise "#{e.is_a?(::Haml::SyntaxError) ? "Syntax error" : "Error"} on line " +
           "#{get_line e}: #{e.message}"
+      rescue LoadError => err
+        dep = err.message.scan(/^no such file to load -- (.*)/)[0]
+        raise err if @options[:trace] || dep.nil? || dep.empty?
+        $stderr.puts "Required dependency #{dep} not found!\n  Use --trace for backtrace."
+        exit 1
       end
     end
 
@@ -433,10 +430,7 @@ END
       # @param args [Array<String>] The command-line arguments
       def initialize(args)
         super
-
         @module_opts = {}
-
-        require 'sass/css'
       end
 
       # Tells optparse how to parse the arguments.
@@ -465,6 +459,8 @@ END
       def process_result
         super
 
+        require 'sass/css'
+
         input = @options[:input]
         output = @options[:output]
 

data/lib/haml/html/erb.rb

@@ -30,7 +30,7 @@ module Haml
 
       # `html2haml` doesn't support HTML-escaped expressions.
       def escaped_expr(code)
-        raise "html2haml doesn't support escaped expressions."
+        raise Haml::Error.new("html2haml doesn't support escaped expressions.")
       end
 
       # The ERB-to-Hamlized-HTML conversion has no preamble.
@@ -79,7 +79,7 @@ module Haml
 
       # `html2haml` doesn't support debugging expressions.
       def add_expr_debug(src, code)
-        raise "html2haml doesn't support debugging expressions."
+        raise Haml::Error.new("html2haml doesn't support debugging expressions.")
       end
 
       private

data/lib/haml/html.rb

@@ -233,7 +233,29 @@ module Haml
         if options[:erb] && name[0...5] == 'haml:'
           case name[5..-1]
           when "loud"
-            return output + "= #{CGI.unescapeHTML(inner_text).gsub(/\n\s*/, ' ').strip}\n"
+            lines = CGI.unescapeHTML(inner_text).split("\n").
+              map {|s| s.rstrip}.reject {|s| s.strip.empty?}
+            lines.first.gsub!(/^[ \t]*/, "= ")
+
+            if lines.size > 1 # Multiline script block
+              # Normalize the indentation so that the last line is the base
+              indent_str = lines.last[/^[ \t]*/]
+              indent_re = /^[ \t]{0,#{indent_str.count(" ") + 8 * indent_str.count("\t")}}/
+              lines.map! {|s| s.gsub!(indent_re, '')}
+
+              # Add an extra "  " to make it indented relative to "= "
+              lines[1..-1].each {|s| s.gsub!(/^/, "  ")}
+
+              # Add | at the end, properly aligned
+              length = lines.map {|s| s.size}.max + 1
+              lines.map! {|s| "%#{-length}s|" % s}
+
+              if next_sibling && next_sibling.is_a?(Hpricot::Elem) && next_sibling.name == "haml:loud" &&
+                  next_sibling.inner_text.split("\n").reject {|s| s.strip.empty?}.size > 1
+                lines << "-#"
+              end
+            end
+            return lines.map {|s| output + s + "\n"}.join
           when "silent"
             return CGI.unescapeHTML(inner_text).split("\n").map do |line|
               next "" if line.strip.empty?
@@ -272,7 +294,7 @@ module Haml
           if child.is_a?(::Hpricot::Text)
             if !child.to_s.include?("\n")
               text = child.to_haml(tabs + 1, options)
-              return output + " " + text.lstrip unless text.chomp.include?("\n")
+              return output + " " + text.lstrip.gsub(/^\\/, '') unless text.chomp.include?("\n")
               return output + "\n" + text
             elsif ["pre", "textarea"].include?(name) ||
                 (name == "code" && parent.is_a?(::Hpricot::Elem) && parent.name == "pre")

data/test/haml/html2haml/erb_tests.rb

@@ -0,0 +1,395 @@
+module ErbTests
+  def test_erb
+    assert_equal '- foo = bar', render_erb('<% foo = bar %>')
+    assert_equal '- foo = bar', render_erb('<% foo = bar -%>')
+    assert_equal '= h @item.title', render_erb('<%=h @item.title %>')
+    assert_equal '= h @item.title', render_erb('<%=h @item.title -%>')
+  end
+
+  def test_inline_erb
+    assert_equal("%p= foo", render_erb("<p><%= foo %></p>"))
+  end
+
+  def test_non_inline_erb
+    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
+%p
+  = foo
+HAML
+<p>
+  <%= foo %>
+</p>
+HTML
+    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
+%p
+  = foo
+HAML
+<p>
+  <%= foo %></p>
+HTML
+    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
+%p
+  = foo
+HAML
+<p><%= foo %>
+</p>
+HTML
+  end
+
+  def test_erb_in_cdata
+    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
+:cdata
+  Foo \#{bar} baz
+HAML
+<![CDATA[Foo <%= bar %> baz]]>
+HTML
+  end
+
+  def test_erb_in_script
+    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
+:javascript
+  function foo() {
+    return \#{foo.to_json};
+  }
+HAML
+<script type="text/javascript">
+  function foo() {
+    return <%= foo.to_json %>;
+  }
+</script>
+HTML
+  end
+
+  def test_erb_in_line
+    assert_equal 'foo bar #{baz}', render_erb('foo bar <%= baz %>')
+    assert_equal 'foo bar #{baz}! Bang.', render_erb('foo bar <%= baz %>! Bang.')
+  end
+
+  def test_erb_multi_in_line
+    assert_equal('foo bar #{baz}! Bang #{bop}.',
+      render_erb('foo bar <%= baz %>! Bang <%= bop %>.'))
+    assert_equal('foo bar #{baz}#{bop}!',
+      render_erb('foo bar <%= baz %><%= bop %>!'))
+  end
+
+  def test_erb_with_html_special_chars
+    assert_equal '= 3 < 5 ? "OK" : "Your computer is b0rken"',
+      render_erb('<%= 3 < 5 ? "OK" : "Your computer is b0rken" %>')
+  end
+
+  def test_erb_in_class_attribute
+    assert_equal "%div{:class => dyna_class} I have a dynamic attribute",
+      render_erb('<div class="<%= dyna_class %>">I have a dynamic attribute</div>')
+  end
+
+  def test_erb_in_id_attribute
+    assert_equal "%div{:id => dyna_id} I have a dynamic attribute",
+      render_erb('<div id="<%= dyna_id %>">I have a dynamic attribute</div>')
+  end
+
+  def test_erb_in_attribute_results_in_string_interpolation
+    assert_equal('%div{:id => "item_#{i}"} Ruby string interpolation FTW',
+      render_erb('<div id="item_<%= i %>">Ruby string interpolation FTW</div>'))
+  end
+
+  def test_erb_in_attribute_with_trailing_content
+    assert_equal('%div{:class => "#{12}!"} Bang!',
+      render_erb('<div class="<%= 12 %>!">Bang!</div>'))
+  end
+
+  def test_erb_in_html_escaped_attribute
+    assert_equal '%div{:class => "foo"} Bang!',
+      render_erb('<div class="<%= "foo" %>">Bang!</div>')
+  end
+
+  def test_erb_in_attribute_to_multiple_interpolations
+    assert_equal('%div{:class => "#{12} + #{13}"} Math is super',
+      render_erb('<div class="<%= 12 %> + <%= 13 %>">Math is super</div>'))
+  end
+
+  def test_whitespace_eating_erb_tags
+    assert_equal '- form_for', render_erb('<%- form_for -%>')
+  end
+
+  def test_interpolation_in_erb
+    assert_equal('= "Foo #{bar} baz"', render_erb('<%= "Foo #{bar} baz" %>'))
+  end
+
+  def test_interpolation_in_erb_attrs
+    assert_equal('%p{:foo => "#{bar} baz"}',
+      render_erb('<p foo="<%= "#{bar} baz" %>"></p>'))
+  end
+
+  def test_multiline_erb_silent_script
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+.blah
+  - foo
+  - bar
+  - baz
+  %p foo
+HAML
+<div class="blah">
+  <%
+    foo
+    bar
+    baz
+  %>
+  <p>foo</p>
+</div>
+ERB
+  end
+
+  def test_multiline_erb_loud_script
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+.blah
+  = foo +            |
+      bar.baz.bang + |
+    baz              |
+  %p foo
+HAML
+<div class="blah">
+  <%=
+    foo +
+      bar.baz.bang +
+    baz
+  %>
+  <p>foo</p>
+</div>
+ERB
+  end
+
+  def test_weirdly_indented_multiline_erb_loud_script
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+.blah
+  = foo +          |
+    bar.baz.bang + |
+    baz            |
+  %p foo
+HAML
+<div class="blah">
+  <%=
+    foo +
+  bar.baz.bang +
+    baz
+  %>
+  <p>foo</p>
+</div>
+ERB
+  end
+
+  def test_two_multiline_erb_loud_scripts
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+.blah
+  = foo +          |
+    bar.baz.bang + |
+    baz            |
+  -#
+  = foo.bar do |
+      bang     |
+    end        |
+  %p foo
+HAML
+<div class="blah">
+  <%=
+    foo +
+    bar.baz.bang +
+    baz
+  %>
+  <%= foo.bar do
+        bang
+      end %>
+  <p>foo</p>
+</div>
+ERB
+  end
+
+  def test_multiline_then_single_line_erb_loud_scripts
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+.blah
+  = foo +          |
+    bar.baz.bang + |
+    baz            |
+  = foo.bar
+  %p foo
+HAML
+<div class="blah">
+  <%=
+    foo +
+    bar.baz.bang +
+    baz
+  %>
+  <%= foo.bar %>
+  <p>foo</p>
+</div>
+ERB
+  end
+
+  def test_multiline_erb_but_really_single_line
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+.blah
+  = foo
+  %p foo
+HAML
+<div class="blah">
+  <%=
+    foo
+  %>
+  <p>foo</p>
+</div>
+ERB
+  end
+
+  ### Block Parsing
+
+  def test_block_parsing
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- foo do
+  %p bar
+HAML
+<% foo do %>
+  <p>bar</p>
+<% end %>
+ERB
+  end
+
+  def test_block_parsing_with_args
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- foo do |a, b, c|
+  %p bar
+HAML
+<% foo do |a, b, c| %>
+  <p>bar</p>
+<% end %>
+ERB
+  end
+
+  def test_block_parsing_with_equals
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+= foo do
+  %p bar
+HAML
+<%= foo do %>
+  <p>bar</p>
+<% end %>
+ERB
+  end
+
+  def test_block_parsing_with_modified_end
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- foo do
+  blah
+- end.bip
+HAML
+<% foo do %>
+  blah
+<% end.bip %>
+ERB
+  end
+
+  def test_block_parsing_with_modified_end_with_block
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- foo do
+  blah
+- end.bip do
+  brang
+HAML
+<% foo do %>
+  blah
+<% end.bip do %>
+  brang
+<% end %>
+ERB
+  end
+
+  def test_multiline_block_opener
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- foo bar
+- baz bang
+- biddle do
+  foo
+HAML
+<% foo bar
+  baz bang
+  biddle do %>
+    foo
+<% end %>
+ERB
+  end
+
+  def test_if_elsif_else_parsing
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- if foo
+  %p bar
+- elsif bar.foo("zip")
+  #bang baz
+- else
+  %strong bibble
+HAML
+<% if foo %>
+  <p>bar</p>
+<% elsif bar.foo("zip") %>
+  <div id="bang">baz</div>
+<% else %>
+  <strong>bibble</strong>
+<% end %>
+ERB
+  end
+
+  def test_case_when_parsing
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- case foo.bar
+- when "bip"
+  %p bip
+- when "bop"
+  %p BOP
+- when bizzle.bang.boop.blip
+  %em BIZZLE BANG BOOP BLIP
+HAML
+<% case foo.bar %>
+<% when "bip" %>
+  <p>bip</p>
+<% when "bop" %>
+  <p>BOP</p>
+<% when bizzle.bang.boop.blip %>
+  <em>BIZZLE BANG BOOP BLIP</em>
+<% end %>
+ERB
+
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- case foo.bar
+- when "bip"
+  %p bip
+- when "bop"
+  %p BOP
+- when bizzle.bang.boop.blip
+  %em BIZZLE BANG BOOP BLIP
+HAML
+<% case foo.bar
+   when "bip" %>
+  <p>bip</p>
+<% when "bop" %>
+  <p>BOP</p>
+<% when bizzle.bang.boop.blip %>
+  <em>BIZZLE BANG BOOP BLIP</em>
+<% end %>
+ERB
+  end
+
+  def test_begin_rescue_ensure
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+- begin
+  %p a
+- rescue FooException => e
+  %p b
+- ensure
+  %p c
+HAML
+<% begin %>
+  <p>a</p>
+<% rescue FooException => e %>
+  <p>b</p>
+<% ensure %>
+  <p>c</p>
+<% end %>
+ERB
+  end
+end

data/test/haml/html2haml_test.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/html2haml/erb_tests'
 require 'haml/html'
 
 class Html2HamlTest < Test::Unit::TestCase
@@ -205,300 +206,23 @@ HAML
 HTML
   end
 
-  ## ERB
-
-  def test_erb
-    assert_equal '- foo = bar', render_erb('<% foo = bar %>')
-    assert_equal '- foo = bar', render_erb('<% foo = bar -%>')
-    assert_equal '= h @item.title', render_erb('<%=h @item.title %>')
-    assert_equal '= h @item.title', render_erb('<%=h @item.title -%>')
-  end
-
-  def test_inline_erb
-    assert_equal("%p= foo", render_erb("<p><%= foo %></p>"))
-  end
-
-  def test_non_inline_erb
-    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
-%p
-  = foo
-HAML
-<p>
-  <%= foo %>
-</p>
-HTML
-    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
-%p
-  = foo
-HAML
-<p>
-  <%= foo %></p>
-HTML
-    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
-%p
-  = foo
-HAML
-<p><%= foo %>
-</p>
-HTML
-  end
-
-  def test_erb_in_cdata
-    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
-:cdata
-  Foo \#{bar} baz
-HAML
-<![CDATA[Foo <%= bar %> baz]]>
-HTML
+  def test_minus_in_tag
+    assert_equal("%p - foo bar -", render("<p>- foo bar -</p>"))
   end
 
-  def test_erb_in_script
-    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
-:javascript
-  function foo() {
-    return \#{foo.to_json};
-  }
-HAML
-<script type="text/javascript">
-  function foo() {
-    return <%= foo.to_json %>;
-  }
-</script>
-HTML
-  end
-
-  def test_erb_in_line
-    assert_equal 'foo bar #{baz}', render_erb('foo bar <%= baz %>')
-    assert_equal 'foo bar #{baz}! Bang.', render_erb('foo bar <%= baz %>! Bang.')
+  def test_equals_in_tag
+    assert_equal("%p = foo bar =", render("<p>= foo bar =</p>"))
   end
 
-  def test_erb_multi_in_line
-    assert_equal('foo bar #{baz}! Bang #{bop}.',
-      render_erb('foo bar <%= baz %>! Bang <%= bop %>.'))
-    assert_equal('foo bar #{baz}#{bop}!',
-      render_erb('foo bar <%= baz %><%= bop %>!'))
+  def test_hash_in_tag
+    assert_equal("%p # foo bar #", render("<p># foo bar #</p>"))
   end
 
-  def test_erb_with_html_special_chars
-    assert_equal '= 3 < 5 ? "OK" : "Your computer is b0rken"',
-      render_erb('<%= 3 < 5 ? "OK" : "Your computer is b0rken" %>')
-  end
-
-  def test_erb_in_class_attribute
-    assert_equal "%div{:class => dyna_class} I have a dynamic attribute",
-      render_erb('<div class="<%= dyna_class %>">I have a dynamic attribute</div>')
-  end
-
-  def test_erb_in_id_attribute
-    assert_equal "%div{:id => dyna_id} I have a dynamic attribute",
-      render_erb('<div id="<%= dyna_id %>">I have a dynamic attribute</div>')
-  end
-
-  def test_erb_in_attribute_results_in_string_interpolation
-    assert_equal('%div{:id => "item_#{i}"} Ruby string interpolation FTW',
-      render_erb('<div id="item_<%= i %>">Ruby string interpolation FTW</div>'))
-  end
-
-  def test_erb_in_attribute_with_trailing_content
-    assert_equal('%div{:class => "#{12}!"} Bang!',
-      render_erb('<div class="<%= 12 %>!">Bang!</div>'))
-  end
-
-  def test_erb_in_html_escaped_attribute
-    assert_equal '%div{:class => "foo"} Bang!',
-      render_erb('<div class="<%= "foo" %>">Bang!</div>')
-  end
-
-  def test_erb_in_attribute_to_multiple_interpolations
-    assert_equal('%div{:class => "#{12} + #{13}"} Math is super',
-      render_erb('<div class="<%= 12 %> + <%= 13 %>">Math is super</div>'))
-  end
-
-  def test_whitespace_eating_erb_tags
-    assert_equal '- form_for', render_erb('<%- form_for -%>')
-  end
-
-  def test_interpolation_in_erb
-    assert_equal('= "Foo #{bar} baz"', render_erb('<%= "Foo #{bar} baz" %>'))
-  end
-
-  def test_interpolation_in_erb_attrs
-    assert_equal('%p{:foo => "#{bar} baz"}',
-      render_erb('<p foo="<%= "#{bar} baz" %>"></p>'))
-  end
-
-  def test_multiline_erb_silent_script
-    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
-.blah
-  - foo
-  - bar
-  - baz
-  %p foo
-HAML
-<div class="blah">
-  <%
-    foo
-    bar
-    baz
-  %>
-  <p>foo</p>
-</div>
-ERB
-  end
-
-  ### Block Parsing
-
-  def test_block_parsing
-    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
-- foo do
-  %p bar
-HAML
-<% foo do %>
-  <p>bar</p>
-<% end %>
-ERB
-  end
-
-  def test_block_parsing_with_args
-    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
-- foo do |a, b, c|
-  %p bar
-HAML
-<% foo do |a, b, c| %>
-  <p>bar</p>
-<% end %>
-ERB
-  end
-
-  def test_block_parsing_with_equals
-    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
-= foo do
-  %p bar
-HAML
-<%= foo do %>
-  <p>bar</p>
-<% end %>
-ERB
-  end
-
-  def test_block_parsing_with_modified_end
-    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
-- foo do
-  blah
-- end.bip
-HAML
-<% foo do %>
-  blah
-<% end.bip %>
-ERB
-  end
-
-  def test_block_parsing_with_modified_end_with_block
-    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
-- foo do
-  blah
-- end.bip do
-  brang
-HAML
-<% foo do %>
-  blah
-<% end.bip do %>
-  brang
-<% end %>
-ERB
-  end
-
-  def test_multiline_block_opener
-    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
-- foo bar
-- baz bang
-- biddle do
-  foo
-HAML
-<% foo bar
-  baz bang
-  biddle do %>
-    foo
-<% end %>
-ERB
-  end
-
-  def test_if_elsif_else_parsing
-    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
-- if foo
-  %p bar
-- elsif bar.foo("zip")
-  #bang baz
-- else
-  %strong bibble
-HAML
-<% if foo %>
-  <p>bar</p>
-<% elsif bar.foo("zip") %>
-  <div id="bang">baz</div>
-<% else %>
-  <strong>bibble</strong>
-<% end %>
-ERB
-  end
-
-  def test_case_when_parsing
-    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
-- case foo.bar
-- when "bip"
-  %p bip
-- when "bop"
-  %p BOP
-- when bizzle.bang.boop.blip
-  %em BIZZLE BANG BOOP BLIP
-HAML
-<% case foo.bar %>
-<% when "bip" %>
-  <p>bip</p>
-<% when "bop" %>
-  <p>BOP</p>
-<% when bizzle.bang.boop.blip %>
-  <em>BIZZLE BANG BOOP BLIP</em>
-<% end %>
-ERB
-
-    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
-- case foo.bar
-- when "bip"
-  %p bip
-- when "bop"
-  %p BOP
-- when bizzle.bang.boop.blip
-  %em BIZZLE BANG BOOP BLIP
-HAML
-<% case foo.bar
-   when "bip" %>
-  <p>bip</p>
-<% when "bop" %>
-  <p>BOP</p>
-<% when bizzle.bang.boop.blip %>
-  <em>BIZZLE BANG BOOP BLIP</em>
-<% end %>
-ERB
-  end
-
-  def test_begin_rescue_ensure
-    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
-- begin
-  %p a
-- rescue FooException => e
-  %p b
-- ensure
-  %p c
-HAML
-<% begin %>
-  <p>a</p>
-<% rescue FooException => e %>
-  <p>b</p>
-<% ensure %>
-  <p>c</p>
-<% end %>
-ERB
+  begin
+    require 'haml/html/erb'
+    include ErbTests
+  rescue LoadError => e
+    puts "\n** Couldn't require #{e.message[/-- (.*)$/, 1]}, skipping some tests"
   end
 
   # Encodings

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.60
+  version: 2.3.61
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-25 00:00:00 -04:00
+date: 2009-10-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -190,6 +190,8 @@ files:
 - test/haml/templates/very_basic.haml
 - test/haml/templates/whitespace_handling.haml
 - test/haml/spec_test.rb
+- test/haml/html2haml
+- test/haml/html2haml/erb_tests.rb
 - test/linked_rails.rb
 - test/sass
 - test/sass/css2sass_test.rb