sevencop 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b95d5ba5dafb534e8e3a9e5c49bd9724db92840e1ca00543251c48a6b0f74f5
-  data.tar.gz: c6f7822017c94416417238387b5e16b76b00e401a8819a27c0d6df40ac1373c2
+  metadata.gz: 8acc90d7c82f23729f66dce9a0376410c1cdd2f01d71592b9c3575a4a9d9c416
+  data.tar.gz: 3d49905a627a5cfd72a00e73328a898fddb0c3a9f78942a32932486e87182eff
 SHA512:
-  metadata.gz: 131bb0495d50ebd37c0c03aa81b22d79d3488d8428697cd3af4263342f884b1857363920c40fa6794ba99e1de3e118bf94cf205cee96cc0aad77525f040072ee
-  data.tar.gz: f49be306dde9d6fda9db8d79a653c7814a4b43059265ceaf42fb4bbad2eee61fe112cb0ad56cdb152f626c26da9b54302f89f51f98652aa5ef37574ffcb06d45
+  metadata.gz: 80f9368358f530ff0eceef9a9a071b26a772b28aee8c8fe3199d8e9fc53571205c94ad2be9af4f8485c5c91f7de6934c7e16773fb3c460ed4ac5a9d68525a74a
+  data.tar.gz: d79f8f27058781abde3fb6773aa427714edb95deff385dc5777ca4d3b069d6bbd62d6b21178786a6f9b7ca9dad3745bbf46f78b40b1e737b5006ab5b4dda9028

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sevencop (0.14.0)
+    sevencop (0.15.0)
       rubocop
 
 GEM

data/README.md

@@ -38,7 +38,7 @@ then enable the cops you want to use:
 
 ```yaml
 # .rubocop.yml
-Sevencop/BelongsToOptional:
+Sevencop/RailsBelongsToOptional:
   Enabled: true
 ```
 
@@ -46,14 +46,15 @@ Sevencop/BelongsToOptional:
 
 See YARD comments in each cop class for details:
 
-- [Sevencop/BelongsToOptional](lib/rubocop/cop/sevencop/belongs_to_optional.rb)
+- [Sevencop/AutoloadOrdered](lib/rubocop/cop/sevencop/autoload_ordered.rb)
 - [Sevencop/HashElementOrdered](lib/rubocop/cop/sevencop/hash_element_ordered.rb)
-- [Sevencop/InferredSpecType](lib/rubocop/cop/sevencop/inferred_spec_type.rb)
 - [Sevencop/MethodDefinitionArgumentsMultiline](lib/rubocop/cop/sevencop/method_definition_arguments_multiline.rb)
-- [Sevencop/MethodDefinitionKeywordArgumentsOrdered](lib/rubocop/cop/sevencop/method_definition_keyword_arguments_ordered.rb)
+- [Sevencop/MethodDefinitionKeywordArgumentOrdered](lib/rubocop/cop/sevencop/method_definition_keyword_argument_ordered.rb)
 - [Sevencop/MethodDefinitionOrdered](lib/rubocop/cop/sevencop/method_definition_ordered.rb)
-- [Sevencop/OrderField](lib/rubocop/cop/sevencop/order_field.rb)
-- [Sevencop/UniquenessValidatorExplicitCaseSensitivity](lib/rubocop/cop/sevencop/uniqueness_validator_explicit_case_sensitivity.rb)
-- [Sevencop/WhereNot](lib/rubocop/cop/sevencop/where_not.rb)
+- [Sevencop/RailsBelongsToOptional](lib/rubocop/cop/sevencop/rails_belongs_to_optional.rb)
+- [Sevencop/RailsInferredSpecType](lib/rubocop/cop/sevencop/rails_inferred_spec_type.rb)
+- [Sevencop/RailsOrderField](lib/rubocop/cop/sevencop/rails_order_field.rb)
+- [Sevencop/RailsUniquenessValidatorExplicitCaseSensitivity](lib/rubocop/cop/sevencop/rails_uniqueness_validator_explicit_case_sensitivity.rb)
+- [Sevencop/RailsWhereNot](lib/rubocop/cop/sevencop/rails_where_not.rb)
 
 Note that all cops are `Enabled: false` by default.

data/config/default.yml

@@ -4,25 +4,12 @@ Sevencop/AutoloadOrdered:
   Enabled: false
   VersionAdded: '0.12'
 
-Sevencop/BelongsToOptional:
-  Description: |
-    Force `belongs_to` with `optional: true` option.
-  Enabled: false
-  Safe: false
-  VersionAdded: '0.5'
-
 Sevencop/HashElementOrdered:
   Description: |
     Sort Hash elements by key.
   Enabled: false
   VersionAdded: '0.6'
 
-Sevencop/InferredSpecType:
-  Description: |
-    Identifies redundant spec type.
-  Enabled: false
-  VersionAdded: '0.9'
-
 Sevencop/MethodDefinitionArgumentsMultiline:
   Description: |
     Inserts new lines between method definition arguments.
@@ -35,27 +22,40 @@ Sevencop/MethodDefinitionOrdered:
   Enabled: false
   VersionAdded: '0.14'
 
-Sevencop/MethodDefinitionKeywordArgumentsOrdered:
+Sevencop/MethodDefinitionKeywordArgumentOrdered:
   Description: |
     Sort method definition keyword arguments in alphabetical order.
   Enabled: false
   VersionAdded: '0.13'
 
-Sevencop/OrderField:
+Sevencop/RailsBelongsToOptional:
+  Description: |
+    Force `belongs_to` with `optional: true` option.
+  Enabled: false
+  Safe: false
+  VersionAdded: '0.5'
+
+Sevencop/RailsInferredSpecType:
+  Description: |
+    Identifies redundant spec type.
+  Enabled: false
+  VersionAdded: '0.9'
+
+Sevencop/RailsOrderField:
   Description: |
     Wrap safe SQL String by `Arel.sql`.
   Enabled: false
   Safe: false
   VersionAdded: '0.4'
 
-Sevencop/UniquenessValidatorExplicitCaseSensitivity:
+Sevencop/RailsUniquenessValidatorExplicitCaseSensitivity:
   Description: |
     Specify :case_sensitivity option on use of UniquenessValidator.
   Enabled: false
   Safe: false
   VersionAdded: '0.3'
 
-Sevencop/WhereNot:
+Sevencop/RailsWhereNot:
   Description: |
     Identifies passing multi-elements Hash literal to `where.not`.
   Enabled: false

data/lib/rubocop/cop/sevencop/{method_definition_keyword_arguments_ordered.rb → method_definition_keyword_argument_ordered.rb}

@@ -17,7 +17,7 @@ module RuboCop
       #
       #   # good
       #   def foo(c:, d:, a: 2, b: 1); end
-      class MethodDefinitionKeywordArgumentsOrdered < Base
+      class MethodDefinitionKeywordArgumentOrdered < Base
         extend AutoCorrector
 
         MSG = 'Sort method definition keyword arguments in alphabetical order.'

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

@@ -37,16 +37,12 @@ module RuboCop
           previous_older_sibling = find_previous_older_sibling(node)
           return unless previous_older_sibling
 
-          add_offense(node) do |corrector|
+          add_offense(
+            range_with_comments(node)
+          ) do |corrector|
             swap(
-              range_by_whole_lines(
-                range_with_comments(previous_older_sibling),
-                include_final_newline: true
-              ),
-              range_by_whole_lines(
-                range_with_comments(node),
-                include_final_newline: true
-              ),
+              range_with_comments_and_lines(previous_older_sibling),
+              range_with_comments_and_lines(node),
               corrector: corrector
             )
           end
@@ -86,6 +82,15 @@ module RuboCop
           end
         end
 
+        # @param node [RuboCop::AST::Node]
+        # @return [Parser::Source::Range]
+        def range_with_comments_and_lines(node)
+          range_by_whole_lines(
+            range_with_comments(node),
+            include_final_newline: true
+          )
+        end
+
         # @param node [RuboCop::AST::DefNode]
         # @return [#<=>]
         def sort_key_of(node)

data/lib/rubocop/cop/sevencop/{belongs_to_optional.rb → rails_belongs_to_optional.rb}

@@ -19,7 +19,7 @@ module RuboCop
       #   # good (We cannot identify offenses in this case.)
       #   belongs_to :group, options
       #
-      class BelongsToOptional < Base
+      class RailsBelongsToOptional < Base
         extend AutoCorrector
 
         MSG = 'Specify :optional option.'

data/lib/rubocop/cop/sevencop/{inferred_spec_type.rb → rails_inferred_spec_type.rb}

@@ -20,7 +20,7 @@ module RuboCop
       #   # spec/models/user_spec.rb
       #   RSpec.describe User, type: :request
       #
-      class InferredSpecType < Base
+      class RailsInferredSpecType < Base
         extend AutoCorrector
 
         # @return [Array<Hash>]

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

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

data/lib/rubocop/cop/sevencop/{uniqueness_validator_explicit_case_sensitivity.rb → rails_uniqueness_validator_explicit_case_sensitivity.rb}

@@ -26,7 +26,7 @@ module RuboCop
       #   # good
       #   validates :name, uniqueness: { allow_nil: true, scope: :user_id, case_sensitive: true }
       #
-      class UniquenessValidatorExplicitCaseSensitivity < Base
+      class RailsUniquenessValidatorExplicitCaseSensitivity < Base
         extend AutoCorrector
 
         MSG = 'Specify :case_sensitivity option on use of UniquenessValidator.'

data/lib/rubocop/cop/sevencop/{where_not.rb → rails_where_not.rb}

@@ -13,13 +13,13 @@ module RuboCop
       #   # good
       #   where.not(key1: value1).where.not(key2: value2)
       #
-      class WhereNot < Base
+      class RailsWhereNot < Base
         extend AutoCorrector
 
         MSG = 'Use `where.not(key1: value1).where.not(key2: value2)` style.'
 
-        # @!method where_not_with_multiple_elements_hash?(node)
-        def_node_matcher :where_not_with_multiple_elements_hash?, <<~PATTERN
+        # @!method rails_where_not_with_multiple_elements_hash?(node)
+        def_node_matcher :rails_where_not_with_multiple_elements_hash?, <<~PATTERN
           (send
             (send _ :where) :not
             ({ hash | kwargs }
@@ -28,7 +28,7 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          return unless where_not_with_multiple_elements_hash?(node)
+          return unless rails_where_not_with_multiple_elements_hash?(node)
 
           add_offense(node) do |corrector|
             pairs = node.children[2].children

data/lib/sevencop/version.rb

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

data/lib/sevencop.rb

@@ -4,12 +4,12 @@ require_relative 'sevencop/rubocop_extension'
 require_relative 'sevencop/version'
 
 require_relative 'rubocop/cop/sevencop/autoload_ordered'
-require_relative 'rubocop/cop/sevencop/belongs_to_optional'
 require_relative 'rubocop/cop/sevencop/hash_element_ordered'
-require_relative 'rubocop/cop/sevencop/inferred_spec_type'
 require_relative 'rubocop/cop/sevencop/method_definition_arguments_multiline'
-require_relative 'rubocop/cop/sevencop/method_definition_keyword_arguments_ordered'
+require_relative 'rubocop/cop/sevencop/method_definition_keyword_argument_ordered'
 require_relative 'rubocop/cop/sevencop/method_definition_ordered'
-require_relative 'rubocop/cop/sevencop/order_field'
-require_relative 'rubocop/cop/sevencop/uniqueness_validator_explicit_case_sensitivity'
-require_relative 'rubocop/cop/sevencop/where_not'
+require_relative 'rubocop/cop/sevencop/rails_belongs_to_optional'
+require_relative 'rubocop/cop/sevencop/rails_inferred_spec_type'
+require_relative 'rubocop/cop/sevencop/rails_order_field'
+require_relative 'rubocop/cop/sevencop/rails_uniqueness_validator_explicit_case_sensitivity'
+require_relative 'rubocop/cop/sevencop/rails_where_not'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sevencop
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -42,15 +42,15 @@ files:
 - Rakefile
 - config/default.yml
 - lib/rubocop/cop/sevencop/autoload_ordered.rb
-- lib/rubocop/cop/sevencop/belongs_to_optional.rb
 - lib/rubocop/cop/sevencop/hash_element_ordered.rb
-- lib/rubocop/cop/sevencop/inferred_spec_type.rb
 - lib/rubocop/cop/sevencop/method_definition_arguments_multiline.rb
-- lib/rubocop/cop/sevencop/method_definition_keyword_arguments_ordered.rb
+- lib/rubocop/cop/sevencop/method_definition_keyword_argument_ordered.rb
 - lib/rubocop/cop/sevencop/method_definition_ordered.rb
-- lib/rubocop/cop/sevencop/order_field.rb
-- lib/rubocop/cop/sevencop/uniqueness_validator_explicit_case_sensitivity.rb
-- lib/rubocop/cop/sevencop/where_not.rb
+- lib/rubocop/cop/sevencop/rails_belongs_to_optional.rb
+- lib/rubocop/cop/sevencop/rails_inferred_spec_type.rb
+- lib/rubocop/cop/sevencop/rails_order_field.rb
+- lib/rubocop/cop/sevencop/rails_uniqueness_validator_explicit_case_sensitivity.rb
+- lib/rubocop/cop/sevencop/rails_where_not.rb
 - lib/sevencop.rb
 - lib/sevencop/config_loader.rb
 - lib/sevencop/rubocop_extension.rb