graphql_includable 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13f8e1de4b38eac1e571c18ecc7ca78dbb16327f
-  data.tar.gz: 8b8318def58be25d950473392715d16f73b0d829
+  metadata.gz: 21599908b740ed6950c8337474da5b68d936311a
+  data.tar.gz: b02f6f9dad596fa35f74e98f13bbf1241d456ed3
 SHA512:
-  metadata.gz: c105a43187fb8d9db518cce6ca824ef96f17f279303c9a5c459e8708370ded44ee22c593d6b5d183dfb108fbafc442ef0bedf0d343a2eb1eff5f5e67c1dcaf9a
-  data.tar.gz: 2745bfa726da7f5ebc806afcc6c438d532a176f19ca9631894e3a62e9132ec814f4447012532359d2675acc370deb9265903aa6a020f7a16bc191d1a6a2d9318
+  metadata.gz: 9529b08e11f10ccbc5ae07985895ded5fb26f7c7e7dc9d7c5d46e66e7f80032306deeb379842cb840f282a4563e515b5c22a506569561300845048de27f0f2ff
+  data.tar.gz: 716d7d4ba07e5af8eec16ae812f59d8ac25f7153428336cdaf67c2c76e1e8e983798e151eb244e447cbc8b5bd3034881071d30a8b0e24fe713697fab5b2ab1c1

data/lib/graphql_includable.rb

@@ -1,5 +1,6 @@
 require "graphql"
 require "active_support/concern"
+require "byebug"
 
 GraphQL::Field.accepts_definitions includes: GraphQL::Define.assign_metadata_key(:includes)
 
@@ -55,18 +56,27 @@ module GraphQLIncludable
     return [] unless node && return_type && return_model
 
     node.scoped_children[return_type].each do |child_name, child_node|
-      child_association_name, explicit_includes = suggested_association_name(child_name, child_node)
-      association, delegated_model_name = find_association(return_model, child_association_name)
+      specified_includes = child_node.definitions[0].metadata[:includes]
+      raw_association_name = specified_includes || (node.definitions[0].property || child_name).to_sym
+      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
-          nested_includes[delegated_model_name || child_association_name] = wrap_delegate(child_includes, delegated_model_name, child_association_name)
+          if delegated_model_name
+            nested_includes[delegated_model_name] = {}
+            nested_includes[delegated_model_name][raw_association_name] = child_includes
+          else
+            nested_includes[association_name] = child_includes
+          end
         else
-          includes << wrap_delegate(child_association_name, delegated_model_name)
+          includes << association_name
         end
-      elsif explicit_includes
-        includes << explicit_includes
+      elsif specified_includes
+        includes << specified_includes
       end
     end
 
@@ -108,24 +118,8 @@ module GraphQLIncludable
     type
   end
 
-  # find a valid association on return_model, following method delegation
-  def self.find_association(return_model, child_name)
-    delegated_model = return_model.instance_variable_get('@delegate_cache').try(:[], child_name.to_sym)
-    association_model = delegated_model ? return_model.reflect_on_association(delegated_model).klass : return_model
-    association = association_model.reflect_on_association(child_name)
-
-    [association, delegated_model]
-  end
-
-  # find the association to look for based on a field definition
-  # precedence is `includes` key, then `property` key, then the field name
-  def self.suggested_association_name(name, node)
-    includes_metadata = node.definitions[0].metadata[:includes]
-
-    assoc_name = node.definitions[0].property || name
-    assoc_name = includes_metadata if includes_metadata && includes_metadata.is_a?(Symbol)
-
-    [assoc_name.to_sym, includes_metadata]
+  def self.get_delegated_model(model, method_name)
+    model.instance_variable_get('@delegate_cache').try(:[], method_name.to_sym)
   end
 
 end

metadata

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