erb-formatter 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddc79db481ece2c7a1a3c3dedbce6f65f176ad045805125cbd997fdaf5f4fb11
-  data.tar.gz: e27fe52c37feb8fe80386af2fb0083a5b6398a9319189ec0baec5251db4a1a31
+  metadata.gz: a957537254444c222e81398e138e7d3bd22512b782cd3a67302ad9b1de8c12bc
+  data.tar.gz: 23eee273e38701317b779ec455353fa801212b80b78c786d5a01b61fc54942c0
 SHA512:
-  metadata.gz: 3e08e5783a5315111f5bbe0acc0f8d819b7e8b80f0a6626ec6283006441005dcba10526282ea6d331b54e7e6fc56c8a24cecb93c235f11b2394448195cf2f264
-  data.tar.gz: 5ca38f5fd851e57056a87490d5f668a0fa2a9374e6ff46cf0efe7b6cb39af0dc813e0026cee9bf7fc57f99a86833c5385979e1b0bd8c2d03a7d83f969daf494f
+  metadata.gz: 05176b2dca77e2500ed5d00ce531e395cf4a11a35d38132fb7539f516d98e007480a32b690f53715a6ca79f967aa773d9698856464e24145e329c8389adad54c
+  data.tar.gz: 2d088aa641242b2a30b8d4a21abe739cf365838950ea9c8aa9d39b395aaf3bda966f3159ee66bb03ad486e337fd6536694b064bdd834d7d138eb59518db44cfe

data/erb-formatter.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "syntax_tree", '~> 5.0'
+  spec.add_dependency "syntax_tree", '~> 6.0'
 end

data/lib/erb/formatter/version.rb

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

data/lib/erb/formatter.rb

@@ -38,8 +38,6 @@ class ERB::Formatter
 
   ERB_TAG = %r{(<%(?:==|=|-|))\s*(.*?)\s*(-?%>)}m
   ERB_PLACEHOLDER = %r{erb[a-z0-9]+tag}
-  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/
@@ -49,10 +47,12 @@ class ERB::Formatter
 
   SELF_CLOSING_TAG = /\A(area|base|br|col|command|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)\z/i
 
-  ERB_OPEN_BLOCK = ->(code) do
+  RUBY_OPEN_BLOCK = ->(code) do
     # is nil when the parsing is broken, meaning it's an open expression
     Ripper.sexp(code).nil?
   end.freeze
+  RUBY_CLOSE_BLOCK = /\Aend\z/
+  RUBY_REOPEN_BLOCK = /\A(else|elsif\b(.*)|when\b(.*))\z/
 
   RUBOCOP_STDIN_MARKER = "===================="
 
@@ -146,45 +146,6 @@ class ERB::Formatter
     attr_html
   end
 
-  def format_erb_attributes(string)
-    erb_scanner = StringScanner.new(string.to_s)
-    erb_pre_pos = 0
-    until erb_scanner.eos?
-      if erb_scanner.scan_until(erb_tags_regexp)
-        erb_pre_match = erb_scanner.pre_match
-        erb_pre_match = erb_pre_match[erb_pre_pos..]
-        erb_pre_pos = erb_scanner.pos
-
-        erb_code = erb_tags[erb_scanner.captures.first]
-
-        format_attributes(erb_pre_match)
-
-        erb_open, ruby_code, erb_close = ERB_TAG.match(erb_code).captures
-        full_erb_tag = "#{erb_open} #{ruby_code} #{erb_close}"
-
-        case ruby_code
-        when /\Aend\z/
-          tag_stack_pop('%erb%', ruby_code)
-          html << (erb_pre_match.match?(/\s+\z/) ? indented(full_erb_tag) : full_erb_tag)
-        when /\A(else|elsif\b(.*))\z/
-          tag_stack_pop('%erb%', ruby_code)
-          html << (erb_pre_match.match?(/\s+\z/) ? indented(full_erb_tag) : full_erb_tag)
-          tag_stack_push('%erb%', ruby_code)
-        when ERB_OPEN_BLOCK
-          html << (erb_pre_match.match?(/\s+\z/) ? indented(full_erb_tag) : full_erb_tag)
-          tag_stack_push('%erb%', ruby_code)
-        else
-          ruby_code = format_ruby(ruby_code, autoclose: false)
-          html << (erb_pre_match.match?(/\s+\z/) ? indented(full_erb_tag) : full_erb_tag)
-        end
-      else
-        rest = erb_scanner.rest.to_s
-        format_erb_attributes(rest)
-        erb_scanner.terminate
-      end
-    end
-  end
-
   def tag_stack_push(tag_name, code)
     tag_stack << [tag_name, code]
     p PUSH: tag_stack if @debug
@@ -258,8 +219,8 @@ class ERB::Formatter
 
   def format_ruby(code, autoclose: false)
     if autoclose
-      code += "\nend" unless ERB_OPEN_BLOCK["#{code}\nend"]
-      code += "\n}" unless ERB_OPEN_BLOCK["#{code}\n}"]
+      code += "\nend" unless RUBY_OPEN_BLOCK["#{code}\nend"]
+      code += "\n}" unless RUBY_OPEN_BLOCK["#{code}\n}"]
     end
     p RUBY_IN_: code if @debug
 
@@ -303,16 +264,16 @@ class ERB::Formatter
         erb_open << ' ' unless ruby_code.start_with?('#')
 
         case ruby_code
-        when /\Aend\z/
+        when RUBY_CLOSE_BLOCK
           full_erb_tag = "#{erb_open}#{ruby_code} #{erb_close}"
           tag_stack_pop('%erb%', ruby_code)
           html << (erb_pre_match.match?(/\s+\z/) ? indented(full_erb_tag) : full_erb_tag)
-        when /\A(else|elsif\b(.*))\z/
+        when RUBY_REOPEN_BLOCK
           full_erb_tag = "#{erb_open}#{ruby_code} #{erb_close}"
           tag_stack_pop('%erb%', ruby_code)
           html << (erb_pre_match.match?(/\s+\z/) ? indented(full_erb_tag) : full_erb_tag)
           tag_stack_push('%erb%', ruby_code)
-        when ERB_OPEN_BLOCK
+        when RUBY_OPEN_BLOCK
           full_erb_tag = "#{erb_open}#{ruby_code} #{erb_close}"
           html << (erb_pre_match.match?(/\s+\z/) ? indented(full_erb_tag) : full_erb_tag)
           tag_stack_push('%erb%', ruby_code)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb-formatter
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Elia Schito
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: syntax_tree
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 description:
 email:
 - elia@schito.me
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Format ERB files with speed and precision.