sevencop 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fc5d0adbf2ac9b5c3aa8ac43e1e375f82efa0906710ca38bd41c145c3a2bb41
-  data.tar.gz: fd8b73bcc7ea73410c6634a3dbd5fcb3b38f3af26570482b22a2d05b2f42f6b3
+  metadata.gz: adcb3382c32455ca63651bf5593974e773cf00dfd0b3d14955541c6ce219c6c7
+  data.tar.gz: d6f50b292bb6f56c0f6ec36fc4271c931af4c1c46cef9b8c14a2505cf984f8ed
 SHA512:
-  metadata.gz: 9024936b3ef659bae3242f40c793e72249edde9d6838f65edf570039077aad0abebe18ad8e2be52dad270ef4322bce2b841ffc33d42323a151b55b97d86cdc5a
-  data.tar.gz: 19450fde029f352c3bba68362bb8a0db0c2ec01ceb319702565083768d281613b9bd123b34345f1096350a6bd3eab7efdb89079cd0f63526406f8d6b0b404b9c
+  metadata.gz: 552d6582fc4aa3baa550afd6d27477c822e4f098b470c0c038a36380c6ab74f9962a27e8f04be05cc60586be43376de1ec20a0a5b56587d71b24d3fa36e8e4cb
+  data.tar.gz: 05df622c8de515879b816077ba5fc40cd47858c1666390beac8d2ac29e86c1983921d5d8964b8b7de64106e789f3217032b6338a9988442207dbe5aeb62a8031

data/Gemfile.lock

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

data/README.md

@@ -49,7 +49,7 @@ All cops are `Enabled: false` by default.
 
 ### Sevencop/AutoloadOrdered
 
-Sort `autoload` in alphabetical order.
+Sort `autoload` in alphabetical order within their section.
 
 ```ruby
 # bad
@@ -59,6 +59,13 @@ autoload :A, 'a'
 # good
 autoload :A, 'a'
 autoload :B, 'b'
+
+# good
+autoload :B, 'b'
+autoload :D, 'd'
+
+autoload :A, 'a'
+autoload :C, 'a'
 ```
 
 ### Sevencop/BelongsToOptional

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Sevencop
-      # Sort `autoload` in alphabetical order.
+      # Sort `autoload` in alphabetical order within their section.
       #
       # @example
       #   # bad
@@ -13,12 +13,19 @@ module RuboCop
       #   # good
       #   autoload :A, 'a'
       #   autoload :B, 'b'
+      #
+      #   # good
+      #   autoload :A, 'a'
+      #   autoload :D, 'd'
+      #
+      #   autoload :B, 'b'
+      #   autoload :C, 'c'
       class AutoloadOrdered < Base
         extend AutoCorrector
 
         include RangeHelp
 
-        MSG = 'Sort `autoload` in alphabetical order.'
+        MSG = 'Sort `autoload` in alphabetical order within their section.'
 
         RESTRICT_ON_SEND = %i[
           autoload
@@ -52,11 +59,21 @@ module RuboCop
           node.left_siblings.find do |sibling|
             next unless sibling.send_type?
             next unless sibling.method?(:autoload)
+            next unless in_same_section?(sibling, node)
 
             node.first_argument.source < sibling.first_argument.source
           end
         end
 
+        # @param node1 [RuboCop::AST::SendNode]
+        # @param node2 [RuboCop::AST::SendNode]
+        # @return [Boolean]
+        def in_same_section?(node1, node2)
+          !node1.location.expression.with(
+            end_pos: node2.location.expression.end_pos
+          ).source.include?("\n\n")
+        end
+
         # @param range1 [Paresr::Source::Range]
         # @param range2 [Paresr::Source::Range]
         # @param corrector [RuboCop::AST::Corrector]

data/lib/sevencop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sevencop
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Ryo Nakamura