rubocop-erb 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 227bb09e4901cb5d84bec63ed5c65f60d2955ddd4e16768ada9044845466fd16
-  data.tar.gz: 8245ac7615be745be61b612c99d455eaa86b987d8328b4765e6b35efbbb62cba
+  metadata.gz: 877390d14fe06387c7cfd3bd589030e34f2b8734467e9ee291c0733d1f5a2eef
+  data.tar.gz: 3a5aec17cb87b8f386dac6aa954bee5065e2f3dad0b90aad10e0b9288892c7ac
 SHA512:
-  metadata.gz: 5a479746047e28f98ca518824bfeb1ea2469e50faa2830eba0db2b76339e9fb2ab69c5de6abeb63c7e844180fd5198f6919a51de88d48e7455affc3b75db0165
-  data.tar.gz: 70aa186e9d2e09011081e228f897a92ae65df19ec252839851b0a41ba404605f77847b942ca58c4dba78a9f222c49c830c039d3da714595a7bcad7f5cb42c728
+  metadata.gz: b3f345e09bbb26bbb949e179aec06a5fdcf3a34e6bc1a60c33258d8f81ae3bbd08b014324dc082d40bdeb4c915ce25707c57a6d4a9215d17ab73a307c4442443
+  data.tar.gz: 355f7e581f3f9045dfd1f1dfe7f143836870ff1b9b14f22f9bb3e05e6af63693458ebc8023089763ea726ecd2c0b4dee9f5c91783e9af1e6830d1256a231334a

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    rubocop-erb (0.5.2)
+    rubocop-erb (0.5.4)
       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.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/config/default.yml

@@ -143,7 +143,7 @@ Lint/OutOfRangeRegexpRef:
   Exclude:
     - '**/*.erb'
 
-Lint/SyntaxError:
+Lint/Syntax:
   Exclude:
     - '**/*.erb'
 

data/gemfiles/ruby_2.7.gemfile.lock

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

data/lib/rubocop/erb/processed_source_builder.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Erb
+    class ProcessedSourceBuilder
+      class << self
+        # Creates a new ProcessedSource, inheriting state from a donor.
+        #
+        # @param [String] code
+        # @param [RuboCop::ProcessedSource] processed_source
+        # @return [RuboCop::ProcessedSource]
+        def call(
+          code:,
+          processed_source:
+        )
+          new(
+            code: code,
+            processed_source: processed_source
+          ).call
+        end
+      end
+
+      def initialize(
+        code:,
+        processed_source:
+      )
+        @code = code
+        @processed_source = processed_source
+      end
+
+      def call
+        new_processed_source = ::RuboCop::ProcessedSource.new(
+          @code,
+          @processed_source.ruby_version,
+          @processed_source.path,
+          **keyword_arguments
+        )
+        new_processed_source.config = @processed_source.config
+        new_processed_source.registry = @processed_source.registry
+        new_processed_source
+      end
+
+      private
+
+      # @return [Hash]
+      def keyword_arguments
+        if @processed_source.respond_to?(:parser_engine)
+          { parser_engine: @processed_source.parser_engine }
+        else
+          {}
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/erb/ruby_extractor.rb

@@ -28,7 +28,10 @@ module RuboCop
         ruby_clips.map do |ruby_clip|
           {
             offset: ruby_clip.offset,
-            processed_source: ruby_clip_to_processed_source(ruby_clip)
+            processed_source: ProcessedSourceBuilder.call(
+              code: ruby_clip.code,
+              processed_source: @processed_source
+            )
           }
         end
       end
@@ -59,35 +62,13 @@ module RuboCop
       def root
         ::BetterHtml::Parser.new(
           ::Parser::Source::Buffer.new(
-            @file_path,
+            file_path,
             source: template_source
           ),
           template_language: :html
         ).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 +77,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.2'
+    VERSION = '0.5.4'
   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,10 @@ 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
-          )
-        )
+        ProcessedSourceBuilder.call(
+          code: source,
+          processed_source: @processed_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 :ProcessedSourceBuilder, 'rubocop/erb/processed_source_builder'
     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.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-28 00:00:00.000000000 Z
+date: 2024-10-01 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_builder.rb
 - lib/rubocop/erb/rubocop_extension.rb
 - lib/rubocop/erb/ruby_clip.rb
 - lib/rubocop/erb/ruby_extractor.rb