rubocop-erb 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5296190cd666230a75345238e04672607de63d81fd9743916dfaa0bbcb93d3cf
-  data.tar.gz: ddf6afb2fff89a0b138c185e98b95ff8ada7d51bfe1e73a43b021261253739f2
+  metadata.gz: 9a314d2115fff57bc77a2fa817590a4678e6d87a3f003956a928e57b9cd42b5b
+  data.tar.gz: 51e9a745d150b3c3c99a4294f0cf1f4f14be871ecf44b415087c411f7c54e33d
 SHA512:
-  metadata.gz: 2b1a9f87e73b4003762d77c8d9a4d3925f8551ea466149d2f8900a4af6df86ffee1d5f05bf1de4d88225a6a01b1cb8a94c8ec1f87a9b66b1da758e6cd324bb91
-  data.tar.gz: f7de81a3f61e54fcdf3a6aaf4c7ccd14634710d758c149acd98efd9f2d7a33b860f7e4a6025dcff0111478f480f320eeec9248dd53c9dc1045aeaa58e43291c1
+  metadata.gz: d39cc8a0b4a91a7e29b2a68434dd19f02e41f31ebb31ad5c5027593e588e8677e452de6e8b3f40dca654dad03b9eb5f34db3e09af87508d94be8d54a569f0c0e
+  data.tar.gz: 45789da936d92b4a212f5160af6ea49f770a07b8ec1a398c60364c2b0e27465a4868ea44d177e775c81010642b51322b6ce9242053cbf250dada6abe489583ff

data/.rubocop.yml

@@ -34,3 +34,6 @@ RSpec/NamedSubject:
 
 Style/Documentation:
   Enabled: false
+
+Style/MultilineBlockChain:
+  Enabled: false

data/Gemfile.lock

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

data/README.md

@@ -1,6 +1,8 @@
 # rubocop-erb
 
-[RuboCop](https://github.com/rubocop/rubocop) plugin for ERB template language.
+[![test](https://github.com/r7kamura/rubocop-erb/actions/workflows/test.yml/badge.svg)](https://github.com/r7kamura/rubocop-erb/actions/workflows/test.yml)
+
+[RuboCop](https://github.com/rubocop/rubocop) plugin for ERB template.
 
 ## Installation
 
@@ -18,7 +20,7 @@ gem install rubocop-erb
 
 ## Usage
 
-Require `"rubocop-erb"` in your RuboCop config.
+Require `rubocop-erb` in your RuboCop config.
 
 ```yaml
 # .rubocop.yml
@@ -51,3 +53,9 @@ spec/fixtures/dummy.erb:7:11: E: Lint/Syntax: unexpected token $end
 
 1 file inspected, 4 offenses detected, 3 offenses autocorrectable
 ```
+
+## Related projects
+
+- https://github.com/r7kamura/rubocop-haml
+- https://github.com/r7kamura/rubocop-slim
+- https://github.com/r7kamura/rubocop-markdown

data/lib/rubocop/erb/ruby_clipper.rb

@@ -5,16 +5,16 @@ module RuboCop
     # Remove unnecessary part (e.g. `if`, `unless`, `do`, ...) from Ruby-ish code.
     class RubyClipper
       class << self
-        # @param [String] code
-        # @return [Hash]
-        def call(code)
-          new(code).call
+        # @param [RuboCop::Erb::RubyClip] ruby_clip
+        # @return [RuboCop::Erb::RubyClip]
+        def call(ruby_clip)
+          new(ruby_clip).call
         end
       end
 
-      # @param [String] code
-      def initialize(code)
-        @code = code
+      # @param [RuboCop::Erb::RubyClip] ruby_clip
+      def initialize(ruby_clip)
+        @ruby_clip = ruby_clip
       end
 
       # @return [RuboCop::Erb::RubyClip]
@@ -22,12 +22,7 @@ module RuboCop
         [
           PrecedingKeywordRemover,
           TrailingDoRemover
-        ].reduce(
-          RubyClip.new(
-            code: @code,
-            offset: 0
-          )
-        ) do |previous, callable|
+        ].reduce(@ruby_clip) do |previous, callable|
           result = callable.call(previous.code)
           RubyClip.new(
             code: result.code,

data/lib/rubocop/erb/ruby_extractor.rb

@@ -25,23 +25,19 @@ module RuboCop
       def call
         return unless supported_file_path_pattern?
 
-        nodes.map do |node|
-          snippet = node.children.first
-          clip = RubyClipper.new(snippet).call
-          next if clip[:code].match?(/\A\s*\z/)
-
+        ruby_clips.map do |ruby_clip|
           processed_source = ::RuboCop::ProcessedSource.new(
-            clip[:code],
+            ruby_clip.code,
             @processed_source.ruby_version,
             file_path
           )
           processed_source.config = @processed_source.config
           processed_source.registry = @processed_source.registry
           {
-            offset: node.location.begin_pos + clip[:offset],
+            offset: ruby_clip.offset,
             processed_source: processed_source
           }
-        end.compact
+        end
       end
 
       private
@@ -71,6 +67,22 @@ module RuboCop
         ).ast
       end
 
+      # @return [Array<RuboCop::Erb::RubyClip>]
+      def ruby_clips
+        nodes.map do |node|
+          RubyClip.new(
+            code: node.children.first,
+            offset: node.location.begin_pos
+          )
+        end.flat_map do |ruby_clip|
+          WhenDecomposer.call(ruby_clip)
+        end.map do |ruby_clip|
+          RubyClipper.call(ruby_clip)
+        end.reject do |ruby_clip|
+          ruby_clip.code.match?(/\A\s*\z/)
+        end
+      end
+
       # @return [String, nil]
       def file_path
         @processed_source.path

data/lib/rubocop/erb/version.rb

@@ -2,6 +2,6 @@
 
 module Rubocop
   module Erb
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/lib/rubocop/erb/when_decomposer.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'parser/current'
+require 'rubocop/ast/builder'
+
+module RuboCop
+  module Erb
+    class WhenDecomposer
+      REGEXP = /
+        \A
+        \s*
+        when[ \t]
+      /x.freeze
+
+      class << self
+        # @param [RuboCop::Erb::RubyClip] ruby_clip
+        # @return [Array<RuboCop::Erb::RubyClip>]
+        def call(ruby_clip)
+          new(ruby_clip).call
+        end
+      end
+
+      # @param [RuboCop::Erb::RubyClip] ruby_clip
+      def initialize(ruby_clip)
+        @ruby_clip = ruby_clip
+      end
+
+      # @return [Array<RuboCop::Erb::RubyClip>]
+      def call
+        match_data = @ruby_clip.code.match(REGEXP)
+        if match_data
+          offset = match_data[0].length
+          parse("[#{@ruby_clip.code[offset..]}]").children.map do |child|
+            RubyClip.new(
+              code: child.location.expression.source,
+              offset: @ruby_clip.offset + offset + child.location.expression.begin_pos - 1
+            )
+          end
+        else
+          [@ruby_clip]
+        end
+      end
+
+      private
+
+      # @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
+          )
+        )
+      end
+    end
+  end
+end

data/lib/rubocop/erb.rb

@@ -6,6 +6,7 @@ module RuboCop
     autoload :RubyClip, 'rubocop/erb/ruby_clip'
     autoload :RubyClipper, 'rubocop/erb/ruby_clipper'
     autoload :RubyExtractor, 'rubocop/erb/ruby_extractor'
+    autoload :WhenDecomposer, 'rubocop/erb/when_decomposer'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-erb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-08 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html
@@ -62,6 +62,7 @@ files:
 - lib/rubocop/erb/ruby_clipper.rb
 - lib/rubocop/erb/ruby_extractor.rb
 - lib/rubocop/erb/version.rb
+- lib/rubocop/erb/when_decomposer.rb
 - rubocop-erb.gemspec
 homepage: https://github.com/r7kamura/rubocop-erb
 licenses: