jpie 3.1.6 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac6d32dde9d9be0163f1f3c48a9c65770f4465176a403efdb5f0ba42f18bb4f5
-  data.tar.gz: 4ac43aa7aaf9194497910650cc1180800952806a7cb5ebf1ecf590decda4aaa0
+  metadata.gz: c54015e01586dd3a4a6f14430928d231e1e6ce8f1e46a9cefa54ab7c93d45226
+  data.tar.gz: 90f24a271244366daf7ff47dd7a20a79740baf72c037b4f9ff428bd7a69bde33
 SHA512:
-  metadata.gz: ec7aff7ee080d6acca4bcf19cd3d72f7084c3bcb492df1d6e5c4b674711575450bd03e558267889d46cc9c436255dbc3013fc1b5bfa3df074503fdb39f342737
-  data.tar.gz: 6a4c2811e9df0bad8bbecc8b6a62ae5a0f9e44912d0035fad7c22a6569b383e24b574dbb35fe2cc3c9402b8157079af4f0addbef91e685e997539200c9b317b5
+  metadata.gz: bd1e8f0ce88654ca8c594f9b58cb4320ecfeba576d5f21062e0136737c0bbabd24a3aef94f899ad0732a7f363f9115e1e602c9079b930aa7159187b90e834a61
+  data.tar.gz: ba4d97f2a60f0b73ca1480de68cdfb05c992e2434bff55ee6569da74447788c7f1c51e7ac2047126976adca6ba1a88a9b8c4fd6e9e60a7b1cddd7aa26ac379e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jpie (3.1.5)
+    jpie (3.1.6)
       actionpack (~> 8.1, >= 8.1.0)
       pg_query (>= 4)
       prosopite (>= 1)

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

@@ -22,7 +22,11 @@ module JSONAPI
         return scope if scope.is_a?(Array)
 
         inc_hash = includes_to_hash(includes)
-        hash_contains_polymorphic?(inc_hash, model_class) ? scope.preload(inc_hash) : scope.includes(inc_hash)
+        # `includes` may resolve to a JOIN when the base scope already references an
+        # associated table (e.g. a `records` override that sorts by one). Rails cannot
+        # eager-load polymorphic or instance-dependent associations in a JOIN, so those
+        # must go through `preload` (a separate query), which loads them without raising.
+        preload_required?(inc_hash, model_class) ? scope.preload(inc_hash) : scope.includes(inc_hash)
       end
 
       def filter_includable(hash, klass)
@@ -34,6 +38,24 @@ module JSONAPI
         end
       end
 
+      def preload_required?(hash, klass)
+        hash.any? do |key, value|
+          assoc = klass.reflect_on_association(key)
+          next false unless assoc
+
+          assoc.polymorphic? || instance_dependent_scope?(assoc) ||
+            (value.present? && preload_required?(value, assoc.klass))
+        end
+      end
+
+      # Rails refuses to eager-load (JOIN) an association whose scope takes the owner
+      # instance (`->(owner) { ... }`), raising "instance dependent scopes are not
+      # supported". Its arity is non-zero; such associations must be preloaded instead.
+      def instance_dependent_scope?(assoc)
+        scope = assoc.scope
+        !scope.nil? && scope.arity != 0
+      end
+
       def hash_contains_polymorphic?(hash, klass)
         hash.any? { |key, value| polymorphic_in_hash_entry?(key, value, klass) }
       end

data/lib/json_api/support/prosopite_instrumentation_logger.rb

@@ -35,7 +35,7 @@ module JSONAPI
         parts = n1_details.split("Call stack:")
         return nil if parts.size < 2
 
-        query_section = parts[0].sub(/\AN\+1 queries detected:\n?/, "")
+        query_section = parts[0].sub(/\AN\+1 queries detected(?: \([\d.]+ms\))?:\n?/, "")
         first_line = query_section.each_line.map(&:strip).reject(&:empty?).first
         first_line.presence
       end

data/lib/json_api/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpie
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.5.0
 platform: ruby
 authors:
 - Emil Kampp
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: JSON:API compliant Rails gem for producing and consuming JSON:API resources
 test_files: []