rubocop-erb 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99ed46b9d8eba4e69cea7d354412e033b02648eace4dfd38d9bcd59f83e0943d
-  data.tar.gz: bb8f0f0aeae48270f3c2ea4a7a90da7b2ebc5f51c85c7df2e9f2dda039fd6f1e
+  metadata.gz: 738549237ab33ab64f83e5a7c2a6804023e44a4b820a672e19f22501f567dc8c
+  data.tar.gz: '0938d75738dde9b60da3f86303e2efc865a6651a2097f1c17b02a310fb48cc65'
 SHA512:
-  metadata.gz: 8aa2e1476e145e3174417b20baef489ada2b253fcfcf5bdb0e2ad80463e192588a7180c9a643b1eccf9d85a3b8a6828cc23b5372b4e5928856855a7cec744575
-  data.tar.gz: 8e5c7ecc7da0bbea9d862d5aac33ff89768de9b2d85365a560e4b799363d07636cd4d9cfb654ceb0794cf79c556cea3c685204ed3b118bc46c581e7debb53899
+  metadata.gz: 44c40245e84d96ca53eca30b4b10520b150960df5caa08367167eee18b98039bc4dd79d0b3a1579f1cd1fc4adc6704c2e2889a2d49ebe6ac9b54c6500339f558
+  data.tar.gz: d1eb898d1bd7fae46842f82aa9c7c4b7acc980ec3866dbc9cd94a7dab20fc850e4f0a6509958a3bf22adfab47b8c9dc91fba8767aa52ba39362db8ac936c1db8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-erb (0.2.2)
+    rubocop-erb (0.2.4)
       better_html
       rubocop (~> 1.45)
 
@@ -39,7 +39,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     minitest (5.17.0)
-    nokogiri (1.14.1-x86_64-linux)
+    nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     parallel (1.22.1)
     parser (3.2.0.0)

data/README.md

@@ -54,6 +54,20 @@ spec/fixtures/dummy.erb:7:11: E: Lint/Syntax: unexpected token $end
 1 file inspected, 4 offenses detected, 3 offenses autocorrectable
 ```
 
+## Workaround
+
+As a known issue, there seems to be a problem with .rubocop_todo.yml overriding config/default.yml provided by rubocop-erb, so we recommend adding a workaround to your .rubocop.yml as shown below:
+
+```yaml
+inherit_from: .rubocop_todo.yml
+
+inherit_mode:
+  merge:
+    - Exclude
+```
+
+See [#15](https://github.com/r7kamura/rubocop-erb/issues/15) for more details.
+
 ## Related projects
 
 - https://github.com/r7kamura/rubocop-haml

data/lib/rubocop/erb/keyword_remover.rb

@@ -51,7 +51,7 @@ module RuboCop
             | while
             | for[ \t]+\w+[ \t]+in
           )
-          [ \t]
+          \b[ \t]*
         /x.freeze
 
         class << self

data/lib/rubocop/erb/ruby_extractor.rb

@@ -44,8 +44,9 @@ module RuboCop
 
       # @return [Array<BetterHtml::AST::Node>]
       def erbs
-        root.descendants(:erb).reject do |erb|
-          erb.children.first&.type == :indicator && erb.children.first&.to_a&.first == '#'
+        root.descendants(:erb).reject do |node|
+          erb_node = ErbNode.new(node)
+          erb_node.comment? || erb_node.escape?
         end
       end
 
@@ -97,6 +98,37 @@ module RuboCop
       def template_source
         @processed_source.raw_source
       end
+
+      class ErbNode
+        # @param [BetterHtml::AST::Node] node
+        def initialize(node)
+          @node = node
+        end
+
+        # @return [Boolean]
+        def comment?
+          indicator == '#'
+        end
+
+        # @return [Boolean]
+        def escape?
+          indicator == '%'
+        end
+
+        private
+
+        # @return [BetterHtml::AST::Node, nil]
+        def first_child
+          @node.children.first
+        end
+
+        # @return [String, nil]
+        def indicator
+          return unless first_child&.type == :indicator
+
+          first_child&.to_a&.first
+        end
+      end
     end
   end
 end

data/lib/rubocop/erb/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Erb
-    VERSION = '0.2.2'
+    VERSION = '0.2.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-erb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2023-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html