graphql_includable 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 803a100d8819528d092fd114ab447f1eabcb3872
-  data.tar.gz: 18b7e345903158ed2bcf003852061a34d6ccaf04
+  metadata.gz: 78dc263783852ec3090c807ab090253f08608de1
+  data.tar.gz: 46aec07790da54100a3787a6c45df8064c90beda
 SHA512:
-  metadata.gz: dd8826b97ddcb70b6701a4da2136593f0b8743f284b8f0115ea547f1b3b8f4cbdc1e25291a5b6efc30bac98a44e8641e1a5a0d2e641144003594f2cb61257b21
-  data.tar.gz: d5a44484141daeae5667cdc06c550623dd636a3324b273672a0ef5918f0bd65c33561f68af35d386f68a5481a56339393278eec22cf8dd45aa9a05389f4f2195
+  metadata.gz: c7ee1838d8167126aecad34b00eaf338ec7515812a2290d724a5f1f7e8eb65c5bcbef139eb0a09a59837938b9cc35030ef239258d584867f95a316d84c3e3255
+  data.tar.gz: fb5d17e8a29ecc47d8f819098573e25dfdd82250906273d105f2ae984303941ead7b0f97cf18b99057a11faea779901659b733c567fa018e22a0f3926ca67168

data/lib/graphql_includable.rb

@@ -1,15 +1,16 @@
-require "graphql"
-require "active_support/concern"
+require 'graphql'
+require 'active_support/concern'
 
-GraphQL::Field.accepts_definitions includes: GraphQL::Define.assign_metadata_key(:includes)
+GraphQL::Field.accepts_definitions(
+  includes: GraphQL::Define.assign_metadata_key(:includes)
+)
 
 module GraphQLIncludable
   extend ActiveSupport::Concern
 
   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}"
+    def includes_from_graphql(ctx)
+      generated_includes = GraphQLIncludable.generate_includes_from_graphql(ctx, model_name.to_s)
       includes(generated_includes)
     end
 
@@ -26,11 +27,9 @@ module GraphQLIncludable
     end
   end
 
-  private
-
-  def self.generate_includes_from_graphql(query_context, model_name)
-    matching_node = GraphQLIncludable.find_child_returning_model_name(query_context.irep_node, model_name)
-    GraphQLIncludable.includes_from_graphql_field(matching_node)
+  def self.generate_includes_from_graphql(ctx, model_name)
+    matching_node = find_child_returning_model_name(ctx.irep_node, model_name)
+    includes_from_graphql_field(matching_node)
   end
 
   def self.find_child_returning_model_name(node, model_name)
@@ -39,7 +38,7 @@ module GraphQLIncludable
     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|
+      node.scoped_children[return_type].each do |_child_name, child_node|
         matching_node = find_child_returning_model_name(child_node, model_name)
         break if matching_node
       end
@@ -51,18 +50,16 @@ module GraphQLIncludable
     includes = []
     nested_includes = {}
 
-    return_type = node_return_type(node)
     return_model = node_return_class(node)
-    return [] unless node && return_type && return_model
+    return [] unless node && return_model
 
-    node.scoped_children[return_type].each do |_child_name, child_node|
+    node.scoped_children[node_return_type(node)].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)
+      else
+        child_includes = [child_includes] unless child_includes.is_a?(Array)
         includes += child_includes
-      elsif child_includes
-        includes << child_includes
       end
     end
 
@@ -89,10 +86,12 @@ module GraphQLIncludable
   end
 
   def self.node_return_class(node)
+    # rubocop:disable Lint/HandleExceptions, Style/RedundantBegin
     begin
       Object.const_get(node_return_type(node).name)
     rescue NameError
     end
+    # rubocop:enable Lint/HandleExceptions, Style/RedundantBegin
   end
 
   def self.node_returns_active_record?(node)
@@ -110,7 +109,7 @@ module GraphQLIncludable
     end
   end
 
-  # unwrap GraphQL ListType and NonNullType wrappers
+  # get unwrapped return type from a field, stripping ListType / NonNullType wrappers
   def self.node_return_type(node)
     type = node.return_type
     type = type.of_type while type.respond_to? :of_type
@@ -125,13 +124,14 @@ module GraphQLIncludable
   # 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)
+  def self.delegated_includes_chain(base_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)
+    method = method_name.to_sym
+    model_name = base_model.instance_variable_get('@delegate_cache').try(:[], method)
+    while model_name
+      chain << model_name
+      model = model_name_to_class(model_name)
+      model_name = model.instance_variable_get('@delegate_cache').try(:[], method)
     end
     chain
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql_includable
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Dan Rouse