sevencop 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d415f24d882b17eb832c22fa9a17d40ebf1ea91fda15e5a25e8e5ceea6824633
-  data.tar.gz: b770d04a2620d1ef6e5f7a0e0b0cd1e6f440b44a5173bd8c26890f0707a4e9b5
+  metadata.gz: 04df97299a228e2e8e8204799cb0b3d0c643a79c97ed4ec45f76f01b227e7e58
+  data.tar.gz: 9515ca6115c293425384b9b25ab4b7e554e54b2bbef00407b3aa194d69bb8be5
 SHA512:
-  metadata.gz: ddd45cdafff3edc2512a962f32d817cd5836f5435547d987c76f96a0d3a873f8398506dc567caea00ed165f7bd206378bcdbea71eec0516fe05ce7249a2b88e9
-  data.tar.gz: 737bd07f00679aa77fce2209f9692b5babff560362a03c412f228584f74d4cd213bbfc5a1223ed999e3ba66abb3f6f7cd7cfcd1d702ee4fed7f8f80d4940e0a3
+  metadata.gz: 8e3ba17d74c6144d551fccab790249ccc242731f213b04016d0aabb4774281ae205c6807fee8527f4388bc2f29352a19925796393432392b81aa19d8940d0b63
+  data.tar.gz: 6aaacdd215db0d477d1470eac9622d09c968fbba8d1eae8de96ef68baeea9a806bdd17bd9b7c8dff55814221cb282e0413aaa09ff4d51c542c3d5aa01f42d206

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sevencop (0.29.0)
+    sevencop (0.30.0)
       activesupport
       rubocop
 
@@ -25,39 +25,39 @@ GEM
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.0)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    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-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rubocop (1.36.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.38.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
     rubocop-performance (1.15.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.13.1)
+    rubocop-rspec (2.15.0)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     tzinfo (2.0.5)

data/README.md

@@ -38,7 +38,6 @@ 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/RailsInferredSpecType](lib/rubocop/cop/sevencop/rails_inferred_spec_type.rb)
 - [Sevencop/RailsOrderField](lib/rubocop/cop/sevencop/rails_order_field.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)

data/config/default.yml

@@ -82,13 +82,6 @@ Sevencop/RailsDateAndTimeCalculation:
   Safe: false
   VersionAdded: '0.26'
 
-Sevencop/RailsInferredSpecType:
-  Description: |
-    Identifies redundant spec type.
-  Enabled: false
-  Safe: false
-  VersionAdded: '0.9'
-
 Sevencop/RailsOrderField:
   Description: |
     Wrap safe SQL String by `Arel.sql`.

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

@@ -148,6 +148,7 @@ module RuboCop
           block = node.parent
           return [] unless block
           return [] unless block.block_type?
+          return [] unless block.body
 
           if block.body.begin_type?
             block.body.children

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

@@ -37,8 +37,8 @@ module RuboCop
           (send
             _ _
             {
-              (str /field\(.+\)/i) |
-              (dstr <(str /field\(.+\)/i) ...>)
+              (str /field(.+)/i) |
+              (dstr <(str /field(.+)/i) ...>)
             }
             ...
           )

data/lib/sevencop/version.rb

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

data/lib/sevencop.rb

@@ -14,7 +14,6 @@ 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_inferred_spec_type'
 require_relative 'rubocop/cop/sevencop/rails_order_field'
 require_relative 'rubocop/cop/sevencop/rails_specific_action_name'
 require_relative 'rubocop/cop/sevencop/rails_uniqueness_validator_explicit_case_sensitivity'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sevencop
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2022-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,7 +66,6 @@ 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_inferred_spec_type.rb
 - lib/rubocop/cop/sevencop/rails_order_field.rb
 - lib/rubocop/cop/sevencop/rails_specific_action_name.rb
 - lib/rubocop/cop/sevencop/rails_uniqueness_validator_explicit_case_sensitivity.rb

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

@@ -1,125 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    module Sevencop
-      # Identifies redundant spec type.
-      # This is automatically set by `config.infer_spec_type_from_file_location!`.
-      #
-      # @example
-      #
-      #   # bad
-      #   # spec/models/user_spec.rb
-      #   RSpec.describe User, type: :model
-      #
-      #   # good
-      #   # spec/models/user_spec.rb
-      #   RSpec.describe User
-      #
-      #   # good
-      #   # spec/models/user_spec.rb
-      #   RSpec.describe User, type: :request
-      #
-      class RailsInferredSpecType < Base
-        extend AutoCorrector
-
-        # @return [Array<Hash>]
-        INFERENCES = [
-          { prefix: 'spec/channels/', type: :channel },
-          { prefix: 'spec/controllers/', type: :controller },
-          { prefix: 'spec/features/', type: :feature },
-          { prefix: 'spec/generator/', type: :generator },
-          { prefix: 'spec/helpers/', type: :helper },
-          { prefix: 'spec/jobs/', type: :job },
-          { prefix: 'spec/mailboxes/', type: :mailbox },
-          { prefix: 'spec/mailers/', type: :mailer },
-          { prefix: 'spec/models/', type: :model },
-          { prefix: 'spec/requests/', type: :request },
-          { prefix: 'spec/integration/', type: :request },
-          { prefix: 'spec/api/', type: :request },
-          { prefix: 'spec/routing/', type: :routing },
-          { prefix: 'spec/system/', type: :system },
-          { prefix: 'spec/views/', type: :view }
-        ].freeze
-
-        MSG = 'Remove redundant spec type.'
-
-        RESTRICT_ON_SEND = %i[
-          describe
-        ].freeze
-
-        # @param [RuboCop::AST::SendNode] node
-        def on_send(node)
-          pair_node = describe_with_type(node)
-          return unless pair_node
-          return unless inferred_type?(pair_node)
-
-          removable_node = detect_removable_node(pair_node)
-          add_offense(removable_node) do |corrector|
-            autocorrect(corrector, removable_node)
-          end
-        end
-
-        private
-
-        # @!method describe_with_type(node)
-        #   @param [RuboCop::AST::SendNode] node
-        #   @return [RuboCop::AST::PairNode, nil]
-        def_node_matcher :describe_with_type, <<~PATTERN
-          (send
-            { (const nil? :RSpec) | nil? }
-            _
-            _
-            _*
-            (hash
-              (pair ...)*
-              $(pair (sym :type) sym)
-              (pair ...)*
-            )
-          )
-        PATTERN
-
-        # @param [RuboCop::AST::Corrector] corrector
-        # @param [RuboCop::AST::Node] node
-        def autocorrect(
-          corrector,
-          node
-        )
-          corrector.remove(
-            node.location.expression.with(
-              begin_pos: node.left_sibling.location.expression.end_pos
-            )
-          )
-        end
-
-        # @param [RuboCop::AST::PairNode] node
-        # @return [RuboCop::AST::Node]
-        def detect_removable_node(node)
-          if node.parent.pairs.size == 1
-            node.parent
-          else
-            node
-          end
-        end
-
-        # @return [String]
-        def file_path
-          processed_source.file_path
-        end
-
-        # @param [RuboCop::AST::PairNode] node
-        # @return [Boolean]
-        def inferred_type?(node)
-          inferred_type_from_file_path.inspect == node.value.source
-        end
-
-        # @return [Symbol, nil]
-        def inferred_type_from_file_path
-          INFERENCES.find do |inference|
-            break inference[:type] if file_path.include?(inference[:prefix])
-          end
-        end
-      end
-    end
-  end
-end