sevencop 0.35.1 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00bdcb34361d6d2adc9c56ad5c04a70763a03b9ed94c94836855ccf1bae0504a
-  data.tar.gz: 42425e905007e02da20af812e08d388a6ab897abc7ae6963084110e709524774
+  metadata.gz: 41302972abfb2a785a3a9fcffb8b9b229d34d8182125f75cc34062720ef7262c
+  data.tar.gz: ac07370e67a54572895b3d49c5992da0521aa474de7e9e47d3b998a740b9f087
 SHA512:
-  metadata.gz: 157017650f5d89046b8acfc2cdc7505c3fe24d9f88ebcdde530ca362c11291b2ece58c02fb983843e2c42ded4262ae2e638bed2f3feb9ffa26149405185e623a
-  data.tar.gz: b42d35a4f16268871b51f794b4d1fcf68cef53576889a8ebbb913fb3ffefb3e0b9ee8d27bbf1eb44d981f9a491f6d14cfae70f026495312a459bdd131f011d5f
+  metadata.gz: 05fccfbdc29de4b5f0dda00caa7a30528068e98e665ba6ace777d1531c968dedce672c429226b4c0c5c167d986b0fcfb9ead8d7244ea359abd27b1edc8d15b3b
+  data.tar.gz: 07a7d923cc6f06c0b9df3ede1de081b23ea116d1bba328faf9529fe6b2174d691ab1c99ea3f6eaa175d8e762e7b61b2c1dc34457cbe5d6ace012b58a0be83066

data/.rubocop.yml

@@ -43,6 +43,13 @@ RSpec/FilePath:
 RSpec/MultipleExpectations:
   Enabled: false
 
+RSpec/SpecFilePathFormat:
+  CustomTransform:
+    RSpecDescribeHttpEndpoint: rspec_describe_http_endpoint
+    RSpecEmptyLineAfterLet: rspec_empty_line_after_let
+    RSpecExamplesInSameGroup: rspec_examples_in_same_group
+    RSpecMemoizedHelperBlockDelimiter: rspec_memoized_helper_block_delimiter
+
 Sevencop/AutoloadOrdered:
   Enabled: true
 

data/Gemfile.lock

@@ -1,32 +1,46 @@
 PATH
   remote: .
   specs:
-    sevencop (0.35.1)
+    sevencop (0.36.0)
       activesupport
       rubocop
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.5)
+    activesupport (7.1.3)
+      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)
-    concurrent-ruby (1.2.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     diff-lcs (1.5.0)
+    drb (2.2.0)
+      ruby2_keywords
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    minitest (5.18.0)
-    parallel (1.23.0)
-    parser (3.2.2.1)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    minitest (5.21.2)
+    mutex_m (0.2.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
+      racc
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.0)
-    rexml (3.2.5)
+    rake (13.1.0)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -36,39 +50,41 @@ GEM
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.50.2)
+    rspec-support (3.12.1)
+    rubocop (1.60.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.1)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
+    rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.22.0)
-      rubocop (~> 1.33)
-    rubocop-performance (1.17.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-performance (1.20.2)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.22.0)
-      rubocop (~> 1.33)
+    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)
     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

@@ -32,6 +32,7 @@ Note that all cops are `Enabled: false` by default.
 - [Sevencop/FactoryBotAssociationOption](lib/rubocop/cop/sevencop/factory_bot_association_option.rb)
 - [Sevencop/FactoryBotAssociationStyle](lib/rubocop/cop/sevencop/factory_bot_association_style.rb)
 - [Sevencop/HashElementOrdered](lib/rubocop/cop/sevencop/hash_element_ordered.rb)
+- [Sevencop/MapMethodChain](lib/rubocop/cop/sevencop/map_method_chain.rb)
 - [Sevencop/MethodDefinitionArgumentsMultiline](lib/rubocop/cop/sevencop/method_definition_arguments_multiline.rb)
 - [Sevencop/MethodDefinitionInIncluded](lib/rubocop/cop/sevencop/method_definition_in_included.rb)
 - [Sevencop/MethodDefinitionKeywordArgumentOrdered](lib/rubocop/cop/sevencop/method_definition_keyword_argument_ordered.rb)

data/config/default.yml

@@ -37,6 +37,12 @@ Sevencop/HashElementOrdered:
   Enabled: false
   Safe: false
 
+Sevencop/MapMethodChain:
+  Description: |
+    Checks if the map method is used in a chain.
+  Enabled: false
+  Safe: false
+
 Sevencop/MethodDefinitionArgumentsMultiline:
   Description: |
     Inserts new lines between method definition arguments.

data/lib/rubocop/cop/sevencop/map_method_chain.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Sevencop
+      # Checks if the map method is used in a chain.
+      #
+      # This cop is another version of `Performance/MapMethodChain` cop which has the autocorrection support.
+      # They have decided not to add autocorrection, so we have this cop in case you want to use it.
+      # https://github.com/rubocop/rubocop-performance/issues/436
+      #
+      # @example
+      #   # bad
+      #   array.map(&:foo).map(&:bar)
+      #
+      #   # good
+      #   array.map { |element| element.foo.bar }
+      class MapMethodChain < Base
+        extend AutoCorrector
+
+        include IgnoredNode
+
+        RESTRICT_ON_SEND = %i[map collect].freeze
+
+        # @!method block_pass_with_symbol_arg?(node)
+        def_node_matcher :block_pass_with_symbol_arg?, <<~PATTERN
+          (:block_pass (:sym $_))
+        PATTERN
+
+        def on_send(node)
+          return if part_of_ignored_node?(node)
+          return unless (map_arg = block_pass_with_symbol_arg?(node.first_argument))
+
+          map_args = [map_arg]
+          return unless (begin_of_chained_map_method = find_begin_of_chained_map_method(node, map_args))
+
+          range = begin_of_chained_map_method.loc.selector.begin.join(node.source_range.end)
+          replacement = "#{begin_of_chained_map_method.method_name} { |element| element.#{map_args.join('.')} }"
+          add_offense(
+            range,
+            message: format(
+              'Use `%<replacement>s` instead of `%<method_name>s` method chain.',
+              method_name: begin_of_chained_map_method.method_name,
+              replacement: replacement
+            )
+          ) do |corrector|
+            corrector.replace(range, replacement)
+          end
+
+          ignore_node(node)
+        end
+
+        private
+
+        def find_begin_of_chained_map_method(
+          node,
+          map_args
+        )
+          return unless (chained_map_method = node.receiver)
+          return if !chained_map_method.call_type? || !RESTRICT_ON_SEND.include?(chained_map_method.method_name)
+          return unless (map_arg = block_pass_with_symbol_arg?(chained_map_method.first_argument))
+
+          map_args.unshift(map_arg)
+
+          receiver = chained_map_method.receiver
+
+          return chained_map_method unless receiver&.call_type? && block_pass_with_symbol_arg?(receiver.first_argument)
+
+          find_begin_of_chained_map_method(chained_map_method, map_args)
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/sevencop/rails_belongs_to_optional.rb

@@ -48,7 +48,7 @@ module RuboCop
           return unless without_options?(node) || (with_hash_options?(node) && !with_optional?(node))
 
           add_offense(node) do |corrector|
-            corrector.insert_after(node.arguments[-1], ', optional: true')
+            corrector.insert_after(node.last_argument, ', optional: true')
           end
         end
       end

data/lib/rubocop/cop/sevencop/rails_order_field_arel_sql.rb

@@ -48,10 +48,10 @@ module RuboCop
         def on_send(node)
           return unless order_with_field?(node)
 
-          first_argument_node = node.arguments.first
+          first_argument_node = node.first_argument
           add_offense(first_argument_node) do |corrector|
             corrector.replace(
-              node.arguments.first,
+              node.first_argument,
               "Arel.sql(#{first_argument_node.source})"
             )
           end

data/lib/sevencop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sevencop
-  VERSION = '0.35.1'
+  VERSION = '0.36.0'
 end

data/lib/sevencop.rb

@@ -8,6 +8,7 @@ require_relative 'rubocop/cop/sevencop/autoload_ordered'
 require_relative 'rubocop/cop/sevencop/factory_bot_association_option'
 require_relative 'rubocop/cop/sevencop/factory_bot_association_style'
 require_relative 'rubocop/cop/sevencop/hash_element_ordered'
+require_relative 'rubocop/cop/sevencop/map_method_chain'
 require_relative 'rubocop/cop/sevencop/method_definition_arguments_multiline'
 require_relative 'rubocop/cop/sevencop/method_definition_in_included'
 require_relative 'rubocop/cop/sevencop/method_definition_keyword_argument_ordered'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sevencop
 version: !ruby/object:Gem::Version
-  version: 0.35.1
+  version: 0.36.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-04 00:00:00.000000000 Z
+date: 2024-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -60,6 +60,7 @@ files:
 - lib/rubocop/cop/sevencop/factory_bot_association_option.rb
 - lib/rubocop/cop/sevencop/factory_bot_association_style.rb
 - lib/rubocop/cop/sevencop/hash_element_ordered.rb
+- lib/rubocop/cop/sevencop/map_method_chain.rb
 - lib/rubocop/cop/sevencop/method_definition_arguments_multiline.rb
 - lib/rubocop/cop/sevencop/method_definition_in_included.rb
 - lib/rubocop/cop/sevencop/method_definition_keyword_argument_ordered.rb