graphql 0.11.0 → 0.11.1

data/spec/graphql/object_type_spec.rb

@@ -18,18 +18,25 @@ describe GraphQL::ObjectType do
     assert_equal([EdibleInterface, AnimalProductInterface], type.interfaces)
   end
 
-  describe '.fields ' do
+  describe '#get_field ' do
     it 'exposes fields' do
-      field = type.fields["id"]
+      field = type.get_field("id")
       assert_equal(GraphQL::TypeKinds::NON_NULL, field.type.kind)
       assert_equal(GraphQL::TypeKinds::SCALAR, field.type.of_type.kind)
     end
 
     it 'exposes defined field property' do
-      field_without_prop = CheeseType.fields['flavor']
-      field_with_prop = CheeseType.fields['fatContent']
+      field_without_prop = CheeseType.get_field('flavor')
+      field_with_prop = CheeseType.get_field('fatContent')
       assert_equal(field_without_prop.property, nil)
       assert_equal(field_with_prop.property, :fat_content)
     end
+
+    it "looks up from interfaces" do
+      field_from_self = CheeseType.get_field('fatContent')
+      field_from_iface = MilkType.get_field('fatContent')
+      assert_equal(field_from_self.property, :fat_content)
+      assert_equal(field_from_iface.property, nil)
+    end
   end
 end

data/spec/graphql/query/executor_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe GraphQL::Query::Executor do
-  let(:debug) { false }
+  let(:debug) { true }
   let(:operation_name) { nil }
   let(:schema) { DummySchema }
   let(:variables) { {"cheeseId" => 2} }
@@ -221,6 +221,26 @@ describe GraphQL::Query::Executor do
       end
     end
 
+    describe "for required input objects" do
+      let(:variables) { { } }
+      let(:query_string) {%| mutation M($input: ReplaceValuesInput!) { replaceValues(input: $input) } |}
+      it "returns a variable validation error" do
+        expected = {
+          "errors"=>[
+            {
+              "message" => "Variable input of type ReplaceValuesInput! was provided invalid value",
+              "locations" => [{ "line" => 1, "column" => 14 }],
+              "value" => nil,
+              "problems" => [
+                { "path" => [], "explanation" => "Expected value to not be null" }
+              ]
+            }
+          ]
+        }
+        assert_equal(expected, result)
+      end
+    end
+
     describe "for required input object fields" do
       let(:variables) { {"input" => {} } }
       let(:query_string) {%| mutation M($input: ReplaceValuesInput!) { replaceValues(input: $input) } |}
@@ -228,8 +248,12 @@ describe GraphQL::Query::Executor do
         expected = {
           "errors"=>[
             {
-              "message" => "Variable input of type ReplaceValuesInput! was provided invalid value {}",
-              "locations" => [{"line"=>1, "column"=>14}]
+              "message" => "Variable input of type ReplaceValuesInput! was provided invalid value",
+              "locations" => [{ "line" => 1, "column" => 14 }],
+              "value" => {},
+              "problems" => [
+                { "path" => ["values"], "explanation" => "Expected value to not be null" }
+              ]
             }
           ]
         }
@@ -244,8 +268,13 @@ describe GraphQL::Query::Executor do
         expected = {
           "errors"=>[
             {
-              "message" => "Variable input of type [DairyProductInput] was provided invalid value [{\"foo\":\"bar\"}]",
-              "locations" => [{"line"=>1, "column"=>11}]
+              "message" => "Variable input of type [DairyProductInput] was provided invalid value",
+              "locations" => [{ "line" => 1, "column" => 11 }],
+              "value" => [{ "foo" => "bar" }],
+              "problems" => [
+                { "path" => [0, "foo"], "explanation" => "Field is not defined on DairyProductInput" },
+                { "path" => [0, "source"], "explanation" => "Expected value to not be null" }
+              ]
             }
           ]
         }

data/spec/graphql/query_spec.rb

@@ -244,7 +244,17 @@ describe GraphQL::Query do
       let(:query_variables) { {"cheeseId" => "2"} }
 
       it "raises an error" do
-        assert_equal(result["errors"][0]["message"], %{Variable cheeseId of type Int! was provided invalid value "2"})
+        expected = {
+          "errors" => [
+            {
+              "message" => "Variable cheeseId of type Int! was provided invalid value",
+              "locations"=>[{ "line" => 2, "column" => 24 }],
+              "value" => "2",
+              "problems" => [{ "path" => [], "explanation" => 'Could not coerce value "2" to Int' }]
+            }
+          ]
+        }
+        assert_equal(expected, result)
       end
     end
 
@@ -252,8 +262,17 @@ describe GraphQL::Query do
       let(:query_variables) { {} }
 
       it "raises an error" do
-        expected = "Variable cheeseId of type Int! can't be null"
-        assert_equal(result["errors"][0]["message"], expected)
+        expected = {
+          "errors" => [
+            {
+              "message" => "Variable cheeseId of type Int! was provided invalid value",
+              "locations" => [{"line" => 2, "column" => 24}],
+              "value" => nil,
+              "problems" => [{ "path" => [], "explanation" => "Expected value to not be null" }]
+            }
+          ]
+        }
+        assert_equal(expected, result)
       end
     end
 

data/spec/graphql/scalar_type_spec.rb

@@ -21,4 +21,32 @@ describe GraphQL::ScalarType do
   it 'coerces result value for serialization' do
     assert_equal(bignum.to_s, scalar.coerce_result(bignum))
   end
+
+  describe 'validate_input with good input' do
+    let(:result) { GraphQL::INT_TYPE.validate_input(150) }
+
+    it 'returns a valid result' do
+      assert(result.valid?)
+    end
+  end
+
+  describe 'validate_input with bad input' do
+    let(:result) { GraphQL::INT_TYPE.validate_input('bad num') }
+
+    it 'returns an invalid result for bad input' do
+      assert(!result.valid?)
+    end
+
+    it 'has one problem' do
+      assert_equal(result.problems.length, 1)
+    end
+
+    it 'has the correct explanation' do
+      assert(result.problems[0]['explanation'].include?('Could not coerce value'))
+    end
+
+    it 'has an empty path' do
+      assert(result.problems[0]['path'].empty?)
+    end
+  end
 end

data/spec/graphql/schema/type_reducer_spec.rb

@@ -5,10 +5,10 @@ describe GraphQL::Schema::TypeReducer do
     reducer = GraphQL::Schema::TypeReducer.new(CheeseType, {})
     expected = {
       "Cheese" => CheeseType,
-      "Int" => GraphQL::INT_TYPE,
+      "Float" => GraphQL::FLOAT_TYPE,
       "String" => GraphQL::STRING_TYPE,
       "DairyAnimal" => DairyAnimalEnum,
-      "Float" => GraphQL::FLOAT_TYPE,
+      "Int" => GraphQL::INT_TYPE,
       "Edible" => EdibleInterface,
       "Milk" => MilkType,
       "ID" => GraphQL::ID_TYPE,

data/spec/graphql/static_validation/complexity_validator_spec.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/document_does_not_exceed_max_depth_spec.rb

@@ -0,0 +1,93 @@
+require "spec_helper"
+
+describe GraphQL::StaticValidation::DocumentDoesNotExceedMaxDepth do
+  let(:rule) { GraphQL::StaticValidation::DocumentDoesNotExceedMaxDepth }
+  let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [rule]) }
+  let(:errors) { validator.validate(GraphQL.parse(query_string)) }
+
+  let(:query_string) { "
+    {
+      cheese(id: 1) {
+        similarCheese(source: SHEEP) {
+          similarCheese(source: SHEEP) {
+            similarCheese(source: SHEEP) {
+              similarCheese(source: SHEEP) {
+                similarCheese(source: SHEEP) {
+                  id
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  "}
+
+  describe "when the query is deeper than max depth" do
+    it "adds an error message for a too-deep query" do
+      assert_equal 1, errors.length
+    end
+  end
+
+  describe "When the query is not deeper than max_depth" do
+    before do
+      @prev_max_depth = DummySchema.max_depth
+      DummySchema.max_depth = 100
+    end
+
+    after do
+      DummySchema.max_depth = @prev_max_depth
+    end
+
+    it "doesn't add an error" do
+      assert_equal 0, errors.length
+    end
+  end
+
+  describe "when the max depth isn't set" do
+    before do
+      @prev_max_depth = DummySchema.max_depth
+      DummySchema.max_depth = nil
+    end
+
+    after do
+      DummySchema.max_depth = @prev_max_depth
+    end
+
+    it "doesn't add an error message" do
+      assert_equal 0, errors.length
+    end
+  end
+
+  describe "when a fragment exceeds max depth" do
+    let(:query_string) { "
+      {
+        cheese(id: 1) {
+          ...moreFields
+        }
+      }
+
+      fragment moreFields on Cheese {
+        similarCheese(source: SHEEP) {
+          similarCheese(source: SHEEP) {
+            similarCheese(source: SHEEP) {
+              ...evenMoreFields
+            }
+          }
+        }
+      }
+
+      fragment evenMoreFields on Cheese {
+        similarCheese(source: SHEEP) {
+          similarCheese(source: SHEEP) {
+            id
+          }
+        }
+      }
+    "}
+
+    it "adds an error message for a too-deep query" do
+      assert_equal 1, errors.length
+    end
+  end
+end

data/spec/support/dairy_app.rb

@@ -5,7 +5,7 @@ class NoSuchDairyError < StandardError; end
 EdibleInterface = GraphQL::InterfaceType.define do
   name "Edible"
   description "Something you can eat, yum"
-  field :fatContent, !types.Float, "Percentage which is fat", property: :bogus_property
+  field :fatContent, !types.Float, "Percentage which is fat"
   field :origin, !types.String, "Place the edible comes from"
 end
 
@@ -65,7 +65,6 @@ MilkType = GraphQL::ObjectType.define do
   field :id, !types.ID
   field :source, DairyAnimalEnum, "Animal which produced this milk"
   field :origin, !types.String, "Place the milk comes from"
-  field :fatContent, !types.Float, "Percentage which is milkfat"
   field :flavors, types[types.String], "Chocolate, Strawberry, etc" do
     argument :limit, types.Int
     resolve -> (milk, args, ctx) {
@@ -251,5 +250,6 @@ DummySchema = GraphQL::Schema.new(
   query: QueryType,
   mutation: MutationType,
   subscription: SubscriptionType,
+  max_depth: 5,
 )
 DummySchema.rescue_from(NoSuchDairyError) { |err| err.message  }

data/spec/support/minimum_input_object.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
+date: 2016-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -212,6 +212,7 @@ files:
 - lib/graphql/query/context.rb
 - lib/graphql/query/directive_chain.rb
 - lib/graphql/query/executor.rb
+- lib/graphql/query/input_validation_result.rb
 - lib/graphql/query/literal_input.rb
 - lib/graphql/query/serial_execution.rb
 - lib/graphql/query/serial_execution/execution_context.rb
@@ -220,6 +221,7 @@ files:
 - 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/variable_validation_error.rb
 - lib/graphql/query/variables.rb
 - lib/graphql/repl.rb
 - lib/graphql/scalar_type.rb
@@ -243,6 +245,7 @@ files:
 - lib/graphql/static_validation/rules/argument_literals_are_compatible.rb
 - lib/graphql/static_validation/rules/arguments_are_defined.rb
 - lib/graphql/static_validation/rules/directives_are_defined.rb
+- lib/graphql/static_validation/rules/document_does_not_exceed_max_depth.rb
 - lib/graphql/static_validation/rules/fields_are_defined_on_type.rb
 - lib/graphql/static_validation/rules/fields_have_appropriate_selections.rb
 - lib/graphql/static_validation/rules/fields_will_merge.rb
@@ -257,6 +260,7 @@ files:
 - lib/graphql/static_validation/rules/variables_are_input_types.rb
 - lib/graphql/static_validation/rules/variables_are_used_and_defined.rb
 - lib/graphql/static_validation/type_stack.rb
+- lib/graphql/static_validation/validation_context.rb
 - lib/graphql/static_validation/validator.rb
 - lib/graphql/string_type.rb
 - lib/graphql/type_kinds.rb
@@ -297,10 +301,11 @@ 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/complexity_validator_spec.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
+- spec/graphql/static_validation/rules/document_does_not_exceed_max_depth_spec.rb
 - spec/graphql/static_validation/rules/fields_are_defined_on_type_spec.rb
 - spec/graphql/static_validation/rules/fields_have_appropriate_selections_spec.rb
 - spec/graphql/static_validation/rules/fields_will_merge_spec.rb
@@ -383,10 +388,11 @@ 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/complexity_validator_spec.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
+- spec/graphql/static_validation/rules/document_does_not_exceed_max_depth_spec.rb
 - spec/graphql/static_validation/rules/fields_are_defined_on_type_spec.rb
 - spec/graphql/static_validation/rules/fields_have_appropriate_selections_spec.rb
 - spec/graphql/static_validation/rules/fields_will_merge_spec.rb

data/spec/graphql/static_validation/complexity_validator.rb

@@ -1,15 +0,0 @@
-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