erb-formatter 0.4.3 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a957537254444c222e81398e138e7d3bd22512b782cd3a67302ad9b1de8c12bc
-  data.tar.gz: 23eee273e38701317b779ec455353fa801212b80b78c786d5a01b61fc54942c0
+  metadata.gz: 9746e0224608b37531674e86d589b087a67875791440318536b7d55ec66c8548
+  data.tar.gz: 73b0639da80cba0761eb5b6a58270b32db5b146cca710b446ebae61737bba385
 SHA512:
-  metadata.gz: 05176b2dca77e2500ed5d00ce531e395cf4a11a35d38132fb7539f516d98e007480a32b690f53715a6ca79f967aa773d9698856464e24145e329c8389adad54c
-  data.tar.gz: 2d088aa641242b2a30b8d4a21abe739cf365838950ea9c8aa9d39b395aaf3bda966f3159ee66bb03ad486e337fd6536694b064bdd834d7d138eb59518db44cfe
+  metadata.gz: d2658816da104a74d23952c1f59c70726c27668763ed94332914112fcd04e76c61ab95e738fea856c44e1f0bd72d0dae61d8ee7c6ec38d28abd927e91b970e56
+  data.tar.gz: 57a63692f5f533077df12677bbdf1dfa414ac564f897621d58fa08607e707d1af02fa9a78d7b0493e9340b27f046b2abee779758a0a6c8239e135abe3811da8b

data/README.md

@@ -33,13 +33,18 @@ Or install it yourself as:
 
 ## Usage
 
+### From [Visual Studio Code](https://code.visualstudio.com)
+
+Just install the [Ruby ERB::Formatter 🪜](https://marketplace.visualstudio.com/items?itemName=elia.erb-formatter) extension
+and follow the setup instructions there.
+
 ### From the command line
 
 Update files in-place:
 
     $ erb-format app/views/**/*.html.erb --write
 
-or use stdin/stdout (useful for editor integrations): 
+or use stdin/stdout (useful for editor integrations):
 
     $ echo "<div       > asdf  <% if 123%> <%='foobar'%> <%end-%>  </div>" | erb-format --stdin
     <div>
@@ -51,7 +56,7 @@ or use stdin/stdout (useful for editor integrations):
 
 Check out `erb-format --help` for more options.
 
-### From Ruby
+### From [Ruby](https://www.ruby-lang.org/en/)
 
 ```ruby
 require 'erb/formatter'
@@ -76,7 +81,7 @@ ERB
 #   </div>
 ```
 
-### With `lint-staged`
+### With [`lint-staged`](https://github.com/okonet/lint-staged#readme)
 
 Add the gem to your gemfile and the following to your `package.json`:
 
@@ -87,7 +92,7 @@ Add the gem to your gemfile and the following to your `package.json`:
 }
 ```
 
-### As a TextMate plugin
+### As a [TextMate](http://macromates.com) command
 
 Create a command with the following settings:
 
@@ -104,6 +109,16 @@ cd "$TM_PROJECT_DIRECTORY"
 bundle exec erb-format --stdin-filename "$TM_FILEPATH" < /dev/stdin 2> /dev/stdout
 ```
 
+### With [(Neo)VIM ALE](https://github.com/dense-analysis/ale)
+
+Enable `erb-formatter` as a fixer in the ALE config:
+
+```vim
+let g:ale_fixers = {
+\   'eruby': ['erb-formatter'],
+\}
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/erb/formatter/command_line.rb

@@ -10,7 +10,7 @@ class ERB::Formatter::CommandLine
     @argv = argv.dup
     @stdin = stdin
 
-    @write, @filename, @read_stdin, @code = nil
+    @write, @filename, @read_stdin, @code, @single_class_per_line = nil
 
     OptionParser.new do |parser|
       parser.banner = "Usage: #{$0} FILENAME... --write"
@@ -37,6 +37,10 @@ class ERB::Formatter::CommandLine
         @width = value
       end
 
+      parser.on("--single-class-per-line", "Print each class on a separate line") do |value|
+        @single_class_per_line = value
+      end
+
       parser.on("--[no-]debug", "Enable debug mode") do |value|
         $DEBUG = value
       end
@@ -77,7 +81,7 @@ class ERB::Formatter::CommandLine
       if ignore_list.should_ignore_file? filename
         print code unless write
       else
-        html = ERB::Formatter.new(code, filename: filename, line_width: @width || 80)
+        html = ERB::Formatter.new(code, filename: filename, line_width: @width || 80, single_class_per_line: @single_class_per_line)
 
         if write
           File.write(filename, html)

data/lib/erb/formatter/version.rb

@@ -3,5 +3,5 @@
 require 'erb'
 
 class ERB::Formatter
-  VERSION = "0.4.3"
+  VERSION = "0.5.1"
 end

data/lib/erb/formatter.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: false
 
 require 'pp'
-require "erb"
-require "ripper"
-require 'securerandom'
+require 'erb'
+require 'yaml'
 require 'strscan'
 require 'stringio'
+require 'securerandom'
 require 'erb/formatter/version'
 
 require 'syntax_tree'
@@ -56,13 +56,6 @@ class ERB::Formatter
 
   RUBOCOP_STDIN_MARKER = "===================="
 
-  # Override the max line length to account from already indented ERB
-  module RubocopForcedMaxLineLength
-    def max
-      Thread.current['RuboCop::Cop::Layout::LineLength#max'] || super
-    end
-  end
-
   module DebugShovel
     def <<(string)
       puts "ADDING: #{string.inspect} FROM:\n  #{caller(1, 5).join("\n  ")}"
@@ -74,13 +67,14 @@ class ERB::Formatter
     new(source, filename: filename).html
   end
 
-  def initialize(source, line_width: 80, filename: nil, debug: $DEBUG)
+  def initialize(source, line_width: 80, single_class_per_line: false, filename: nil, debug: $DEBUG)
     @original_source = source
     @filename = filename || '(erb)'
     @line_width = line_width
     @source = remove_front_matter source.dup
     @html = +""
     @debug = debug
+    @single_class_per_line = single_class_per_line
 
     html.extend DebugShovel if @debug
 
@@ -104,10 +98,13 @@ class ERB::Formatter
   end
 
   def remove_front_matter(source)
-    source.sub(/\A---\n[\s\S]*?\n---\n/) do |match|
-      @front_matter = match
-      match.gsub(/[^\n]/, ' ')
-    end
+    return source unless source.start_with?("---\n")
+
+    first_body_line = YAML.parse(source).children.first.end_line + 1
+    lines = source.lines
+
+    @front_matter = lines[0...first_body_line].join
+    lines[first_body_line..].join
   end
 
   attr_accessor \
@@ -124,23 +121,48 @@ class ERB::Formatter
 
     attr_html = ""
     tag_stack_push(['attr='], attrs)
+
     attrs.scan(ATTR).flatten.each do |attr|
       attr.strip!
-      full_attr = indented(attr)
       name, value = attr.split('=', 2)
 
+      if value.nil?
+        attr_html << indented("#{name}")
+        next
+      end
+
+      value_parts = value[1...-1].strip.split(/\s+/)
+
+      full_attr = indented("#{name}=#{value[0]}#{value_parts.join(" ")}#{value[-1]}")
+
       if full_attr.size > line_width && MULTILINE_ATTR_NAMES.include?(name) && attr.match?(QUOTED_ATTR)
         attr_html << indented("#{name}=#{value[0]}")
         tag_stack_push('attr"', value)
-        value[1...-1].strip.split(/\s+/).each do |value_part|
-          attr_html << indented(value_part)
+
+        if !@single_class_per_line && name == 'class'
+          line = value_parts.shift
+          value_parts.each do |value_part|
+            if (line.size + value_part.size + 1) <= line_width
+              line << " #{value_part}"
+            else
+              attr_html << indented(line)
+              line = value_part
+            end
+          end
+          attr_html << indented(line) if line
+        else
+          value_parts.each do |value_part|
+            attr_html << indented(value_part)
+          end
         end
+
         tag_stack_pop('attr"', value)
         attr_html << indented(value[-1])
       else
         attr_html << full_attr
       end
     end
+
     tag_stack_pop(['attr='], attrs)
     attr_html << indented("")
     attr_html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb-formatter
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.1
 platform: ruby
 authors:
 - Elia Schito
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: syntax_tree
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.23
 signing_key:
 specification_version: 4
 summary: Format ERB files with speed and precision.