jsonapi_compliable 0.11.15 → 0.11.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3948d56bb234ee8a53b3697830eec3a1e556baef
-  data.tar.gz: c3f2004adda3e41025714b46609db656bd2dce4a
+  metadata.gz: 91b4575901e4872810f2439548136f4798893a9a
+  data.tar.gz: 206d39a17e6cd69449ef459447f33ef7db361c62
 SHA512:
-  metadata.gz: 7430a24b6b1e5c03d13c6ac5e1bb16a2d443f5028a5d246ce7658d26d06828d5ce645d038bf3775a791b005e450b51c15df35258c35ef83297dadc48ae1ceddd
-  data.tar.gz: c3bee1548419c881cdb9483635473ce2cf630ff8dec548aa72e3731134a6c95e1a92c127094893010eefdc144b026faf4af247260b4223a1ee6e18784b178b2d
+  metadata.gz: 780451a9a115ea499c590ede80da6cde4dd680e22776ad4df06aca54e9e7bb119e8fd492ba0f21587cd9ac907cf9f4213019d225f3de9c051067f26efd6f49b3
+  data.tar.gz: a55448c5e88e2044e678b0b4fbdce36d79f79609a116f22a9cbb933e6781c5fefebc27727e28db2b5889808e7a822d0469608ef137a9ccf344263942d888ba60

data/lib/jsonapi_compliable/adapters/active_record_sideloading.rb

@@ -53,7 +53,15 @@ module JsonapiCompliable
             _scope.call.where(foreign_key => parent_ids.uniq.compact)
           end
 
+          # The 'assigned' code here is to remove all children that do not
+          # get assigned. This is because there is no 'limit(1)' in the query.
+          # If we did 'limit(1)' for the query, it wouldn't work for index
+          # actions (only 1 would come back, when we want one *per result*).
+          #
+          # Instead, avoid pagination in the query, assign only one result, and
+          # remove anything else. This is more or less what AR does.
           assign do |parents, children|
+            assigned = []
             parents.each do |parent|
               parent.association(association_name).loaded!
               relevant_child = children.find { |c| c.send(foreign_key) == parent.send(primary_key) }
@@ -65,6 +73,10 @@ module JsonapiCompliable
               association.send(:set_owner_attributes, relevant_child)
               association.send(:set_inverse_instance, relevant_child)
               association.send(:target=, relevant_child)
+              assigned << relevant_child
+            end
+            (children - assigned).each do |unassigned|
+              children.delete(unassigned)
             end
           end
 

data/lib/jsonapi_compliable/scope.rb

@@ -64,6 +64,7 @@ module JsonapiCompliable
         []
       else
         resolved = @resource.resolve(@object)
+        yield resolved if block_given?
         sideload(resolved, query_hash[:include]) if query_hash[:include]
         resolved
       end

data/lib/jsonapi_compliable/sideload.rb

@@ -399,8 +399,9 @@ module JsonapiCompliable
     def resolve_basic(parents, query, namespace)
       sideload_scope   = scope_proc.call(parents)
       sideload_scope   = Scope.new(sideload_scope, resource_class.new, query, default_paginate: false, namespace: namespace)
-      sideload_results = sideload_scope.resolve
-      assign_proc.call(parents, sideload_results)
+      sideload_scope.resolve do |sideload_results|
+        assign_proc.call(parents, sideload_results)
+      end
     end
   end
 end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.11.15"
+  VERSION = "0.11.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.11.15
+  version: 0.11.16
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable