rubocop-slim 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e66ccc298ec65e04faa7e04a808599561bf00a5612f894b696e95f5dc0d78133
-  data.tar.gz: e0cc9efca5b9bb323d40152ddc164d366cbffd991d8687fd7b081681aeb278c0
+  metadata.gz: 1412b34e431ea64b3ebb1784f24b0a8fd41fc67f293278c27edd4996c6f1bc4a
+  data.tar.gz: 1d80d23726ef31a8204ee3b2e3a06c9b0998035e49dfe7addd97b886d5cb399f
 SHA512:
-  metadata.gz: 89e1f4affe662786a84a62185518ebf90a9dabbeab66f4e19e85fa2f97e6b1f4d813d61b9b07d99b7e7159028f591f616939a61f654f9b2df8e16ff50444ecea
-  data.tar.gz: 72b4f5485a411e9de2bc3e086e78fdf9c41076a4fc0434ce8397fb2abddd5760ef4732499405e52f45874b1fecf7e06646f17a479f4656577afab927c9423b43
+  metadata.gz: c31f7ce364db6efc2c4ea2bd7cef636a231cedcdaa0b254f32a17570ce21dca5ab8bd2956e8836c7223bbf3e4d7e98071ee015d794b934df41b8ce91f6198d56
+  data.tar.gz: a33f1cf616116690d0f54d0f84d64fc500468e00e0f0c24795a81b7f8000bad8022c08cdd67a843ab26d343ad459382b1ce38cc4c9bd22ff955cd647ef3b72bb

data/.rubocop.yml

@@ -12,7 +12,7 @@ AllCops:
   Exclude:
     - spec/**/*.slim
   NewCops: enable
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.3
 
 Gemspec/RequireMFA:
   Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-slim (0.3.0)
+    rubocop-slim (0.4.0)
       lint_roller (>= 1.1)
       rubocop (>= 1.72.1)
       slimi (~> 0.7)
@@ -36,7 +36,7 @@ GEM
     language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
     logger (1.7.0)
-    minitest (5.25.5)
+    minitest (5.27.0)
     mutex_m (0.3.0)
     parallel (1.26.3)
     parser (3.3.7.4)
@@ -86,18 +86,18 @@ GEM
       activesupport
       lint_roller (>= 1.1)
       rubocop (>= 1.72.1)
-    slimi (0.7.6)
+    slimi (0.10.0)
       temple
       thor
       tilt
-    temple (0.10.3)
-    thor (1.3.2)
-    tilt (2.6.0)
+    temple (0.10.7)
+    thor (1.5.0)
+    tilt (2.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-emoji (4.3.0)
 
 PLATFORMS
   ruby

data/config/default.yml

@@ -63,6 +63,10 @@ Layout/HashAlignment:
   Exclude:
     - '**/*.slim'
 
+Layout/InitialIndentation:
+  Exclude:
+    - '**/*.slim'
+
 Layout/IndentationConsistency:
   Exclude:
     - '**/*.slim'
@@ -175,6 +179,10 @@ Style/ParallelAssignment:
   Exclude:
     - '**/*.slim'
 
+Style/RedundantParentheses:
+  Exclude:
+    - '**/*.slim'
+
 Style/RescueModifier:
   Exclude:
     - '**/*.slim'

data/lib/rubocop/slim/keyword_remover.rb

@@ -50,7 +50,7 @@ module RuboCop
             | for[ \t]+\w+[ \t]+in
           )
           \b[ \t]*
-        /x.freeze
+        /x
 
         class << self
           # @param [String] code
@@ -93,7 +93,7 @@ module RuboCop
           [ \t]*
           (\#.*)?
           \Z
-        /x.freeze
+        /x
 
         class << self
           # @param [String] code

data/lib/rubocop/slim/ruby_extractor.rb

@@ -7,6 +7,17 @@ module RuboCop
   module Slim
     # Extract Ruby codes from Slim template.
     class RubyExtractor
+      # Keep `ruby:` bodies as is, so that their positions are available.
+      class Interpolation < ::Slimi::Filters::Interpolation
+        def on_slimi_embedded(
+          type,
+          expression,
+          attributes
+        )
+          type == 'ruby' ? [:slimi, :embedded, type, expression, attributes] : super
+        end
+      end
+
       class << self
         # @param [RuboCop::ProcessedSource] processed_source
         # @return [Array<RuboCop::ProcessedSource>, nil]
@@ -39,7 +50,7 @@ module RuboCop
 
       # @return [Array] Slim AST, represented in S-expression.
       def ast
-        ::Slimi::Filters::Interpolation.new.call(
+        Interpolation.new.call(
           ::Slimi::Parser.new(file: file_path).call(template_source)
         )
       end
@@ -51,23 +62,24 @@ module RuboCop
 
       # @return [Array<RuboCop::Slim::RubyClip]
       def ruby_clips
-        ruby_ranges.map do |(begin_, end_)|
-          RubyClip.new(
+        ruby_ranges.flat_map do |(begin_, end_, embedded)|
+          ruby_clip = RubyClip.new(
             code: template_source[begin_...end_],
             offset: begin_
           )
-        end.flat_map do |ruby_clip|
-          WhenDecomposer.call(@processed_source, ruby_clip)
-        end.map do |ruby_clip|
-          KeywordRemover.call(ruby_clip)
+          next ruby_clip if embedded
+
+          WhenDecomposer.call(@processed_source, ruby_clip).map do |decomposed_ruby_clip|
+            KeywordRemover.call(decomposed_ruby_clip)
+          end
         end
       end
 
       # @return [Array<Array<Integer>>]
       def ruby_ranges
         result = []
-        traverse(ast) do |begin_, end_|
-          result << [begin_, end_]
+        traverse(ast) do |begin_, end_, embedded|
+          result << [begin_, end_, embedded]
         end
         result
       end
@@ -88,6 +100,15 @@ module RuboCop
       )
         return unless node.instance_of?(::Array)
 
+        if node[0..2] == [:slimi, :embedded, 'ruby']
+          lines = node[3].grep(::Array).select { |child| child[1] == :interpolate }
+          unless lines.empty?
+            begin_ = (template_source.rindex("\n", lines.first[2] - 1) || -1) + 1
+            block.call(begin_, lines.last[3], true)
+          end
+          return
+        end
+
         block.call(node[2], node[3]) if node[0] == :slimi && node[1] == :position
         node.each do |element|
           traverse(element, &block)

data/lib/rubocop/slim/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Slim
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/lib/rubocop/slim/when_decomposer.rb

@@ -7,7 +7,7 @@ module RuboCop
         \A
         \s*
         when[ \t]
-      /x.freeze
+      /x
 
       class << self
         # @param [RuboCop::ProcessedSource] processed_source

data/rubocop-slim.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = 'RuboCop plugin for Slim template.'
   spec.homepage = 'https://github.com/r7kamura/rubocop-slim'
   spec.license = 'MIT'
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.3'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-slim
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-04-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lint_roller
@@ -52,7 +51,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-description: 
 email:
 - r7kamura@gmail.com
 executables: []
@@ -87,7 +85,6 @@ metadata:
   source_code_uri: https://github.com/r7kamura/rubocop-slim
   changelog_uri: https://github.com/r7kamura/rubocop-slim/releases
   default_lint_roller_plugin: RuboCop::Slim::Plugin
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -95,15 +92,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: RuboCop plugin for Slim template.
 test_files: []