graphql-activerecord 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daaabd69e2bf2900bf933c0925ac6b2372f2bd02
-  data.tar.gz: ccba786159faaad1cd884bf2ee72da23d47ad45f
+  metadata.gz: 863565c48d4d2defa03c704b85a502cdadea56d2
+  data.tar.gz: 2e0b68206bce268981dd11d65ca1d520041ed74d
 SHA512:
-  metadata.gz: 1a27c8559b95c44529659e156c99f39ef8e3e28a4816a9a05413a1ff19965a910277d257e52c371137a64214d6280bef1e2aa2993dd83024309c69d6a64b3a47
-  data.tar.gz: 0600db6e7d05dcf42f4e6e6b3fafd6a327296616a2e368a57c44499b053a4c005198acb5487da807c442294921b63460474e6c1f07016b4820185c5172d9e268
+  metadata.gz: 4b6ac2a65fb4c4e57f8c58c5a4a5f0039d7c7f767d58e8b6cac35cc178009a8aaa459777c55f9d48d13facc6526750dadb43703241b9f9609e66ae12d430d1e4
+  data.tar.gz: 280d8bc46fe2119be8597f241be32c3b35eb68725681b032bc6dcccbc8673eeb9ddbc2a997babc8d9bf15398aab1cfd0694e8f817de2d69eee7cf4e48526013a

data/lib/graphql/activerecord.rb

@@ -33,7 +33,7 @@ require 'graphql/models/mutator'
 module GraphQL
   module Models
     class << self
-      attr_accessor :node_interface_proc, :model_from_id, :authorize
+      attr_accessor :node_interface_proc, :model_from_id, :authorize, :id_for_model
     end
 
     # Returns a promise that will traverse the associations and resolve to the model at the end of the path.

data/lib/graphql/models/definition_helpers/associations.rb

@@ -53,7 +53,11 @@ module GraphQL
         fail ArgumentError.new("Association #{association} wasn't found on model #{model_type.name}") unless reflection
         fail ArgumentError.new("Cannot include #{reflection.macro} association #{association} on model #{model_type.name} with has_one") unless [:has_one, :belongs_to].include?(reflection.macro)
 
-        camel_name = options[:name] || association.to_s.camelize(:lower).to_sym
+        # Define the field for the association itself
+
+        camel_name = options[:name] || association.to_s.camelize(:lower)
+        camel_name = camel_name.to_sym if camel_name.is_a?(String)
+
         type_lambda = resolve_has_one_type(reflection)
 
         DefinitionHelpers.register_field_metadata(graph_type, camel_name, {
@@ -77,6 +81,46 @@ module GraphQL
             DefinitionHelpers.load_and_traverse(model, [association], context)
           end
         end
+
+        # Define the field for the associated model's ID
+        id_field_name = :"#{camel_name}Id"
+
+        DefinitionHelpers.register_field_metadata(graph_type, id_field_name, {
+          macro: :has_one,
+          macro_type: :association,
+          path: path,
+          association: association,
+          base_model_type: base_model_type,
+          model_type: model_type,
+          object_to_base_model: object_to_model
+        })
+
+        can_use_optimized = reflection.macro == :belongs_to
+
+        if !reflection.polymorphic? && reflection.klass.column_names.include?('type')
+          can_use_optimized = false
+        end
+
+        graph_type.fields[id_field_name.to_s] = GraphQL::Field.define do
+          name id_field_name.to_s
+          type types.ID
+          deprecation_reason options[:deprecation_reason] if options.include?(:deprecation_reason)
+
+          resolve -> (model, args, context) do
+            return nil unless model
+
+            if can_use_optimized
+              id = model.public_send(reflection.foreign_key)
+              return nil if id.nil?
+
+              type = model.association(association).klass.name
+              GraphQL::Models.id_for_model.call(type, id)
+            else
+              # We have to actually load the model and then get it's ID
+              DefinitionHelpers.load_and_traverse(model, [association], context).then(&:gid)
+            end
+          end
+        end
       end
 
       def self.define_has_many_array(graph_type, base_model_type, model_type, path, association, object_to_model, options)
@@ -111,6 +155,32 @@ module GraphQL
             end
           end
         end
+
+        # Define the field for the associated model's ID
+        id_field_name = :"#{camel_name.to_s.singularize}Ids"
+
+        DefinitionHelpers.register_field_metadata(graph_type, id_field_name, {
+          macro: :has_one,
+          macro_type: :association,
+          path: path,
+          association: association,
+          base_model_type: base_model_type,
+          model_type: model_type,
+          object_to_base_model: object_to_model
+        })
+
+        graph_type.fields[id_field_name.to_s] = GraphQL::Field.define do
+          name id_field_name.to_s
+          type types[!types.ID]
+          deprecation_reason options[:deprecation_reason] if options.include?(:deprecation_reason)
+
+          resolve -> (model, args, context) do
+            return nil unless model
+            DefinitionHelpers.load_and_traverse(model, [association], context).then do |result|
+              Array.wrap(result).map(&:gid)
+            end
+          end
+        end
       end
 
       def self.define_has_many_connection(graph_type, base_model_type, model_type, path, association, object_to_model, options)

data/lib/graphql/models/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Models
-    VERSION = "0.5.6"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Ryan Foster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql