sevencop 0.32.2 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4a4965c23bf272ebe52214f0c8a37c6bd989638560cbf7e079b3af2e9782622
-  data.tar.gz: 134934de2b553fabf8b07b63c5e10364178fd007866bb45cea8ff8e357985c77
+  metadata.gz: 33aea941e4f044a45b702d9c9e700c1d9a42aa5f4f44819e506e83b9b939849b
+  data.tar.gz: 83f1c6d8f55256f5a6f89a9cbc632efe084b6acd70cdbc2aaef4f6c7a339fbdd
 SHA512:
-  metadata.gz: 6bf335fbbf8fc003e83369b98b67c2af236bdfd2cee48b6a142ff13a34cea3d0f633a142f340924c61411755adb771171e1fb87498a70edc0e3c4d241f96ca22
-  data.tar.gz: a5592277696b87dc3ec141b8d2155681da27d7d1f8369d919fd5d24dc1da8d1c2d8ca1070315083e334217f1ecf9d7e77e8879efcbcdc86ed9639ec4aeed0500
+  metadata.gz: dc6b9622262cee943fe8d5274155ea7a3d5c46948d3f5b22c3f6b651e37b032eeaa6f3c63757de06e347c4d3fbcab22723ca612c4acb28445662671ca5f5dae9
+  data.tar.gz: 3e4400c2c7c2b63c7f0733888e05793f5c752d59771aae2308d5a19164d177843296a31bfecfef4b2d789cc998a172df4973412c4a8eb04d658e6366ba669cbe

data/.rubocop.yml

@@ -39,7 +39,6 @@ RSpec/FilePath:
     RSpecEmptyLineAfterLet: rspec_empty_line_after_let
     RSpecExamplesInSameGroup: rspec_examples_in_same_group
     RSpecMemoizedHelperBlockDelimiter: rspec_memoized_helper_block_delimiter
-    RSpecRailsResponseParsedBody: rspec_rails_response_parsed_body
 
 RSpec/MultipleExpectations:
   Enabled: false

data/Gemfile.lock

@@ -1,68 +1,71 @@
 PATH
   remote: .
   specs:
-    sevencop (0.32.2)
+    sevencop (0.34.0)
       activesupport
       rubocop
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
-    minitest (5.16.3)
+    json (2.6.3)
+    minitest (5.18.0)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.0)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.38.0)
+    rubocop (1.45.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.15.0)
+    rubocop-capybara (2.17.0)
+      rubocop (~> 1.41)
+    rubocop-performance (1.16.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.15.0)
+    rubocop-rspec (2.18.1)
       rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
     ruby-progressbar (1.11.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   x86_64-linux

data/README.md

@@ -39,7 +39,7 @@ Note that all cops are `Enabled: false` by default.
 - [Sevencop/MethodDefinitionOrdered](lib/rubocop/cop/sevencop/method_definition_ordered.rb)
 - [Sevencop/RailsBelongsToOptional](lib/rubocop/cop/sevencop/rails_belongs_to_optional.rb)
 - [Sevencop/RailsDateAndTimeCalculation](lib/rubocop/cop/sevencop/rails_date_and_time_calculation.rb)
-- [Sevencop/RailsOrderField](lib/rubocop/cop/sevencop/rails_order_field.rb)
+- [Sevencop/RailsOrderFieldArelSql](lib/rubocop/cop/sevencop/rails_order_field_arel_sql.rb)
 - [Sevencop/RailsOrderFieldInOrderOf](lib/rubocop/cop/sevencop/rails_order_field_in_order_of.rb)
 - [Sevencop/RailsSpecificActionName](lib/rubocop/cop/sevencop/rails_specific_action_name.rb)
 - [Sevencop/RailsUniquenessValidatorExplicitCaseSensitivity](lib/rubocop/cop/sevencop/rails_uniqueness_validator_explicit_case_sensitivity.rb)
@@ -49,7 +49,6 @@ Note that all cops are `Enabled: false` by default.
 - [Sevencop/RSpecEmptyLineAfterLet](lib/rubocop/cop/sevencop/rspec_empty_line_after_let.rb)
 - [Sevencop/RSpecExamplesInSameGroup](lib/rubocop/cop/sevencop/rspec_examples_in_same_group.rb)
 - [Sevencop/RSpecMemoizedHelperBlockDelimiter](lib/rubocop/cop/sevencop/rspec_memoized_helper_block_delimiter.rb)
-- [Sevencop/RSpecRailsResponseParsedBody](lib/rubocop/cop/sevencop/rspec_rails_response_parsed_body.rb)
 
 ## Notes
 

data/config/default.yml

@@ -3,26 +3,22 @@ Sevencop/AutoloadOrdered:
     Sort `autoload` in alphabetical order.
   Enabled: false
   Safe: false
-  VersionAdded: '0.12'
 
 Sevencop/ConstantBase:
   Description: |
     Avoid unnecessary `::` prefix on constant.
   Enabled: false
-  VersionAdded: '0.31'
 
 Sevencop/FactoryBotAssociationOption:
   Description: |
     Avoid redundant options on FactoryBot associations.
   Enabled: false
-  VersionAdded: '0.21'
 
 Sevencop/FactoryBotAssociationStyle:
   Description: |
     Use consistent style in FactoryBot associations.
   Enabled: false
   Safe: false
-  VersionAdded: '0.21'
   EnforcedStyle: implicit
   SupportedStyles:
     - explicit
@@ -45,69 +41,58 @@ Sevencop/HashElementOrdered:
     Sort Hash elements by key.
   Enabled: false
   Safe: false
-  VersionAdded: '0.6'
 
 Sevencop/MethodDefinitionArgumentsMultiline:
   Description: |
     Inserts new lines between method definition arguments.
   Enabled: false
-  VersionAdded: '0.11'
 
 Sevencop/MethodDefinitionInIncluded:
   Description: |
     Do not define methods in `included` blocks.
   Enabled: false
   Safe: false
-  VersionAdded: '0.19'
 
 Sevencop/MethodDefinitionOrdered:
   Description: |
     Sort method definitions in alphabetical order.
   Enabled: false
   Safe: false
-  VersionAdded: '0.14'
 
 Sevencop/MethodDefinitionKeywordArgumentOrdered:
   Description: |
     Sort method definition keyword arguments in alphabetical order.
   Enabled: false
   Safe: false
-  VersionAdded: '0.13'
 
 Sevencop/RailsBelongsToOptional:
   Description: |
     Force `belongs_to` with `optional: true` option.
   Enabled: false
   Safe: false
-  VersionAdded: '0.5'
 
 Sevencop/RailsDateAndTimeCalculation:
   Description: |
     Prefer ActiveSupport date and time helper.
   Enabled: false
   Safe: false
-  VersionAdded: '0.26'
 
-Sevencop/RailsOrderField:
+Sevencop/RailsOrderFieldArelSql:
   Description: |
     Wrap safe SQL String by `Arel.sql`.
   Enabled: false
   Safe: false
-  VersionAdded: '0.4'
 
 Sevencop/RailsOrderFieldInOrderOf:
   Description: |
-    Prefer `in_order_of` to MySQL `FIELD` function.
+    Prefer `in_order_of` to MySQL `FIELD` function if possible.
   Enabled: false
-  SafeAutoCorrect: false
-  VersionAdded: '0.32'
+  Safe: false
 
 Sevencop/RailsSpecificActionName:
   Description: |
     Use only specific action names.
   Enabled: false
-  VersionAdded: '0.24'
-  VersionChanged: '0.29'
   ActionNames:
     - create
     - destroy
@@ -124,27 +109,23 @@ Sevencop/RailsUniquenessValidatorExplicitCaseSensitivity:
     Specify :case_sensitivity option on use of UniquenessValidator.
   Enabled: false
   Safe: false
-  VersionAdded: '0.3'
 
 Sevencop/RailsWhereNot:
   Description: |
     Identifies passing multi-elements Hash literal to `where.not`.
   Enabled: false
   Safe: false
-  VersionAdded: '0.7'
 
 Sevencop/RequireOrdered:
   Description: |
     Sort `require` and `require_relative` in alphabetical order.
   Enabled: false
   Safe: false
-  VersionAdded: '0.16'
 
 Sevencop/RSpecDescribeHttpEndpoint:
   Description: |
     Pass HTTP endpoint identifier (e.g. `GET /users`) to top-level `describe` on request-specs.
   Enabled: false
-  VersionAdded: '0.18'
   Include:
     - spec/requests/**/*.rb
 
@@ -152,7 +133,6 @@ Sevencop/RSpecEmptyLineAfterLet:
   Description: |
     Insert empty line after `let`.
   Enabled: false
-  VersionAdded: '0.27'
   Include:
     - spec/**/*
 
@@ -160,7 +140,6 @@ Sevencop/RSpecExamplesInSameGroup:
   Description: |
     Combine examples in the same groups in the time-consuming kinds of specs.
   Enabled: false
-  VersionAdded: '0.17'
   IncludeSharedExamples: false
   Include:
     - spec/controllers/**/*
@@ -170,16 +149,5 @@ Sevencop/RSpecMemoizedHelperBlockDelimiter:
   Description: |
     Use do-end block delimiter on RSpec memoized helper.
   Enabled: false
-  VersionAdded: '0.27'
   Include:
     - spec/**/*
-
-Sevencop/RSpecRailsResponseParsedBody:
-  Description: |
-    Prefer `response.parsed_body` to `JSON.parse(response.body)`.
-  Enabled: false
-  Safe: false
-  VersionAdded: '0.28'
-  Include:
-    - spec/controllers/**/*
-    - spec/requests/**/*

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

@@ -41,14 +41,8 @@ module RuboCop
 
           add_offense(node) do |corrector|
             swap(
-              range_by_whole_lines(
-                previous_older_sibling.location.expression,
-                include_final_newline: true
-              ),
-              range_by_whole_lines(
-                node.location.expression,
-                include_final_newline: true
-              ),
+              range_with_comments_and_lines(previous_older_sibling),
+              range_with_comments_and_lines(node),
               corrector: corrector
             )
           end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'set'
-
 module RuboCop
   module Cop
     module Sevencop
@@ -110,42 +108,36 @@ module RuboCop
       class RailsDateAndTimeCalculation < Base
         extend AutoCorrector
 
-        CALCULATION_METHOD_NAMES = ::Set.new(
-          %i[
-            -
-            +
-          ]
-        ).freeze
-
-        COMPARISON_METHOD_NAMES = ::Set.new(
-          %i[
-            <
-            >
-            after?
-            before?
-          ]
-        ).freeze
-
-        DURATION_METHOD_NAMES = ::Set.new(
-          %i[
-            day
-            days
-            fortnight
-            fortnights
-            hour
-            hours
-            minute
-            minutes
-            month
-            months
-            second
-            seconds
-            week
-            weeks
-            year
-            years
-          ]
-        ).freeze
+        CALCULATION_METHOD_NAMES = %i[
+          -
+          +
+        ].to_set.freeze
+
+        COMPARISON_METHOD_NAMES = %i[
+          <
+          >
+          after?
+          before?
+        ].to_set.freeze
+
+        DURATION_METHOD_NAMES = %i[
+          day
+          days
+          fortnight
+          fortnights
+          hour
+          hours
+          minute
+          minutes
+          month
+          months
+          second
+          seconds
+          week
+          weeks
+          year
+          years
+        ].to_set.freeze
 
         MSG = 'Prefer ActiveSupport date and time helper.'
 

data/lib/rubocop/cop/sevencop/{rails_order_field.rb → rails_order_field_arel_sql.rb}

@@ -22,7 +22,7 @@ module RuboCop
       #   # good
       #   reorder(Arel.sql('field(id, ?)'), a)
       #
-      class RailsOrderField < Base
+      class RailsOrderFieldArelSql < Base
         extend AutoCorrector
 
         MSG = 'Wrap safe SQL String by `Arel.sql`.'

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

@@ -3,9 +3,11 @@
 module RuboCop
   module Cop
     module Sevencop
-      # Prefer `in_order_of` to MySQL `FIELD` function.
+      # Prefer `in_order_of` to MySQL `FIELD` function if possible.
       #
       # @safety
+      #   This cop is unsafe because `in_order_of` also adds `WHERE` clause.
+      #
       #   This cop's autocorrection is unsafe because in the original code the array value is interpolated as
       #   literals on SQL query, but after its autocorrection, the value will be now passed directly to in_order_of,
       #   which may produce different results.
@@ -89,7 +91,7 @@ module RuboCop
           \z
         /ix.freeze
 
-        MSG = 'Prefer `in_order_of` to MySQL `FIELD` function.'
+        MSG = 'Prefer `in_order_of` to MySQL `FIELD` function if possible.'
 
         RESTRICT_ON_SEND = %i[
           order

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'set'
-
 module RuboCop
   module Cop
     module Sevencop

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

@@ -36,19 +36,19 @@ module RuboCop
       #     includes_examples 'creates Foo'
       #   end
       class RSpecExamplesInSameGroup < Base
-        METHOD_NAMES_FOR_REGULAR_EXAMPLE = ::Set[
-          :example,
-          :it,
-          :its,
-          :scenario,
-          :specify
-        ].freeze
+        METHOD_NAMES_FOR_REGULAR_EXAMPLE = %i[
+          example
+          it
+          its
+          scenario
+          specify
+        ].to_set.freeze
 
-        METHOD_NAMES_FOR_SHARED_EXAMPLES = ::Set[
-          :include_examples,
-          :it_behaves_like,
-          :it_should_behave_like
-        ]
+        METHOD_NAMES_FOR_SHARED_EXAMPLES = %i[
+          include_examples
+          it_behaves_like
+          it_should_behave_like
+        ].to_set.freeze
 
         MSG = 'Combine examples in the same group in the time-consuming kinds of specs.'
 

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'set'
-
 module RuboCop
   module Cop
     module Sevencop

data/lib/sevencop/rubocop_extension.rb

@@ -7,7 +7,7 @@ require_relative 'config_loader'
 RuboCop::ConfigLoader.instance_variable_set(
   :@default_configuration,
   Sevencop::ConfigLoader.call(
-    path: ::File.expand_path(
+    path: File.expand_path(
       '../../config/default.yml',
       __dir__
     )

data/lib/sevencop/version.rb

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

data/lib/sevencop.rb

@@ -15,7 +15,7 @@ require_relative 'rubocop/cop/sevencop/method_definition_keyword_argument_ordere
 require_relative 'rubocop/cop/sevencop/method_definition_ordered'
 require_relative 'rubocop/cop/sevencop/rails_belongs_to_optional'
 require_relative 'rubocop/cop/sevencop/rails_date_and_time_calculation'
-require_relative 'rubocop/cop/sevencop/rails_order_field'
+require_relative 'rubocop/cop/sevencop/rails_order_field_arel_sql'
 require_relative 'rubocop/cop/sevencop/rails_order_field_in_order_of'
 require_relative 'rubocop/cop/sevencop/rails_specific_action_name'
 require_relative 'rubocop/cop/sevencop/rails_uniqueness_validator_explicit_case_sensitivity'
@@ -25,4 +25,3 @@ require_relative 'rubocop/cop/sevencop/rspec_describe_http_endpoint'
 require_relative 'rubocop/cop/sevencop/rspec_empty_line_after_let'
 require_relative 'rubocop/cop/sevencop/rspec_examples_in_same_group'
 require_relative 'rubocop/cop/sevencop/rspec_memoized_helper_block_delimiter'
-require_relative 'rubocop/cop/sevencop/rspec_rails_response_parsed_body'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sevencop
 version: !ruby/object:Gem::Version
-  version: 0.32.2
+  version: 0.34.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,7 +67,7 @@ files:
 - lib/rubocop/cop/sevencop/method_definition_ordered.rb
 - lib/rubocop/cop/sevencop/rails_belongs_to_optional.rb
 - lib/rubocop/cop/sevencop/rails_date_and_time_calculation.rb
-- lib/rubocop/cop/sevencop/rails_order_field.rb
+- lib/rubocop/cop/sevencop/rails_order_field_arel_sql.rb
 - lib/rubocop/cop/sevencop/rails_order_field_in_order_of.rb
 - lib/rubocop/cop/sevencop/rails_specific_action_name.rb
 - lib/rubocop/cop/sevencop/rails_uniqueness_validator_explicit_case_sensitivity.rb
@@ -77,7 +77,6 @@ files:
 - lib/rubocop/cop/sevencop/rspec_empty_line_after_let.rb
 - lib/rubocop/cop/sevencop/rspec_examples_in_same_group.rb
 - lib/rubocop/cop/sevencop/rspec_memoized_helper_block_delimiter.rb
-- lib/rubocop/cop/sevencop/rspec_rails_response_parsed_body.rb
 - lib/sevencop.rb
 - lib/sevencop/config_loader.rb
 - lib/sevencop/cop_concerns.rb
@@ -107,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Opinionated custom cops for RuboCop.

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

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    module Sevencop
-      # Prefer `response.parsed_body` to `JSON.parse(response.body)`.
-      #
-      # @safety
-      #   This cop is unsafe because Content-Type may not be `application/json`.
-      #
-      # @example
-      #   # bad
-      #   JSON.parse(response.body)
-      #
-      #   # good
-      #   response.parsed_body
-      class RSpecRailsResponseParsedBody < Base
-        extend AutoCorrector
-
-        MSG = 'Prefer `response.parsed_body` to `JSON.parse(response.body)`.'
-
-        RESTRICT_ON_SEND = %i[parse].freeze
-
-        # @param node [RuboCop::AST::SendNode]
-        # @return [void]
-        def on_send(node)
-          return unless bad?(node)
-
-          add_offense(node) do |corrector|
-            autocorrect(corrector, node)
-          end
-        end
-
-        private
-
-        # @!method json_parse_response_body?(node)
-        #   @param node [RuboCop::AST::Node]
-        #   @return [Boolean]
-        def_node_matcher :json_parse_response_body?, <<~PATTERN
-          (send
-            (const
-              {nil? cbase}
-              :JSON
-            )
-            :parse
-            (send
-              (send
-                nil?
-                :response
-              )
-              :body
-            )
-          )
-        PATTERN
-        alias bad? json_parse_response_body?
-
-        # @param corrector [RuboCop::Cop::Corrector]
-        # @param node [RuboCop::AST::SendNode]
-        # @return [void]
-        def autocorrect(
-          corrector,
-          node
-        )
-          corrector.replace(node, 'response.parsed_body')
-        end
-      end
-    end
-  end
-end