graphql 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7858558a3c50740243e5bf0c4947bf63b05e2fee
-  data.tar.gz: a338af05768f34122b1b2d7e9579aa2ced8ee27c
+  metadata.gz: c2492431f6efd112dd3a4aa0c2b26e17f2e45df2
+  data.tar.gz: cd351bd76f0bf2bf4e173c900710b317210767b7
 SHA512:
-  metadata.gz: 43d57c6c30c0cdd5dbc2991c7ebe6fe3fd13d894d3a4ac7d0a53b2a982ffb2567a50d6da46a7dc7ac02e75383e4939184bf12335343671683767002a993f0bcd
-  data.tar.gz: c24a60479ef04db9373cc4ee8a1659434c3cf26b31656fa133212924487580d387aae6bed9826ca003ac9e43ceac4c864ba5c837944c93d4d5fb976ab6a7c8d0
+  metadata.gz: 3faf8b928d7cec65474d15cc3f29dd886f25f23d5b514d9427c578619e6c4ef8fbca048839f7633ad12ad61fae427bab5fe4eb0ff259afb8363b49524b063636
+  data.tar.gz: a7574edfbda2742ef46ce2bb70faf5d7f437aced4180f87b2c8c7b55f5a1e267608416ca70864187debe00efac594ece5b705fdfff9edf6b3b7be34875b40b3b

data/lib/graphql/query/serial_execution/field_resolution.rb

@@ -15,17 +15,8 @@ module GraphQL
 
         def result
           result_name = irep_node.name
-          begin
-            raw_value = get_raw_value
-            { result_name => get_finished_value(raw_value) }
-          rescue GraphQL::InvalidNullError => err
-            if field.type.kind.non_null?
-              raise(err)
-            else
-              err.parent_error? || execution_context.add_error(err)
-              {result_name => nil}
-            end
-          end
+          raw_value = get_raw_value
+          { result_name => get_finished_value(raw_value) }
         end
 
         private
@@ -33,15 +24,34 @@ module GraphQL
         # After getting the value from the field's resolve method,
         # continue by "finishing" the value, eg. executing sub-fields or coercing values
         def get_finished_value(raw_value)
-          if raw_value.is_a?(GraphQL::ExecutionError)
+          case raw_value
+          when GraphQL::ExecutionError
             raw_value.ast_node = irep_node.ast_node
             raw_value.path = irep_node.path
             execution_context.add_error(raw_value)
+          when Array
+            list_errors = raw_value.each_with_index.select { |value, _| value.is_a?(GraphQL::ExecutionError) }
+            if list_errors.any?
+              list_errors.each do |error, index|
+                error.ast_node = irep_node.ast_node
+                error.path = irep_node.path + [index]
+                execution_context.add_error(error)
+              end
+            end
           end
 
           strategy_class = GraphQL::Query::SerialExecution::ValueResolution.get_strategy_for_kind(field.type.kind)
           result_strategy = strategy_class.new(raw_value, field.type, target, parent_type, irep_node, execution_context)
-          result_strategy.result
+          begin
+            result_strategy.result
+          rescue GraphQL::InvalidNullError => err
+            if field.type.kind.non_null?
+              raise(err)
+            else
+              err.parent_error? || execution_context.add_error(err)
+              nil
+            end
+          end
         end
 
 

data/lib/graphql/schema/printer.rb

@@ -111,7 +111,7 @@ module GraphQL
             when ScalarType, ID_TYPE, STRING_TYPE
               value.to_s.inspect
             when EnumType
-              value.to_s
+              type.coerce_result(value)
             when InputObjectType
               fields = value.to_h.map{ |field_name, field_value|
                 field_type = type.input_fields.fetch(field_name.to_s).type

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.19.1"
+  VERSION = "0.19.2"
 end

data/spec/graphql/execution_error_spec.rb

@@ -27,6 +27,9 @@ describe GraphQL::ExecutionError do
           executionError
         }
       }
+      dairyErrors: allDairy(executionErrorAtIndex: 1) {
+        __typename
+      }
       dairy {
         milks {
           source
@@ -66,6 +69,12 @@ describe GraphQL::ExecutionError do
               { "flavor" => "Manchego" },
               { "source" => "COW", "executionError" => nil }
             ],
+            "dairyErrors" => [
+              { "__typename" => "Cheese" },
+              nil,
+              { "__typename" => "Cheese" },
+              { "__typename" => "Milk" }
+            ],
             "dairy" => {
               "milks" => [
                 {
@@ -98,19 +107,24 @@ describe GraphQL::ExecutionError do
               "locations"=>[{"line"=>22, "column"=>11}],
               "path"=>["allDairy", 3, "executionError"]
             },
+            {
+              "message"=>"missing dairy",
+              "locations"=>[{"line"=>25, "column"=>7}],
+              "path"=>["dairyErrors", 1]
+            },
             {
               "message"=>"There was an execution error",
-              "locations"=>[{"line"=>28, "column"=>11}],
+              "locations"=>[{"line"=>31, "column"=>11}],
               "path"=>["dairy", "milks", 0, "executionError"]
             },
             {
               "message"=>"There was an execution error",
-              "locations"=>[{"line"=>33, "column"=>15}],
+              "locations"=>[{"line"=>36, "column"=>15}],
               "path"=>["dairy", "milks", 0, "allDairy", 3, "executionError"]
             },
             {
               "message"=>"There was an execution error",
-              "locations"=>[{"line"=>38, "column"=>7}],
+              "locations"=>[{"line"=>41, "column"=>7}],
               "path"=>["executionError"]
             },
           ]

data/spec/graphql/schema/printer_spec.rb

@@ -11,8 +11,8 @@ describe GraphQL::Schema::Printer do
     choice_type = GraphQL::EnumType.define do
       name "Choice"
 
-      value "FOO"
-      value "BAR"
+      value "FOO", value: :foo
+      value "BAR", value: :bar
       value "BAZ", deprecation_reason: 'Use "BAR".'
       value "WOZ", deprecation_reason: GraphQL::Directive::DEFAULT_DEPRECATION_REASON
     end
@@ -28,7 +28,7 @@ describe GraphQL::Schema::Printer do
       input_field :int, types.Int
       input_field :float, types.Float
       input_field :bool, types.Boolean
-      input_field :enum, choice_type
+      input_field :enum, choice_type, default_value: :foo
       input_field :sub, types[sub_input_type]
     end
 
@@ -58,7 +58,7 @@ describe GraphQL::Schema::Printer do
       field :post do
         type post_type
         argument :id, !types.ID
-        argument :varied, variant_input_type, default_value: { id: "123", int: 234, float: 2.3, enum: "FOO", sub: [{ string: "str" }] }
+        argument :varied, variant_input_type, default_value: { id: "123", int: 234, float: 2.3, enum: :foo, sub: [{ string: "str" }] }
         resolve -> (obj, args, ctx) { Post.find(args["id"]) }
       end
     end
@@ -211,7 +211,7 @@ input Varied {
   int: Int
   float: Float
   bool: Boolean
-  enum: Choice
+  enum: Choice = FOO
   sub: [Sub]
 }
 SCHEMA

data/spec/support/dairy_app.rb

@@ -271,7 +271,12 @@ DairyAppQueryType = GraphQL::ObjectType.define do
   end
 
   field :allDairy, types[DairyProductUnion] do
-    resolve -> (obj, args, ctx) { CHEESES.values + MILKS.values }
+    argument :executionErrorAtIndex, types.Int
+    resolve -> (obj, args, ctx) {
+      result = CHEESES.values + MILKS.values
+      result[args[:executionErrorAtIndex]] = GraphQL::ExecutionError.new("missing dairy") if args[:executionErrorAtIndex]
+      result
+    }
   end
 
   field :allEdible, types[EdibleInterface] do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter