rubocop-erb 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 742cdbab5d75368c8a97e45b610809a11ee36a806b7a6eea84e85b9f5810cd9e
-  data.tar.gz: 10da21545ab9f73ada119f5cb2a54dda6e297bbc5660325fa098aa0e92c83787
+  metadata.gz: 69ccb933a550ae4dfe699ed42350e4c39eb7b2e0e7488915ec3ead433ef1d2be
+  data.tar.gz: cf759f1dddd604d8843fccf1bd71fa3a2d8f7a833c08f35048452bb0de18955e
 SHA512:
-  metadata.gz: 585098a85e2b0d6c4b3cd286014a2f2e1578e6744241f3cc3f098f2533f6346268c3e207937f359385b882db3ec4e189d8d680b787d28839c98c72881dbb617d
-  data.tar.gz: 21cdb3c2918b0d01eee173e24dafbedde1340459e7c884ca7e62e3688e85b53faf576ac883753774738b9b9f7cc62c2901c21150af092b02a1e44492e0a90ab5
+  metadata.gz: 65177bdd79e44d0ed83f431c480ec5399ebcd4fb5d196a4c1bab61947984525cc2c2f8aaf6ff3978fd66558d058e8fcf2fb50f88d0c27ed4715613b5426e73f5
+  data.tar.gz: 4c2ecc5c6b0be161bb72799e17761d50b5dc8387d1ae1de6043ed8dc02dfd2a16093ed49c5ca529e93c6e3d004079406d345e5d5155e883dd4527e0c4be09f65

data/Gemfile

@@ -5,6 +5,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in rubocop-erb.gemspec
 gemspec
 
+gem 'prism'
 gem 'rake'
 gem 'rspec'
 gem 'rubocop-rake'

data/Gemfile.lock

@@ -1,25 +1,31 @@
 PATH
   remote: .
   specs:
-    rubocop-erb (0.3.0)
+    rubocop-erb (0.4.0)
       better_html
       rubocop (~> 1.45)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (7.0.4.2)
-      activesupport (= 7.0.4.2)
+    actionview (7.1.3.2)
+      activesupport (= 7.1.3.2)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.4.2)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
+    base64 (0.2.0)
     better_html (2.0.2)
       actionview (>= 6.0)
       activesupport (>= 6.0)
@@ -27,25 +33,32 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
+    bigdecimal (3.1.6)
     builder (3.2.4)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     crass (1.0.6)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
     erubi (1.12.0)
-    i18n (1.12.0)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    loofah (2.21.3)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    minitest (5.17.0)
-    nokogiri (1.15.3-x86_64-linux)
+    minitest (5.22.2)
+    mutex_m (0.2.0)
+    nokogiri (1.16.2-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.2.0.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
-    racc (1.7.1)
-    rails-dom-testing (2.1.1)
+      racc
+    prism (0.24.0)
+    racc (1.7.3)
+    rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
@@ -53,54 +66,59 @@ GEM
       loofah (~> 2.21)
       nokogiri (~> 1.14)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.2)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rake (13.1.0)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.45.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.62.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
-    rubocop-capybara (2.17.0)
+    rubocop-ast (1.31.1)
+      parser (>= 3.3.0.4)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.18.1)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.27.1)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
-    ruby-progressbar (1.11.0)
-    sevencop (0.33.0)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    sevencop (0.38.0)
       activesupport
       rubocop
     smart_properties (1.17.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  prism
   rake
   rspec
   rubocop-erb!

data/gemfiles/ruby_2.7.gemfile

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'nokogiri', '~> 1.15.0'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'
+gem 'sevencop'

data/gemfiles/ruby_2.7.gemfile.lock

@@ -0,0 +1,131 @@
+PATH
+  remote: ..
+  specs:
+    rubocop-erb (0.4.0)
+      better_html
+      rubocop (~> 1.45)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionview (7.1.2)
+      activesupport (= 7.1.2)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    better_html (2.0.2)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      parser (>= 2.4)
+      smart_properties
+    bigdecimal (3.1.5)
+    builder (3.2.4)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    diff-lcs (1.5.0)
+    drb (2.2.0)
+      ruby2_keywords
+    erubi (1.12.0)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    minitest (5.20.0)
+    mutex_m (0.2.0)
+    nokogiri (1.15.5-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.24.0)
+    parser (3.3.0.2)
+      ast (~> 2.4.1)
+      racc
+    racc (1.7.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    rainbow (3.1.1)
+    rake (13.1.0)
+    regexp_parser (2.8.3)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.59.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.2.2.4)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.26.1)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sevencop (0.35.1)
+      activesupport
+      rubocop
+    smart_properties (1.17.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  nokogiri (~> 1.15.0)
+  rake
+  rspec
+  rubocop-erb!
+  rubocop-rake
+  rubocop-rspec
+  sevencop
+
+BUNDLED WITH
+   2.3.19

data/lib/rubocop/erb/keyword_remover.rb

@@ -21,6 +21,9 @@ module RuboCop
       def call
         [
           PrecedingKeywordRemover,
+          PrecedingBraceRemover,
+          TrailingBraceRemover,
+          TrailingThenRemover,
           TrailingDoRemover
         ].reduce(@ruby_clip) do |previous, callable|
           result = callable.call(previous.code)
@@ -31,29 +34,7 @@ module RuboCop
         end
       end
 
-      # Remove preceding keyword.
-      class PrecedingKeywordRemover
-        REGEXP = /
-          \A
-          \s*
-          (?:
-            begin
-            | case
-            | else
-            | elsif
-            | end
-            | ensure
-            | if
-            | rescue
-            | unless
-            | until
-            | when
-            | while
-            | for[ \t]+\w+[ \t]+in
-          )
-          \b[ \t]*
-        /x.freeze
-
+      class PrecedingSourceRemover
         class << self
           # @param [String] code
           # @return [RubyClip]
@@ -69,7 +50,7 @@ module RuboCop
 
         # @return [Hash]
         def call
-          data = @code.match(REGEXP)
+          data = @code.match(self.class::REGEXP)
           if data
             offset = data[0].length
             RubyClip.new(
@@ -85,17 +66,40 @@ module RuboCop
         end
       end
 
-      # Remove trailing `do`.
-      class TrailingDoRemover
+      # Remove preceding keyword.
+      class PrecedingKeywordRemover < PrecedingSourceRemover
         REGEXP = /
-          [ \t]
-          do
-          [ \t]*
-          (\|[^|]*\|)?
-          [ \t]*
-          \Z
+          \A
+          \s*
+          (?:
+            begin
+            | case
+            | else
+            | elsif
+            | end
+            | ensure
+            | if
+            | rescue
+            | unless
+            | until
+            | when
+            | while
+            | for[ \t]+\w+[ \t]+in
+          )
+          \b[ \t]*
         /x.freeze
+      end
 
+      # Remove preceding `}`.
+      class PrecedingBraceRemover < PrecedingSourceRemover
+        REGEXP = /
+          \A
+          \s*
+          }
+        /x.freeze
+      end
+
+      class TrailingSourceRemover
         class << self
           # @param [String] code
           # @return [RubyClip]
@@ -112,11 +116,44 @@ module RuboCop
         # @return [Hash]
         def call
           RubyClip.new(
-            code: @code.sub(REGEXP, ''),
+            code: @code.sub(self.class::REGEXP, ''),
             offset: 0
           )
         end
       end
+
+      # Remove trailing `{`.
+      class TrailingBraceRemover < TrailingSourceRemover
+        REGEXP = /
+          {
+          [ \t]*
+          (?:\|[^|]*\|)?
+          \s*
+          \z
+        /x.freeze
+      end
+
+      # Remove trailing `then`.
+      class TrailingThenRemover < TrailingSourceRemover
+        REGEXP = /
+          [ \t]*\b
+          then
+          \s*
+          \z
+        /x.freeze
+      end
+
+      # Remove trailing `do`.
+      class TrailingDoRemover < TrailingSourceRemover
+        REGEXP = /
+          [ \t]
+          do
+          [ \t]*
+          (?:\|[^|]*\|)?
+          \s*
+          \z
+        /x.freeze
+      end
     end
   end
 end

data/lib/rubocop/erb/ruby_extractor.rb

@@ -26,16 +26,9 @@ module RuboCop
         return unless supported_file_path_pattern?
 
         ruby_clips.map do |ruby_clip|
-          processed_source = ::RuboCop::ProcessedSource.new(
-            ruby_clip.code,
-            @processed_source.ruby_version,
-            file_path
-          )
-          processed_source.config = @processed_source.config
-          processed_source.registry = @processed_source.registry
           {
             offset: ruby_clip.offset,
-            processed_source: processed_source
+            processed_source: ruby_clip_to_processed_source(ruby_clip)
           }
         end
       end
@@ -73,6 +66,28 @@ module RuboCop
         ).ast
       end
 
+      # @return [RuboCop::ProcessedSource]
+      def ruby_clip_to_processed_source(ruby_clip)
+        supports_prism = @processed_source.respond_to?(:parser_engine)
+        processed_source = if supports_prism
+                             ::RuboCop::ProcessedSource.new(
+                               ruby_clip.code,
+                               @processed_source.ruby_version,
+                               file_path,
+                               parser_engine: @processed_source.parser_engine
+                             )
+                           else
+                             ::RuboCop::ProcessedSource.new(
+                               ruby_clip.code,
+                               @processed_source.ruby_version,
+                               file_path
+                             )
+                           end
+        processed_source.config = @processed_source.config
+        processed_source.registry = @processed_source.registry
+        processed_source
+      end
+
       # @return [Array<RuboCop::Erb::RubyClip>]
       def ruby_clips
         nodes.map do |node|

data/lib/rubocop/erb/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Erb
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-erb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-20 00:00:00.000000000 Z
+date: 2024-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html
@@ -54,6 +54,8 @@ files:
 - README.md
 - Rakefile
 - config/default.yml
+- gemfiles/ruby_2.7.gemfile
+- gemfiles/ruby_2.7.gemfile.lock
 - lib/rubocop/erb.rb
 - lib/rubocop/erb/config_loader.rb
 - lib/rubocop/erb/keyword_remover.rb