rubocop_method_order 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab19c825958da68b876b86e287411591d1656885ad6add3df83d6893e586cc0f
-  data.tar.gz: 276d8f2e12003d75b283312aad1f1cc7a8e84166f8cf5332d9c537b95f77cdeb
+  metadata.gz: 3a11e352cb4082399b5874ee8e3cd5832ec63767bce1fecf763623fcb007239b
+  data.tar.gz: 7d79c93d3f9fa79c4a68ab6ce6ebacb98e1f7a44dc018b5539d4e335381f3f01
 SHA512:
-  metadata.gz: 55fd84404e00fc9bb72cad2fe6bc6a93d1316df805f0cea41947fb02c05ee56c6db941cf07c6694379a929b03ce26515d64ae66275b78defff1359821071e5c5
-  data.tar.gz: 9e2964b8653047536814e91c514dfb398fcd2c7329725a2eedf143b9f7cd6dc411bf27898e923398a2f6ef802582620a4a091e8c88f1c4f3c6081706e8224f9f
+  metadata.gz: d9dbbc9ff80535bf34c0b87ff1f20105f843647d9b8c668386a8d57f03971f921eb3c1d487127e45c9eb9e265e0f369940bf79397679032a100eb8c4a4233454
+  data.tar.gz: d5ed4b360456386c23e88bdb5ffae8b5b7eb445b183f5a97f9240cb5fa31a4fcd251538a537e5fdb477deab27d8d111f85b20e1112e263686e722c4471527770

data/CHANGELOG.md

@@ -5,11 +5,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+* Autocorrect of method order would not replace all incorrectly ordered nodes in
+  certain combinations.
+
 ## [0.1.0] - 2018-03-21
 
 ### Added
 
 * Initial version of the extension.
 
-[unreleased]: https://github.com/CoffeeAndCode/rubocop_method_order
+[unreleased]: https://github.com/CoffeeAndCode/rubocop_method_order/compare/v0.2.0...HEAD
+[0.2.0]: https://github.com/CoffeeAndCode/rubocop_method_order/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/CoffeeAndCode/rubocop_method_order/releases/tag/v0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop_method_order (0.1.0)
+    rubocop_method_order (0.2.0)
       rubocop (~> 0.53)
 
 GEM

data/lib/rubocop/cop/style/method_order.rb

@@ -106,23 +106,28 @@ module RuboCop
         MSG = 'Methods should be sorted in alphabetical order within their section' \
               ' of the code. Method `%<method>s` should come before `%<previous_method>s`.'
 
-        def autocorrect(node)
-          return if @autocorrect_replacements[node].nil?
-
+        def autocorrect(_node) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
           lambda do |corrector|
-            @autocorrect_replacements[node].each do |node_to_move, node_to_replace|
-              next if @autocorrected_nodes.include?(node_to_move)
-
-              @autocorrected_nodes << node_to_move
-              node_source = range_with_method_comments(node_to_move).source
-              replacement_range = range_with_method_comments(node_to_replace)
-              corrector.replace(replacement_range, node_source)
+            @method_collector.nodes_by_scope.values.each do |method_collection|
+              next if @autocorrected_method_collections.include?(method_collection)
+
+              @autocorrected_method_collections << method_collection
+              method_collection.replacements.values.each do |replacement_collection|
+                replacement_collection.each do |node_to_move, node_to_replace|
+                  next if @autocorrected_nodes.include?(node_to_move)
+
+                  @autocorrected_nodes << node_to_move
+                  node_source = range_with_method_comments(node_to_move).source
+                  replacement_range = range_with_method_comments(node_to_replace)
+                  corrector.replace(replacement_range, node_source)
+                end
+              end
             end
           end
         end
 
         def investigate(_processed_source)
-          @autocorrect_replacements = {}
+          @autocorrected_method_collections = []
           @autocorrected_nodes = []
           @method_collector = RuboCopMethodOrder::MethodCollector.new(
             should_skip_method: ->(node) { !cop_enabled_for_node?(node) }
@@ -173,7 +178,6 @@ module RuboCop
 
         def check_nodes
           @method_collector.nodes_by_scope.values.each do |method_collection|
-            @autocorrect_replacements.merge!(method_collection.replacements)
             method_collection.offenses.each do |offense|
               add_offense(offense[:node], location: :expression, message: message(
                 offense[:node].method_name,

data/lib/rubocop_method_order/version.rb

@@ -10,7 +10,7 @@ module RuboCopMethodOrder
   # Contains individual version parts for this gem.
   module VERSION
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
     PRE   = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop_method_order
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Knapp
@@ -34,7 +34,7 @@ cert_chain:
   XxvXYAfIUSbb6/CHtemZT4zsEprRuk8eADIYUTMyAt9d2roTcsRKgq20m+PZO+b+
   DVnSbPSTRxaM+9Hds4CAzdoo5hIiLyvSXSqSRGgQEMT0yiFdK+6kRw==
   -----END CERTIFICATE-----
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop