graphiti 1.0.alpha.11 → 1.0.alpha.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b451b3a2214bfee53214b84b53455b40df0a555
-  data.tar.gz: f3208a80a842591303a7f091f6544edb1c26ac3b
+  metadata.gz: 5ce517d6401bea528533904e46403edc173ff484
+  data.tar.gz: 2dbb938df50136bcd97d3cab586252c4789e10d4
 SHA512:
-  metadata.gz: 877bbfdfc4af3bd92c6ff59bc932d5dc1022a9fee8ed2d138da4045cd01c7c5249e2ef06c993e83084fce6c5fa89f7f54ae6a05ca778750d4eb95e7ff01ee887
-  data.tar.gz: 075a9538fd31ecc16c84a317d3d80445d447de5598eb4bd23afa493c482845789fe33b66af0b4c699c976e513e1f9bd721096d7b0b7018303d6b56fa1d9420a4
+  metadata.gz: 62550f735f9afc8bfcb68261e9a671c8f066245f15931ecbc2497fbe317ec720b6898aa1784daa01c7aed03f39565183c07f43c14d7cd5f0fe4d777e08137ebb
+  data.tar.gz: b006db1dd79aa9f3541ab1a6960468c919d19378b9ff330cbd565c4714bd4d290b0b86778e0f94b51e2101108ad85bda12f80e7ed45576c9b8208286264ad866

data/lib/graphiti.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'forwardable'
 require 'active_support/core_ext/string'
+require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/hash/conversions' # to_xml
 require 'active_support/concern'

data/lib/graphiti/sideload.rb

@@ -173,13 +173,11 @@ module Graphiti
           associated |= relevant_children
           associate_all(parent, relevant_children)
         else
-          associated << relevant_children
+          associated << relevant_children if relevant_children
           associate(parent, relevant_children)
         end
       end
-      (children - associated).each do |unassigned|
-        children.delete(unassigned)
-      end
+      children.replace(associated)
     end
 
     def resolve(parents, query)

data/lib/graphiti/sideload/belongs_to.rb

@@ -24,7 +24,8 @@ class Graphiti::Sideload::BelongsTo < Graphiti::Sideload
   end
 
   def assign_each(parent, children)
-    children.find { |c| c.send(primary_key) == parent.send(foreign_key) }
+    children_hash = children.index_by(&primary_key)
+    children_hash[parent.send(foreign_key)]
   end
 
   def ids_for_parents(parents)

data/lib/graphiti/sideload/has_many.rb

@@ -15,6 +15,7 @@ class Graphiti::Sideload::HasMany < Graphiti::Sideload
   end
 
   def assign_each(parent, children)
-    children.select { |c| c.send(foreign_key) == parent.send(primary_key) }
+    children_hash = children.group_by(&foreign_key)
+    children_hash[parent.send(primary_key)] || []
   end
 end

data/lib/graphiti/sideload/has_one.rb

@@ -4,6 +4,8 @@ class Graphiti::Sideload::HasOne < Graphiti::Sideload::HasMany
   end
 
   def assign_each(parent, children)
-    children.find { |c| c.send(foreign_key) == parent.send(primary_key) }
+    children_hash = children.group_by(&foreign_key)
+    result = children_hash[parent.send(primary_key)] || []
+    result[0]
   end
 end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.alpha.11"
+  VERSION = "1.0.alpha.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha.11
+  version: 1.0.alpha.12
 platform: ruby
 authors:
 - Lee Richmond