rubocop-erb 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b13699d8ba0b6d66de391094e0bbfcc7a4476cfcd821e584b1c75c7d016324c5
-  data.tar.gz: bfab6b295f44a2e98e74b4a35ad82217ccf14cf212943b9c9dd4c2d978df3531
+  metadata.gz: 1650bd31cfedf2d62fc05f8979e290bf33b04b8b42a6988fbab36ddef75a113f
+  data.tar.gz: 44de0adbdc72ac2abb1cb49778989bb6266f6c91a5cfeffd428c2c83df9ec764
 SHA512:
-  metadata.gz: d11d09706fd7d59ef07600ce2c3986ba90b436272465c19ed3dc60e1a87344540396d7b739d2f64afce8d6e486cc4de6a276e47eabf6251695d22f43df0a6fb3
-  data.tar.gz: f3153518ca9634939f6327e8881aa958012d20d1805ecb677a66909424d27add955bdb50c4f128d8b350184a153b5ac60657e838ff745cb679e7d3f68a77e971
+  metadata.gz: '059b029c8a15edf705991b6e0acf4e7b31dbae52afd4c109afc04902cb4e3db353b0dc3cc2c6fdc0118a361be190b755b73dfa54472a0d85097e70192e0f4203'
+  data.tar.gz: 1d69a7428f7caee5cbcfad7d987ac49f0f38b28b16cb11888fe1aa66a6a827bf8528b178f86e3b395b195f24dd588d67dbea48121448d2d23952a443e3f398f3

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    rubocop-erb (0.5.1)
+    rubocop-erb (0.5.3)
       better_html
       rubocop (~> 1.45)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -33,31 +33,31 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.8)
     builder (3.3.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     crass (1.0.6)
     diff-lcs (1.5.1)
     drb (2.2.1)
     erubi (1.13.0)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    json (2.7.1)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    minitest (5.22.2)
+    minitest (5.24.1)
     mutex_m (0.2.0)
-    nokogiri (1.16.6-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
-    prism (0.24.0)
-    racc (1.7.3)
+    prism (0.30.0)
+    racc (1.8.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -66,50 +66,46 @@ GEM
       loofah (~> 2.21)
       nokogiri (~> 1.14)
     rainbow (3.1.1)
-    rake (13.1.0)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.4)
+      strscan
     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)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.62.0)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.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-ast (1.32.0)
+      parser (>= 3.3.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.27.1)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+    rubocop-rspec (3.0.4)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    sevencop (0.38.0)
+    sevencop (0.43.1)
       activesupport
       rubocop
     smart_properties (1.17.0)
+    strscan (3.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)

data/gemfiles/ruby_2.7.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    rubocop-erb (0.5.1)
+    rubocop-erb (0.5.3)
       better_html
       rubocop (~> 1.45)
 

data/lib/rubocop/erb/keyword_remover.rb

@@ -146,7 +146,7 @@ module RuboCop
       # Remove trailing `do`.
       class TrailingDoRemover < TrailingSourceRemover
         REGEXP = /
-          [ \t]
+          (?:\b[ \t]*|[ \t])
           do
           [ \t]*
           (?:\|[^|]*\|)?

data/lib/rubocop/erb/processed_source_helper.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Erb
+    module ProcessedSourceHelper
+      # Creates a new ProcessedSource, inheriting state from a donor
+      #
+      # @param [RuboCop::ProcessedSource] input_processed_source
+      # @param [String] code
+      # @return [RuboCop::ProcessedSource]
+      def self.code_to_processed_source(input_processed_source, path, code)
+        supports_prism = input_processed_source.respond_to?(:parser_engine)
+        processed_source = if supports_prism
+                             ::RuboCop::ProcessedSource.new(
+                               code,
+                               input_processed_source.ruby_version,
+                               path,
+                               parser_engine: input_processed_source.parser_engine
+                             )
+                           else
+                             ::RuboCop::ProcessedSource.new(
+                               code,
+                               input_processed_source.ruby_version,
+                               path
+                             )
+                           end
+        processed_source.config = input_processed_source.config
+        processed_source.registry = input_processed_source.registry
+        processed_source
+      end
+    end
+  end
+end

data/lib/rubocop/erb/ruby_extractor.rb

@@ -28,7 +28,11 @@ module RuboCop
         ruby_clips.map do |ruby_clip|
           {
             offset: ruby_clip.offset,
-            processed_source: ruby_clip_to_processed_source(ruby_clip)
+            processed_source: ProcessedSourceHelper.code_to_processed_source(
+              @processed_source,
+              file_path,
+              ruby_clip.code
+            )
           }
         end
       end
@@ -66,28 +70,6 @@ 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|
@@ -96,7 +78,7 @@ module RuboCop
             offset: node.location.begin_pos
           )
         end.flat_map do |ruby_clip|
-          WhenDecomposer.call(ruby_clip)
+          WhenDecomposer.call(@processed_source, ruby_clip)
         end.map do |ruby_clip|
           KeywordRemover.call(ruby_clip)
         end.reject do |ruby_clip|

data/lib/rubocop/erb/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Erb
-    VERSION = '0.5.1'
+    VERSION = '0.5.3'
   end
 end

data/lib/rubocop/erb/when_decomposer.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'parser/current'
-require 'rubocop/ast/builder'
-
 module RuboCop
   module Erb
     class WhenDecomposer
@@ -13,15 +10,24 @@ module RuboCop
       /x.freeze
 
       class << self
+        # @param [RuboCop::ProcessedSource] processed_source
         # @param [RuboCop::Erb::RubyClip] ruby_clip
         # @return [Array<RuboCop::Erb::RubyClip>]
-        def call(ruby_clip)
-          new(ruby_clip).call
+        def call(
+          processed_source,
+          ruby_clip
+        )
+          new(processed_source, ruby_clip).call
         end
       end
 
+      # @param [RuboCop::ProcessedSource] processed_source
       # @param [RuboCop::Erb::RubyClip] ruby_clip
-      def initialize(ruby_clip)
+      def initialize(
+        processed_source,
+        ruby_clip
+      )
+        @processed_source = processed_source
         @ruby_clip = ruby_clip
       end
 
@@ -53,14 +59,11 @@ module RuboCop
       # @param [String] source
       # @return [RuboCop::AST::Node]
       def parse(source)
-        ::Parser::CurrentRuby.new(
-          ::RuboCop::AST::Builder.new
-        ).parse(
-          ::Parser::Source::Buffer.new(
-            '(string)',
-            source: source
-          )
-        )
+        ProcessedSourceHelper.code_to_processed_source(
+          @processed_source,
+          '(string)',
+          source
+        ).ast
       end
     end
   end

data/lib/rubocop/erb.rb

@@ -4,6 +4,7 @@ module RuboCop
   module Erb
     autoload :ConfigLoader, 'rubocop/erb/config_loader'
     autoload :KeywordRemover, 'rubocop/erb/keyword_remover'
+    autoload :ProcessedSourceHelper, 'rubocop/erb/processed_source_helper'
     autoload :RubyClip, 'rubocop/erb/ruby_clip'
     autoload :RubyExtractor, 'rubocop/erb/ruby_extractor'
     autoload :WhenDecomposer, 'rubocop/erb/when_decomposer'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-erb
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-25 00:00:00.000000000 Z
+date: 2024-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html
@@ -59,6 +59,7 @@ files:
 - lib/rubocop/erb.rb
 - lib/rubocop/erb/config_loader.rb
 - lib/rubocop/erb/keyword_remover.rb
+- lib/rubocop/erb/processed_source_helper.rb
 - lib/rubocop/erb/rubocop_extension.rb
 - lib/rubocop/erb/ruby_clip.rb
 - lib/rubocop/erb/ruby_extractor.rb