erb-formatter 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 923478a0d01b0942755e41fca1f84a656020383d2de0249210462274b8427a1c
-  data.tar.gz: 8b3304851134b98f48cbf7e716274770f3fb71e3e3121a1a706928fe063eb9c3
+  metadata.gz: 74ce05292fc99dcfeb80526b22aa762325c40589640086886190cf40d534facd
+  data.tar.gz: faecec389f0cd92c85e1300d9c32920ac76f508e0fc37b7c2e6a5449b5d7db35
 SHA512:
-  metadata.gz: 384b0ff6f0bc9fb286191f54721e2b21c7c6dc30c27fc6d80a2ec6f85e600877aa53b83f27bd0b447bb978f74e1410a22971e66a91b921b14223454fbd745896
-  data.tar.gz: e2506d5249e000ae0c6318b9baa4f6236e3d35a9a8bab069d43a812a710545f1b2c018f2871b72537c6294abea1f5670832404c9e71b4809b4af7256601e06e8
+  metadata.gz: 13dfae2c05ecbb7f283ed1e76e1239dbad2923f1b0bc63b5d67e8de229ea3dfd97fe11d3d51734a2a33382a0d5a566dd16e8b2d8c73cc334eb8e424b685a7e3b
+  data.tar.gz: 64b9b47e1a6dd2c324c8167daf9dafcc0126950e0ae509088e19abc9ffb51b14bfd21cefb98aaf538e2c4a46bf5073fbab90c187e02e7831aa32024d55529ca1

data/exe/erb-format

@@ -1,69 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'optparse'
-
-write, filename, read_stdin, code = nil
-
-OptionParser.new do |parser|
-  parser.banner = "Usage: #{$0} FILENAME... --write"
-
-  parser.on("-w", "--[no-]write", "Write file") do |value|
-    write = value
-  end
-
-  parser.on("--stdin-filename FILEPATH", "Set the stdin filename (implies --stdin)") do |value|
-    filename = value
-    read_stdin = true
-  end
-
-  parser.on("--[no-]stdin", "Read the file from stdin") do |value|
-    if read_stdin == true && value == false
-      abort "Can't set stdin filename and not use stdin at the same time"
-    end
-
-    read_stdin = value
-    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
-  end
-end.parse!(ARGV)
-
-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 |arg|
-    warn "==> Formatting #{arg}..."
-    system __FILE__, arg, *[
-      ('--write' if write)
-    ].compact or exit(1)
-  end
-  exit
-end
-
-require 'erb/formatter'
-
-filename ||= ARGV.first
-code = read_stdin ? $stdin.read : File.read(filename)
-ignore = ERB::Formatter::IgnoreList.new
-
-if ignore.should_ignore_file? filename
-  print code unless write
-else
-  html = ERB::Formatter.format(code, filename: filename)
-
-  if write
-    File.write(filename, html)
-  else
-    puts html
-  end
-end
+require 'erb/formatter/command_line'
 
+ERB::Formatter::CommandLine.new(ARGV).run

data/exe/erb-formatter

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'erb/formatter/command_line'
+
+ERB::Formatter::CommandLine.new(ARGV).run

data/lib/erb/formatter/command_line.rb

@@ -0,0 +1,81 @@
+
+require 'erb/formatter'
+require 'optparse'
+
+class ERB::Formatter::CommandLine
+
+  attr_reader :write, :filename, :read_stdin
+
+  def initialize(argv, stdin: $stdin)
+    @argv = argv.dup
+    @stdin = stdin
+
+    @write, @filename, @read_stdin, @code = nil
+
+    OptionParser.new do |parser|
+      parser.banner = "Usage: #{$0} FILENAME... --write"
+
+      parser.on("-w", "--[no-]write", "Write file") do |value|
+        @write = value
+      end
+
+      parser.on("--stdin-filename FILEPATH", "Set the stdin filename (implies --stdin)") do |value|
+        @filename = value
+        @read_stdin = true
+      end
+
+      parser.on("--[no-]stdin", "Read the file from stdin") do |value|
+        if read_stdin == true && value == false
+          abort "Can't set stdin filename and not use stdin at the same time"
+        end
+
+        @read_stdin = value
+        @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
+      end
+    end.parse!(@argv)
+  end
+
+  def ignore_list
+    @ignore_list ||= ERB::Formatter::IgnoreList.new
+  end
+
+  def ignore?(filename)
+
+  end
+
+  def run
+    if read_stdin
+      abort "Can't read both stdin and a list of files" unless @argv.empty?
+      files = [
+        [@filename, @stdin.read]
+      ]
+    else
+      files = @argv.map do |filename|
+        [filename, File.read(filename)]
+      end
+    end
+
+    files.each do |(filename, code)|
+      if ignore_list.should_ignore_file? filename
+        print code unless write
+      else
+        html = ERB::Formatter.format(code, filename: filename)
+
+        if write
+          File.write(filename, html)
+        else
+          puts html
+        end
+      end
+    end
+  end
+end

data/lib/erb/formatter.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: false
 
-# @debug = true
+require 'pp'
 require "erb"
-require "cgi"
 require "ripper"
 require 'securerandom'
 require 'strscan'
-require 'pp'
 require 'stringio'
 
 class ERB::Formatter
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
+
   autoload :IgnoreList, 'erb/formatter/ignore_list'
 
   class Error < StandardError; end
@@ -31,9 +30,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
 
@@ -291,7 +292,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]
+        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
@@ -341,7 +342,7 @@ class ERB::Formatter
         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
+        raise "Bad attribute, please fix spaces after the equal sign:\n#{pre_match}" if BAD_ATTR.match? pre_match
 
         format_erb_tags(pre_match) if pre_match
 
@@ -355,7 +356,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!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb-formatter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Elia Schito
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-19 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufo
@@ -29,6 +29,7 @@ email:
 - elia@schito.me
 executables:
 - erb-format
+- erb-formatter
 extensions: []
 extra_rdoc_files: []
 files:
@@ -39,7 +40,9 @@ files:
 - Rakefile
 - erb-formatter.gemspec
 - exe/erb-format
+- exe/erb-formatter
 - lib/erb/formatter.rb
+- lib/erb/formatter/command_line.rb
 - lib/erb/formatter/ignore_list.rb
 - lib/erb/formatter/version.rb
 - sig/erb/formatter.rbs