rubocop-erb 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5296190cd666230a75345238e04672607de63d81fd9743916dfaa0bbcb93d3cf
-  data.tar.gz: ddf6afb2fff89a0b138c185e98b95ff8ada7d51bfe1e73a43b021261253739f2
+  metadata.gz: 99ed46b9d8eba4e69cea7d354412e033b02648eace4dfd38d9bcd59f83e0943d
+  data.tar.gz: bb8f0f0aeae48270f3c2ea4a7a90da7b2ebc5f51c85c7df2e9f2dda039fd6f1e
 SHA512:
-  metadata.gz: 2b1a9f87e73b4003762d77c8d9a4d3925f8551ea466149d2f8900a4af6df86ffee1d5f05bf1de4d88225a6a01b1cb8a94c8ec1f87a9b66b1da758e6cd324bb91
-  data.tar.gz: f7de81a3f61e54fcdf3a6aaf4c7ccd14634710d758c149acd98efd9f2d7a33b860f7e4a6025dcff0111478f480f320eeec9248dd53c9dc1045aeaa58e43291c1
+  metadata.gz: 8aa2e1476e145e3174417b20baef489ada2b253fcfcf5bdb0e2ad80463e192588a7180c9a643b1eccf9d85a3b8a6828cc23b5372b4e5928856855a7cec744575
+  data.tar.gz: 8e5c7ecc7da0bbea9d862d5aac33ff89768de9b2d85365a560e4b799363d07636cd4d9cfb654ceb0794cf79c556cea3c685204ed3b118bc46c581e7debb53899

data/.rubocop.yml

@@ -2,6 +2,7 @@ require:
   - rubocop-erb
   - rubocop-rake
   - rubocop-rspec
+  - sevencop
 
 inherit_mode:
   merge:
@@ -19,10 +20,6 @@ Gemspec/RequireMFA:
 Metrics:
   Enabled: false
 
-Naming/FileName:
-  Exclude:
-    - lib/rubocop-erb.rb
-
 RSpec/ExampleLength:
   Enabled: false
 
@@ -32,5 +29,23 @@ RSpec/MultipleExpectations:
 RSpec/NamedSubject:
   Enabled: false
 
+Sevencop/AutoloadOrdered:
+  Enabled: true
+
+Sevencop/HashElementOrdered:
+  Enabled: true
+
+Sevencop/MethodDefinitionArgumentsMultiline:
+  Enabled: true
+
+Sevencop/MethodDefinitionKeywordArgumentOrdered:
+  Enabled: true
+
+Sevencop/MethodDefinitionOrdered:
+  Enabled: true
+
 Style/Documentation:
   Enabled: false
+
+Style/MultilineBlockChain:
+  Enabled: false

data/Gemfile

@@ -9,3 +9,4 @@ gem 'rake'
 gem 'rspec'
 gem 'rubocop-rake'
 gem 'rubocop-rspec'
+gem 'sevencop'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-erb (0.2.0)
+    rubocop-erb (0.2.2)
       better_html
       rubocop (~> 1.45)
 
@@ -87,6 +87,9 @@ GEM
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
     ruby-progressbar (1.11.0)
+    sevencop (0.33.0)
+      activesupport
+      rubocop
     smart_properties (1.17.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -101,6 +104,7 @@ DEPENDENCIES
   rubocop-erb!
   rubocop-rake
   rubocop-rspec
+  sevencop
 
 BUNDLED WITH
    2.3.19

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 → keyword_remover.rb}

@@ -2,19 +2,19 @@
 
 module RuboCop
   module Erb
-    # Remove unnecessary part (e.g. `if`, `unless`, `do`, ...) from Ruby-ish code.
-    class RubyClipper
+    # Remove unnecessary keyword part (e.g. `if`, `unless`, `do`, ...) from Ruby-ish code.
+    class KeywordRemover
       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
@@ -53,6 +49,11 @@ module RuboCop
         end
       end
 
+      # @return [String, nil]
+      def file_path
+        @processed_source.path
+      end
+
       # @return [Enumerator<BetterHtml::AST::Node>]
       def nodes
         erbs.flat_map do |erb|
@@ -71,9 +72,20 @@ module RuboCop
         ).ast
       end
 
-      # @return [String, nil]
-      def file_path
-        @processed_source.path
+      # @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|
+          KeywordRemover.call(ruby_clip)
+        end.reject do |ruby_clip|
+          ruby_clip.code.match?(/\A\s*\z/)
+        end
       end
 
       # @return [Boolean]

data/lib/rubocop/erb/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module Rubocop
+module RuboCop
   module Erb
-    VERSION = '0.2.0'
+    VERSION = '0.2.2'
   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

@@ -3,9 +3,10 @@
 module RuboCop
   module Erb
     autoload :ConfigLoader, 'rubocop/erb/config_loader'
+    autoload :KeywordRemover, 'rubocop/erb/keyword_remover'
     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
 

data/rubocop-erb.gemspec

@@ -4,7 +4,7 @@ require_relative 'lib/rubocop/erb/version'
 
 Gem::Specification.new do |spec|
   spec.name = 'rubocop-erb'
-  spec.version = Rubocop::Erb::VERSION
+  spec.version = RuboCop::Erb::VERSION
   spec.authors = ['Ryo Nakamura']
   spec.email = ['r7kamura@gmail.com']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-erb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-08 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.45'
-description:
+description: 
 email:
 - r7kamura@gmail.com
 executables: []
@@ -54,14 +54,14 @@ files:
 - README.md
 - Rakefile
 - config/default.yml
-- lib/rubocop-erb.rb
 - lib/rubocop/erb.rb
 - lib/rubocop/erb/config_loader.rb
+- lib/rubocop/erb/keyword_remover.rb
 - lib/rubocop/erb/rubocop_extension.rb
 - lib/rubocop/erb/ruby_clip.rb
-- 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:
@@ -70,7 +70,7 @@ metadata:
   homepage_uri: https://github.com/r7kamura/rubocop-erb
   source_code_uri: https://github.com/r7kamura/rubocop-erb
   changelog_uri: https://github.com/r7kamura/rubocop-erb/releases
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -85,8 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: RuboCop plugin for ERB template.
 test_files: []

data/lib/rubocop-erb.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubocop/erb'