rubocop-fourshark 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 202b492f9486b827fd67079c3a7bb113bb194a87fd968646eebbf30b881140cc
-  data.tar.gz: 20f9b022eb67bad4c30fe2295c3d56a30c027594c15142303dcfe707c5390f85
+  metadata.gz: 4f2644c550944bc0f11e7b4222b430e7cecc1ed4bf97f2650eb6f60e9f588a03
+  data.tar.gz: 5e2cbafe91b1b52c7d8de97d8d45c8a7e39a65921d3040bd07d48b5ccfbcd0e4
 SHA512:
-  metadata.gz: 6cd1bc1df875dc06da1fbe6091e896afe434e99f13e64c3f564e5ac43bcf23ac5cb5a4e3e0ff6792829df9df109ec331066fac1395472b536372ced8dd025d65
-  data.tar.gz: f62cfe9f582d0ef9108800eef733aa8957852b7183cc3bee53f7182680a51ceda57293d19137f4baf9badb345cf9add64f9a15643734d0b515672188026435a9
+  metadata.gz: 7564a809a8d3e84320ac5de4e597cdc610c8568dbbc30eafcfa8b908955a38d022e68778fce30a35a8391a4576b98f965976e03234adb985c64dc26ae46c7ca8
+  data.tar.gz: fc105db26052f84221d17282382d867aa3d72a12d8a8b91d900061b84b01fe58d552e5365755af15f1a72df2036bb523574b28ff6311d2ffd14c0de5295e35dc

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [0.2.3] - 2026-05-30
+
+### Fixed
+
+- `Rails/OrderedMacros` sorts `:through` associations as a separate trailing group instead of interleaving them alphabetically — a `:through` association declared after its target association is no longer flagged
+
+## [0.2.2] - 2026-05-30
+
+### Fixed
+
+- `RSpec/InverseOfMatcher` no longer demands `.inverse_of` on polymorphic associations — it reads the polymorphic declaration from the model instead of the spec matcher chain
+- `RSpec/InverseOfMatcher` classifies a nested class by its own superclass instead of the first `class` line in the file — a nested root model is no longer misread as an STI subclass
+
 ## [0.2.1] - 2026-05-29
 
 ### Fixed

data/lib/rubocop/cop/rails/ordered_macros.rb

@@ -9,9 +9,13 @@ module RuboCop
       # alphabetically by their first symbol argument. Checked per macro name:
       # all `belongs_to` sorted among themselves, all `validates` sorted, etc.
       #
-      # Exceptions (lifecycle callbacks, dependency-ordered items, logical
-      # grouping) are NOT modelled — this is an experimental cop; if it flags
-      # more legitimate cases than it helps, drop it.
+      # `:through` associations are sorted as a separate trailing group (a
+      # `:through` association must be declared after its target association),
+      # not interleaved with the regular declarations.
+      #
+      # Other exceptions (lifecycle callbacks, other dependency-ordered items)
+      # are NOT modelled — this is an experimental cop; if it flags more
+      # legitimate cases than it helps, drop it.
       #
       # @example
       #   # bad
@@ -38,12 +42,24 @@ module RuboCop
           statements = body.begin_type? ? body.children : [body]
 
           MACROS.each do |macro|
-            flag_unsorted(statements.select { |statement| macro_call?(statement, macro) })
+            calls = statements.select { |statement| macro_call?(statement, macro) }
+            regular, through = calls.partition { |call| !through_option?(call) }
+            flag_unsorted(regular)
+            flag_unsorted(through)
           end
         end
 
         private
 
+        # A `:through` association must be declared after its target association,
+        # so it forms a separate trailing group sorted among itself — never
+        # interleaved with (or compared against) the regular declarations.
+        def through_option?(node)
+          node.arguments.any? do |argument|
+            argument.hash_type? && argument.keys.any? { |key| key.value == :through }
+          end
+        end
+
         def flag_unsorted(calls)
           calls.each_cons(2) do |previous, current|
             previous_name = macro_name(previous)

data/lib/rubocop/cop/rspec/inverse_of_matcher.rb

@@ -12,7 +12,7 @@ module RuboCop
       # Rules:
       # - Root models (direct superclass = `ApplicationRecord`) must include `.inverse_of`.
       # - STI subclasses (superclass is another model) must NOT include `.inverse_of` (it belongs to the parent).
-      # - Associations marked as polymorphic or through are ignored.
+      # - Associations the model declares as polymorphic are ignored (they have no single inverse).
       # - Classes whose model file is missing or whose superclass is not a model are ignored.
       #
       # The root/subclass decision is made **statically** — by reading the model
@@ -31,12 +31,13 @@ module RuboCop
 
         def on_send(node)
           return unless node.method?(:belong_to)
-          return if chain_has_option?(node, :polymorphic)
-          return if chain_has_option?(node, :through)
 
           model_name = model_class_from_spec
           return unless model_name
 
+          association_name = association_name_from(node)
+          return if association_name && polymorphic_in_model?(model_name, association_name)
+
           classification = classify_model(model_name)
           return if classification == :non_ar
 
@@ -63,13 +64,22 @@ module RuboCop
           node.each_ancestor(:send).any? { |ancestor| ancestor.method?(:inverse_of) }
         end
 
-        # Check if association has a given option (e.g., :polymorphic, :through)
-        def chain_has_option?(node, option_name)
-          node.each_ancestor(:send).any? do |ancestor|
-            ancestor.arguments.any? do |arg|
-              arg.hash_type? && arg.keys.any? { |k| k.value == option_name }
-            end
-          end
+        # The association name passed to the matcher, e.g. belong_to(:user) -> :user
+        def association_name_from(node)
+          argument = node.first_argument
+          return nil unless argument && argument.sym_type?
+
+          argument.value
+        end
+
+        # Whether the model declares this association as polymorphic. Polymorphic
+        # associations have no single inverse, so `.inverse_of` does not apply —
+        # and the declaration lives in the model, not in the spec matcher chain.
+        def polymorphic_in_model?(model_name, association_name)
+          content = model_source(model_name)
+          return false unless content
+
+          content.match?(/belongs_to\s+:#{Regexp.escape(association_name.to_s)}\b[^\n]*polymorphic:\s*true/)
         end
 
         # Convert spec file path into model class name
@@ -92,7 +102,7 @@ module RuboCop
           content = model_source(model_name)
           return :non_ar unless content
 
-          superclass = superclass_of(content)
+          superclass = superclass_of(content, model_name)
           return :non_ar unless superclass
           return :root if superclass == 'ApplicationRecord'
           return :subclass if model_source(superclass)
@@ -107,8 +117,12 @@ module RuboCop
           File.exist?(path) ? File.read(path) : nil
         end
 
-        def superclass_of(content)
-          match = content.match(/^\s*class\s+[\w:]+\s*<\s*([\w:]+)/)
+        # The declared superclass of the specific class named by the spec — not the
+        # first `class` line in the file. A nested `class Row < ApplicationRecord`
+        # inside `class Wrapper < Parent` must resolve to its own superclass.
+        def superclass_of(content, model_name)
+          class_name = model_name.split('::').last
+          match = content.match(/^\s*class\s+(?:[\w:]*::)?#{Regexp.escape(class_name)}\s*<\s*([\w:]+)/)
           match && match[1]
         end
 

data/lib/rubocop/fourshark/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Fourshark
-    VERSION = '0.2.1'
+    VERSION = '0.2.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-fourshark
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Paulo Ribeiro