graphql 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb79bf185d3d89d53f50ad5f0ae1cc93e3480acb
-  data.tar.gz: 46c04d4e296ea2b3b520d6df50f82d76da5ec641
+  metadata.gz: 31138f73214b24b895b8717ef50dcc39c61c6e45
+  data.tar.gz: 1c105034b3b21b0dd732e1143acbf54538fc54ef
 SHA512:
-  metadata.gz: 78e070c3df4abd9e2d649ba0e5f1e7fdcef9b0241572a30bf233d516fa28b7eee9afa0fd2d650db835556dff87f4eddb344aefce8825019569aa7e55ff28f780
-  data.tar.gz: eb138cb5d2274c815ea42ec2eff4371cf34023ad817e4009302cb6de6da7deea213ccfaa2169d86a6a8c2b684f9e4fc8bd0780060163a764960d22af1a48bb25
+  metadata.gz: fc6e63617dc34dd096a3b279ec3f2a2f476f3a8032bfcf4008bccc9e6c3f1c3f45e23d0d43e2dc0b7798376424e2f196ee71e65cd365cb89c9384a89b6e1c39e
+  data.tar.gz: 07cbfa84015057a980b90820470e721352db0f42f85ab985312e01787328f0fef448ac6d774e08a625c88388246f5276352da72514be18f1e24c6468f5438f9d

data/lib/graphql/schema/resolver.rb

@@ -201,7 +201,8 @@ module GraphQL
         loaded_application_object = object_from_id(lookup_as_type, id, context)
         context.schema.after_lazy(loaded_application_object) do |application_object|
           if application_object.nil?
-            raise LoadApplicationObjectFailedError.new(argument: argument, id: id, object: application_object)
+            err = LoadApplicationObjectFailedError.new(argument: argument, id: id, object: application_object)
+            load_application_object_failed(err)
           end
           # Double-check that the located object is actually of this type
           # (Don't want to allow arbitrary access to objects this way)
@@ -209,7 +210,8 @@ module GraphQL
           context.schema.after_lazy(resolved_application_object_type) do |application_object_type|
             possible_object_types = context.schema.possible_types(lookup_as_type)
             if !possible_object_types.include?(application_object_type)
-              raise LoadApplicationObjectFailedError.new(argument: argument, id: id, object: application_object)
+              err = LoadApplicationObjectFailedError.new(argument: argument, id: id, object: application_object)
+              load_application_object_failed(err)
             else
               # This object was loaded successfully
               # and resolved to the right type,
@@ -232,9 +234,6 @@ module GraphQL
             end
           end
         end
-      rescue LoadApplicationObjectFailedError => err
-        # pass it to a handler
-        load_application_object_failed(err)
       end
 
       def load_application_object_failed(err)

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "1.9.0"
+  VERSION = "1.9.1"
 end

data/spec/graphql/schema/resolver_spec.rb

@@ -171,11 +171,15 @@ describe GraphQL::Schema::Resolver do
       include GraphQL::Schema::Interface
       field :value, Integer, null: false
       def self.resolve_type(obj, ctx)
-        if obj.is_a?(Integer)
-          IntegerWrapper
-        else
-          raise "Unexpected: #{obj.inspect}"
-        end
+        LazyBlock.new {
+          if obj.is_a?(Integer)
+            IntegerWrapper
+          elsif obj == :resolve_type_as_wrong_type
+            GraphQL::Types::String
+          else
+            raise "Unexpected: #{obj.inspect}"
+          end
+        }
       end
     end
 
@@ -218,6 +222,30 @@ describe GraphQL::Schema::Resolver do
       end
     end
 
+    class ResolverWithErrorHandler < BaseResolver
+      argument :int, ID, required: true, loads: HasValue
+      type HasValue, null: true
+      def object_from_id(type, id, ctx)
+        LazyBlock.new {
+          if id == "failed_to_find"
+            nil
+          elsif id == "resolve_type_as_wrong_type"
+            :resolve_type_as_wrong_type
+          else
+            id.length
+          end
+        }
+      end
+
+      def resolve(int:)
+        int * 4
+      end
+
+      def load_application_object_failed(err)
+        raise GraphQL::ExecutionError.new("ResolverWithErrorHandler failed for id: #{err.id.inspect} (#{err.object.inspect}) (#{err.class.name})")
+      end
+    end
+
     class PrepResolver10 < BaseResolver
       argument :int1, Integer, required: true
       argument :int2, Integer, required: true, as: :integer_2
@@ -356,6 +384,7 @@ describe GraphQL::Schema::Resolver do
       field :prep_resolver_12, resolver: PrepResolver12
       field :prep_resolver_13, resolver: PrepResolver13
       field :prep_resolver_14, resolver: PrepResolver14
+      field :resolver_with_error_handler, resolver: ResolverWithErrorHandler
     end
 
     class Schema < GraphQL::Schema
@@ -433,6 +462,51 @@ describe GraphQL::Schema::Resolver do
     end
   end
 
+  describe "load_application_object_failed hook" do
+    it "isn't called for successful queries" do
+      query_str = <<-GRAPHQL
+      {
+        resolverWithErrorHandler(int: "abcd") { value }
+      }
+      GRAPHQL
+
+      res = exec_query(query_str)
+      assert_equal 16, res["data"]["resolverWithErrorHandler"]["value"]
+      refute res.key?("errors")
+    end
+
+    describe "when the id doesn't find anything" do
+      it "passes an error to the handler" do
+        query_str = <<-GRAPHQL
+        {
+          resolverWithErrorHandler(int: "failed_to_find") { value }
+        }
+        GRAPHQL
+
+        res = exec_query(query_str)
+        assert_nil res["data"].fetch("resolverWithErrorHandler")
+        expected_err = "ResolverWithErrorHandler failed for id: \"failed_to_find\" (nil) (GraphQL::Schema::Resolver::LoadApplicationObjectFailedError)"
+        assert_equal [expected_err], res["errors"].map { |e| e["message"] }
+      end
+    end
+
+    describe "when resolve_type returns a no-good type" do
+      it "calls the handler" do
+        query_str = <<-GRAPHQL
+        {
+          resolverWithErrorHandler(int: "resolve_type_as_wrong_type") { value }
+        }
+        GRAPHQL
+
+        res = exec_query(query_str)
+        assert_nil res["data"].fetch("resolverWithErrorHandler")
+        expected_err = "ResolverWithErrorHandler failed for id: \"resolve_type_as_wrong_type\" (:resolve_type_as_wrong_type) (GraphQL::Schema::Resolver::LoadApplicationObjectFailedError)"
+        assert_equal [expected_err], res["errors"].map { |e| e["message"] }
+      end
+    end
+  end
+
+
   describe "extras" do
     it "is inherited" do
       res = exec_query " { resolver4 resolver5 } ", root_value: OpenStruct.new(value: 0)

metadata

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