rubocop-fourshark 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c048d884d1fbe9ba0f351c1bdf7e93e70410136084f72bb700dacb04d773cf8
-  data.tar.gz: 2459ffac3431fce8bcba699eea337e61146dedac826ea854f262b96aa01139d7
+  metadata.gz: a8b84b9e99c1ff660e70c0dc9b6d600361f175fc7ea47be4c27ceb3ed46c879c
+  data.tar.gz: b80b447aff3ef40874166bef818eba3d18caff427b39e095c0ad15099804fc88
 SHA512:
-  metadata.gz: 76dbe2d05b1dc7471ac29d280a91d5bf9daa7a3da1888b7487b0715e36049d9883e72f15de51736c7ad35a8dac5bcca738797547e3f5549b8661b9034253ef26
-  data.tar.gz: c09dcdc4fd7a190a916c9ce199116ad61fcfe2e5d5023139512f23da7418c780a1232b4489e2fb20982b417f93a264c162e2e6af1719255a4875a395c7da5898
+  metadata.gz: abdb30af6129f55a4c37b4f788dbee1528e28129642bcdaaaddc6164d4187d6fb4b0d8177b27b0b523c5749482951af32ebcbd54963651d8c4eb16bb73b4ab19
+  data.tar.gz: eb6678c1b97f140ef14c222e047b3dbf9c6342281b1a01818f176f9000246de2c95c7d919f1fda3e6cb83507367b88697d049effac922cfd5a3c7f521de323b7

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [0.3.0] - 2026-06-19
+
+### Added
+
+- `RSpec/Dialect` configured to forbid `subject`, `subject!` and `let!` in favor of a lazy `let`
+
+## [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

data/README.md

@@ -82,6 +82,7 @@ Where a 4Shark cop supersedes or contradicts a stock cop, `config/default.yml` t
 
 | Cop | Intent |
 |---|---|
+| `RSpec/Dialect` | Use `let`, never `subject` or `let!` — every `subject`/`subject!`/`let!` is flagged in favor of a lazy `let` (force creation in an explicit `before`, not with `let!`). The implicit subject behind `is_expected` is a different method and is left untouched. Stock cop, configured via `PreferredMethods`. |
 | `RSpec/InverseOfMatcher` | Root models must assert `.inverse_of` in association specs; subclasses must not (it belongs to the parent). Scoped to `spec/models`. |
 | `RSpec/OverwrittenLet` | A `let`/`let!` must not override one defined in an outer example group — shadowing makes it ambiguous which value applies. Scenario-specific `let`s, and the same name across sibling contexts, are fine. |
 | `RSpec/ConditionalInLet` | A `let` must not contain conditional logic (`if`/`case`) — branch with separate `context`s instead. Ternaries are allowed. |

data/config/default.yml

@@ -50,6 +50,20 @@ Rails/OrderedMacros:
     - 'app/models/**/*.rb'
   VersionAdded: '0.2.0'
 
+# Stock cop configured (not a 4Shark cop): map `subject`/`subject!`/`let!` to `let`
+# so every `subject`, `subject!` and `let!` call is flagged in favor of a lazy
+# `let` (force creation in an explicit `before`, not with `let!`). The implicit
+# subject behind `is_expected` is a different method and is left untouched.
+RSpec/Dialect:
+  Description: 'Use `let`, never `subject` or `let!` — objects are lazy `let`, forced in `before`.'
+  Enabled: true
+  PreferredMethods:
+    subject: let
+    subject!: let
+    let!: let
+  Include:
+    - 'spec/**/*_spec.rb'
+
 RSpec/InverseOfMatcher:
   Description: 'Root models must include `.inverse_of` in association specs; subclasses must not.'
   Enabled: true

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/fourshark/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Fourshark
-    VERSION = '0.2.2'
+    VERSION = '0.3.0'
   end
 end

metadata

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