erb-formatter 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab97e4adbe2cdfa30f5dc353679d8d50ca4d26ace14a192748cceb7c6592ec55
-  data.tar.gz: b47ebce98595b833ca99418d9ce9d331ccf72e6286fdf138d74e429e65d1ac51
+  metadata.gz: b90b39bdcbed3837f51229bc9c840b0bd44d61fa48eace4e2c7b32aedcb90e3c
+  data.tar.gz: d42ecb4464e92ceb46b9d266647db19c88540b369acb8585bec5800b4f0d6617
 SHA512:
-  metadata.gz: cbc94f9055deb521afb0842c591a26b1d540b92ae8a77b2c4a6e4d4dc95ad34c899cd0dbb5a682c168fa92a172548dfd2cbe1ea47df4fadf37cd8795f94c2b49
-  data.tar.gz: 56bdbdce6955b6bd0e8bb3ea1fbd45cc4874189ce138d1238e483b5620f533eee2b69c3f17300b38b839b317fbe6eff8d4b734ee241bce50bdb23466e244c103
+  metadata.gz: 7e7ba4c9ad276e45a2ad557000fe565ed66bc9205a7aabaf432d5a99dd693758c73a7975fbe0a770fe0becd9f66be294d0f2bf168b1249b3fd4d416e20770611
+  data.tar.gz: 0fed7945792aa4ad161c6b784796703c00b0aef7c69c61f4d77d4cfedbfae71ee76b1d2b7eeb106e6f3ec633031878dff5fd033605d7e61e0875ce1a3902b30d

data/README.md

@@ -113,7 +113,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/elia/erb-formatter.
+Bug reports and pull requests are welcome on GitHub at https://github.com/nebulab/erb-formatter.
 
 ## License
 

data/exe/erb-format

@@ -25,6 +25,10 @@ OptionParser.new do |parser|
     filename ||= '-'
   end
 
+  parser.on("--[no-]debug", "Enable debug mode") do |value|
+    $DEBUG = value
+  end
+
   parser.on("-h", "--help", "Prints this help") do
     puts parser
     exit
@@ -36,9 +40,9 @@ abort "Can't read both stdin and a list of files" if read_stdin && !ARGV.empty?
 # If multiple files are provided assume `--write` and
 # execute on each of them.
 if ARGV.size > 1
-  ARGV.each do
-    warn "==> Formatting #{_1}..."
-    system __FILE__, _1, *[
+  ARGV.each do |arg|
+    warn "==> Formatting #{arg}..."
+    system __FILE__, arg, *[
       ('--write' if write)
     ].compact or exit(1)
   end

data/lib/erb/formatter/ignore_list.rb

@@ -7,8 +7,8 @@ class ERB::Formatter::IgnoreList
 
   def should_ignore_file?(path)
     path = File.expand_path(path, @base_dir)
-    @ignore_list.any? do
-      File.fnmatch? File.expand_path(_1.chomp, @base_dir), path
+    @ignore_list.any? do |line|
+      File.fnmatch? File.expand_path(line.chomp, @base_dir), path
     end
   end
 end

data/lib/erb/formatter.rb

@@ -1,16 +1,13 @@
 # frozen_string_literal: false
 
-# $DEBUG = true
 require "erb"
-require "cgi"
 require "ripper"
 require 'securerandom'
 require 'strscan'
-require 'pp'
 require 'stringio'
 
 class ERB::Formatter
-  VERSION = "0.1.1"
+  VERSION = "0.2.2"
   autoload :IgnoreList, 'erb/formatter/ignore_list'
 
   class Error < StandardError; end
@@ -31,9 +28,11 @@ class ERB::Formatter
   ERB_END = %r{(<%-?)\s*(end)\s*(-?%>)}
   ERB_ELSE = %r{(<%-?)\s*(else|elsif\b.*)\s*(-?%>)}
 
+  TAG_NAME = /[a-z0-9_:-]+/
+  TAG_NAME_ONLY = /\A#{TAG_NAME}\z/
   HTML_ATTR = %r{\s+#{SINGLE_QUOTE_ATTR}|\s+#{DOUBLE_QUOTE_ATTR}|\s+#{UNQUOTED_ATTR}|\s+#{ATTR_NAME}}m
-  HTML_TAG_OPEN = %r{<(\w+)((?:#{HTML_ATTR})*)(\s*?)(/>|>)}m
-  HTML_TAG_CLOSE = %r{</\s*(\w+)\s*>}
+  HTML_TAG_OPEN = %r{<(#{TAG_NAME})((?:#{HTML_ATTR})*)(\s*?)(/>|>)}m
+  HTML_TAG_CLOSE = %r{</\s*(#{TAG_NAME})\s*>}
 
   SELF_CLOSING_TAG = /\A(area|base|br|col|command|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)\z/i
 
@@ -62,14 +61,15 @@ class ERB::Formatter
     new(source, filename: filename).html
   end
 
-  def initialize(source, line_width: 80, filename: nil)
+  def initialize(source, line_width: 80, filename: nil, debug: $DEBUG)
     @original_source = source
     @filename = filename || '(erb)'
     @line_width = line_width
     @source = source.dup
     @html = +""
+    @debug = debug
 
-    html.extend DebugShovel if $DEBUG
+    html.extend DebugShovel if @debug
 
     @tag_stack = []
     @pre_pos = 0
@@ -168,13 +168,13 @@ class ERB::Formatter
 
   def tag_stack_push(tag_name, code)
     tag_stack << [tag_name, code]
-    p PUSH: tag_stack if $DEBUG
+    p PUSH: tag_stack if @debug
   end
 
   def tag_stack_pop(tag_name, code)
     if tag_name == tag_stack.last&.first
       tag_stack.pop
-      p POP_: tag_stack if $DEBUG
+      p POP_: tag_stack if @debug
     else
       raise "Unmatched close tag, tried with #{[tag_name, code]}, but #{tag_stack.last} was on the stack"
     end
@@ -201,6 +201,7 @@ class ERB::Formatter
   end
 
   def format_text(text)
+    p format_text: text if @debug
     starting_space = text.match?(/\A\s/)
 
     final_newlines_count = text.match(/(\s*)\z/m).captures.last.count("\n")
@@ -210,14 +211,23 @@ class ERB::Formatter
 
     text = text.gsub(/\s+/m, ' ').strip
 
-    offset = (starting_space ? indented("") : "").size
+    offset = indented("").size
+    # Restore full line width if there are less than 40 columns available
+    offset = 0 if (line_width - offset) <= 40
+    available_width = line_width - offset
+
     lines = []
 
     until text.empty?
-      lines << text.slice!(0..text.rindex(' ', -(line_width - offset)))
+      if text.size >= available_width
+        last_space_index = text[0..available_width].rindex(' ')
+        lines << text.slice!(0..last_space_index)
+      else
+        lines << text.slice!(0..-1)
+      end
       offset = 0
     end
-
+    p lines: lines if @debug
     html << lines.shift.strip unless starting_space
     lines.each do |line|
       html << indented(line)
@@ -253,7 +263,7 @@ class ERB::Formatter
       code += "\nend" unless ERB_OPEN_BLOCK["#{code}\nend"]
       code += "\n}" unless ERB_OPEN_BLOCK["#{code}\n}"]
     end
-    p RUBY_IN_: code if $DEBUG
+    p RUBY_IN_: code if @debug
 
     offset = tag_stack.size * 2
     if defined? Rubocop
@@ -264,12 +274,13 @@ class ERB::Formatter
 
     lines = code.strip.lines
     lines = lines[0...-1] if autoclose
-    code = lines.map { indented(_1) }.join.strip
-    p RUBY_OUT: code if $DEBUG
+    code = lines.map { |l| indented(l) }.join.strip
+    p RUBY_OUT: code if @debug
     code
   end
 
   def format_erb_tags(string)
+    p format_erb_tags: string if @debug
     if %w[style script].include?(tag_stack.last&.first)
       html << string.rstrip
       return
@@ -279,6 +290,7 @@ class ERB::Formatter
     erb_pre_pos = 0
     until erb_scanner.eos?
       if erb_scanner.scan_until(erb_tags_regexp)
+        p PRE_MATCH: [erb_pre_pos, '..', erb_scanner.pre_match] if @debug
         erb_pre_match = erb_scanner.pre_match
         erb_pre_match = erb_pre_match[erb_pre_pos..]
         erb_pre_pos = erb_scanner.pos
@@ -308,6 +320,7 @@ class ERB::Formatter
           html << (erb_pre_match.match?(/\s+\z/) ? indented(full_erb_tag) : full_erb_tag)
         end
       else
+        p ERB_REST: erb_scanner.rest if @debug
         rest = erb_scanner.rest.to_s
         format_text(rest)
         erb_scanner.terminate
@@ -319,10 +332,12 @@ class ERB::Formatter
     scanner = StringScanner.new(source)
 
     until scanner.eos?
-
       if matched = scanner.scan_until(tags_regexp)
+        p format_pre_match: [pre_pos, '..', scanner.pre_match[pre_pos..]]  if @debug
         pre_match = scanner.pre_match[pre_pos..]
-        self.pre_pos = scanner.pos
+        p POS: pre_pos...scanner.pos, advanced: source[pre_pos...scanner.pos] if @debug
+        p MATCHED: matched if @debug
+        self.pre_pos = scanner.charpos
 
         # Don't accept `name= "value"` attributes
         raise "Bad attribute, please fix spaces after the equal sign." if BAD_ATTR.match? pre_match
@@ -339,7 +354,7 @@ class ERB::Formatter
         elsif matched.match(HTML_TAG_OPEN)
           _, tag_name, tag_attrs, _, tag_closing = *scanner.captures
 
-          raise "Unknown tag #{tag_name.inspect}" unless tag_name.match?(/\A[a-z0-9]+\z/)
+          raise "Unknown tag #{tag_name.inspect}" unless tag_name.match?(TAG_NAME_ONLY)
 
           tag_self_closing = tag_closing == '/>' || SELF_CLOSING_TAG.match?(tag_name)
           tag_attrs.strip!
@@ -352,6 +367,7 @@ class ERB::Formatter
           raise "Unrecognized content: #{matched.inspect}"
         end
       else
+        p format_rest: scanner.rest if @debug
         format_erb_tags(scanner.rest.to_s)
         scanner.terminate
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb-formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Elia Schito
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufo