rubocop-asjer 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 772cbb0491de18ffeb19b27e41336474005b2c9295f5f2c152c842883e250654
-  data.tar.gz: f2b5e866ba2bccd3fee26d59868f80b8f12de62e57b161e203e932f8aa70533f
+  metadata.gz: 6401e9b5d10c63a9c3ff7f3292aac36e8368a54fdd4df3062efda177ee331c11
+  data.tar.gz: a7e90b0a705e59b161b575fdedb087d82b54dd8af3cfec7509bc54553012c5f5
 SHA512:
-  metadata.gz: 891112aad96477909e4a2de0a24660655b5573b6ef8f837cd70fe84927502390a3544f47994a9644b4d5b12b826aba74c8ab09f73dde3d49b044bb5fa6cc62cf
-  data.tar.gz: f6c1dd35c8a2fe82392a38576b5c26af9b4958ad732d35493d4ae8e35cd0f423610b4263ff80909ce31c99f28d044a979eb8c0d124a5d4738777f984dc753fb6
+  metadata.gz: a0f223e4e32b83736f21750b9ebb06ab49eacd9e2ccb45d37f047b231d763cb4f4dd1effa7bb87e0376f04db89287b48a7727c544b84b96585b657a02d2fa092
+  data.tar.gz: '0810af3f8f3b56e7ae3b4ee4295805a9a01ee0cb34911da8d6197db60ff1d0f8ad3a37d596d8411ced98e2eae0fb13c60f904903bebea26b2302b52cdc66d3de'

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.4.0"
+  ".": "0.4.1"
 }

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.4.1](https://github.com/asjer/rubocop-asjer/compare/v0.4.0...v0.4.1) (2026-01-28)
+
+
+### Bug Fixes
+
+* improve autocorrect functionality for `RailsClassOrder` cop and add Ruby 4.0 to ci ([#23](https://github.com/asjer/rubocop-asjer/issues/23)) ([16fc637](https://github.com/asjer/rubocop-asjer/commit/16fc63770f05f74e2bc005becd136af7d8ccb0d1))
+
 ## [0.4.0](https://github.com/asjer/rubocop-asjer/compare/v0.3.1...v0.4.0) (2026-01-23)
 
 

data/lib/rubocop/asjer/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Asjer
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/lib/rubocop/cop/asjer/rails_class_order.rb

@@ -56,34 +56,96 @@ module RuboCop
         OTHERS = %w[attr_readonly serialize].freeze
       end
 
+      # Autocorrect helpers for RailsClassOrder cop
+      module RailsClassOrderCorrector
+        def autocorrect(corrector, body, original, sorted)
+          first_target = original.min_by { |m| body.children.index(m) }
+          new_source = build_sorted_source(sorted, original)
+          corrector.replace(range_with_comments(first_target), new_source.rstrip)
+
+          (original - [first_target]).each do |method|
+            corrector.remove(full_method_range(method))
+          end
+        end
+
+        def range_with_comments(node)
+          comments = preceding_comments(node)
+          start_pos = comments.empty? ? node.loc.expression.begin_pos : comments.first.loc.expression.begin_pos
+          range_between(start_pos, node.loc.expression.end_pos)
+        end
+
+        def preceding_comments(node)
+          collect_adjacent_comments(node.loc.expression)
+        end
+
+        def collect_adjacent_comments(node_pos)
+          expected_line = node_pos.first_line - 1
+          comments_before_node(node_pos).take_while do |comment|
+            pos = comment.loc.expression
+            (pos.last_line == expected_line).tap { expected_line = pos.first_line - 1 }
+          end.reverse
+        end
+
+        def comments_before_node(node_pos)
+          processed_source.comments.select { |c| c.loc.expression.end_pos < node_pos.begin_pos }.reverse
+        end
+
+        def full_method_range(node)
+          range = range_with_comments(node)
+          source = processed_source.buffer.source
+          line_start = source.rindex("\n", range.begin_pos - 1)&.+(1) || 0
+          end_pos = source[range.end_pos] == "\n" ? range.end_pos + 1 : range.end_pos
+          range_between(line_start, end_pos)
+        end
+
+        def build_sorted_source(sorted, original)
+          indent = ' ' * original.first.loc.column
+          grouped = sorted.group_by { |m| method_type(m) }
+
+          %i[association callback other].filter_map do |type|
+            next unless grouped[type]&.any?
+
+            grouped[type].map { |m| source_with_comments(m) }.join("\n#{indent}")
+          end.join("\n\n#{indent}")
+        end
+
+        def source_with_comments(node)
+          range = range_with_comments(node)
+          processed_source.buffer.source[range.begin_pos...range.end_pos].lstrip
+        end
+      end
+
       # Enforces consistent ordering of declarative methods in Rails models.
       #
       # @see RailsClassOrderDefaults for default method lists
       class RailsClassOrder < Base
         extend AutoCorrector
         include RangeHelp
+        include RailsClassOrderCorrector
 
         MSG = 'Declarative methods should be sorted by type: associations, callbacks, then others.'
-
         TYPE_ORDER = { association: 0, callback: 1, other: 2 }.freeze
 
         def on_class(node)
           _name, _superclass, body = *node
           return unless body&.begin_type?
 
+          check_order(body)
+        end
+
+        private
+
+        def check_order(body)
           targets = target_methods(body)
           return if targets.empty?
 
           sorted = sort_methods(targets)
           return if targets == sorted
 
-          add_offense(body) do |corrector|
-            autocorrect(corrector, body, targets, sorted) if contiguous?(body, targets)
-          end
+          first_misplaced = targets.zip(sorted).find { |a, e| a != e }&.first
+          add_offense(first_misplaced) { |corrector| autocorrect(corrector, body, targets, sorted) }
         end
 
-        private
-
         def associations
           @associations ||= cop_config.fetch('Associations', RailsClassOrderDefaults::ASSOCIATIONS).map(&:to_sym)
         end
@@ -101,20 +163,11 @@ module RuboCop
         end
 
         def target_methods(body)
-          body.children.select do |child|
-            child.send_type? && all_target_methods.include?(child.method_name)
-          end
+          body.children.select { |child| child.send_type? && all_target_methods.include?(child.method_name) }
         end
 
         def sort_methods(methods)
-          # Use sort_by with index to make stable sort (preserve original order for equal elements)
-          methods.each_with_index.sort_by do |method, index|
-            [
-              method_type_order(method),
-              method_position_in_type(method),
-              index
-            ]
-          end.map(&:first)
+          methods.each_with_index.sort_by { |m, i| [method_type_order(m), method_position_in_type(m), i] }.map(&:first)
         end
 
         def method_type(method)
@@ -130,51 +183,12 @@ module RuboCop
         end
 
         def method_position_in_type(method)
-          name = method.method_name
-          list = method_list_for_type(method_type(method))
-          list.index(name) || list.size
+          method_list_for_type(method_type(method)).index(method.method_name) || 999
         end
 
         def method_list_for_type(type)
           { association: associations, callback: callbacks, other: others }[type]
         end
-
-        def contiguous?(body, targets)
-          indices = targets.map { |t| body.children.index(t) }
-          indices.max - indices.min + 1 == indices.size
-        end
-
-        def autocorrect(corrector, _body, original, sorted)
-          grouped = group_by_type(sorted)
-          new_source = build_grouped_source(grouped, original)
-          range = methods_range(original)
-          corrector.replace(range, new_source)
-        end
-
-        def group_by_type(methods)
-          methods.group_by { |m| method_type(m) }
-        end
-
-        def build_grouped_source(grouped, original)
-          indent = ' ' * original.first.loc.column
-
-          groups = []
-          %i[association callback other].each do |type|
-            next unless grouped[type]&.any?
-
-            group_lines = grouped[type].map(&:source)
-            groups << group_lines.join("\n#{indent}")
-          end
-
-          groups.join("\n\n#{indent}")
-        end
-
-        def methods_range(methods)
-          first = methods.min_by { |m| m.loc.expression.begin_pos }
-          last = methods.max_by { |m| m.loc.expression.end_pos }
-
-          range_between(first.loc.expression.begin_pos, last.loc.expression.end_pos)
-        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-asjer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Asjer Querido