graphiti 1.0.alpha.12 → 1.0.alpha.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ce517d6401bea528533904e46403edc173ff484
-  data.tar.gz: 2dbb938df50136bcd97d3cab586252c4789e10d4
+  metadata.gz: b5ea1fc71cafab76e9d9978a65d0db8c9e947609
+  data.tar.gz: f09f4fbb1322c7da9a07c9ba0e96d9906a586b7f
 SHA512:
-  metadata.gz: 62550f735f9afc8bfcb68261e9a671c8f066245f15931ecbc2497fbe317ec720b6898aa1784daa01c7aed03f39565183c07f43c14d7cd5f0fe4d777e08137ebb
-  data.tar.gz: b006db1dd79aa9f3541ab1a6960468c919d19378b9ff330cbd565c4714bd4d290b0b86778e0f94b51e2101108ad85bda12f80e7ed45576c9b8208286264ad866
+  metadata.gz: bf4c9ddbd38979ec78ee272629304cc725a9ab2f634e8864f3cd146b9101a2b704ac55299033360fe92a1153a79e963f199256a2306ff60bd2b418fa50325509
+  data.tar.gz: c42eb4d69df9c79c9bf54b1fb71bf71c6c531ce687c84fa5967a9bc0e736fb1a2130ad364ffca4aeb9f02da3ed42dd406413db514f97b13a6bfa2b8bfce874b2

data/lib/graphiti/sideload.rb

@@ -166,18 +166,28 @@ module Graphiti
     end
 
     def assign(parents, children)
-      associated = []
+      track_associated = type == :has_one
+      associated = [] if track_associated
+      if performant_assign?
+        map = child_map(children)
+      end
+
       parents.each do |parent|
-        relevant_children = fire_assign_each(parent, children)
+        if performant_assign?
+          relevant_children = children_for(parent, map) || []
+        else
+          relevant_children = fire_assign_each(parent, children)
+        end
+
         if relevant_children.is_a?(Array)
-          associated |= relevant_children
-          associate_all(parent, relevant_children)
+            associated |= relevant_children if track_associated
+            associate_all(parent, relevant_children)
         else
-          associated << relevant_children if relevant_children
+          associated << relevant_children if track_associated && relevant_children
           associate(parent, relevant_children)
         end
       end
-      children.replace(associated)
+      children.replace(associated) if track_associated
     end
 
     def resolve(parents, query)
@@ -246,6 +256,10 @@ module Graphiti
       parent_ids
     end
 
+    def performant_assign?
+      !self.class.assign_each_proc
+    end
+
     private
 
     def load_options(parents, query)

data/lib/graphiti/sideload/belongs_to.rb

@@ -23,11 +23,6 @@ class Graphiti::Sideload::BelongsTo < Graphiti::Sideload
     { primary_key => parent_ids.join(',') }
   end
 
-  def assign_each(parent, children)
-    children_hash = children.index_by(&primary_key)
-    children_hash[parent.send(foreign_key)]
-  end
-
   def ids_for_parents(parents)
     parent_ids = parents.map(&foreign_key)
     parent_ids.compact!
@@ -45,4 +40,14 @@ class Graphiti::Sideload::BelongsTo < Graphiti::Sideload
       :"#{model_name.underscore}_id"
     end
   end
+
+  private
+
+  def child_map(children)
+    children.index_by(&primary_key)
+  end
+
+  def children_for(parent, map)
+    map[parent.send(foreign_key)]
+  end
 end

data/lib/graphiti/sideload/has_many.rb

@@ -14,8 +14,13 @@ class Graphiti::Sideload::HasMany < Graphiti::Sideload
     { foreign_key => ids_for_parents(parents).join(',') }
   end
 
-  def assign_each(parent, children)
-    children_hash = children.group_by(&foreign_key)
-    children_hash[parent.send(primary_key)] || []
+  private
+
+  def child_map(children)
+    children.group_by(&foreign_key)
+  end
+
+  def children_for(parent, map)
+    map[parent.send(primary_key)] || []
   end
 end

data/lib/graphiti/sideload/has_one.rb

@@ -3,9 +3,9 @@ class Graphiti::Sideload::HasOne < Graphiti::Sideload::HasMany
     :has_one
   end
 
-  def assign_each(parent, children)
-    children_hash = children.group_by(&foreign_key)
-    result = children_hash[parent.send(primary_key)] || []
-    result[0]
+  private
+
+  def children_for(parent, map)
+    super[0]
   end
 end

data/lib/graphiti/sideload/many_to_many.rb

@@ -19,6 +19,10 @@ class Graphiti::Sideload::ManyToMany < Graphiti::Sideload::HasMany
     raise 'You must explicitly pass :foreign_key for many-to-many relationships, or override in subclass to return a hash.'
   end
 
+  def performant_assign?
+    false
+  end
+
   def assign_each(parent, children)
     children.select do |c|
       match = ->(ct) { ct.send(true_foreign_key) == parent.send(primary_key) }

data/lib/graphiti/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha.12
+  version: 1.0.alpha.14
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable