jpie 4.1.4 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb96ac4995c6800cd07f48cd102d03820072ca58b8f1db35fcc54dece961a281
-  data.tar.gz: 7dfa2d854082e1b4848b94230a0ae06606751019c0b239308c4f57dc14027a7b
+  metadata.gz: 618cb164f0b64934d5cd9a0c6e871b726bcc6b40f4add24c3204bea490a0cd5c
+  data.tar.gz: f4acc02e6f57760deae01dc2d4c49acb29fb5273acefb3eac290f7519e3f53d4
 SHA512:
-  metadata.gz: 2e87c64831d1acbeaa40a4d0d91e2741e0d34c30585903ef7fe7d266daaa0359078549592eb1ae516a4dab9879a2d5e2e45b59ba452e797d4a6f3fe4014714c8
-  data.tar.gz: f4dba819c5a1e0b04997e623ce83bf568050e80842b93a75547b02be2232813d9f0f060cfb643d50c693c66bacf7785ae4fc071863748bd4241e5f7ff71460e7
+  metadata.gz: b83a3b08c429dc700144718b112c578bb9c67243a05a2400ef7fdd9055f614e50852e4819bd63c6897e04cf168eee09e1f7d2b606da39340b9dc6acd2e723b8a
+  data.tar.gz: 79f17c229521c0c99541e9787e298e9e00268996759ca8a54f67fec95f212f3cd7f124ea672d8c9da65f65546c6ad02794c971b49a8a8fef7b874883eb601760

data/CHANGELOG.md

@@ -7,6 +7,20 @@ at release time.
 
 ## [Unreleased]
 
+## [4.1.5] - 2026-11-11
+
+### Fixed
+
+- **Run resource preloads once for the subclasses of a polymorphic hop.** The
+  include preload step grouped the targets of a hop by exact class and ran the
+  `records` preloads of the resource once for each class. Five STI subclasses
+  that share one preload set ran each preload five times. The step now groups
+  the targets by the preloads their resource declares. Classes that share a
+  preload set run each preload once for all their records. A mixed STI set on
+  a hop that is not polymorphic now gets the preloads of every subclass. The
+  response does not change. Regression spec:
+  `polymorphic_sti_resource_preload_spec.rb`.
+
 ## [4.1.4] - 2026-11-10
 
 ### Fixed

data/lib/json_api/controllers/concerns/resource_actions/include_preloading.rb

@@ -66,7 +66,7 @@ module JSONAPI
           targets = collect_include_targets(records, association_name)
           next if targets.empty?
 
-          apply_preloads_for_targets(targets, reflection.polymorphic?)
+          apply_resource_preloads(targets)
           next if subtree.empty?
 
           descend_resource_tree(targets, reflection, subtree)
@@ -85,11 +85,13 @@ module JSONAPI
         end
       end
 
-      def apply_preloads_for_targets(targets, polymorphic)
-        if polymorphic
-          targets.group_by(&:class).each_value { |recs| apply_resource_preloads(recs) }
-        else
-          apply_resource_preloads(targets)
+      # Groups the targets by the preloads their resource declares, so classes that share them
+      # (STI subclasses and sibling resources) run each preload once for all their records.
+      def apply_resource_preloads(targets)
+        groups = Hash.new { |hash, values| hash[values] = [] }
+        targets.group_by(&:class).each { |klass, records| groups[resource_preload_values(klass)].concat(records) }
+        groups.each do |values, records|
+          ActiveRecord::Associations::Preloader.new(records:, associations: values).call unless values.empty?
         end
       end
 
@@ -100,15 +102,9 @@ module JSONAPI
         end.compact.uniq
       end
 
-      def apply_resource_preloads(records)
-        return if records.empty?
-
-        klass = records.first.class
-        resource_scope = ResourceLoader.find_for_model(klass, namespace: jsonapi_namespace).records
-        preload_values = resource_scope.preload_values + resource_scope.includes_values
-        return if preload_values.empty?
-
-        ActiveRecord::Associations::Preloader.new(records:, associations: preload_values).call
+      def resource_preload_values(klass)
+        scope = ResourceLoader.find_for_model(klass, namespace: jsonapi_namespace).records
+        scope.preload_values + scope.includes_values
       end
     end
   end

data/lib/json_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSONAPI
-  VERSION = "4.1.4"
+  VERSION = "4.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpie
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.1.5
 platform: ruby
 authors:
 - Emil Kampp