rubocop-erb 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1650bd31cfedf2d62fc05f8979e290bf33b04b8b42a6988fbab36ddef75a113f
-  data.tar.gz: 44de0adbdc72ac2abb1cb49778989bb6266f6c91a5cfeffd428c2c83df9ec764
+  metadata.gz: 49341b04ccc3098029bdd8f9b98b961825328a46623797e1a544e3264f16768b
+  data.tar.gz: eac652e2b1a040701290af19e4cded60a4cd53aa2849bc2aa5d1c9ddfefe7fee
 SHA512:
-  metadata.gz: '059b029c8a15edf705991b6e0acf4e7b31dbae52afd4c109afc04902cb4e3db353b0dc3cc2c6fdc0118a361be190b755b73dfa54472a0d85097e70192e0f4203'
-  data.tar.gz: 1d69a7428f7caee5cbcfad7d987ac49f0f38b28b16cb11888fe1aa66a6a827bf8528b178f86e3b395b195f24dd588d67dbea48121448d2d23952a443e3f398f3
+  metadata.gz: d3dd34349dc3eeea3925ad0b0d789e89efabc1ce0120f80ef64298e1b2b8b548936be1f7e4d10b7b2569a36685cc10170af706eeb3d982c08ac1d5638979e90c
+  data.tar.gz: 7705cb8f5537d18855c89e431fe40489f002a2c9a104b5662fa7bf20e967c23ae549507c42649819360180d1ee792b9980432b810ea1e17f4feb73d3b477f747

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-erb (0.5.3)
+    rubocop-erb (0.5.5)
       better_html
       rubocop (~> 1.45)
 
@@ -45,12 +45,12 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
-    loofah (2.22.0)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     minitest (5.24.1)
     mutex_m (0.2.0)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.16.8-x86_64-linux)
       racc (~> 1.4)
     parallel (1.25.1)
     parser (3.3.4.0)
@@ -62,9 +62,9 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.1)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)

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.3)
+    rubocop-erb (0.5.5)
       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,10 +28,9 @@ module RuboCop
         ruby_clips.map do |ruby_clip|
           {
             offset: ruby_clip.offset,
-            processed_source: ProcessedSourceHelper.code_to_processed_source(
-              @processed_source,
-              file_path,
-              ruby_clip.code
+            processed_source: ProcessedSourceBuilder.call(
+              code: ruby_clip.code,
+              processed_source: @processed_source
             )
           }
         end
@@ -63,7 +62,7 @@ module RuboCop
       def root
         ::BetterHtml::Parser.new(
           ::Parser::Source::Buffer.new(
-            @file_path,
+            file_path,
             source: template_source
           ),
           template_language: :html

data/lib/rubocop/erb/version.rb

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

data/lib/rubocop/erb/when_decomposer.rb

@@ -37,13 +37,15 @@ module RuboCop
         if match_data
           offset = match_data[0].length
           condition = @ruby_clip.code[offset..].sub(/[ \t]then(?:[ \t].*)?/, '')
-          parse(
+          nodes = parse(
             <<~RUBY
               [
                 #{condition}
               ]
             RUBY
-          ).children.map do |child|
+          )&.children || []
+
+          nodes.map do |child|
             RubyClip.new(
               code: child.location.expression.source,
               offset: @ruby_clip.offset + offset + child.location.expression.begin_pos - 4
@@ -59,10 +61,9 @@ module RuboCop
       # @param [String] source
       # @return [RuboCop::AST::Node]
       def parse(source)
-        ProcessedSourceHelper.code_to_processed_source(
-          @processed_source,
-          '(string)',
-          source
+        ProcessedSourceBuilder.call(
+          code: source,
+          processed_source: @processed_source
         ).ast
       end
     end

data/lib/rubocop/erb.rb

@@ -4,7 +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 :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.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-11 00:00:00.000000000 Z
+date: 2024-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html
@@ -59,7 +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/processed_source_builder.rb
 - lib/rubocop/erb/rubocop_extension.rb
 - lib/rubocop/erb/ruby_clip.rb
 - lib/rubocop/erb/ruby_extractor.rb

data/lib/rubocop/erb/processed_source_helper.rb

@@ -1,33 +0,0 @@
-# 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