htmlbeautifier 0.0.12 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aaf76d4d6d04d9e89603730cb13417bf03a0321
-  data.tar.gz: 56808b31dc24878165d2bd3c55cf43b93fd893de
+  metadata.gz: 47d8a66494066ec486f778eb743569aa10eda648
+  data.tar.gz: 964230bf12d44b7e71733b1d0c902864d9c879d1
 SHA512:
-  metadata.gz: 0168d0c22faff926c2af24939434dea45fb35b5b95451efd207819f7401aedc32dec9a00a9bbda8a7e423be2e49af6ce3d0296a844ee69bb34593c18cc777080
-  data.tar.gz: 90c25b3b9628e98a4edddfc7069ce610d31570cfafe97ce6d2586683dbfdc633c7f12afc3bc7290966fc1dcee86c8499d3277f2c6a88dc8b43f19b9872f42f9f
+  metadata.gz: 6f3421ac4478a9e60a9ef959ce88f62b2d08a0ee246118b8913f54f5c7b4dc396b64596348b8ae5b79905a101b4dfa1a05a79ba7eb9ecb97813dba5f6832c061
+  data.tar.gz: 93bcc5f3cb49700c15977d4609e7f3ec1d66722dec0d5c33085459a69cd23b9d41cd9b6e23d5780f31cb672aef5c4e1b26b0fdd8d843dbc5b4ad37115ab48f2b

data/README.md

@@ -1,16 +1,8 @@
 HTML Beautifier
 ===============
 
-A normaliser/beautifier for HTML that also understands embedded Ruby. Ideal for tidying up Rails templates.
-
-Usage
------
-
-    htmlbeautifier file1 [file2 ...]
-
-or
-
-    htmlbeautifier < input > output
+A normaliser/beautifier for HTML that also understands embedded Ruby.
+Ideal for tidying up Rails templates.
 
 What it does
 ------------
@@ -23,5 +15,36 @@ What it does
 * Indents after block-opening embedded Ruby (if, do etc.)
 * Outdents before closing Ruby blocks
 * Outdents elsif and then indents again
-* Indents the left-hand margin of JavaScript and CSS blocks to match the indentation level of the code
+* Indents the left-hand margin of JavaScript and CSS blocks to match the
+  indentation level of the code
+
+Usage
+-----
+
+### From the command line
+
+To update files in-place:
+
+``` sh
+$ htmlbeautifier file1 [file2 ...]
+```
+
+or to operate on standard input and output:
+
+``` sh
+$ htmlbeautifier < input > output
+```
+
+## In your code
+
+```ruby
+require 'htmlbeautifier'
+
+beautiful = HtmlBeautifier.beautify(messy)
+```
+
+You can also specify the number of spaces to indent (the default is 2):
 
+```ruby
+beautiful = HtmlBeautifier.beautify(messy, tab_stops: 4)
+```

data/Rakefile

@@ -1,9 +1,9 @@
-require 'rake/testtask'
+require "rspec/core/rake_task"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/test_*.rb'
-  t.verbose = true
+desc "Run the specs."
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "spec/**/*_spec.rb"
+  t.verbose = false
 end
 
-task :default => :test
+task :default => [:spec]

data/bin/htmlbeautifier

@@ -4,10 +4,7 @@ require 'optparse'
 require 'fileutils'
 
 def beautify(name, input, output, options)
-  beautifier = HtmlBeautifier::Beautifier.new(output)
-  beautifier.tab_stops = options[:tab_stops]
-  beautifier.scan(input)
-  output << "\n"
+  output.puts HtmlBeautifier.beautify(input, options)
 rescue => e
   raise "Error parsing #{name}: #{e}"
 end
@@ -18,6 +15,9 @@ parser = OptionParser.new do |opts|
   opts.on("-t", "--tab-stops NUMBER", Integer, "Set number of tab stops") do |num|
     options[:tab_stops] = num
   end
+  opts.on("-e", "--stop-on-errors", "Stop with an error on problems in source") do |num|
+    options[:stop_on_errors] = num
+  end
   opts.on("-h", "--help", "Display this help message and exit") do
     puts opts
     exit

data/lib/htmlbeautifier.rb

@@ -1,2 +1,20 @@
-require 'htmlbeautifier/beautifier'
+require 'htmlbeautifier/builder'
+require 'htmlbeautifier/html_parser'
 require 'htmlbeautifier/version'
+
+module HtmlBeautifier
+
+  # Returns a beautified HTML/HTML+ERB document as a String.
+  # html must be an object that responds to +#to_s+.
+  #
+  # Available options are:
+  # tab_stops - an integer for the number of spaces to indent, default 2
+  # stop_on_errors - raise an exception on a badly-formed document. Default
+  # is false, i.e. continue to process the rest of the document.
+  #
+  def self.beautify(html, options = {})
+    ''.tap { |output|
+      HtmlParser.new.scan html.to_s, Builder.new(output, options)
+    }
+  end
+end

data/lib/htmlbeautifier/builder.rb

@@ -12,22 +12,36 @@ module HtmlBeautifier
         }x
     ELEMENT_CONTENT = %r{ (?:[^<>]|<%.*?%>)* }mx
 
-    def initialize(output, tab_stops)
+    DEFAULT_OPTIONS = {
+      tab_stops: 2,
+      stop_on_errors: false
+    }
+
+    def initialize(output, options = {})
+      options = DEFAULT_OPTIONS.merge(options)
       @level = 0
       @new_line = false
-      @tab = ' ' * tab_stops
+      @tab = ' ' * options[:tab_stops]
+      @stop_on_errors = options[:stop_on_errors]
       @output = output
       @empty = true
       @ie_cc_levels = []
     end
 
+  private
+
+    def error(text)
+      return unless @stop_on_errors
+      raise RuntimeError, text
+    end
+
     def indent
       @level += 1
     end
 
     def outdent
-      @level -= 1
-      raise "Outdented too far" if @level < 0
+      error "Extraneous closing tag" if @level == 0
+      @level = [@level - 1, 0].max
     end
 
     def emit(s)
@@ -107,8 +121,11 @@ module HtmlBeautifier
     end
 
     def close_ie_cc(e)
-      raise "Unclosed conditional comment" if @ie_cc_levels.empty?
-      @level = @ie_cc_levels.pop
+      if @ie_cc_levels.empty?
+        error "Unclosed conditional comment"
+      else
+        @level = @ie_cc_levels.pop
+      end
       emit e
     end
 

data/lib/htmlbeautifier/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htmlbeautifier
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 1.0.0
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: A normaliser/beautifier for HTML that also understands embedded Ruby.
 email: pbattley@gmail.com
 executables:
@@ -35,16 +49,10 @@ files:
 - Rakefile
 - bin/htmlbeautifier
 - lib/htmlbeautifier.rb
-- lib/htmlbeautifier/beautifier.rb
 - lib/htmlbeautifier/builder.rb
 - lib/htmlbeautifier/html_parser.rb
 - lib/htmlbeautifier/parser.rb
 - lib/htmlbeautifier/version.rb
-- test/test_executable.rb
-- test/test_helper.rb
-- test/test_html_beautifier_integration.rb
-- test/test_html_beautifier_regression.rb
-- test/test_parser.rb
 homepage: http://github.com/threedaymonk/htmlbeautifier
 licenses:
 - MIT
@@ -57,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/htmlbeautifier/beautifier.rb

@@ -1,23 +0,0 @@
-require 'htmlbeautifier/html_parser'
-require 'htmlbeautifier/builder'
-
-module HtmlBeautifier
-  class Beautifier
-    attr_accessor :tab_stops
-
-    # Create a new Beautifier.
-    # output should be an object that responds to <<
-    # i.e. a String or an IO
-    def initialize(output)
-      self.tab_stops = 2
-      @output = output
-    end
-
-    # Process an HTML/HTML+ERB document
-    # html should be a string
-    def scan(html)
-      @parser = HtmlParser.new
-      @parser.scan html.strip, Builder.new(@output, self.tab_stops)
-    end
-  end
-end

data/test/test_executable.rb

@@ -1,66 +0,0 @@
-require 'test_helper'
-require 'shellwords'
-require 'fileutils'
-
-class TestExecutable < Test::Unit::TestCase
-  def path_to(*partial)
-    File.join(File.expand_path('../..', __FILE__), *partial)
-  end
-
-  def command
-    'ruby -I%s %s' % [
-      escape(path_to('lib')),
-      escape(path_to('bin', 'htmlbeautifier'))
-    ]
-  end
-
-  def escape(s)
-    Shellwords.escape(s)
-  end
-
-  def test_should_beautify_a_file_in_place
-    FileUtils.mkdir_p path_to('tmp')
-    input = "<p>\nfoo\n</p>"
-    expected = "<p>\n  foo\n</p>\n"
-    path = path_to('tmp', 'in-place.html')
-    File.open(path, 'w') do |f|
-      f.write input
-    end
-
-    system '%s %s' % [command, escape(path)]
-
-    output = File.read(path)
-    assert_equal expected, output
-  end
-
-  def test_should_beautify_a_file_from_stdin_to_stdout
-    FileUtils.mkdir_p path_to('tmp')
-    input = "<p>\nfoo\n</p>"
-    expected = "<p>\n  foo\n</p>\n"
-    in_path = path_to('tmp', 'input.html')
-    out_path = path_to('tmp', 'output.html')
-    File.open(in_path, 'w') do |f|
-      f.write input
-    end
-
-    system '%s < %s > %s' % [command, escape(in_path), escape(out_path)]
-
-    output = File.read(out_path)
-    assert_equal expected, output
-  end
-
-  def test_should_allow_configurable_number_of_tab_stops
-    FileUtils.mkdir_p path_to('tmp')
-    input = "<p>\nfoo\n</p>"
-    expected = "<p>\n   foo\n</p>\n"
-    path = path_to('tmp', 'in-place.html')
-    File.open(path, 'w') do |f|
-      f.write input
-    end
-
-    system '%s --tab-stops=3 %s' % [command, escape(path)]
-
-    output = File.read(path)
-    assert_equal expected, output
-  end
-end

data/test/test_helper.rb

@@ -1,19 +0,0 @@
-require 'test/unit'
-lib = File.expand_path('../../lib', __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
-module HtmlBeautifierTestUtilities
-  def code(str)
-    str = str.gsub(/\A\n|\n\s*\Z/, '')
-    indentation = str[/\A +/]
-    lines = str.split(/\n/)
-    lines.map{ |line| line.sub(/^#{indentation}/, '') }.join("\n")
-  end
-
-  def assert_beautifies(expected, source)
-    actual = ''
-    beautifier = HtmlBeautifier::Beautifier.new(actual)
-    beautifier.scan(source)
-    assert expected == actual, "Expected:\n#{expected}\nbut was:\n#{actual}"
-  end
-end

data/test/test_html_beautifier_integration.rb

@@ -1,117 +0,0 @@
-require 'test_helper'
-require 'htmlbeautifier/beautifier'
-
-class TestHtmlBeautifierIntegration < Test::Unit::TestCase
-  include HtmlBeautifierTestUtilities
-
-  def test_should_correctly_indent_mixed_document
-    source = code(%q(
-      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-      <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-      <head>
-      <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-      <script src="/javascripts/prototype.js" type="text/javascript"></script>
-      <link rel="stylesheet" type="text/css" href="/stylesheets/screen.css" media="screen"/>
-      <!--[if IE 6]>
-      <link rel="stylesheet" href="/stylesheets/screen_ie6.css" type="text/css" />
-      <![endif]-->
-      <title>Title Goes Here</title>
-      <script type="text/javascript" charset="utf-8">
-      doSomething();
-      </script>
-      </head>
-      <body>
-      <div id="something">
-      <h1>
-      Heading 1
-      </h1>
-      </div>
-      <div id="somethingElse"><p>Lorem Ipsum</p>
-      <% if @x %>
-      <% @ys.each do |y| %>
-      <p>
-      <%= h y %>
-      </p>
-      <% end %>
-      <% elsif @z %>
-      <hr />
-      <% end %>
-      </div>
-      <table>
-      <colgroup>
-      <col style="width: 50%;">
-      <col style="width: 50%;">
-      </colgroup>
-      <tbody>
-      <tr><td>First column</td></tr><tr>
-      <td>Second column</td></tr>
-      </tbody>
-      </table>
-      </body>
-      </html>
-    ))
-    expected = code(%q(
-      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-      <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-        <head>
-          <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-          <script src="/javascripts/prototype.js" type="text/javascript"></script>
-          <link rel="stylesheet" type="text/css" href="/stylesheets/screen.css" media="screen"/>
-          <!--[if IE 6]>
-            <link rel="stylesheet" href="/stylesheets/screen_ie6.css" type="text/css" />
-          <![endif]-->
-          <title>Title Goes Here</title>
-          <script type="text/javascript" charset="utf-8">
-            doSomething();
-          </script>
-        </head>
-        <body>
-          <div id="something">
-            <h1>
-              Heading 1
-            </h1>
-          </div>
-          <div id="somethingElse">
-            <p>Lorem Ipsum</p>
-            <% if @x %>
-              <% @ys.each do |y| %>
-                <p>
-                  <%= h y %>
-                </p>
-              <% end %>
-            <% elsif @z %>
-              <hr />
-            <% end %>
-          </div>
-          <table>
-            <colgroup>
-              <col style="width: 50%;">
-              <col style="width: 50%;">
-            </colgroup>
-            <tbody>
-              <tr>
-                <td>First column</td>
-              </tr>
-              <tr>
-                <td>Second column</td>
-              </tr>
-            </tbody>
-          </table>
-        </body>
-      </html>
-    ))
-    assert_beautifies expected, source
-  end
-
-  def test_should_raise_an_error_with_the_source_line_of_an_illegal_outdent
-    begin
-      HtmlBeautifier::Beautifier.new('').scan("<html>\n</html>\n</html>")
-    rescue Exception => e
-      @exception = e
-    end
-    assert_equal RuntimeError, @exception.class
-    assert_match /outdent/i, @exception.message
-    assert_match /line 3/i, @exception.message
-  end
-
-end

data/test/test_html_beautifier_regression.rb

@@ -1,345 +0,0 @@
-require 'test_helper'
-require 'htmlbeautifier/beautifier'
-
-class HtmlBeautifierRegressionTest < Test::Unit::TestCase
-
-  include HtmlBeautifierTestUtilities
-
-  def test_should_ignore_html_fragments_in_embedded_code
-    source = code(%q(
-      <div>
-        <%= a[:b].gsub("\n","<br />\n") %>
-      </div>
-    ))
-    expected = code(%q(
-      <div>
-        <%= a[:b].gsub("\n","<br />\n") %>
-      </div>
-    ))
-    assert_beautifies expected, source
-  end
-
-  def test_should_indent_scripts
-    source = code(%q(
-      <script>
-      function(f) {
-          g();
-          return 42;
-      }
-      </script>
-    ))
-    expected = code(%q(
-      <script>
-        function(f) {
-            g();
-            return 42;
-        }
-      </script>
-    ))
-    assert_beautifies expected, source
-  end
-
-  def test_should_remove_blank_lines_around_scripts
-    source = code(%q(
-      <script>
-
-        f();
-
-      </script>
-    ))
-    expected = code(%q(
-      <script>
-        f();
-      </script>
-    ))
-    assert_beautifies expected, source
-  end
-
-  def test_should_remove_trailing_space_from_script_lines
-    source   = %Q(<script>\n  f();  \n</script>)
-    expected = %Q(<script>\n  f();\n</script>)
-    assert_beautifies expected, source
-  end
-
-  def test_should_skip_over_empty_scripts
-    source = %q(<script src="/foo.js" type="text/javascript" charset="utf-8"></script>)
-    expected = source
-    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>
-      .foo{ margin: 0; }
-      .bar{
-        padding: 0;
-        margin: 0;
-      }
-      </style>
-    ))
-    expected = code(%q(
-      <style>
-        .foo{ margin: 0; }
-        .bar{
-          padding: 0;
-          margin: 0;
-        }
-      </style>
-    ))
-    assert_beautifies expected, source
-  end
-
-  def test_should_remove_blank_lines_around_styles
-    source = code(%q(
-      <style>
-
-        .foo{ margin: 0; }
-
-      </style>
-    ))
-    expected = code(%q(
-      <style>
-        .foo{ margin: 0; }
-      </style>
-    ))
-    assert_beautifies expected, source
-  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>
-    ))
-    expected = code(%q(
-      <STYLE>
-        .foo{ margin: 0; }
-      </STYLE>
-    ))
-    assert_beautifies expected, source
-  end
-
-  def test_should_indent_divs_containing_standalone_elements
-    source = code(%q(
-      <div>
-        <div>
-          <img src="foo" alt="" />
-        </div>
-        <div>
-          <img src="foo" alt="" />
-        </div>
-      </div>
-    ))
-    expected = source
-    assert_beautifies expected, source
-  end
-
-  def test_should_not_break_line_on_embedded_code_within_script_opening_element
-    source = '<script src="<%= path %>" type="text/javascript"></script>'
-    expected = source
-    assert_beautifies expected, source
-  end
-
-  def test_should_not_break_line_on_embedded_code_within_normal_element
-    source = '<img src="<%= path %>" alt="foo" />'
-    expected = source
-    assert_beautifies expected, source
-  end
-
-  def test_should_indent_inside_IE_conditional_comments
-    source = code(%q(
-      <!--[if IE 6]>
-      <link rel="stylesheet" href="/stylesheets/ie6.css" type="text/css" />
-      <![endif]-->
-      <!--[if IE 5]>
-      <link rel="stylesheet" href="/stylesheets/ie5.css" type="text/css" />
-      <![endif]-->
-    ))
-    expected = code(%q(
-      <!--[if IE 6]>
-        <link rel="stylesheet" href="/stylesheets/ie6.css" type="text/css" />
-      <![endif]-->
-      <!--[if IE 5]>
-        <link rel="stylesheet" href="/stylesheets/ie5.css" type="text/css" />
-      <![endif]-->
-    ))
-    assert_beautifies expected, source
-  end
-
-  def test_should_outdent_else
-    source = code(%q(
-      <% if @x %>
-      Foo
-      <% else %>
-      Bar
-      <% end %>
-    ))
-    expected = code(%q(
-      <% if @x %>
-        Foo
-      <% else %>
-        Bar
-      <% end %>
-    ))
-    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
-
-  def test_should_not_indent_comments
-    source = code(%q(
-      <!-- This is a comment -->
-      <!-- So is this -->
-    ))
-    assert_beautifies source, source
-  end
-
-  def test_should_not_indent_conditional_comments
-    source = code(%q(
-      <!--[if lt IE 7]><html lang="en-us" class="ie6"><![endif]-->
-      <!--[if IE 7]><html lang="en-us" class="ie7"><![endif]-->
-      <!--[if IE 8]><html lang="en-us" class="ie8"><![endif]-->
-      <!--[if gt IE 8]><!--><html lang="en-us"><!--<![endif]-->
-        <body>
-        </body>
-      </html>
-    ))
-    assert_beautifies source, source
-  end
-
-  def test_should_not_indent_doctype
-    source = code(%q(
-      <!DOCTYPE html>
-      <html>
-      </html>
-    ))
-    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
-
-  def test_should_not_parse_colgroup_as_standalone
-    source = code(%q(
-      <colgroup>
-        <col style="width: 50%;">
-      </colgroup>
-    ))
-    assert_beautifies source, source
-  end
-
-  def test_should_not_modify_pre_content
-    source = code(%q(
-      <div>
-        <pre>   Preformatted   text
-
-                should  <em>not  be </em>
-                      modified,
-                ever!
-
-        </pre>
-      </div>
-    ))
-    assert_beautifies source, source
-  end
-
-  def test_should_add_newline_after_block_elements
-    source = code(%q(
-      <section><h1>Title</h1><p>Lorem <em>ipsum</em></p>
-      <ol>
-        <li>First</li><li>Second</li></ol>
-      </section>
-    ))
-    expected = code(%(
-      <section>
-        <h1>Title</h1>
-        <p>Lorem <em>ipsum</em></p>
-        <ol>
-          <li>First</li>
-          <li>Second</li>
-        </ol>
-      </section>
-    ))
-    assert_beautifies expected, source
-  end
-
-  def test_should_add_newlines_around_pre_element
-    source = %(<section><pre>puts "Allons-y!"</pre></section>)
-    expected = code(%(
-      <section>
-        <pre>puts "Allons-y!"</pre>
-      </section>
-    ))
-    assert_beautifies expected, source
-  end
-
-  def test_should_add_newline_after_br_element
-    source = %(<p>Lorem ipsum<br>dolor sit<br />amet,<br/>consectetur.</p>)
-    expected = code(%(
-      <p>Lorem ipsum<br>
-        dolor sit<br />
-        amet,<br/>
-        consectetur.</p>
-    ))
-    assert_beautifies expected, source
-  end
-end

data/test/test_parser.rb

@@ -1,82 +0,0 @@
-require 'test_helper'
-require 'htmlbeautifier/parser'
-
-class TestParser < Test::Unit::TestCase
-
-  class Receiver
-    attr_reader :sequence
-
-    def initialize
-      @sequence = []
-    end
-
-    def method_missing(method, *params)
-      @sequence << [method, params]
-    end
-  end
-
-  def setup
-    # HtmlBeautifier::Parser.debug_block{ |match, method| puts("#{match.inspect} => #{method}") }
-  end
-
-  def test_should_dispatch_matching_sequence
-    receiver = Receiver.new
-    parser = HtmlBeautifier::Parser.new { |p|
-      p.map %r{foo}, :foo
-      p.map %r{bar\s*}, :bar
-      p.map %r{\s+}, :whitespace
-    }
-    parser.scan('foo bar ', receiver)
-    assert_equal [[:foo, ['foo']], [:whitespace, [' ']], [:bar, ['bar ']]], receiver.sequence
-  end
-
-  def test_should_send_parenthesized_components_as_separate_parameters
-    receiver = Receiver.new
-    parser = HtmlBeautifier::Parser.new { |p|
-      p.map %r{(foo)\((.*?)\)}, :foo
-    }
-    parser.scan('foo(bar)', receiver)
-    assert_equal [[:foo, ['foo', 'bar']]], receiver.sequence
-  end
-
-  class SourceTrackingReceiver < Receiver
-    attr_reader :sources_so_far
-    attr_reader :source_line_numbers
-
-    def initialize(parser)
-      @sources_so_far = []
-      @source_line_numbers = []
-      @parser = parser
-      super()
-    end
-
-    def append_new_source_so_far(*ignored)
-      @sources_so_far << @parser.source_so_far
-    end
-
-    def append_new_source_line_number(*ignored)
-      @source_line_numbers << @parser.source_line_number
-    end
-  end
-
-  def test_should_give_source_so_far
-    parser = HtmlBeautifier::Parser.new { |p|
-      p.map %r{(M+)}m, :append_new_source_so_far
-      p.map %r{([\s\n]+)}m, :space_or_newline
-    }
-    receiver = SourceTrackingReceiver.new(parser)
-    parser.scan("M MM MMM", receiver)
-    assert_equal ['M', 'M MM', 'M MM MMM'], receiver.sources_so_far
-  end
-
-  def test_should_give_source_line_number
-    parser = HtmlBeautifier::Parser.new{ |p|
-      p.map %r{(M+)}m, :append_new_source_line_number
-      p.map %r{([\s\n]+)}m, :space_or_newline
-    }
-    receiver = SourceTrackingReceiver.new(parser)
-    parser.scan("M \n\nMM\nMMM", receiver)
-    assert_equal [1, 3, 4], receiver.source_line_numbers
-  end
-
-end