htmlbeautifier 0.0.8 → 0.0.9

data/lib/htmlbeautifier/html_parser.rb

@@ -3,21 +3,39 @@ require 'htmlbeautifier/parser'
 module HtmlBeautifier
   class HtmlParser < Parser
     ELEMENT_CONTENT = %r{ (?:[^<>]|<%.*?%>)* }mx
+    HTML_VOID_ELEMENTS = %r{(?:
+      area | base | br | col | command | embed | hr | img | input | keygen |
+      link | meta | param | source | track | wbr
+    )}mix
 
     def initialize
       super do |p|
-        p.map %r{(<%-?=?)(.*?)(-?%>)}m,                           :embed
-        p.map %r{<!--\[.*?\]>}m,                                  :open_ie_cc
-        p.map %r{<!\[.*?\]-->}m,                                  :close_ie_cc
-        p.map %r{<!--.*?-->}m,                                    :standalone_element
-        p.map %r{<!.*?>}m,                                        :standalone_element
-        p.map %r{(<script#{ELEMENT_CONTENT}>)(.*?)(</script>)}m,  :foreign_block
-        p.map %r{(<style#{ELEMENT_CONTENT}>)(.*?)(</style>)}m,    :foreign_block
-        p.map %r{<#{ELEMENT_CONTENT}/>}m,                         :standalone_element
-        p.map %r{</#{ELEMENT_CONTENT}>}m,                         :close_element
-        p.map %r{<#{ELEMENT_CONTENT}>}m,                          :open_element
-        p.map %r{\s+},                                            :whitespace
-        p.map %r{[^<]+},                                          :text
+        p.map %r{(<%-?=?)(.*?)(-?%>)}m,
+          :embed
+        p.map %r{<!--\[.*?\]>}m,
+          :open_ie_cc
+        p.map %r{<!\[.*?\]-->}m,
+          :close_ie_cc
+        p.map %r{<!--.*?-->}m,
+          :standalone_element
+        p.map %r{<!.*?>}m,
+          :standalone_element
+        p.map %r{(<script#{ELEMENT_CONTENT}>)(.*?)(</script>)}m,
+          :foreign_block
+        p.map %r{(<style#{ELEMENT_CONTENT}>)(.*?)(</style>)}m,
+          :foreign_block
+        p.map %r{<#{ELEMENT_CONTENT}/>}m,
+          :standalone_element
+        p.map %r{<#{HTML_VOID_ELEMENTS}#{ELEMENT_CONTENT}>}m,
+          :standalone_element
+        p.map %r{</#{ELEMENT_CONTENT}>}m,
+          :close_element
+        p.map %r{<#{ELEMENT_CONTENT}>}m,
+          :open_element
+        p.map %r{\s+},
+          :whitespace
+        p.map %r{[^<]+},
+          :text
       end
     end
   end

data/lib/htmlbeautifier/version.rb

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

data/test/test_html_beautifier_regression.rb

@@ -60,16 +60,8 @@ class HtmlBeautifierRegressionTest < Test::Unit::TestCase
   end
 
   def test_should_remove_trailing_space_from_script_lines
-    source = code(%q(
-      <script>
-        f();
-      </script>
-    ))
-    expected = code(%q(
-      <script>
-        f();
-      </script>
-    ))
+    source   = %Q(<script>\n  f();  \n</script>)
+    expected = %Q(<script>\n  f();\n</script>)
     assert_beautifies expected, source
   end
 
@@ -79,6 +71,23 @@ class HtmlBeautifierRegressionTest < Test::Unit::TestCase
     assert_beautifies expected, source
   end
 
+  def test_should_ignore_case_of_script
+    source = code(%q(
+      <SCRIPT>
+
+      // code
+
+      </SCRIPT>
+    ))
+    expected = code(%q(
+      <SCRIPT>
+        // code
+      </SCRIPT>
+    ))
+    assert_beautifies expected, source
+  end
+
+
   def test_should_indent_styles
     source = code(%q(
       <style>
@@ -118,15 +127,23 @@ class HtmlBeautifierRegressionTest < Test::Unit::TestCase
   end
 
   def test_should_remove_trailing_space_from_style_lines
+    source   = %Q(<style>\n  .foo{ margin: 0; }  \n</style>)
+    expected = %Q(<style>\n  .foo{ margin: 0; }\n</style>)
+    assert_beautifies expected, source
+  end
+
+  def test_should_ignore_case_of_style
     source = code(%q(
-      <style>
-        .foo{ margin: 0; }
-      </style>
+      <STYLE>
+
+      .foo{ margin: 0; }
+
+      </STYLE>
     ))
     expected = code(%q(
-      <style>
+      <STYLE>
         .foo{ margin: 0; }
-      </style>
+      </STYLE>
     ))
     assert_beautifies expected, source
   end
@@ -248,4 +265,22 @@ class HtmlBeautifierRegressionTest < Test::Unit::TestCase
     assert_beautifies source, source
   end
 
+  def test_should_not_indent_html_void_elements
+    source = code(%q(
+    <meta>
+    <input id="id">
+    <br>
+    ))
+    assert_beautifies source, source
+  end
+
+  def test_should_ignore_case_of_void_elements
+    source = code(%q(
+    <META>
+    <INPUT id="id">
+    <BR>
+    ))
+    assert_beautifies source, source
+  end
+
 end

metadata

@@ -2,14 +2,14 @@
 name: htmlbeautifier
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :development
@@ -27,7 +27,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-description: 
+description: A normaliser/beautifier for HTML that also understands embedded Ruby.
 email: pbattley@gmail.com
 executables:
 - htmlbeautifier
@@ -37,14 +37,14 @@ files:
 - Rakefile
 - README.md
 - bin/htmlbeautifier
-- test/test_html_beautifier_regression.rb
-- test/test_parser.rb
 - test/test_html_beautifier_integration.rb
 - test/test_helper.rb
-- lib/htmlbeautifier/html_parser.rb
+- test/test_html_beautifier_regression.rb
+- test/test_parser.rb
+- lib/htmlbeautifier/version.rb
 - lib/htmlbeautifier/parser.rb
+- lib/htmlbeautifier/html_parser.rb
 - lib/htmlbeautifier/beautifier.rb
-- lib/htmlbeautifier/version.rb
 - lib/htmlbeautifier/builder.rb
 - lib/htmlbeautifier.rb
 homepage: http://github.com/threedaymonk/htmlbeautifier
@@ -71,5 +71,5 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: A normaliser/beautifier for HTML that also understands embedded Ruby.
+summary: HTML/ERB beautifier
 test_files: []