graphql_includable 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 422e58558f8fad15867c7e3310cb466d1da7ad87
-  data.tar.gz: d6872a079bc7fd67b241736ef7214a2f1aefe806
+  metadata.gz: 803a100d8819528d092fd114ab447f1eabcb3872
+  data.tar.gz: 18b7e345903158ed2bcf003852061a34d6ccaf04
 SHA512:
-  metadata.gz: 0e27a2d8c049be3eda8248860aecc254e67944c908a32c5b06a9af5ceb7f4f748495620b9dee6725f9be5b04bfcb34e677625a1c935f59258fb30907e19e7680
-  data.tar.gz: 509fdbaa84c06ce4e4bc8ccff1d653e53fc09f7b8fd82cb12b060d1d6b9a7ecf69a221d6f5d43c3d979e5cb0fdfb3d75e25dba9cb89c203b7fa31ee3dc17c4d2
+  metadata.gz: dd8826b97ddcb70b6701a4da2136593f0b8743f284b8f0115ea547f1b3b8f4cbdc1e25291a5b6efc30bac98a44e8641e1a5a0d2e641144003594f2cb61257b21
+  data.tar.gz: d5a44484141daeae5667cdc06c550623dd636a3324b273672a0ef5918f0bd65c33561f68af35d386f68a5481a56339393278eec22cf8dd45aa9a05389f4f2195

data/lib/graphql_includable.rb

@@ -9,6 +9,7 @@ module GraphQLIncludable
   module ClassMethods
     def includes_from_graphql(query_context)
       generated_includes = GraphQLIncludable.generate_includes_from_graphql(query_context, self.model_name.to_s)
+      puts "final gen: #{generated_includes}"
       includes(generated_includes)
     end
 
@@ -28,66 +29,68 @@ module GraphQLIncludable
   private
 
   def self.generate_includes_from_graphql(query_context, model_name)
-    matching_node = GraphQLIncludable.find_child_node_matching_model_name(query_context.irep_node, model_name)
-    GraphQLIncludable.includes_from_irep_node(matching_node)
+    matching_node = GraphQLIncludable.find_child_returning_model_name(query_context.irep_node, model_name)
+    GraphQLIncludable.includes_from_graphql_field(matching_node)
   end
 
-  def self.find_child_node_matching_model_name(node, model_name)
+  def self.find_child_returning_model_name(node, model_name)
     matching_node = nil
-    return_type = unwrapped_type(node)
+    return_type = node_return_type(node)
     if return_type.to_s == model_name
       matching_node = node
     elsif node.respond_to? :scoped_children
       node.scoped_children[return_type].each do |child_name, child_node|
-        matching_node = find_child_node_matching_model_name(child_node, model_name)
+        matching_node = find_child_returning_model_name(child_node, model_name)
         break if matching_node
       end
     end
     matching_node
   end
 
-  def self.includes_from_irep_node(node)
+  def self.includes_from_graphql_field(node)
     includes = []
     nested_includes = {}
 
-    return_type = unwrapped_type(node)
+    return_type = node_return_type(node)
     return_model = node_return_class(node)
     return [] unless node && return_type && return_model
 
-    node.scoped_children[return_type].each do |child_name, child_node|
-      specified_includes = child_node.definitions[0].metadata[:includes]
-      raw_association_name = (child_node.definitions[0].property || child_name).to_sym
-      raw_association_name = specified_includes if specified_includes.is_a?(Symbol)
-      delegated_model_name = get_delegated_model(return_model, raw_association_name)
-      association_name = delegated_model_name || raw_association_name
-      association = return_model.reflect_on_association(association_name)
-
-      if association
-        child_includes = includes_from_irep_node(child_node)
-        if node_has_active_record_children(child_node) && child_includes.size > 0
-          child_key = delegated_model_name || association_name
-          nested_includes[child_key] = wrap_delegate(child_includes, delegated_model_name, raw_association_name)
-        else
-          includes << wrap_delegate(specified_includes || association_name, delegated_model_name)
-        end
-      elsif specified_includes
-        includes << specified_includes
+    node.scoped_children[return_type].each do |_child_name, child_node|
+      child_includes = includes_from_graphql_child(child_node, return_model)
+      if child_includes.is_a?(Hash)
+        nested_includes.merge!(child_includes)
+      elsif child_includes.is_a?(Array)
+        includes += child_includes
+      elsif child_includes
+        includes << child_includes
       end
     end
 
-    includes << nested_includes if nested_includes.size > 0
+    includes << nested_includes unless nested_includes.empty?
     includes
   end
 
-  def self.node_has_active_record_children(node)
-    node.scoped_children[unwrapped_type(node)].each do |child_return_name, child_node|
-      node_returns_active_record?(child_node)
+  def self.includes_from_graphql_child(child_node, return_model)
+    specified_includes = child_node.definitions[0].metadata[:includes]
+    attribute_name = node_predicted_association_name(child_node)
+    includes_chain = delegated_includes_chain(return_model, attribute_name)
+
+    if model_has_association?(return_model, attribute_name, includes_chain)
+      child_includes = includes_from_graphql_field(child_node)
+      includes_chain << (specified_includes || attribute_name)
+      includes_chain << child_includes unless child_includes.empty?
+      array_to_nested_hash(includes_chain)
+    else
+      includes = []
+      includes << array_to_nested_hash(includes_chain) unless includes_chain.empty?
+      includes << specified_includes if specified_includes
+      includes
     end
   end
 
   def self.node_return_class(node)
     begin
-      Object.const_get(unwrapped_type(node).name)
+      Object.const_get(node_return_type(node).name)
     rescue NameError
     end
   end
@@ -97,24 +100,56 @@ module GraphQLIncludable
     klass && klass < ActiveRecord::Base
   end
 
-  # return raw contents, or contents wrapped in a hash (for delegated associations)
-  def self.wrap_delegate(contents, delegate, delegate_key = delegate)
-    return contents unless delegate
-
-    obj = {}
-    obj[delegate_key] = contents
-    obj
+  def self.node_predicted_association_name(node)
+    definition = node.definitions[0]
+    specified_includes = definition.metadata[:includes]
+    if specified_includes.is_a?(Symbol)
+      specified_includes
+    else
+      (definition.property || definition.name).to_sym
+    end
   end
 
   # unwrap GraphQL ListType and NonNullType wrappers
-  def self.unwrapped_type(node)
+  def self.node_return_type(node)
     type = node.return_type
     type = type.of_type while type.respond_to? :of_type
     type
   end
 
-  def self.get_delegated_model(model, method_name)
-    model.instance_variable_get('@delegate_cache').try(:[], method_name.to_sym)
+  def self.model_has_association?(model, association_name, includes_chain)
+    delegated_model = model_name_to_class(includes_chain.last) unless includes_chain.empty?
+    (delegated_model || model).reflect_on_association(association_name)
+  end
+
+  # get a 1d array of the chain of delegated model names,
+  # so if model A delegates method B to model C, which delegates method B to model D,
+  # delegated_includes_chain(A, :B) => [:C, :D]
+  def self.delegated_includes_chain(model, method_name)
+    chain = []
+    delegated_model_name = model.instance_variable_get('@delegate_cache').try(:[], method_name.to_sym)
+    while delegated_model_name
+      chain << delegated_model_name
+      delegated_model = model_name_to_class(delegated_model_name)
+      delegated_model_name = delegated_model.instance_variable_get('@delegate_cache').try(:[], method_name.to_sym)
+    end
+    chain
   end
 
+  # convert a 1d array into a nested hash
+  # e.g. [:foo, :bar, :baz] => { :foo => { :bar => :baz }}
+  def self.array_to_nested_hash(arr)
+    arr.reverse.inject { |acc, item| { item => acc } }
+  end
+
+  # convert a model name into a class variable,
+  # e.g. :search_parameters -> SearchParameters
+  def self.model_name_to_class(model_name)
+    begin
+      model = model_name.to_s.camelize.constantize
+    rescue NameError
+      model = model_name.to_s.singularize.camelize.constantize
+    end
+    model
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql_includable
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Dan Rouse
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: