graphql 1.5.12 → 1.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e204a82f5db905b17eeaa50f14e7b2af0ddff12
-  data.tar.gz: 6c7029686c56fb6ad2ef90084381131f1f06a68c
+  metadata.gz: 68f3728c4d164599a943599551db20d7add67e5d
+  data.tar.gz: 86b930739f630566edbaeb9b024e6461f5a30627
 SHA512:
-  metadata.gz: d4de6aa1e85f4e2b51ae00866c00fd3ef0b201059ccb6a28a74a97cfe1528b1739086585db4488911893a781b8a0857fd318175e95fd135e91e5cb091cfc55d6
-  data.tar.gz: 59ef188909e4f03b6793cf00c935e05bc4fd45f91e1910b068529a4661e7261d778c7e3d78b5b55cd563cc5e23fe5be8cb1a989a56180dff4df48380c3aea286
+  metadata.gz: bdaf08df4286ec916b87839a354eb7d21bf822d49462a659a5e634210065baac1a5553a3dec3003b6c24bd5c8f4ab894f0796603883d4f87d7024ddffef87ece
+  data.tar.gz: b64f7d422547af515ee634f885dd6f5fc990478ef84c65e5bd244e8b889fb206ae7aa4843309723a8ab2a9baf47cf01a30226b4c6bb6c2b952d298b0cb120942

data/lib/graphql/relay/mutation/instrumentation.rb

@@ -11,8 +11,8 @@ module GraphQL
         # giving users access to the original resolve function in earlier instrumentation.
         def self.instrument(type, field)
           if field.mutation
-            new_resolve = Mutation::Resolve.new(field.mutation, field.resolve_proc)
-            new_lazy_resolve = Mutation::Resolve.new(field.mutation, field.lazy_resolve_proc)
+            new_resolve = Mutation::Resolve.new(field.mutation, field.resolve_proc, eager: true)
+            new_lazy_resolve = Mutation::Resolve.new(field.mutation, field.lazy_resolve_proc, eager: false)
             field.redefine(resolve: new_resolve, lazy_resolve: new_lazy_resolve)
           else
             field

data/lib/graphql/relay/mutation/resolve.rb

@@ -7,35 +7,40 @@ module GraphQL
       # Also, pass the `clientMutationId` to that result object.
       # @api private
       class Resolve
-        def initialize(mutation, resolve)
+        def initialize(mutation, resolve, eager:)
           @mutation = mutation
           @resolve = resolve
           @wrap_result = mutation.has_generated_return_type?
+          @eager = eager
         end
 
         def call(obj, args, ctx)
+          error_raised = false
           begin
             mutation_result = @resolve.call(obj, args[:input], ctx)
           rescue GraphQL::ExecutionError => err
             mutation_result = err
+            error_raised = true
           end
 
           if ctx.schema.lazy?(mutation_result)
             mutation_result
           else
-            build_result(mutation_result, args, ctx)
+            build_result(mutation_result, args, ctx, raised: error_raised)
           end
         end
 
         private
 
-        def build_result(mutation_result, args, ctx)
+        def build_result(mutation_result, args, ctx, raised: false)
           if mutation_result.is_a?(GraphQL::ExecutionError)
             ctx.add_error(mutation_result)
             mutation_result = nil
           end
 
-          if @wrap_result
+          if @eager && raised
+            nil
+          elsif @wrap_result
             if mutation_result && !mutation_result.is_a?(Hash)
               raise StandardError, "Expected `#{mutation_result}` to be a Hash."\
                 " Return a hash when using `return_field` or specify a custom `return_type`."

data/lib/graphql/version.rb

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

data/spec/graphql/relay/mutation_spec.rb

@@ -322,5 +322,24 @@ describe GraphQL::Relay::Mutation do
 
       assert_equal(expected, result)
     end
+
+    it "supports raising an error in the resolve function" do
+      result = star_wars_query(query_string, "clientMutationId" => "5678", "shipName" => "Leviathan")
+
+      expected = {
+        "data" => {
+          "introduceShip" => nil,
+        },
+        "errors" => [
+          {
+            "message" => "🔥",
+            "locations" => [ { "line" => 3 , "column" => 7}],
+            "path" => ["introduceShip"]
+          }
+        ]
+      }
+
+      assert_equal(expected, result)
+    end
   end
 end

data/spec/support/star_wars/schema.rb

@@ -209,6 +209,8 @@ module StarWars
       faction_id = args["factionId"]
       if args["shipName"] == 'Millennium Falcon'
         GraphQL::ExecutionError.new("Sorry, Millennium Falcon ship is reserved")
+      elsif args["shipName"] == 'Leviathan'
+        raise GraphQL::ExecutionError.new("🔥")
       elsif args["shipName"] == "Ebon Hawk"
         LazyWrapper.new { raise GraphQL::ExecutionError.new("💥")}
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.5.12
+  version: 1.5.13
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -642,7 +642,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A GraphQL language and runtime for Ruby