htmlbeautifier 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f0dba839e3aa0da9272b5789530d578eb210cb4
-  data.tar.gz: 156a6912f4c8980d3ca06c5e43865c535af0238e
+  metadata.gz: 7aaf76d4d6d04d9e89603730cb13417bf03a0321
+  data.tar.gz: 56808b31dc24878165d2bd3c55cf43b93fd893de
 SHA512:
-  metadata.gz: 2a322f76309db244d0eb0d5b4860b3a6681efd0f8c6219b039baeb1e756c78df756995d6975574a4db7b9a559ff92fa6f87c5dcc6fef59c1dfbdcc5cbc4a1321
-  data.tar.gz: 8fe4f9811c1789f532a27a73862e0ad6b9495a96172e14ddc87cab6dcb47de7c722bd2a0252e49ae2ef540233e4c0281cf052340927831cd0c1480289af74be2
+  metadata.gz: 0168d0c22faff926c2af24939434dea45fb35b5b95451efd207819f7401aedc32dec9a00a9bbda8a7e423be2e49af6ce3d0296a844ee69bb34593c18cc777080
+  data.tar.gz: 90c25b3b9628e98a4edddfc7069ce610d31570cfafe97ce6d2586683dbfdc633c7f12afc3bc7290966fc1dcee86c8499d3277f2c6a88dc8b43f19b9872f42f9f

data/lib/htmlbeautifier/builder.rb

@@ -17,6 +17,7 @@ module HtmlBeautifier
       @new_line = false
       @tab = ' ' * tab_stops
       @output = output
+      @empty = true
       @ie_cc_levels = []
     end
 
@@ -30,11 +31,12 @@ module HtmlBeautifier
     end
 
     def emit(s)
-      if @new_line && !@output.empty?
+      if @new_line && !@empty
         @output << ("\n" + @tab * @level)
       end
       @output << s
       @new_line = false
+      @empty = false
     end
 
     def new_line(*_args)
@@ -70,13 +72,16 @@ module HtmlBeautifier
     end
 
     def preformatted_block(opening, content, closing)
+      new_line
       emit opening
       emit content
       emit closing
+      new_line
     end
 
     def standalone_element(e)
       emit e
+      new_line if e =~ /^<br[^\w]/
     end
 
     def close_block_element(e)

data/lib/htmlbeautifier/html_parser.rb

@@ -8,10 +8,10 @@ module HtmlBeautifier
       link | meta | param | source | track | wbr
     )}mix
     HTML_BLOCK_ELEMENTS = %r{(?:
-      address | blockquote | center | dd | dir | div | dl | dt | fieldset |
-      form | h1 | h2 | h3 | h4 | h5 | h6 | hr | isindex | li | menu |
-      noframes | noscript | ol | p | pre | table | tbody | td | tfoot | th |
-      thead | tr | ul
+      address | article | aside | audio | blockquote | canvas | dd | dir | div |
+      dl | dt | fieldset | figcaption | figure | footer | form | h1 | h2 | h3 |
+      h4 | h5 | h6 | header | hr | li | menu | noframes | noscript | ol | p |
+      pre | section | table | tbody | td | tfoot | th | thead | tr | ul | video
     )}mix
 
     def initialize
@@ -32,9 +32,7 @@ module HtmlBeautifier
           :foreign_block
         p.map %r{(<pre#{ELEMENT_CONTENT}>)(.*?)(</pre>)}mi,
           :preformatted_block
-        p.map %r{<#{ELEMENT_CONTENT}/>}m,
-          :standalone_element
-        p.map %r{<#{HTML_VOID_ELEMENTS}(?: #{ELEMENT_CONTENT})?>}m,
+        p.map %r{<#{HTML_VOID_ELEMENTS}(?: #{ELEMENT_CONTENT})?/?>}m,
           :standalone_element
         p.map %r{</#{HTML_BLOCK_ELEMENTS}>}m,
           :close_block_element

data/lib/htmlbeautifier/version.rb

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

data/test/test_executable.rb

@@ -0,0 +1,66 @@
+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_html_beautifier_regression.rb

@@ -321,4 +321,25 @@ class HtmlBeautifierRegressionTest < Test::Unit::TestCase
     ))
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htmlbeautifier
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -40,6 +40,7 @@ files:
 - 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