htmlbeautifier 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 657518afa5b160297e6b490855c02526f48ad144
-  data.tar.gz: bfdfbca49d50e276f2314a893ecc0b70b6392115
+  metadata.gz: 818d22d7f95ad8d6e04cd9873ac17c76b45e214a
+  data.tar.gz: 5969729a1fd18825c7ee8769570b06091afa9d1f
 SHA512:
-  metadata.gz: 9a96bc60da54b69d972b80d5faf47a547dc7ab403e19c4ab6685dce4896a71a76bf9b7f49ce3b2c8039d8f0b661fe5c9b21c740116ac49e7e49313a11bd0a903
-  data.tar.gz: cfe7bb9dceaad5997e65ba6fdc397a0ce5a30ee3012e295c1a1fdc2dedcf3a34661d662b92c83ec28ea4d675f99c82a05c7a2924f8f3f13d32f12db094d82fb8
+  metadata.gz: b58be67dccb5256cd6f0d9de0eab7be4e6d3654de867167859faa9d15d0e7721aeebd32b0fba89b6e81c5817b0d632536a8d6d32f6bb51568709b86c11636d29
+  data.tar.gz: a8e35db53495bf2b95bb11c6b605d17b3afbff46f321b7a35d3e2c1825b736cebddc15134c7e9930b1fb63dacb9807311c9c02cc049c5fc5896a29a96dfb16c4

data/bin/htmlbeautifier

@@ -50,6 +50,12 @@ END
   ) do |num|
     options[:stop_on_errors] = num
   end
+  opts.on(
+    "-b", "--keep-blank-lines NUMBER", Integer,
+    "Set number of consecutive blank lines"
+  ) do |num|
+    options[:keep_blank_lines] = num
+  end
   opts.on(
     "-h", "--help",
     "Display this help message and exit"

data/lib/htmlbeautifier.rb

@@ -15,6 +15,8 @@ module HtmlBeautifier
   # is false, i.e. continue to process the rest of the document.
   # initial_level - The entire output will be indented by this number of steps.
   # Default is 0.
+  # keep_blank_lines - an integer for the number of consecutive empty lines
+  # to keep in output.
   #
   def self.beautify(html, options = {})
     if options[:tab_stops]

data/lib/htmlbeautifier/builder.rb

@@ -6,7 +6,8 @@ module HtmlBeautifier
     DEFAULT_OPTIONS = {
       indent: "  ",
       initial_level: 0,
-      stop_on_errors: false
+      stop_on_errors: false,
+      keep_blank_lines: 0
     }
 
     def initialize(output, options = {})
@@ -14,6 +15,7 @@ module HtmlBeautifier
       @tab = options[:indent]
       @stop_on_errors = options[:stop_on_errors]
       @level = options[:initial_level]
+      @keep_blank_lines = options[:keep_blank_lines]
       @new_line = false
       @empty = true
       @ie_cc_levels = []
@@ -45,7 +47,7 @@ module HtmlBeautifier
       @empty = false
     end
 
-    def new_line(*)
+    def new_line
       @new_line = true
     end
 
@@ -121,9 +123,15 @@ module HtmlBeautifier
       indent
     end
 
+    def new_lines(*content)
+      blank_lines = content.first.scan(%r{\n}).count - 1
+      blank_lines = [blank_lines, @keep_blank_lines].min
+      @output << "\n" * blank_lines
+      new_line
+    end
+
     def text(t)
-      emit t.chomp
-      new_line if t.end_with?("\n")
+      emit t
     end
   end
 end

data/lib/htmlbeautifier/html_parser.rb

@@ -45,9 +45,9 @@ module HtmlBeautifier
        :close_element],
       [%r{<#{ELEMENT_CONTENT}>}om,
        :open_element],
-      [%r{\s*\r?\n\s*}om,
-       :new_line],
-      [%r{[^<]+},
+      [%r{(\s*\r?\n\s*)+}om,
+       :new_lines],
+      [%r{[^<\n]+},
        :text]]
 
     def initialize

data/lib/htmlbeautifier/version.rb

@@ -1,8 +1,8 @@
 module HtmlBeautifier #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 2
-    TINY  = 1
+    MINOR = 3
+    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: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: HTML/ERB beautifier