graphoid 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 375c20ef39601434456ec8704edecc50a6d746904ae4b66bd9f14372c0ff6cb5
-  data.tar.gz: 88250e49413a5e779cbb38734b814ec80896e14cf111ca730b2d9afcdc9d7c53
+  metadata.gz: 34f70b682b22f97dbe9d9f23cc51db8cb3e7ab30ce5b0ed545916a671f312601
+  data.tar.gz: ef6d309e4c7310c397aedfcba0b037a283b0b30675688c64b1455de78438e9db
 SHA512:
-  metadata.gz: 28225d479a2ddf3ba1ed6b9715c39cf62843e3b0b74dc4224db7e74132bbb1ab2cfb90f5c289f16dafa69919bd2067bf5905962e6a8d9fc24669d847eeb8704c
-  data.tar.gz: 440fd7a515d9451a629e3c99d7ddcff351fd621ecad77d942772e96012663a5c80a7e50ac7890280043d690e5678ea301773e200aff77fa05b097d44988ef7ab
+  metadata.gz: 29cbfea735f3a72fd1b6842c914a1128eec1cc0e61982a565a179b57a4c5e49a25b0d24563a57f39ba9e72c7252b0f8b2fad42237361080b299c3529e1511126
+  data.tar.gz: e20edd2b6ade55cd0a26090945ff0a19794f8f4ebcd9c1636dddd5b9fcdfaeffe309aeb1b1d4a53221140851949f2bc35e3c212660c0b75490080d6ae58fecee

data/lib/graphoid/drivers/active_record.rb

@@ -83,8 +83,26 @@ module Graphoid
         relation.class
       end
 
-      def eager_load(_selection, model)
-        model
+      def generate_array(nodes)
+        include_array = []
+        nodes.each do |node|
+          children = node.selections.select!{ |n| !n.selections.empty? }
+
+          if children.empty?
+            include_array.push(node.name.to_sym)
+          else
+            include_array.push(node.name.to_sym => generate_array(children))
+          end
+        end
+
+        include_array
+      end
+
+      def eager_load(selection, model)
+        nodes = selection.ast_node.selections.first.selections
+        nodes.select!{ |n| !n.selections.empty? }
+        include_array = generate_array(nodes)
+        include_array.empty? ? model : model.includes(*include_array)
       end
 
       def execute_and(scope, parsed)

data/lib/graphoid/drivers/mongoid.rb

@@ -114,7 +114,7 @@ module Graphoid
         relation.relation
       end
 
-      def eager_load(selection, model)
+      def eager_load(selection, model, first = true)
         referenced_relations = [
           mongo_constants[:many_to_many],
           mongo_constants[:has_many],
@@ -122,21 +122,27 @@ module Graphoid
           mongo_constants[:belongs_to]
         ]
 
-        properties = Graphoid::Queries::Processor.children_of(selection)
+        properties = first ? Utils.first_children_of(selection) : Utils.children_of(selection)
         inclusions = Utils.symbolize(properties)
 
         Relation.relations_of(model).each do |name, relation|
           name = relation.name
-          next if inclusions.exclude?(name) || referenced_relations.exclude?(association.relation)
+          next if inclusions.exclude?(name) || referenced_relations.exclude?(relation.relation)
 
           subselection = properties[name.to_s.camelize(:lower)]
-          children = Utils.symbolize(Graphoid::Queries::Processor.children_of(subselection))
-          relations = relation.class_name.constantize.reflections.values.map(&:name)
+          subproperties = Utils.children_of(subselection)
+          subchildren = Utils.symbolize(subproperties)
+          subrelations = relation.class_name.constantize.relations.values.map(&:name)
 
-          if (relations & children).empty?
+          if (subrelations & subchildren).empty?
             model = model.includes(name)
           else
-            model = model.includes(name, with: ->(instance) { Graphoid::Queries::Processor.eager_load(subselection, instance) })
+            begin
+              gem "mongoid_includes"
+              model = model.includes(name, with: ->(instance) { eager_load(subselection, instance, false) })
+            rescue Gem::LoadError
+              model = model.includes(name)
+            end
           end
         end
 

data/lib/graphoid/queries/processor.rb

@@ -33,10 +33,6 @@ module Graphoid
           end
         end
 
-        def children_of(selection)
-          selection.scoped_children.values[0]
-        end
-
         def parse_order(scope, order)
           fields = Attribute.fieldnames_of(scope)
           Utils.underscore(order, fields)

data/lib/graphoid/utils.rb

@@ -17,7 +17,15 @@ module Graphoid
       end
 
       def symbolize(fields)
-        fields.keys.map(&:underscore).map(&:to_sym)
+        fields.keys.map { |f| f.underscore.to_sym  }
+      end
+
+      def children_of(selection)
+        selection.scoped_children.values.first
+      end
+      
+      def first_children_of(selection)
+        selection.scoped_children.values.first.values.first.scoped_children.values.first
       end
 
       def underscore(props, fields = [])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphoid
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Maximiliano Perez Coto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql