htmlbeautifier 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ad32fe5c137d828c711e50642ff3b00af14e3b8cdf18105506c1149de2c6cde
-  data.tar.gz: d42bcce139d8a3e9a96f73735fbb068044f1f43c8d9951c89cd642bf4e996bef
+  metadata.gz: fcd8d466ff4ebc3419c99968d8a82f617c9911c520a4623d649d72a821dcec5c
+  data.tar.gz: 28113c3062ebfcf3dd6cb5d30dfd551d658b6d3061e7127bfb50e5584266266c
 SHA512:
-  metadata.gz: 89dc1309a74d24da1f91ec626e3a0291918c9e0ef64370d10893ee30c961bcb788efa2bc99fbdb89af96d643cf418333b6b5b6eb3ec3e54dfb164398d0cdf0b5
-  data.tar.gz: accce8738133c66d40ddcbdc21aee322f7b68e2d9bcca81102fbecc680a5a3b021d8911587e31e0a1963f3cae166e2f436a76800feebde59da411d96cb5fe628
+  metadata.gz: 0c07ed38537750b35280e3131c9333f5c31deabff6da46f5a333557b8af5c261babda15f98a45f9ea9d8213f14368ad9b671fac38f61e7f7439a3d0edb2bb675
+  data.tar.gz: 76c39b1d92accd12e3b6c354b2214e0da149d7e400d0e66583b6505c498eadd8de79336abfcf90087d1ca9e56c00d6a0ec4b4f211da5924a7546fc65e1d84971

data/README.md

@@ -23,13 +23,13 @@ Ideal for tidying up Rails templates.
 To update files in-place:
 
 ``` sh
-$ htmlbeautifier file1 [file2 ...]
+$ htmlbeautifier file1.html.erb [file2.html.erb ...]
 ```
 
 or to operate on standard input and output:
 
 ``` sh
-$ htmlbeautifier < input > output
+$ htmlbeautifier < untidy.html.erb > formatted.html.erb
 ```
 
 ### In your code
@@ -37,13 +37,13 @@ $ htmlbeautifier < input > output
 ```ruby
 require 'htmlbeautifier'
 
-beautiful = HtmlBeautifier.beautify(messy)
+beautiful = HtmlBeautifier.beautify(untify_html_string)
 ```
 
 You can also specify how to indent (the default is two spaces):
 
 ```ruby
-beautiful = HtmlBeautifier.beautify(messy, indent: "\t")
+beautiful = HtmlBeautifier.beautify(untidy_html_string, indent: "\t")
 ```
 
 ## Installation

data/bin/htmlbeautifier

@@ -8,13 +8,13 @@ require "stringio"
 
 def beautify(name, input, output, options)
   output.puts HtmlBeautifier.beautify(input, options)
-rescue StandardError => e
+rescue => e
   raise "Error parsing #{name}: #{e}"
 end
 
 executable = File.basename(__FILE__)
 
-options = { indent: "  " }
+options = {indent: "  "}
 parser = OptionParser.new do |opts|
   opts.banner = "Usage: #{executable} [options] [file ...]"
   opts.separator <<~STRING
@@ -101,12 +101,9 @@ if ARGV.any?
     end
   end
   unless failures.empty?
-    relative_paths = failures.map { |path|
-      Pathname.new(path).relative_path_from Dir.pwd
-    }
-    $stderr.puts [
+    warn [
       "Lint failed - files would be modified:",
-      *relative_paths
+      *failures
     ].join("\n")
     exit 1
   end

data/lib/htmlbeautifier/builder.rb

@@ -25,7 +25,7 @@ module HtmlBeautifier
       @embedded_indenter = RubyIndenter.new
     end
 
-  private
+    private
 
     def error(text)
       return unless @stop_on_errors

data/lib/htmlbeautifier/html_parser.rb

@@ -10,47 +10,48 @@ module HtmlBeautifier
       link | meta | param | source | track | wbr
     )}mix
     HTML_BLOCK_ELEMENTS = %r{(?:
-      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
+      address | article | aside | audio | blockquote | canvas | dd | details |
+      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
 
     MAPPINGS = [
       [%r{(<%-?=?)(.*?)(-?%>)}om,
-       :embed],
+        :embed],
       [%r{<!--\[.*?\]>}om,
-       :open_ie_cc],
+        :open_ie_cc],
       [%r{<!\[.*?\]-->}om,
-       :close_ie_cc],
+        :close_ie_cc],
       [%r{<!--.*?-->}om,
-       :standalone_element],
+        :standalone_element],
       [%r{<!.*?>}om,
-       :standalone_element],
+        :standalone_element],
       [%r{(<script#{ELEMENT_CONTENT}>)(.*?)(</script>)}omi,
-       :foreign_block],
+        :foreign_block],
       [%r{(<style#{ELEMENT_CONTENT}>)(.*?)(</style>)}omi,
-       :foreign_block],
+        :foreign_block],
       [%r{(<pre#{ELEMENT_CONTENT}>)(.*?)(</pre>)}omi,
-       :preformatted_block],
+        :preformatted_block],
       [%r{(<textarea#{ELEMENT_CONTENT}>)(.*?)(</textarea>)}omi,
-       :preformatted_block],
+        :preformatted_block],
       [%r{<#{HTML_VOID_ELEMENTS}(?: #{ELEMENT_CONTENT})?/?>}om,
-       :standalone_element],
+        :standalone_element],
       [%r{</#{HTML_BLOCK_ELEMENTS}>}om,
-       :close_block_element],
+        :close_block_element],
       [%r{<#{HTML_BLOCK_ELEMENTS}(?: #{ELEMENT_CONTENT})?>}om,
-       :open_block_element],
+        :open_block_element],
       [%r{</#{ELEMENT_CONTENT}>}om,
-       :close_element],
+        :close_element],
       [%r{<#{ELEMENT_CONTENT}[^/]>}om,
-       :open_element],
+        :open_element],
       [%r{<[\w\-]+(?: #{ELEMENT_CONTENT})?/>}om,
-       :standalone_element],
+        :standalone_element],
       [%r{(\s*\r?\n\s*)+}om,
-       :new_lines],
+        :new_lines],
       [%r{[^<\n]+},
-       :text]
+        :text]
     ].freeze
 
     def initialize

data/lib/htmlbeautifier/parser.rb

@@ -26,14 +26,14 @@ module HtmlBeautifier
       [source_so_far.chomp.split(%r{\n}).count, 1].max
     end
 
-  private
+    private
 
     def dispatch(receiver)
       _, method = @maps.find { |pattern, _| @scanner.scan(pattern) }
       raise "Unmatched sequence" unless method
 
       receiver.__send__(method, *extract_params(@scanner))
-    rescue StandardError => e
+    rescue => e
       raise "#{e.message} on line #{source_line_number}"
     end
 

data/lib/htmlbeautifier/ruby_indenter.rb

@@ -2,8 +2,8 @@
 
 module HtmlBeautifier
   class RubyIndenter
-    INDENT_KEYWORDS = %w[if elsif else unless while until begin for].freeze
-    OUTDENT_KEYWORDS = %w[elsif else end].freeze
+    INDENT_KEYWORDS = %w[if elsif else unless while until begin for case when].freeze
+    OUTDENT_KEYWORDS = %w[elsif else end when].freeze
     RUBY_INDENT = %r{
       ^ ( #{INDENT_KEYWORDS.join("|")} )\b
       | \b ( do | \{ ) ( \s* \| [^|]+ \| )? $

data/lib/htmlbeautifier/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htmlbeautifier
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.3
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-05 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.33'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.33'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.15
 signing_key: 
 specification_version: 4
 summary: HTML/ERB beautifier