rubocop-slim 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cf87a8612b574266dfd299f12015fdeb0bab05209d10a7442986d246afaefac
-  data.tar.gz: b0e326fe05f6ae9ac27cd10dbd68413baae05ddb75d6858ffc6cf9f6f1120d5d
+  metadata.gz: 8c45227572489dcaf1115c4f96c218f75b7df3b493cc73fe9d35e8695e86e2b1
+  data.tar.gz: 07ac242bc16d7b6b0edbdd58af4cc47cb34eb4a8274faffcb39829eeb1a8208d
 SHA512:
-  metadata.gz: cf91db8b95de79e09cc0dd2871cb4765ffe8add777acafd28506e05087962ce16a93669eda08b642d3019904bd9a6a6803b0bf09cda5bb99004b9f3843da5b4c
-  data.tar.gz: 5cafcb80661c32d6589ce183b3276697475e473b53e7424c823c1751e9f6bea69add7fbe9ccd8e33b1cf4252e0ae4392c19eef8cccc4f6e0c68583fa0f0a02f9
+  metadata.gz: 4504afb95f22cb097a22281038f758106ea29d08a81f1d26d6bd9089ef74b40f208b7f48ff798d5b6f3da411c8204bd23e5ea47bc932c5c1b76bad9be9a989bf
+  data.tar.gz: e55105528126f91087a9707678ad744e3ceffee372381749198a7e2d3709de3a24ebd1bfa1307584c9a433e736d81a631a9e4f66d8e7cf08bb2fab1568a34e86

data/.rubocop.yml

@@ -2,6 +2,7 @@ require:
   - rubocop-rake
   - rubocop-rspec
   - rubocop-slim
+  - sevencop
 
 inherit_mode:
   merge:
@@ -11,7 +12,10 @@ AllCops:
   Exclude:
     - spec/**/*.slim
   NewCops: enable
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
+
+Gemspec/RequireMFA:
+  Enabled: false
 
 Metrics:
   Enabled: false
@@ -29,5 +33,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

@@ -7,6 +7,6 @@ gemspec
 
 gem 'rake'
 gem 'rspec'
-gem 'rubocop'
 gem 'rubocop-rake'
 gem 'rubocop-rspec'
+gem 'sevencop'

data/Gemfile.lock

@@ -1,16 +1,25 @@
 PATH
   remote: .
   specs:
-    rubocop-slim (0.2.0)
+    rubocop-slim (0.2.1)
       rubocop (~> 1.45)
       slimi (~> 0.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (7.0.4.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     ast (2.4.2)
+    concurrent-ruby (1.2.0)
     diff-lcs (1.5.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
     json (2.6.3)
+    minitest (5.17.0)
     parallel (1.22.1)
     parser (3.2.0.0)
       ast (~> 2.4.1)
@@ -51,6 +60,9 @@ GEM
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
     ruby-progressbar (1.11.0)
+    sevencop (0.33.0)
+      activesupport
+      rubocop
     slimi (0.7.2)
       temple
       thor
@@ -58,6 +70,8 @@ GEM
     temple (0.10.0)
     thor (1.2.1)
     tilt (2.0.11)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
 
 PLATFORMS
@@ -66,10 +80,10 @@ PLATFORMS
 DEPENDENCIES
   rake
   rspec
-  rubocop
   rubocop-rake
   rubocop-rspec
   rubocop-slim!
+  sevencop
 
 BUNDLED WITH
    2.3.19

data/README.md

@@ -1,6 +1,8 @@
 # rubocop-slim
 
-[RuboCop](https://github.com/rubocop/rubocop) plugin for [Slim](https://github.com/slim-template/slim) template language.
+[![test](https://github.com/r7kamura/rubocop-slim/actions/workflows/test.yml/badge.svg)](https://github.com/r7kamura/rubocop-slim/actions/workflows/test.yml)
+
+[RuboCop](https://github.com/rubocop/rubocop) plugin for [Slim](https://github.com/slim-template/slim) template.
 
 ## Installation
 
@@ -18,7 +20,7 @@ gem install rubocop-slim
 
 ## Usage
 
-Require `"rubocop-slim"` in your RuboCop config.
+Require `rubocop-slim` in your RuboCop config.
 
 ```yaml
 # .rubocop.yml
@@ -53,3 +55,9 @@ spec/fixtures/dummy.slim:8:6: C: [Correctable] Style/StringLiterals: Prefer sing
 
 1 file inspected, 5 offenses detected, 5 offenses autocorrectable
 ```
+
+## Related projects
+
+- https://github.com/r7kamura/rubocop-erb
+- https://github.com/r7kamura/rubocop-haml
+- https://github.com/r7kamura/rubocop-markdown

data/lib/rubocop/slim/{ruby_clipper.rb → keyword_remover.rb}

@@ -3,18 +3,18 @@
 module RuboCop
   module Slim
     # Remove unnecessary part (e.g. `if`, `unless`, `do`, ...) from Ruby-ish code.
-    class RubyClipper
+    class KeywordRemover
       class << self
-        # @param [String] code
-        # @return [Hash]
-        def call(code)
-          new(code).call
+        # @param [RuboCop::Slim::RubyClip] ruby_clip
+        # @return [RuboCop::Slim::RubyClip]
+        def call(ruby_clip)
+          new(ruby_clip).call
         end
       end
 
-      # @param [String] code
-      def initialize(code)
-        @code = code
+      # @param [String] ruby_clip
+      def initialize(ruby_clip)
+        @ruby_clip = ruby_clip
       end
 
       # @return [RuboCop::Slim::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/slim/ruby_extractor.rb

@@ -24,17 +24,16 @@ module RuboCop
       def call
         return unless supported_file_path_pattern?
 
-        ruby_ranges.map do |(begin_, end_)|
-          clip = RubyClipper.new(template_source[begin_...end_]).call
+        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: begin_ + clip[:offset],
+            offset: ruby_clip.offset,
             processed_source: processed_source
           }
         end
@@ -54,6 +53,20 @@ module RuboCop
         @processed_source.path
       end
 
+      # @return [Array<RuboCop::Slim::RubyClip]
+      def ruby_clips
+        ruby_ranges.map do |(begin_, end_)|
+          RubyClip.new(
+            code: template_source[begin_...end_],
+            offset: begin_
+          )
+        end.flat_map do |ruby_clip|
+          WhenDecomposer.call(ruby_clip)
+        end.map do |ruby_clip|
+          KeywordRemover.call(ruby_clip)
+        end
+      end
+
       # @return [Array<Array<Integer>>]
       def ruby_ranges
         result = []
@@ -68,7 +81,15 @@ module RuboCop
         file_path&.end_with?('.slim')
       end
 
-      def traverse(node, &block)
+      # @return [String]
+      def template_source
+        @processed_source.raw_source
+      end
+
+      def traverse(
+        node,
+        &block
+      )
         return unless node.instance_of?(::Array)
 
         block.call(node[2], node[3]) if node[0] == :slimi && node[1] == :position
@@ -76,11 +97,6 @@ module RuboCop
           traverse(element, &block)
         end
       end
-
-      # @return [String]
-      def template_source
-        @processed_source.raw_source
-      end
     end
   end
 end

data/lib/rubocop/slim/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module Rubocop
+module RuboCop
   module Slim
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/lib/rubocop/slim/when_decomposer.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'parser/current'
+require 'rubocop/ast/builder'
+
+module RuboCop
+  module Slim
+    class WhenDecomposer
+      REGEXP = /
+        \A
+        \s*
+        when[ \t]
+      /x.freeze
+
+      class << self
+        # @param [RuboCop::Slim::RubyClip] ruby_clip
+        # @return [Array<RuboCop::Slim::RubyClip>]
+        def call(ruby_clip)
+          new(ruby_clip).call
+        end
+      end
+
+      # @param [RuboCop::Slim::RubyClip] ruby_clip
+      def initialize(ruby_clip)
+        @ruby_clip = ruby_clip
+      end
+
+      # @return [Array<RuboCop::Slim::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/slim.rb

@@ -3,9 +3,10 @@
 module RuboCop
   module Slim
     autoload :ConfigLoader, 'rubocop/slim/config_loader'
+    autoload :KeywordRemover, 'rubocop/slim/keyword_remover'
     autoload :RubyClip, 'rubocop/slim/ruby_clip'
-    autoload :RubyClipper, 'rubocop/slim/ruby_clipper'
     autoload :RubyExtractor, 'rubocop/slim/ruby_extractor'
+    autoload :WhenDecomposer, 'rubocop/slim/when_decomposer'
   end
 end
 

data/rubocop-slim.gemspec

@@ -4,14 +4,14 @@ require_relative 'lib/rubocop/slim/version'
 
 Gem::Specification.new do |spec|
   spec.name = 'rubocop-slim'
-  spec.version = Rubocop::Slim::VERSION
+  spec.version = RuboCop::Slim::VERSION
   spec.authors = ['Ryo Nakamura']
   spec.email = ['r7kamura@gmail.com']
 
   spec.summary = 'RuboCop plugin for Slim template.'
   spec.homepage = 'https://github.com/r7kamura/rubocop-slim'
   spec.license = 'MIT'
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-slim
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 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: rubocop
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-description:
+description: 
 email:
 - r7kamura@gmail.com
 executables: []
@@ -57,11 +57,12 @@ files:
 - lib/rubocop-slim.rb
 - lib/rubocop/slim.rb
 - lib/rubocop/slim/config_loader.rb
+- lib/rubocop/slim/keyword_remover.rb
 - lib/rubocop/slim/rubocop_extension.rb
 - lib/rubocop/slim/ruby_clip.rb
-- lib/rubocop/slim/ruby_clipper.rb
 - lib/rubocop/slim/ruby_extractor.rb
 - lib/rubocop/slim/version.rb
+- lib/rubocop/slim/when_decomposer.rb
 - rubocop-slim.gemspec
 homepage: https://github.com/r7kamura/rubocop-slim
 licenses:
@@ -70,7 +71,7 @@ metadata:
   homepage_uri: https://github.com/r7kamura/rubocop-slim
   source_code_uri: https://github.com/r7kamura/rubocop-slim
   changelog_uri: https://github.com/r7kamura/rubocop-slim/releases
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -78,15 +79,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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 Slim template.
 test_files: []