graphql 0.10.9 → 0.11.0

data/spec/graphql/query/executor_spec.rb

@@ -132,6 +132,37 @@ describe GraphQL::Query::Executor do
       end
     end
 
+    describe 'if nil is given for a non-null field' do
+      let(:query_string) {%| query noMilk { cow { name cantBeNullButIs } }|}
+      it 'turns into error message and nulls the entire selection' do
+        expected = {
+          "data" => { "cow" => nil },
+          "errors" => [
+            {
+              "message" => "Cannot return null for non-nullable field cantBeNullButIs"
+            }
+          ]
+        }
+        assert_equal(expected, result)
+      end
+    end
+
+    describe 'if an execution error is raised for a non-null field' do
+      let(:query_string) {%| query noMilk { cow { name cantBeNullButRaisesExecutionError } }|}
+      it 'uses provided error message and nulls the entire selection' do
+        expected = {
+          "data" => { "cow" => nil },
+          "errors" => [
+            {
+              "message" => "BOOM",
+              "locations" => [ { "line" => 1, "column" => 28 } ]
+            }
+          ]
+        }
+        assert_equal(expected, result)
+      end
+    end
+
     describe "if the schema has a rescue handler" do
       before do
         schema.rescue_from(RuntimeError) { "Error was handled!" }

data/spec/graphql/query/serial_execution/execution_context_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe GraphQL::Query::SerialExecution::ExecutionContext do
+  let(:query_string) { %|
+    query getFlavor($cheeseId: Int!) {
+      brie: cheese(id: 1)   { ...cheeseFields, taste: flavor }
+    }
+    fragment cheeseFields on Cheese { flavor }
+  |}
+  let(:debug) { false }
+  let(:operation_name) { nil }
+  let(:query_variables) { {"cheeseId" => 2} }
+  let(:schema) { DummySchema }
+  let(:query) { GraphQL::Query.new(
+    schema,
+    query_string,
+    variables: query_variables,
+    debug: debug,
+    operation_name: operation_name,
+  )}
+  let(:execution_context) {
+    GraphQL::Query::SerialExecution::ExecutionContext.new(query, nil)
+  }
+
+  describe "add_error" do
+    let(:err) { StandardError.new("test") }
+    let(:expected) { [err] }
+
+    it "adds an error on the query context" do
+      execution_context.add_error(err)
+      assert_equal(expected, query.context.errors)
+    end
+  end
+
+  describe "get_type" do
+    it "returns the respective type from the schema" do
+      type = execution_context.get_type('Dairy')
+      assert_equal(DairyType, type)
+    end
+  end
+
+  describe "get_field" do
+    it "returns the respective field from the schema" do
+      field = execution_context.get_field(DairyType, 'cheese')
+      assert_equal('cheese', field.name)
+    end
+  end
+
+  describe "get_fragment" do
+    it "returns a fragment on the query by name" do
+      fragment = execution_context.get_fragment('cheeseFields')
+      assert_equal('cheeseFields', fragment.name)
+    end
+  end
+end

data/spec/graphql/query/{base_execution → serial_execution}/value_resolution_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe GraphQL::Query::BaseExecution::ValueResolution do
+describe GraphQL::Query::SerialExecution::ValueResolution do
   let(:debug) { false }
   let(:query_root) {
     day_of_week_enum = GraphQL::EnumType.define do

data/spec/graphql/query/variables_spec.rb

@@ -8,7 +8,7 @@ describe GraphQL::Query::Variables do
     }
   }
   |}
-  let(:ast_variables) { GraphQL.parse(query_string).parts.first.variables }
+  let(:ast_variables) { GraphQL.parse(query_string).definitions.first.variables }
   let(:variables) { GraphQL::Query::Variables.new(
     DummySchema,
     ast_variables,

data/spec/graphql/static_validation/complexity_validator.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe GraphQL::StaticValidation::ComplexityValidator do
+  let(:document) { GraphQL.parse(query_string)}
+  let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [complexity_validator]) }
+  let(:errors) { validator.validate(document) }
+  let(:complexity_validator) { GraphQL::StaticValidation::ComplexityValidator.new(max_fields: 6, list_multiplier: 2) }
+
+  describe "too many fields" do
+    it "adds errors if there are too many fields"
+    it "counts fields for each time they're included from fragments"
+  end
+
+  it "multiplies fields inside list types"
+end

data/spec/graphql/static_validation/rules/argument_literals_are_compatible_spec.rb

@@ -9,6 +9,7 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
       badSource: searchDairy(product: [{source: 1.1}]) { source }
       missingSource: searchDairy(product: [{fatContent: 1.1}]) { source }
       listCoerce: cheese(id: 1) { similarCheese(source: YAK) }
+      missingInputField: searchDairy(product: [{source: YAK, wacky: 1}])
     }
 
     fragment cheeseFields on Cheese {
@@ -54,7 +55,7 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
 
     fragment_error = {
       "message"=>"Argument 'source' on Field 'similarCheese' has an invalid value",
-      "locations"=>[{"line"=>12, "column"=>7}]
+      "locations"=>[{"line"=>13, "column"=>7}]
     }
     assert_includes(errors, fragment_error)
   end

data/spec/graphql/static_validation/validator_spec.rb

@@ -14,7 +14,7 @@ class DocumentErrorValidator
 end
 
 describe GraphQL::StaticValidation::Validator do
-  let(:document)  { OpenStruct.new(name: "This is not a document", children: [], parts: []) }
+  let(:document)  { OpenStruct.new(name: "This is not a document", children: [], definitions: []) }
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: "This is not a schema", rules: [SchemaErrorValidator, DocumentErrorValidator]) }
   let(:errors) { validator.validate(document) }
   it 'uses rules' do

data/spec/support/dairy_app.rb

@@ -100,6 +100,16 @@ CowType = GraphQL::ObjectType.define do
   field :id, !types.ID
   field :name, types.String
   field :last_produced_dairy, DairyProductUnion
+
+  field :cantBeNullButIs do
+    type !GraphQL::STRING_TYPE
+    resolve -> (t, a, c) { nil }
+  end
+
+  field :cantBeNullButRaisesExecutionError do
+    type !GraphQL::STRING_TYPE
+    resolve -> (t, a, c) { raise GraphQL::ExecutionError, "BOOM" }
+  end
 end
 
 DairyProductInputType = GraphQL::InputObjectType.define {
@@ -189,6 +199,11 @@ QueryType = GraphQL::ObjectType.define do
     resolve -> (t, a, c) { raise("This error was raised on purpose") }
   end
 
+  field :executionError do
+    type GraphQL::STRING_TYPE
+    resolve -> (t, a, c) { raise(GraphQL::ExecutionError, "There was an execution error") }
+  end
+
   # To test possibly-null fields
   field :maybeNull, MaybeNullType do
     resolve -> (t, a, c) { OpenStruct.new(cheese: nil) }

data/spec/support/minimum_input_object.rb

@@ -0,0 +1,13 @@
+# This is the minimum required interface for an input object
+class MinimumInputObject
+  KEY_VALUE_PAIRS = [["source", "COW"], ["fatContent", 0.4]]
+
+  def all?
+    KEY_VALUE_PAIRS.all? { |pair| yield(pair) }
+  end
+
+  def [](key)
+    pair = KEY_VALUE_PAIRS.find { |k, v| k == key }
+    pair[1]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.11.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -198,6 +198,7 @@ files:
 - lib/graphql/introspection/type_kind_enum.rb
 - lib/graphql/introspection/type_type.rb
 - lib/graphql/introspection/typename_field.rb
+- lib/graphql/invalid_null_error.rb
 - lib/graphql/language.rb
 - lib/graphql/language/nodes.rb
 - lib/graphql/language/parser.rb
@@ -208,16 +209,16 @@ files:
 - lib/graphql/object_type.rb
 - lib/graphql/query.rb
 - lib/graphql/query/arguments.rb
-- lib/graphql/query/base_execution.rb
-- lib/graphql/query/base_execution/value_resolution.rb
 - lib/graphql/query/context.rb
 - lib/graphql/query/directive_chain.rb
 - lib/graphql/query/executor.rb
 - lib/graphql/query/literal_input.rb
 - lib/graphql/query/serial_execution.rb
+- lib/graphql/query/serial_execution/execution_context.rb
 - lib/graphql/query/serial_execution/field_resolution.rb
 - lib/graphql/query/serial_execution/operation_resolution.rb
 - lib/graphql/query/serial_execution/selection_resolution.rb
+- lib/graphql/query/serial_execution/value_resolution.rb
 - lib/graphql/query/type_resolver.rb
 - lib/graphql/query/variables.rb
 - lib/graphql/repl.rb
@@ -236,6 +237,7 @@ files:
 - lib/graphql/static_validation.rb
 - lib/graphql/static_validation/all_rules.rb
 - lib/graphql/static_validation/arguments_validator.rb
+- lib/graphql/static_validation/complexity_validator.rb
 - lib/graphql/static_validation/literal_validator.rb
 - lib/graphql/static_validation/message.rb
 - lib/graphql/static_validation/rules/argument_literals_are_compatible.rb
@@ -279,9 +281,10 @@ files:
 - spec/graphql/list_type_spec.rb
 - spec/graphql/object_type_spec.rb
 - spec/graphql/query/arguments_spec.rb
-- spec/graphql/query/base_execution/value_resolution_spec.rb
 - spec/graphql/query/context_spec.rb
 - spec/graphql/query/executor_spec.rb
+- spec/graphql/query/serial_execution/execution_context_spec.rb
+- spec/graphql/query/serial_execution/value_resolution_spec.rb
 - spec/graphql/query/type_resolver_spec.rb
 - spec/graphql/query/variables_spec.rb
 - spec/graphql/query_spec.rb
@@ -294,6 +297,7 @@ files:
 - spec/graphql/schema/type_reducer_spec.rb
 - spec/graphql/schema/type_validator_spec.rb
 - spec/graphql/schema_spec.rb
+- spec/graphql/static_validation/complexity_validator.rb
 - spec/graphql/static_validation/rules/argument_literals_are_compatible_spec.rb
 - spec/graphql/static_validation/rules/arguments_are_defined_spec.rb
 - spec/graphql/static_validation/rules/directives_are_defined_spec.rb
@@ -317,6 +321,7 @@ files:
 - spec/support/calculator_schema.rb
 - spec/support/dairy_app.rb
 - spec/support/dairy_data.rb
+- spec/support/minimum_input_object.rb
 - spec/support/star_wars_data.rb
 - spec/support/star_wars_schema.rb
 homepage: http://github.com/rmosolgo/graphql-ruby
@@ -362,9 +367,10 @@ test_files:
 - spec/graphql/list_type_spec.rb
 - spec/graphql/object_type_spec.rb
 - spec/graphql/query/arguments_spec.rb
-- spec/graphql/query/base_execution/value_resolution_spec.rb
 - spec/graphql/query/context_spec.rb
 - spec/graphql/query/executor_spec.rb
+- spec/graphql/query/serial_execution/execution_context_spec.rb
+- spec/graphql/query/serial_execution/value_resolution_spec.rb
 - spec/graphql/query/type_resolver_spec.rb
 - spec/graphql/query/variables_spec.rb
 - spec/graphql/query_spec.rb
@@ -377,6 +383,7 @@ test_files:
 - spec/graphql/schema/type_reducer_spec.rb
 - spec/graphql/schema/type_validator_spec.rb
 - spec/graphql/schema_spec.rb
+- spec/graphql/static_validation/complexity_validator.rb
 - spec/graphql/static_validation/rules/argument_literals_are_compatible_spec.rb
 - spec/graphql/static_validation/rules/arguments_are_defined_spec.rb
 - spec/graphql/static_validation/rules/directives_are_defined_spec.rb
@@ -400,5 +407,6 @@ test_files:
 - spec/support/calculator_schema.rb
 - spec/support/dairy_app.rb
 - spec/support/dairy_data.rb
+- spec/support/minimum_input_object.rb
 - spec/support/star_wars_data.rb
 - spec/support/star_wars_schema.rb

data/lib/graphql/query/base_execution.rb

@@ -1,32 +0,0 @@
-require 'graphql/query/base_execution/value_resolution'
-
-module GraphQL
-  class Query
-    class BaseExecution
-      # This is the only required method for an Execution strategy.
-      # You could create a custom execution strategy and configure your schema to
-      # use that custom strategy instead.
-      #
-      # @param ast_operation [GraphQL::Language::Nodes::OperationDefinition] The operation definition to run
-      # @param root_type [GraphQL::ObjectType] either the query type or the mutation type
-      # @param query_obj [GraphQL::Query] the query object for this execution
-      # @return [Hash] a spec-compliant GraphQL result, as a hash
-      def execute(ast_operation, root_type, query_obj)
-        resolver = operation_resolution.new(ast_operation, root_type, query_obj, self)
-        resolver.result
-      end
-
-      def field_resolution
-        self.class::FieldResolution
-      end
-
-      def operation_resolution
-        self.class::OperationResolution
-      end
-
-      def selection_resolution
-        self.class::SelectionResolution
-      end
-    end
-  end
-end