rubocop-erb 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a314d2115fff57bc77a2fa817590a4678e6d87a3f003956a928e57b9cd42b5b
-  data.tar.gz: 51e9a745d150b3c3c99a4294f0cf1f4f14be871ecf44b415087c411f7c54e33d
+  metadata.gz: 99ed46b9d8eba4e69cea7d354412e033b02648eace4dfd38d9bcd59f83e0943d
+  data.tar.gz: bb8f0f0aeae48270f3c2ea4a7a90da7b2ebc5f51c85c7df2e9f2dda039fd6f1e
 SHA512:
-  metadata.gz: d39cc8a0b4a91a7e29b2a68434dd19f02e41f31ebb31ad5c5027593e588e8677e452de6e8b3f40dca654dad03b9eb5f34db3e09af87508d94be8d54a569f0c0e
-  data.tar.gz: 45789da936d92b4a212f5160af6ea49f770a07b8ec1a398c60364c2b0e27465a4868ea44d177e775c81010642b51322b6ce9242053cbf250dada6abe489583ff
+  metadata.gz: 8aa2e1476e145e3174417b20baef489ada2b253fcfcf5bdb0e2ad80463e192588a7180c9a643b1eccf9d85a3b8a6828cc23b5372b4e5928856855a7cec744575
+  data.tar.gz: 8e5c7ecc7da0bbea9d862d5aac33ff89768de9b2d85365a560e4b799363d07636cd4d9cfb654ceb0794cf79c556cea3c685204ed3b118bc46c581e7debb53899

data/.rubocop.yml

@@ -2,6 +2,7 @@ require:
   - rubocop-erb
   - rubocop-rake
   - rubocop-rspec
+  - sevencop
 
 inherit_mode:
   merge:
@@ -19,10 +20,6 @@ Gemspec/RequireMFA:
 Metrics:
   Enabled: false
 
-Naming/FileName:
-  Exclude:
-    - lib/rubocop-erb.rb
-
 RSpec/ExampleLength:
   Enabled: false
 
@@ -32,6 +29,21 @@ 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
 

data/Gemfile

@@ -9,3 +9,4 @@ gem 'rake'
 gem 'rspec'
 gem 'rubocop-rake'
 gem 'rubocop-rspec'
+gem 'sevencop'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-erb (0.2.1)
+    rubocop-erb (0.2.2)
       better_html
       rubocop (~> 1.45)
 
@@ -87,6 +87,9 @@ GEM
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
     ruby-progressbar (1.11.0)
+    sevencop (0.33.0)
+      activesupport
+      rubocop
     smart_properties (1.17.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -101,6 +104,7 @@ DEPENDENCIES
   rubocop-erb!
   rubocop-rake
   rubocop-rspec
+  sevencop
 
 BUNDLED WITH
    2.3.19

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

@@ -2,8 +2,8 @@
 
 module RuboCop
   module Erb
-    # Remove unnecessary part (e.g. `if`, `unless`, `do`, ...) from Ruby-ish code.
-    class RubyClipper
+    # Remove unnecessary keyword part (e.g. `if`, `unless`, `do`, ...) from Ruby-ish code.
+    class KeywordRemover
       class << self
         # @param [RuboCop::Erb::RubyClip] ruby_clip
         # @return [RuboCop::Erb::RubyClip]

data/lib/rubocop/erb/ruby_extractor.rb

@@ -49,6 +49,11 @@ module RuboCop
         end
       end
 
+      # @return [String, nil]
+      def file_path
+        @processed_source.path
+      end
+
       # @return [Enumerator<BetterHtml::AST::Node>]
       def nodes
         erbs.flat_map do |erb|
@@ -77,17 +82,12 @@ module RuboCop
         end.flat_map do |ruby_clip|
           WhenDecomposer.call(ruby_clip)
         end.map do |ruby_clip|
-          RubyClipper.call(ruby_clip)
+          KeywordRemover.call(ruby_clip)
         end.reject do |ruby_clip|
           ruby_clip.code.match?(/\A\s*\z/)
         end
       end
 
-      # @return [String, nil]
-      def file_path
-        @processed_source.path
-      end
-
       # @return [Boolean]
       def supported_file_path_pattern?
         file_path&.end_with?('.erb')

data/lib/rubocop/erb/version.rb

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

data/lib/rubocop/erb.rb

@@ -3,8 +3,8 @@
 module RuboCop
   module Erb
     autoload :ConfigLoader, 'rubocop/erb/config_loader'
+    autoload :KeywordRemover, 'rubocop/erb/keyword_remover'
     autoload :RubyClip, 'rubocop/erb/ruby_clip'
-    autoload :RubyClipper, 'rubocop/erb/ruby_clipper'
     autoload :RubyExtractor, 'rubocop/erb/ruby_extractor'
     autoload :WhenDecomposer, 'rubocop/erb/when_decomposer'
   end

data/rubocop-erb.gemspec

@@ -4,7 +4,7 @@ require_relative 'lib/rubocop/erb/version'
 
 Gem::Specification.new do |spec|
   spec.name = 'rubocop-erb'
-  spec.version = Rubocop::Erb::VERSION
+  spec.version = RuboCop::Erb::VERSION
   spec.authors = ['Ryo Nakamura']
   spec.email = ['r7kamura@gmail.com']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-erb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-09 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.45'
-description:
+description: 
 email:
 - r7kamura@gmail.com
 executables: []
@@ -54,12 +54,11 @@ files:
 - README.md
 - Rakefile
 - config/default.yml
-- lib/rubocop-erb.rb
 - lib/rubocop/erb.rb
 - lib/rubocop/erb/config_loader.rb
+- lib/rubocop/erb/keyword_remover.rb
 - lib/rubocop/erb/rubocop_extension.rb
 - lib/rubocop/erb/ruby_clip.rb
-- lib/rubocop/erb/ruby_clipper.rb
 - lib/rubocop/erb/ruby_extractor.rb
 - lib/rubocop/erb/version.rb
 - lib/rubocop/erb/when_decomposer.rb
@@ -71,7 +70,7 @@ metadata:
   homepage_uri: https://github.com/r7kamura/rubocop-erb
   source_code_uri: https://github.com/r7kamura/rubocop-erb
   changelog_uri: https://github.com/r7kamura/rubocop-erb/releases
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -86,8 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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 ERB template.
 test_files: []

data/lib/rubocop-erb.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubocop/erb'