graphql 0.15.3 → 0.16.0

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

@@ -19,7 +19,7 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::ArgumentLiteralsAreCompatible]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   it "finds undefined or missing-required arguments to fields and directives" do
     assert_equal(6, errors.length)

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

@@ -16,7 +16,7 @@ describe GraphQL::StaticValidation::ArgumentsAreDefined do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::ArgumentsAreDefined]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   it "finds undefined arguments to fields and directives" do
     assert_equal(4, errors.length)

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

@@ -15,7 +15,7 @@ describe GraphQL::StaticValidation::DirectivesAreDefined do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::DirectivesAreDefined]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   describe "non-existent directives" do
     it "makes errors for them" do

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

@@ -19,7 +19,7 @@ describe GraphQL::StaticValidation::DirectivesAreInValidLocations do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::DirectivesAreInValidLocations]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   describe "invalid directive locations" do
     it "makes errors for them" do

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

@@ -13,7 +13,7 @@ describe GraphQL::StaticValidation::FieldsAreDefinedOnType do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::FieldsAreDefinedOnType]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
   let(:error_messages) { errors.map { |e| e["message"] } }
 
   it "finds fields that are requested on types that don't have that field" do

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

@@ -11,7 +11,7 @@ describe GraphQL::StaticValidation::FieldsHaveAppropriateSelections do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::FieldsHaveAppropriateSelections]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   it "adds errors for selections on scalars" do
     assert_equal(2, errors.length)

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

@@ -31,7 +31,7 @@ describe GraphQL::StaticValidation::FieldsWillMerge do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::FieldsWillMerge]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
   let(:error_messages) { errors.map { |e| e["message" ] }}
 
   it "finds field naming conflicts" do

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

@@ -24,7 +24,7 @@ describe GraphQL::StaticValidation::FragmentSpreadsArePossible do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::FragmentSpreadsArePossible]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   it "doesnt allow spreads where they'll never apply" do
     # TODO: more negative, abstract examples here, add stuff to the schema

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

@@ -21,7 +21,7 @@ describe GraphQL::StaticValidation::FragmentTypesExist do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::FragmentTypesExist]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   it "finds non-existent types on fragments" do
     assert_equal(2, errors.length)

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

@@ -26,7 +26,7 @@ describe GraphQL::StaticValidation::FragmentsAreFinite do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::FragmentsAreFinite]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   it "doesnt allow infinite loops" do
     expected = [

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

@@ -27,7 +27,7 @@ describe GraphQL::StaticValidation::FragmentsAreOnCompositeTypes do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::FragmentsAreOnCompositeTypes]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   it "requires Object/Union/Interface fragment types" do
     expected = [

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

@@ -13,7 +13,7 @@ describe GraphQL::StaticValidation::FragmentsAreUsed do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::FragmentsAreUsed]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   it "adds errors for unused fragment definitions" do
     assert_includes(errors, {"message"=>"Fragment unusedFields was defined, but not used", "locations"=>[{"line"=>8, "column"=>5}]})

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

@@ -16,7 +16,7 @@ describe GraphQL::StaticValidation::RequiredArgumentsArePresent do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::RequiredArgumentsArePresent]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   it "finds undefined arguments to fields and directives" do
     assert_equal(3, errors.length)

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

@@ -18,7 +18,7 @@ describe GraphQL::StaticValidation::VariableDefaultValuesAreCorrectlyTyped do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::VariableDefaultValuesAreCorrectlyTyped]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   it "finds default values that don't match their types" do
     expected = [

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

@@ -36,7 +36,7 @@ describe GraphQL::StaticValidation::VariableUsagesAreAllowed do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::VariableUsagesAreAllowed]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   it "finds variables used as arguments but don't match the argument's type" do
     assert_equal(4, errors.length)

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

@@ -15,7 +15,7 @@ describe GraphQL::StaticValidation::VariablesAreInputTypes do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::VariablesAreInputTypes]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   it "finds variables whose types are invalid" do
     expected = [

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

@@ -31,7 +31,7 @@ describe GraphQL::StaticValidation::VariablesAreUsedAndDefined do
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::VariablesAreUsedAndDefined]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
   it "finds variables which are used-but-not-defined or defined-but-not-used" do
     expected = [

data/spec/graphql/static_validation/validator_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe GraphQL::StaticValidation::Validator do
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
-  let(:errors) { validator.validate(query) }
+  let(:errors) { validator.validate(query)[:errors] }
 
 
   describe "validation order" do

data/spec/support/dairy_app.rb

@@ -83,11 +83,17 @@ MilkType = GraphQL::ObjectType.define do
   end
 end
 
+SweetenerInterface = GraphQL::InterfaceType.define do
+  name "Sweetener"
+  field :sweetness, types.Int
+end
+
 # No actual data; This type is an "orphan", only accessible through Interfaces
 HoneyType = GraphQL::ObjectType.define do
   name "Honey"
   description "Sweet, dehydrated bee barf"
-  interfaces [EdibleInterface, AnimalProductInterface]
+  field :flowerType, types.String, "What flower this honey came from"
+  interfaces [EdibleInterface, AnimalProductInterface, SweetenerInterface]
 end
 
 DairyType = GraphQL::ObjectType.define do
@@ -150,6 +156,17 @@ DairyProductInputType = GraphQL::InputObjectType.define {
   input_field :organic, types.Boolean, default_value: false
 }
 
+DeepNonNullType = GraphQL::ObjectType.define do
+  name "DeepNonNull"
+  field :nonNullInt, !types.Int do
+    argument :returning, types.Int
+    resolve -> (obj, args, ctx) { args[:returning] }
+  end
+
+  field :deepNonNull, -> { DeepNonNullType.to_non_null_type } do
+    resolve -> (obj, args, ctx) { :deepNonNull }
+  end
+end
 
 class FetchField
   def self.create(type:, data:, id_type: !GraphQL::INT_TYPE)
@@ -239,6 +256,10 @@ QueryType = GraphQL::ObjectType.define do
   field :maybeNull, MaybeNullType do
     resolve -> (t, a, c) { OpenStruct.new(cheese: nil) }
   end
+
+  field :deepNonNull, !DeepNonNullType do
+    resolve -> (o, a, c) { :deepNonNull }
+  end
 end
 
 GLOBAL_VALUES = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.16.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -188,6 +188,13 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - lib/graphql.rb
+- lib/graphql/analysis.rb
+- lib/graphql/analysis/analyze_query.rb
+- lib/graphql/analysis/max_query_complexity.rb
+- lib/graphql/analysis/max_query_depth.rb
+- lib/graphql/analysis/query_complexity.rb
+- lib/graphql/analysis/query_depth.rb
+- lib/graphql/analysis_error.rb
 - lib/graphql/argument.rb
 - lib/graphql/base_type.rb
 - lib/graphql/boolean_type.rb
@@ -211,6 +218,9 @@ files:
 - lib/graphql/input_object_type.rb
 - lib/graphql/int_type.rb
 - lib/graphql/interface_type.rb
+- lib/graphql/internal_representation.rb
+- lib/graphql/internal_representation/node.rb
+- lib/graphql/internal_representation/rewrite.rb
 - lib/graphql/introspection.rb
 - lib/graphql/introspection/arguments_field.rb
 - lib/graphql/introspection/directive_location_enum.rb
@@ -269,6 +279,7 @@ files:
 - lib/graphql/schema/printer.rb
 - lib/graphql/schema/reduce_types.rb
 - lib/graphql/schema/rescue_middleware.rb
+- lib/graphql/schema/timeout_middleware.rb
 - lib/graphql/schema/type_expression.rb
 - lib/graphql/schema/type_map.rb
 - lib/graphql/schema/validation.rb
@@ -281,7 +292,6 @@ files:
 - lib/graphql/static_validation/rules/arguments_are_defined.rb
 - lib/graphql/static_validation/rules/directives_are_defined.rb
 - lib/graphql/static_validation/rules/directives_are_in_valid_locations.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
@@ -303,6 +313,11 @@ files:
 - lib/graphql/union_type.rb
 - lib/graphql/version.rb
 - readme.md
+- spec/graphql/analysis/analyze_query_spec.rb
+- spec/graphql/analysis/max_query_complexity_spec.rb
+- spec/graphql/analysis/max_query_depth_spec.rb
+- spec/graphql/analysis/query_complexity_spec.rb
+- spec/graphql/analysis/query_depth_spec.rb
 - spec/graphql/argument_spec.rb
 - spec/graphql/base_type_spec.rb
 - spec/graphql/boolean_type_spec.rb
@@ -316,6 +331,7 @@ files:
 - spec/graphql/input_object_type_spec.rb
 - spec/graphql/int_type_spec.rb
 - spec/graphql/interface_type_spec.rb
+- spec/graphql/internal_representation/rewrite_spec.rb
 - spec/graphql/introspection/directive_type_spec.rb
 - spec/graphql/introspection/input_value_type_spec.rb
 - spec/graphql/introspection/introspection_query_spec.rb
@@ -325,6 +341,7 @@ files:
 - spec/graphql/language/parser_spec.rb
 - spec/graphql/language/visitor_spec.rb
 - spec/graphql/list_type_spec.rb
+- spec/graphql/non_null_type_spec.rb
 - spec/graphql/object_type_spec.rb
 - spec/graphql/query/arguments_spec.rb
 - spec/graphql/query/context_spec.rb
@@ -340,6 +357,7 @@ files:
 - spec/graphql/schema/printer_spec.rb
 - spec/graphql/schema/reduce_types_spec.rb
 - spec/graphql/schema/rescue_middleware_spec.rb
+- spec/graphql/schema/timeout_middleware_spec.rb
 - spec/graphql/schema/type_expression_spec.rb
 - spec/graphql/schema/validation_spec.rb
 - spec/graphql/schema_spec.rb
@@ -347,7 +365,6 @@ files:
 - 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/directives_are_in_valid_locations_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
@@ -396,6 +413,11 @@ signing_key:
 specification_version: 4
 summary: A GraphQL server implementation for Ruby
 test_files:
+- spec/graphql/analysis/analyze_query_spec.rb
+- spec/graphql/analysis/max_query_complexity_spec.rb
+- spec/graphql/analysis/max_query_depth_spec.rb
+- spec/graphql/analysis/query_complexity_spec.rb
+- spec/graphql/analysis/query_depth_spec.rb
 - spec/graphql/argument_spec.rb
 - spec/graphql/base_type_spec.rb
 - spec/graphql/boolean_type_spec.rb
@@ -409,6 +431,7 @@ test_files:
 - spec/graphql/input_object_type_spec.rb
 - spec/graphql/int_type_spec.rb
 - spec/graphql/interface_type_spec.rb
+- spec/graphql/internal_representation/rewrite_spec.rb
 - spec/graphql/introspection/directive_type_spec.rb
 - spec/graphql/introspection/input_value_type_spec.rb
 - spec/graphql/introspection/introspection_query_spec.rb
@@ -418,6 +441,7 @@ test_files:
 - spec/graphql/language/parser_spec.rb
 - spec/graphql/language/visitor_spec.rb
 - spec/graphql/list_type_spec.rb
+- spec/graphql/non_null_type_spec.rb
 - spec/graphql/object_type_spec.rb
 - spec/graphql/query/arguments_spec.rb
 - spec/graphql/query/context_spec.rb
@@ -433,6 +457,7 @@ test_files:
 - spec/graphql/schema/printer_spec.rb
 - spec/graphql/schema/reduce_types_spec.rb
 - spec/graphql/schema/rescue_middleware_spec.rb
+- spec/graphql/schema/timeout_middleware_spec.rb
 - spec/graphql/schema/type_expression_spec.rb
 - spec/graphql/schema/validation_spec.rb
 - spec/graphql/schema_spec.rb
@@ -440,7 +465,6 @@ test_files:
 - 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/directives_are_in_valid_locations_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/lib/graphql/static_validation/rules/document_does_not_exceed_max_depth.rb

@@ -1,79 +0,0 @@
-module GraphQL
-  module StaticValidation
-    class DocumentDoesNotExceedMaxDepth
-      include GraphQL::StaticValidation::Message::MessageHelper
-
-      def validate(context)
-        max_allowed_depth = context.query.max_depth
-        return if max_allowed_depth.nil?
-
-        visitor = context.visitor
-
-        # operation or fragment name
-        current_field_scope = nil
-        current_depth = 0
-        skip_current_scope = false
-
-        # {name => depth} pairs for operations and fragments
-        depths = Hash.new { |h, k| h[k] = 0 }
-
-        # {name => [fragmentName...]} pairs
-        fragments = Hash.new { |h, k| h[k] = []}
-
-        visitor[GraphQL::Language::Nodes::Document].leave << -> (node, parent) {
-          context.errors.none? && assert_under_max_depth(context, max_allowed_depth, depths, fragments)
-        }
-
-        visitor[GraphQL::Language::Nodes::OperationDefinition] << -> (node, parent) {
-          current_field_scope = node.name
-        }
-
-        visitor[GraphQL::Language::Nodes::FragmentDefinition] << -> (node, parent) {
-          current_field_scope = node.name
-        }
-
-        visitor[GraphQL::Language::Nodes::Field] << -> (node, parent) {
-          # Don't validate queries on __schema, __type
-          skip_current_scope ||= context.skip_field?(node.name)
-
-          if node.selections.any? && !skip_current_scope
-            current_depth += 1
-            if current_depth > depths[current_field_scope]
-              depths[current_field_scope] = current_depth
-            end
-          end
-        }
-
-        visitor[GraphQL::Language::Nodes::Field].leave << -> (node, parent) {
-          if skip_current_scope && context.skip_field?(node.name)
-            skip_current_scope = false
-          elsif node.selections.any?
-            current_depth -= 1
-          end
-        }
-
-        visitor [GraphQL::Language::Nodes::FragmentSpread] << -> (node, parent) {
-          fragments[current_field_scope] << node.name
-        }
-      end
-
-      private
-
-      def assert_under_max_depth(context, max_allowed_depth, depths, fragments)
-        context.operations.each do |op_name, operation|
-          op_depth = get_total_depth(op_name, depths, fragments)
-          if op_depth > max_allowed_depth
-            op_name ||= "operation"
-            context.errors << message("#{op_name} has depth of #{op_depth}, which exceeds max depth of #{max_allowed_depth}", operation)
-          end
-        end
-      end
-
-      # Get the total depth of a given fragment or operation
-      def get_total_depth(scope_name, depths, fragments)
-        own_fragments = fragments[scope_name]
-        depths[scope_name] + own_fragments.reduce(0) { |memo, frag_name| memo + get_total_depth(frag_name, depths, fragments) }
-      end
-    end
-  end
-end