htmlbeautifier 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b82dd8d2489286ab4474e1690d0a47ff91ffce8
-  data.tar.gz: e20a70c076be7e6eda31e456b0fd56715c1554ce
+  metadata.gz: a56b2b5efa4d86724c29098dd2877d5e480cc3f8
+  data.tar.gz: 191861084a908515224d0df8cb6bce30d962090d
 SHA512:
-  metadata.gz: 9da8945658fddb13a0af61e5d61e05b381ffdb8168247d22fe6026043c41822cce4bce45910e844cb8f5183f01a790836a209802531cd4e13a1bbd67b0092877
-  data.tar.gz: 224c74e0769b2e208505cd0d1461f4c971ed9a264f2ed78bf27c6311c5fa037e40295b8beb607fed7edf114e354138805cec3e766432b9a3a8e08e0b66a86950
+  metadata.gz: c21dd2ce56776f1ef0dd3ccb496eda14c5f83363660d95098d96bf9af287d63f98ce512011b9433e3a5136e0ed19d273b8bda4465fe21e892c1cc22c9e873bea
+  data.tar.gz: 0d14c894a17c9841abaef8f41121f10cb7701cd2a4a1fc1721692aca02fc70af0274d1a2317746d0be1aba69ead804dedae0d5ecf5bbc4ccf8415335fa444480

data/README.md

@@ -5,7 +5,7 @@ Ideal for tidying up Rails templates.
 
 ## What it does
 
-* Normalises hard tabs to spaces
+* Normalises hard tabs to spaces (or vice versa)
 * Removes trailing spaces
 * Indents after opening HTML elements
 * Outdents before closing elements
@@ -40,10 +40,10 @@ require 'htmlbeautifier'
 beautiful = HtmlBeautifier.beautify(messy)
 ```
 
-You can also specify the number of spaces to indent (the default is 2):
+You can also specify how to indent (the default is two spaces):
 
 ```ruby
-beautiful = HtmlBeautifier.beautify(messy, tab_stops: 4)
+beautiful = HtmlBeautifier.beautify(messy, indent: "\t")
 ```
 
 ## Installation

data/bin/htmlbeautifier

@@ -11,7 +11,7 @@ end
 
 executable = File.basename(__FILE__)
 
-options = { tab_stops: 2 }
+options = { indent: "  " }
 parser = OptionParser.new do |opts|
   opts.banner = "Usage: #{executable} [options] [file ...]"
   opts.separator <<END
@@ -30,7 +30,19 @@ END
     "-t", "--tab-stops NUMBER", Integer,
     "Set number of spaces per indent (default #{options[:tab_stops]})"
   ) do |num|
-    options[:tab_stops] = num
+    options[:indent] = " " * num
+  end
+  opts.on(
+    "-T", "--tab",
+    "Indent using tabs"
+  ) do
+    options[:indent] = "\t"
+  end
+  opts.on(
+    "-i", "--indent-by NUMBER", Integer,
+    "Indent the output by NUMBER steps (default 0)."
+  ) do |num|
+    options[:initial_level] = num
   end
   opts.on(
     "-e", "--stop-on-errors",

data/lib/htmlbeautifier.rb

@@ -8,11 +8,18 @@ module HtmlBeautifier
   # 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
+  # tab_stops - an integer for the number of spaces to indent, default 2.
+  # Deprecated: see indent.
+  # indent - what to indent with ("  ", "\t" etc.), default "  "
   # stop_on_errors - raise an exception on a badly-formed document. Default
   # 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.
   #
   def self.beautify(html, options = {})
+    if options[:tab_stops]
+      options[:indent] = " " * options[:tab_stops]
+    end
     "".tap { |output|
       HtmlParser.new.scan html.to_s, Builder.new(output, options)
     }

data/lib/htmlbeautifier/builder.rb

@@ -4,15 +4,16 @@ require "htmlbeautifier/ruby_indenter"
 module HtmlBeautifier
   class Builder
     DEFAULT_OPTIONS = {
-      tab_stops: 2,
+      indent: "  ",
+      initial_level: 0,
       stop_on_errors: false
     }
 
     def initialize(output, options = {})
       options = DEFAULT_OPTIONS.merge(options)
-      @tab = " " * options[:tab_stops]
+      @tab = options[:indent]
       @stop_on_errors = options[:stop_on_errors]
-      @level = 0
+      @level = options[:initial_level]
       @new_line = false
       @empty = true
       @ie_cc_levels = []
@@ -37,7 +38,8 @@ module HtmlBeautifier
     end
 
     def emit(*strings)
-      @output << ("\n" + @tab * @level) if @new_line && !@empty
+      @output << "\n" if @new_line && !@empty
+      @output << (@tab * @level) if @new_line
       @output << strings.join("")
       @new_line = false
       @empty = false

data/lib/htmlbeautifier/version.rb

@@ -1,8 +1,8 @@
 module HtmlBeautifier #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 1
-    TINY  = 1
+    MINOR = 2
+    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.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2016-09-06 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.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: HTML/ERB beautifier