jsonapi_compliable 0.11.26 → 0.11.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63d6810b917de89c84b683301cd42dbb0d88a6ae
-  data.tar.gz: 13312ec071a1764665f701020898e856e45f0825
+  metadata.gz: fd319c54a4ba9b170f855b7fa6096fba621d9899
+  data.tar.gz: 3f114d62e1af153fb8b0a54075a4974673103e2c
 SHA512:
-  metadata.gz: 52f9e04896faeeaab2a0e6e4661a2e69568c25c2c484d824b8df6a217c1c467676c3c99584e92196d3996a32df816b43b3eafdb8d8cd4004236f67b0d6191583
-  data.tar.gz: 2650a80b254d475ba962af09c9cfa7105f156340df388313b6fa6c55df1859f9bc47d5e29eded38dfdd12bafd1bae2c5b88d77d94617cd526245607e910e2adb
+  metadata.gz: d1c1992697517db3a0fbf36595d501672bddb1f33b5355c29a480118db270f0591d9573202f0ec8104e3e5e2106877c9b271e11854b049a4af749aed33447082
+  data.tar.gz: a79ab173ff26b5a5eb17cffc9b50da7ae2164012cc7bc96d0c4cacdb35638bdb5dd0a9ba16307b60bd3262bdb0a3f2dff7b130fc3be7c8982ea4632918635ffe

data/lib/jsonapi_compliable/adapters/active_record_sideloading.rb

@@ -11,9 +11,10 @@ module JsonapiCompliable
           end
 
           assign do |parents, children|
+            children_hash = children.group_by(&foreign_key)
             parents.each do |parent|
               parent.association(association_name).loaded!
-              relevant_children = children.select { |c| c.send(foreign_key) == parent.send(primary_key) }
+              relevant_children = children_hash[parent.send(primary_key)] || []
               relevant_children.each do |c|
                 parent.association(association_name).add_to_target(c, :skip_callbacks)
               end
@@ -34,8 +35,9 @@ module JsonapiCompliable
           end
 
           assign do |parents, children|
+            children_hash = children.index_by(&primary_key)
             parents.each do |parent|
-              relevant_child = children.find { |c| parent.send(foreign_key) == c.send(primary_key) }
+              relevant_child = children_hash[parent.send(foreign_key)]
               parent.send(:"#{association_name}=", relevant_child)
             end
           end
@@ -62,10 +64,12 @@ module JsonapiCompliable
           # remove anything else. This is more or less what AR does.
           assign do |parents, children|
             assigned = []
+            children_hash = children.group_by(&foreign_key)
             parents.each do |parent|
               parent.association(association_name).loaded!
-              relevant_child = children.find { |c| c.send(foreign_key) == parent.send(primary_key) }
-              next unless relevant_child
+              relevant_children = children_hash[parent.send(primary_key)]
+              next unless relevant_children
+              relevant_child = relevant_children.first
 
               # Use private methods because of Rails bug
               # https://github.com/rails/rails/issues/32886
@@ -75,9 +79,7 @@ module JsonapiCompliable
               association.send(:target=, relevant_child)
               assigned << relevant_child
             end
-            (children - assigned).each do |unassigned|
-              children.delete(unassigned)
-            end
+            children.replace(assigned)
           end
 
           instance_eval(&blk) if blk

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.11.26"
+  VERSION = "0.11.27"
 end

metadata

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