graphql 0.18.8 → 0.18.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3550ea852aad13e43cd451dfa44ed0889f71f9a
-  data.tar.gz: ce68835d73683f572b8b53529dc5f7de426b7a02
+  metadata.gz: 18dd53e870fcdffcb0ce92efe962848d7e9b0259
+  data.tar.gz: edc7a7a7e56f10bbd3f50b330fe59f53efc35653
 SHA512:
-  metadata.gz: af009ae9281638daab169b41c94b6def2967a16ba2e41f667cf51d5c45a83b6aeacf0169195c651e5f2136934346a086775d65be713d4da03db429e4d41ce421
-  data.tar.gz: b7c1225ffe636db87a332f8ec0af465ee38b29d8269cc18485f40f22296608b1cb0ee0d69a17be58e7f28067611ebf946b1b306d1c796bb4dcf439190bc15249
+  metadata.gz: 1082187dac20710314b4dc469514f20d91f2619b6f658cf66ff8992e50813aa658eb47a0c7e0eb0d1febed8f7615cadcd7382e57dfe15b5a43e00da94f055cd1
+  data.tar.gz: 251ff406e0738e217bcbb1a5983a6ac7e2bc4c99678417bf16aead3bfa5a31d1a04f9b225cab14bef1e514c293719ec3f046fffb265a30b42b4e112d37f51020

data/lib/graphql/relay/global_node_identification.rb

@@ -108,11 +108,12 @@ module GraphQL
         warn("type_from_object(object) is deprecated; use Schema.resolve_type(object) instead")
 
         if @type_from_object_proc
-          schema.resolve_type = @type_from_object_proc
+          type_from_obj = @type_from_object_proc
+          schema.resolve_type = -> (obj, ctx) { type_from_obj.call(obj) }
           @type_from_object_proc = nil
         end
 
-        schema.resolve_type(object)
+        schema.resolve_type(object, nil)
       end
 
       def type_from_object=(new_type_from_object_proc)

data/lib/graphql/schema.rb

@@ -63,7 +63,7 @@ module GraphQL
 
     DIRECTIVES = [GraphQL::Directive::SkipDirective, GraphQL::Directive::IncludeDirective]
     DYNAMIC_FIELDS = ["__type", "__typename", "__schema"]
-    RESOLVE_TYPE_PROC_REQUIRED = -> (obj) { raise("Schema.resolve_type is undefined, can't resolve type for #{obj}") }
+    RESOLVE_TYPE_PROC_REQUIRED = -> (obj, ctx) { raise("Schema.resolve_type is undefined, can't resolve type for #{obj.inspect}") }
 
     attr_reader :directives, :static_validator
 

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.18.8"
+  VERSION = "0.18.9"
 end

data/spec/graphql/relay/global_node_identification_spec.rb

@@ -52,6 +52,28 @@ describe GraphQL::Relay::GlobalNodeIdentification do
     end
   end
 
+  describe "type_from_object" do
+    it "works even though it's deprecated" do
+      thing_type = GraphQL::ObjectType.define do
+        name "Thing"
+        global_id_field :id
+        field :object_id, types.Int
+      end
+
+      node_ident = GraphQL::Relay::GlobalNodeIdentification.define do
+        type_from_object -> (obj) { thing_type }
+      end
+
+      schema = GraphQL::Schema.define do
+        node_identification(node_ident)
+      end
+
+      schema.send(:ensure_defined)
+      assert_equal thing_type, node_ident.type_from_object(nil)
+      assert_equal thing_type, schema.resolve_type(nil, nil)
+    end
+  end
+
   describe 'to_global_id / from_global_id ' do
     it 'Converts typename and ID to and from ID' do
       global_id = node_identification.to_global_id("SomeType", 123)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.18.8
+  version: 0.18.9
 platform: ruby
 authors:
 - Robert Mosolgo