rubocop-ordered_methods 0.11 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8136e162c37c297ad3e2eee09364841551f447b6854ada050b165d0286fda95d
-  data.tar.gz: 595fd69b9114f9122920cf5c8f15a1cb6a43b22f4c31ab9665a11bf2411ff91d
+  metadata.gz: b4d888d565f892bba920e148aa967920188045908a193d44a7a1e672fc713a66
+  data.tar.gz: 70396bfc0679f49119a78b1e6e62d6b85492c308b93e31738c4148117a3ec6ec
 SHA512:
-  metadata.gz: ab8b3c4ae74ac44dc4ee43af04cdb3854f8df847113e499dc2d429843c4276a34084316edc3c0aca41fd4174fdd6c3a508a642ec8dbc19302e6c015bc65ee16e
-  data.tar.gz: 96347af9d20819c73c485e5a985702097ab5507ec86774ab144bf8f9fa54363461dc0a53f993429a6321e0e8fea6d0b4bcf244c9159b17a03fcf7f503b41ec75
+  metadata.gz: e41e772f903aae3b9d92278bd09d3568ccb189c56a5c0ffece2d0b79eb97b3e7f6f03142d04d2bef61265717b2253c4c825d9bb953d042b45bb8124aef30a99e
+  data.tar.gz: 82ef17c01433200a393bed3fa2c812addaeb059ffc99b76b9c85287b972618f32e2b62acdbbeabe014e61dff597a490519835ab8118f7a65ae9a2123e4418e48

data/.github/workflows/main.yml

@@ -16,6 +16,8 @@ jobs:
           - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
+          - "3.4"
 
     name: "Ruby ${{ matrix.ruby }}: run rspec"
     steps:
@@ -35,6 +37,8 @@ jobs:
           - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
+          - "3.4"
 
     name: "Ruby ${{ matrix.ruby }}: run rubocop"
     steps:

data/CHANGELOG.md

@@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.13] - 2024-10-01
+
+### Fixed
+
+- Fix clobbering when consecutive nodes are with wrong order [#17](https://github.com/shanecav84/rubocop-ordered_methods/pull/17). Thanks, @Darhazer.
+
+## [0.12] - 2024-07-16
+
+### Fixed
+
+- Add MethodQualifiers to the default config [#13](https://github.com/shanecav84/rubocop-ordered_methods/pull/13). Thanks, @Darhazer.
+- Fix rubocop 1.65 compatability [#16](https://github.com/shanecav84/rubocop-ordered_methods/pull/16). Thanks, @Darhazer.
+
 ## [0.11] - 2023-12-19
 
 ### Fixed

data/config/default.yml

@@ -4,4 +4,5 @@ Layout/OrderedMethods:
   EnforcedStyle: 'alphabetical'
   IgnoredMethods:
     - initialize
+  MethodQualifiers: []
   Signature: ~

data/lib/rubocop/cop/correctors/ordered_methods_corrector.rb

@@ -17,14 +17,11 @@ module RuboCop
         @cop_config = cop_config
       end
 
-      def correct(node, previous_node)
+      def correct(node, previous_node, corrector)
         AliasMethodOrderVerifier.verify!(node, previous_node)
         current_range = join_surroundings(node)
         previous_range = join_surroundings(previous_node)
-        lambda do |corrector|
-          corrector.replace(current_range, previous_range.source)
-          corrector.replace(previous_range, current_range.source)
-        end
+        corrector.swap(current_range, previous_range)
       end
 
       private
@@ -51,7 +48,7 @@ module RuboCop
       # @param source_range Parser::Source::Range
       # @return Parser::Source::Range
       def join_comments(node, source_range)
-        @comment_locations[node.loc].each do |comment|
+        @comment_locations[node].each do |comment|
           source_range = source_range.join(comment.loc.expression)
         end
         source_range

data/lib/rubocop/cop/layout/ordered_methods.rb

@@ -29,9 +29,9 @@ module RuboCop
       #
       #   def c; end
       #   def d; end
-      class OrderedMethods < Cop
-        # TODO: Extending Cop is deprecated. Should extend Cop::Base.
-        include IgnoredMethods
+      class OrderedMethods < Base
+        extend AutoCorrector
+        include AllowedMethods
         include RangeHelp
 
         COMPARISONS = {
@@ -48,24 +48,9 @@ module RuboCop
           node.first_argument.method_name
         end
 
-        def autocorrect(node)
-          _siblings, corrector = cache(node)
-          corrector.correct(node, @previous_node)
-        end
-
         def on_begin(node)
           start_node = node.children.find(&:class_type?)&.children&.last || node
-          siblings, _corrector = cache(start_node)
-
-          consecutive_methods(siblings) do |previous, current|
-            unless ordered?(previous, current)
-              @previous_node = previous
-              add_offense(
-                current,
-                message: "Methods should be sorted in #{cop_config['EnforcedStyle']} order."
-              )
-            end
-          end
+          check(start_node)
         end
 
         private
@@ -76,33 +61,21 @@ module RuboCop
             (node.send_type? && node.bare_access_modifier?)
         end
 
-        # rubocop:disable Metrics/MethodLength
-        # Cache to avoid traversing the AST multiple times
-        def cache(node)
-          @cache ||= Hash.new do |h, key|
-            h[key.hash] = begin
-              siblings = node.children
-
-              # Init the corrector with the cache to avoid traversing the AST in
-              # the corrector.
-              #
-              # We always init the @corrector, even if @options[:auto_correct] is
-              # nil, because `add_offense` always attempts correction. This
-              # correction attempt is how RuboCop knows if the offense can be
-              # labeled "[Correctable]".
-              comment_locations = ::Parser::Source::Comment.associate_locations(
-                processed_source.ast,
-                processed_source.comments
-              )
-              corrector = OrderedMethodsCorrector.new(comment_locations, siblings, cop_config)
-
-              [siblings, corrector]
+        def check(start_node)
+          consecutive_methods(start_node.children) do |previous, current|
+            next if ordered?(previous, current)
+
+            add_offense(current, message: message) do |corrector|
+              next if part_of_ignored_node?(previous)
+
+              OrderedMethodsCorrector.new(
+                processed_source.ast_with_comments, start_node.children, cop_config
+              ).correct(current, previous, corrector)
+
+              ignore_node(current)
             end
           end
-
-          @cache[node.hash]
         end
-        # rubocop:enable Metrics/MethodLength
 
         # We disable `Style/ExplicitBlockArgument` for performance. See
         # https://github.com/shanecav84/rubocop-ordered_methods/pull/5#pullrequestreview-562957146
@@ -147,6 +120,10 @@ module RuboCop
           end
         end
 
+        def message
+          "Methods should be sorted in #{cop_config['EnforcedStyle']} order."
+        end
+
         def ordered?(left_method, right_method)
           comparison = COMPARISONS[cop_config['EnforcedStyle']]
           raise Error, ERR_INVALID_COMPARISON if comparison.nil?
@@ -162,7 +139,7 @@ module RuboCop
         end
 
         def relevant_node?(node)
-          (node.defs_type? || node.def_type?) && !ignored_method?(node.method_name)
+          (node.defs_type? || node.def_type?) && !allowed_method?(node.method_name)
         end
       end
     end

data/rubocop-ordered_methods.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name = 'rubocop-ordered_methods'
-  spec.version = '0.11'
+  spec.version = '0.13'
   spec.authors = ['Shane Cavanaugh']
   spec.email = ['shane@shanecav.net']
 
@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rubocop', '>= 1.0'
+  spec.add_dependency 'rubocop', '>= 1.0'
 
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-ordered_methods
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: '0.13'
 platform: ruby
 authors:
 - Shane Cavanaugh
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Checks that methods are ordered alphabetically.