rubocop-erb 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c57699be856b07c099f05fb62bdb69d656e008af86319f739c5e35a902628f84
-  data.tar.gz: 5094efa6732c052e82eb56a44c3547dc52af06594b5a7cc648f63d4bcd39ac8e
+  metadata.gz: b13699d8ba0b6d66de391094e0bbfcc7a4476cfcd821e584b1c75c7d016324c5
+  data.tar.gz: bfab6b295f44a2e98e74b4a35ad82217ccf14cf212943b9c9dd4c2d978df3531
 SHA512:
-  metadata.gz: bf57a7afa7c9990b85dc9028d0bf0353c076cd8cf37702e329d6d1bbe911d34f557d48d5ce324c8400f3679e6bdcd85c27977a01d7a61567d4b0bdfcd753c26e
-  data.tar.gz: a9307f9f21a006152684219c01a4d683df8259eb155872c2dbf96be15d995a60924238b71648d0bda6987f01450ff5189177b5f4d5bbfaa2b8617b4a5959f92e
+  metadata.gz: d11d09706fd7d59ef07600ce2c3986ba90b436272465c19ed3dc60e1a87344540396d7b739d2f64afce8d6e486cc4de6a276e47eabf6251695d22f43df0a6fb3
+  data.tar.gz: f3153518ca9634939f6327e8881aa958012d20d1805ecb677a66909424d27add955bdb50c4f128d8b350184a153b5ac60657e838ff745cb679e7d3f68a77e971

data/Gemfile.lock

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

data/config/default.yml

@@ -23,6 +23,10 @@ Layout/ClosingParenthesisIndentation:
   Exclude:
     - '**/*.erb'
 
+Layout/CommentIndentation:
+  Exclude:
+    - '**/*.erb'
+
 Layout/InitialIndentation:
   Exclude:
     - '**/*.erb'

data/gemfiles/ruby_2.7.gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
+gem 'better_html', '< 2.1' # 2.1 dropped ruby 2.7 support.
 gem 'nokogiri', '~> 1.15.0'
 gem 'rake'
 gem 'rspec'

data/gemfiles/ruby_2.7.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    rubocop-erb (0.4.1)
+    rubocop-erb (0.5.1)
       better_html
       rubocop (~> 1.45)
 
@@ -26,7 +26,7 @@ GEM
       tzinfo (~> 2.0)
     ast (2.4.2)
     base64 (0.2.0)
-    better_html (2.1.1)
+    better_html (2.0.2)
       actionview (>= 6.0)
       activesupport (>= 6.0)
       ast (~> 2.0)
@@ -49,9 +49,11 @@ GEM
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
+    mini_portile2 (2.8.7)
     minitest (5.20.0)
     mutex_m (0.2.0)
-    nokogiri (1.15.5-x86_64-linux)
+    nokogiri (1.15.5)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.24.0)
     parser (3.3.0.2)
@@ -119,6 +121,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  better_html (< 2.1)
   nokogiri (~> 1.15.0)
   rake
   rspec

data/lib/rubocop/erb/keyword_remover.rb

@@ -151,6 +151,7 @@ module RuboCop
           [ \t]*
           (?:\|[^|]*\|)?
           \s*
+          (\#.*)?
           \z
         /x.freeze
       end

data/lib/rubocop/erb/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Erb
-    VERSION = '0.4.1'
+    VERSION = '0.5.1'
   end
 end

data/lib/rubocop/erb/when_decomposer.rb

@@ -30,10 +30,17 @@ module RuboCop
         match_data = @ruby_clip.code.match(REGEXP)
         if match_data
           offset = match_data[0].length
-          parse("[#{@ruby_clip.code[offset..]}]").children.map do |child|
+          condition = @ruby_clip.code[offset..].sub(/[ \t]then(?:[ \t].*)?/, '')
+          parse(
+            <<~RUBY
+              [
+                #{condition}
+              ]
+            RUBY
+          ).children.map do |child|
             RubyClip.new(
               code: child.location.expression.source,
-              offset: @ruby_clip.offset + offset + child.location.expression.begin_pos - 1
+              offset: @ruby_clip.offset + offset + child.location.expression.begin_pos - 4
             )
           end
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-erb
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-16 00:00:00.000000000 Z
+date: 2024-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html