htmlbeautifier 0.0.2 → 0.0.3

data/lib/htmlbeautifier/beautifier.rb

@@ -95,7 +95,7 @@ module HtmlBeautifier
     def scan(html)
       html = html.strip.gsub(/\t/, @tab)
       parser = Parser.new do
-        map %r{(<%=?)(.*?)(%>)}m,                               :embed
+        map %r{(<%-?=?)(.*?)(-?%>)}m,                           :embed
         map %r{<!--\[.*?\]>}m,                                  :open_element
         map %r{<!\[.*?\]-->}m,                                  :close_element
         map %r{<!--.*?-->}m,                                    :standalone_element

data/lib/htmlbeautifier/version.rb

@@ -2,7 +2,7 @@ module HtmlBeautifier #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/html_beautifier_test_utilities.rb

@@ -11,9 +11,7 @@ module HtmlBeautifierTestUtilities
     actual = ''
     beautifier = HtmlBeautifier::Beautifier.new(actual)
     beautifier.scan(source)
-    # puts expected
-    # puts actual
-    assert_equal expected, actual
+    assert expected == actual, "Expected:\n#{expected}\nbut was:\n#{actual}"
   end
 
 end

data/test/test_html_beautifier_regression.rb

@@ -178,4 +178,26 @@ class HtmlBeautifierRegressionTest < Test::Unit::TestCase
     assert_beautifies expected, source
   end
 
+  def test_should_indent_with_hyphenated_erb_tags
+    source = code(%q(
+      <%- if @x -%>
+      <%- @ys.each do |y| -%>
+      <p>Foo</p>
+      <%- end -%>
+      <%- elsif @z -%>
+      <hr />
+      <%- end -%>
+    ))
+    expected = code(%q(
+      <%- if @x -%>
+        <%- @ys.each do |y| -%>
+          <p>Foo</p>
+        <%- end -%>
+      <%- elsif @z -%>
+        <hr />
+      <%- end -%>
+    ))
+    assert_beautifies expected, source
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: htmlbeautifier
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Paul Battley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 +01:00
+date: 2009-10-13 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -25,13 +25,13 @@ files:
 - Rakefile
 - README.txt
 - bin/htmlbeautifier
-- test/test_html_beautifier_regression.rb
-- test/test_parser.rb
+- test/html_beautifier_test_utilities.rb
 - test/test_helper.rb
 - test/test_html_beautifier_integration.rb
-- test/html_beautifier_test_utilities.rb
-- lib/htmlbeautifier/parser.rb
+- test/test_html_beautifier_regression.rb
+- test/test_parser.rb
 - lib/htmlbeautifier/beautifier.rb
+- lib/htmlbeautifier/parser.rb
 - lib/htmlbeautifier/version.rb
 - lib/htmlbeautifier.rb
 has_rdoc: true
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: A normaliser/beautifier for HTML that also understands embedded Ruby.