rubocop-erb 0.2.4 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 738549237ab33ab64f83e5a7c2a6804023e44a4b820a672e19f22501f567dc8c
-  data.tar.gz: '0938d75738dde9b60da3f86303e2efc865a6651a2097f1c17b02a310fb48cc65'
+  metadata.gz: 8dd1a38dc89ce7ae5d7234726efd075da3475197ef392869ce3a6c3091049829
+  data.tar.gz: '016658e07334e120f4b3a5a099df1533ca5dc806106d66a4dcb883852ba0812f'
 SHA512:
-  metadata.gz: 44c40245e84d96ca53eca30b4b10520b150960df5caa08367167eee18b98039bc4dd79d0b3a1579f1cd1fc4adc6704c2e2889a2d49ebe6ac9b54c6500339f558
-  data.tar.gz: d1eb898d1bd7fae46842f82aa9c7c4b7acc980ec3866dbc9cd94a7dab20fc850e4f0a6509958a3bf22adfab47b8c9dc91fba8767aa52ba39362db8ac936c1db8
+  metadata.gz: 660537eddd2dbfddde1f6f318b086eaa99ff567f7b90998947efcdc5cdbeea05c9ab97e87263aa0a2b15f4eec35996f9c9e95576bd2711047acc6300a6dd075b
+  data.tar.gz: 6756de8632f08c1640735251bd3225ead59072aea590f234caf7fca37ca888212eacfedc44228b51508357536b6dbda99cc5585f3e1e9775ee0cde1b7e51083a

data/Gemfile.lock

@@ -1,99 +1,119 @@
 PATH
   remote: .
   specs:
-    rubocop-erb (0.2.4)
+    rubocop-erb (0.3.1)
       better_html
       rubocop (~> 1.45)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (7.0.4.2)
-      activesupport (= 7.0.4.2)
+    actionview (7.1.2)
+      activesupport (= 7.1.2)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.4.2)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
-    better_html (2.0.1)
+    base64 (0.2.0)
+    better_html (2.0.2)
       actionview (>= 6.0)
       activesupport (>= 6.0)
       ast (~> 2.0)
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
+    bigdecimal (3.1.5)
     builder (3.2.4)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     crass (1.0.6)
     diff-lcs (1.5.0)
+    drb (2.2.0)
+      ruby2_keywords
     erubi (1.12.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    loofah (2.19.1)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    minitest (5.17.0)
-    nokogiri (1.14.2-x86_64-linux)
+      nokogiri (>= 1.12.0)
+    minitest (5.20.0)
+    mutex_m (0.2.0)
+    nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.2.0.0)
+    parallel (1.24.0)
+    parser (3.3.0.2)
       ast (~> 2.4.1)
-    racc (1.6.2)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+      racc
+    racc (1.7.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.2)
-    rexml (3.2.5)
+    rake (13.1.0)
+    regexp_parser (2.8.3)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.45.0)
+    rspec-support (3.12.1)
+    rubocop (1.59.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
-    rubocop-capybara (2.17.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.18.1)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.26.1)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
-    ruby-progressbar (1.11.0)
-    sevencop (0.33.0)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sevencop (0.35.1)
       activesupport
       rubocop
     smart_properties (1.17.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   x86_64-linux

data/README.md

@@ -33,7 +33,7 @@ Now you can use RuboCop also for ERB templates.
 ```
 $ bundle exec rubocop spec/fixtures/dummy.erb
 Inspecting 1 file
-E
+C
 
 Offenses:
 
@@ -46,12 +46,11 @@ spec/fixtures/dummy.erb:4:9: C: [Correctable] Style/ZeroLengthPredicate: Use !em
 spec/fixtures/dummy.erb:5:4: C: [Correctable] Style/NegatedIf: Favor unless over if for negative conditions.
 <% a if !b %>
    ^^^^^^^
-spec/fixtures/dummy.erb:7:11: E: Lint/Syntax: unexpected token $end
-(Using Ruby 2.6 parser; configure using TargetRubyVersion parameter, under AllCops)
+spec/fixtures/dummy.erb:7:7: C: [Correctable] Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.
 <% if "a" %>
+      ^^^
 
-
-1 file inspected, 4 offenses detected, 3 offenses autocorrectable
+1 file inspected, 4 offenses detected, 4 offenses autocorrectable
 ```
 
 ## Workaround

data/config/default.yml

@@ -75,6 +75,10 @@ Layout/IndentationWidth:
   Exclude:
     - '**/*.erb'
 
+Layout/LeadingEmptyLine:
+  Exclude:
+    - '**/*.erb'
+
 Layout/LineEndStringConcatenationIndentation:
   Exclude:
     - '**/*.erb'

data/gemfiles/ruby_2.7.gemfile

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'nokogiri', '~> 1.15.0'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'
+gem 'sevencop'

data/gemfiles/ruby_2.7.gemfile.lock

@@ -0,0 +1,131 @@
+PATH
+  remote: ..
+  specs:
+    rubocop-erb (0.3.0)
+      better_html
+      rubocop (~> 1.45)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionview (7.1.2)
+      activesupport (= 7.1.2)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    better_html (2.0.2)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      parser (>= 2.4)
+      smart_properties
+    bigdecimal (3.1.5)
+    builder (3.2.4)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    diff-lcs (1.5.0)
+    drb (2.2.0)
+      ruby2_keywords
+    erubi (1.12.0)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    minitest (5.20.0)
+    mutex_m (0.2.0)
+    nokogiri (1.15.5-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.24.0)
+    parser (3.3.0.2)
+      ast (~> 2.4.1)
+      racc
+    racc (1.7.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    rainbow (3.1.1)
+    rake (13.1.0)
+    regexp_parser (2.8.3)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.59.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.2.2.4)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.26.1)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sevencop (0.35.1)
+      activesupport
+      rubocop
+    smart_properties (1.17.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  nokogiri (~> 1.15.0)
+  rake
+  rspec
+  rubocop-erb!
+  rubocop-rake
+  rubocop-rspec
+  sevencop
+
+BUNDLED WITH
+   2.3.19

data/lib/rubocop/erb/keyword_remover.rb

@@ -21,6 +21,9 @@ module RuboCop
       def call
         [
           PrecedingKeywordRemover,
+          PrecedingBraceRemover,
+          TrailingBraceRemover,
+          TrailingThenRemover,
           TrailingDoRemover
         ].reduce(@ruby_clip) do |previous, callable|
           result = callable.call(previous.code)
@@ -31,29 +34,7 @@ module RuboCop
         end
       end
 
-      # Remove preceding keyword.
-      class PrecedingKeywordRemover
-        REGEXP = /
-          \A
-          \s*
-          (?:
-            begin
-            | case
-            | else
-            | elsif
-            | end
-            | ensure
-            | if
-            | rescue
-            | unless
-            | until
-            | when
-            | while
-            | for[ \t]+\w+[ \t]+in
-          )
-          \b[ \t]*
-        /x.freeze
-
+      class PrecedingSourceRemover
         class << self
           # @param [String] code
           # @return [RubyClip]
@@ -69,7 +50,7 @@ module RuboCop
 
         # @return [Hash]
         def call
-          data = @code.match(REGEXP)
+          data = @code.match(self.class::REGEXP)
           if data
             offset = data[0].length
             RubyClip.new(
@@ -85,17 +66,40 @@ module RuboCop
         end
       end
 
-      # Remove trailing `do`.
-      class TrailingDoRemover
+      # Remove preceding keyword.
+      class PrecedingKeywordRemover < PrecedingSourceRemover
         REGEXP = /
-          [ \t]
-          do
-          [ \t]*
-          (\|[^|]*\|)?
-          [ \t]*
-          \Z
+          \A
+          \s*
+          (?:
+            begin
+            | case
+            | else
+            | elsif
+            | end
+            | ensure
+            | if
+            | rescue
+            | unless
+            | until
+            | when
+            | while
+            | for[ \t]+\w+[ \t]+in
+          )
+          \b[ \t]*
         /x.freeze
+      end
 
+      # Remove preceding `}`.
+      class PrecedingBraceRemover < PrecedingSourceRemover
+        REGEXP = /
+          \A
+          \s*
+          }
+        /x.freeze
+      end
+
+      class TrailingSourceRemover
         class << self
           # @param [String] code
           # @return [RubyClip]
@@ -112,11 +116,44 @@ module RuboCop
         # @return [Hash]
         def call
           RubyClip.new(
-            code: @code.sub(REGEXP, ''),
+            code: @code.sub(self.class::REGEXP, ''),
             offset: 0
           )
         end
       end
+
+      # Remove trailing `{`.
+      class TrailingBraceRemover < TrailingSourceRemover
+        REGEXP = /
+          {
+          [ \t]*
+          (?:\|[^|]*\|)?
+          \s*
+          \z
+        /x.freeze
+      end
+
+      # Remove trailing `then`.
+      class TrailingThenRemover < TrailingSourceRemover
+        REGEXP = /
+          [ \t]*\b
+          then
+          \s*
+          \z
+        /x.freeze
+      end
+
+      # Remove trailing `do`.
+      class TrailingDoRemover < TrailingSourceRemover
+        REGEXP = /
+          [ \t]
+          do
+          [ \t]*
+          (?:\|[^|]*\|)?
+          \s*
+          \z
+        /x.freeze
+      end
     end
   end
 end

data/lib/rubocop/erb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-erb
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.1
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-26 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html
@@ -54,6 +54,8 @@ files:
 - README.md
 - Rakefile
 - config/default.yml
+- gemfiles/ruby_2.7.gemfile
+- gemfiles/ruby_2.7.gemfile.lock
 - lib/rubocop/erb.rb
 - lib/rubocop/erb/config_loader.rb
 - lib/rubocop/erb/keyword_remover.rb