graphql 0.13.0 → 0.14.0

data/spec/graphql/schema/type_expression_spec.rb

@@ -6,20 +6,20 @@ describe GraphQL::Schema::TypeExpression do
     document = GraphQL.parse("query dostuff($var: #{type_name}) { id } ")
     document.definitions.first.variables.first.type
   }
-  let(:type_expression) { GraphQL::Schema::TypeExpression.new(schema, ast_node) }
+  let(:type_expression_result) { GraphQL::Schema::TypeExpression.build_type(schema, ast_node) }
 
   describe "#type" do
     describe "simple types" do
       let(:type_name) { "DairyProductInput" }
       it "it gets types from the schema" do
-        assert_equal(DairyProductInputType, type_expression.type)
+        assert_equal(DairyProductInputType, type_expression_result)
       end
     end
 
     describe "non-null types" do
       let(:type_name) { "String!"}
       it "makes non-null types" do
-        assert_equal(GraphQL::STRING_TYPE.to_non_null_type, type_expression.type)
+        assert_equal(GraphQL::STRING_TYPE.to_non_null_type,type_expression_result)
       end
     end
 
@@ -31,7 +31,7 @@ describe GraphQL::Schema::TypeExpression do
           .to_non_null_type
           .to_list_type
           .to_non_null_type
-        assert_equal(expected, type_expression.type)
+        assert_equal(expected, type_expression_result)
       end
     end
   end

data/spec/graphql/schema/validation_spec.rb

@@ -0,0 +1,219 @@
+require "spec_helper"
+
+describe GraphQL::Schema::Validation do
+  def assert_error_includes(object, error_substring)
+    validation_error = GraphQL::Schema::Validation.validate(object)
+    assert_includes validation_error, error_substring
+  end
+
+  describe "validating Fields" do
+    let(:unnamed_field) {
+      GraphQL::Field.define do
+        type GraphQL::STRING_TYPE
+      end
+    }
+
+    let(:untyped_field) {
+      GraphQL::Field.define do
+        name "Untyped"
+        type :something_invalid
+      end
+    }
+
+    let(:bad_arguments_field) {
+      field = GraphQL::Field.define do
+        name "BadArgs"
+        type !GraphQL::BOOLEAN_TYPE
+      end
+      field.arguments[:bad_key] = :bad_value
+      field
+    }
+
+    let(:invalid_argument_member_field) {
+      GraphQL::Field.define do
+        name "InvalidArgument"
+        type !types[!GraphQL::INT_TYPE]
+        argument :invalid do
+          type GraphQL::STRING_TYPE
+          default_value [1,2,3]
+        end
+      end
+    }
+
+    it "requires a String for name" do
+      assert_error_includes unnamed_field, "must return String, not NilClass"
+    end
+
+    it "requires a BaseType for type" do
+      assert_error_includes untyped_field, "must return GraphQL::BaseType, not Symbol"
+    end
+
+    it "requires String => Argument arguments" do
+      assert_error_includes bad_arguments_field, "must map String => GraphQL::Argument, not Symbol => Symbol"
+    end
+
+    it "applies validation to its member Arguments" do
+      assert_error_includes invalid_argument_member_field, "default value [1, 2, 3] is not valid for type String"
+    end
+  end
+
+  describe "validating BaseType" do
+    let(:unnamed_type) {
+      GraphQL::BaseType.define do
+        name :invalid_name
+      end
+    }
+
+    let(:wrongly_described_type) {
+      GraphQL::BaseType.define do
+        name "WronglyDescribed"
+        description 12345
+      end
+    }
+    it "requires a String name" do
+      assert_error_includes unnamed_type, "must return String, not Symbol"
+    end
+
+    it "requires String-or-nil description" do
+      assert_error_includes wrongly_described_type, "must return String or NilClass, not Fixnum"
+    end
+  end
+
+  describe "validating ObjectTypes" do
+    let(:invalid_interfaces_object) {
+      GraphQL::ObjectType.define do
+        name "InvalidInterfaces"
+        interfaces({a: 1})
+      end
+    }
+    let(:invalid_interface_member_object) {
+      GraphQL::ObjectType.define do
+        name "InvalidInterfaceMember"
+        interfaces [:not_an_interface]
+      end
+    }
+
+    let(:invalid_field_object) {
+      GraphQL::ObjectType.define do
+        name "InvalidField"
+        field :invalid, :nonsense
+      end
+    }
+
+    it "requires an Array for interfaces" do
+      assert_error_includes invalid_interfaces_object, "must be an Array of GraphQL::InterfaceType, not a Hash"
+      assert_error_includes invalid_interface_member_object, "must contain GraphQL::InterfaceType, not Symbol"
+    end
+
+    it "validates the fields" do
+      assert_error_includes invalid_field_object, "must return GraphQL::BaseType, not Symbol"
+    end
+  end
+
+  describe "validating UnionTypes" do
+    let(:non_array_union) {
+      GraphQL::UnionType.define do
+        name "NonArray"
+        possible_types 55
+      end
+    }
+
+    let(:non_object_type_union) {
+      GraphQL::UnionType.define do
+        name "NonObjectTypes"
+        possible_types [
+          GraphQL::InterfaceType.new
+        ]
+      end
+    }
+
+    let(:no_possible_types_union) {
+      GraphQL::UnionType.define do
+        name "NoPossibleTypes"
+        possible_types []
+      end
+    }
+
+    it "requires an array of ObjectTypes for possible_types" do
+      assert_error_includes non_array_union, "must be an Array of GraphQL::ObjectType, not a Fixnum"
+
+      assert_error_includes non_object_type_union, "must contain GraphQL::ObjectType, not GraphQL::InterfaceType"
+    end
+
+    it "requires at least one possible_types" do
+      assert_error_includes no_possible_types_union, "must have at least one possible type"
+    end
+  end
+
+  describe "validating InputObjectTypes" do
+    let(:invalid_arguments_input) {
+      input = GraphQL::InputObjectType.define do
+        name "InvalidArgumentsHash"
+      end
+      input.arguments[123] = :nonsense
+      input
+    }
+
+    let(:invalid_argument_member_input) {
+      GraphQL::InputObjectType.define do
+        name "InvalidArgumentMember"
+        argument :nonsense do
+          type GraphQL::FLOAT_TYPE
+          default_value "xyz"
+        end
+      end
+    }
+
+    it "requires {String => Argument} arguments" do
+      assert_error_includes invalid_arguments_input, "map String => GraphQL::Argument, not Fixnum => Symbol"
+    end
+
+    it "applies validation to its member Arguments" do
+      assert_error_includes invalid_argument_member_input, "default value \"xyz\" is not valid for type Float"
+    end
+  end
+
+  describe "validating InterfaceTypes" do
+    let(:invalid_field_interface) {
+      GraphQL::InterfaceType.define do
+        name "InvalidField"
+        field :invalid do
+          type GraphQL::BOOLEAN_TYPE
+          argument :invalid do
+            type GraphQL::STRING_TYPE
+            default_value 4.56
+          end
+        end
+      end
+    }
+
+    it "validates fields" do
+      assert_error_includes invalid_field_interface, "default value 4.56 is not valid for type String"
+    end
+  end
+
+  describe "validating Arguments" do
+    let(:untyped_argument) {
+      GraphQL::Argument.define do
+        name "Untyped"
+        type :Bogus
+      end
+    }
+
+    let(:invalid_default_argument) {
+      GraphQL::Argument.define do
+        name "InvalidDefault"
+        type GraphQL::INT_TYPE
+        default_value "abc"
+      end
+    }
+
+    it "requires the type is a Base type" do
+      assert_error_includes untyped_argument, "must be a valid input type (Scalar or InputObject), not Symbol"
+    end
+
+    it "requires the default value is compatible" do
+      assert_error_includes invalid_default_argument, 'default value "abc" is not valid for type Int'
+    end
+  end
+end

data/spec/support/dairy_app.rb

@@ -200,6 +200,9 @@ FavoriteFieldDefn = Proc.new {
 QueryType = GraphQL::ObjectType.define do
   name "Query"
   description "Query root of the system"
+  field :root, types.String do
+    resolve ->(root_value, args, c) { root_value }
+  end
   field :cheese, field: FetchField.create(type: CheeseType, data: CHEESES)
   field :milk, field: FetchField.create(type: MilkType, data: MILKS, id_type: !types.ID)
   field :dairy, field: SingletonField.create(type: DairyType, data: DAIRY)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -233,6 +233,7 @@ files:
 - lib/graphql/introspection/typename_field.rb
 - lib/graphql/invalid_null_error.rb
 - lib/graphql/language.rb
+- lib/graphql/language/generation.rb
 - lib/graphql/language/lexer.rb
 - lib/graphql/language/lexer.rl
 - lib/graphql/language/nodes.rb
@@ -261,17 +262,15 @@ files:
 - lib/graphql/query/variables.rb
 - lib/graphql/scalar_type.rb
 - lib/graphql/schema.rb
-- lib/graphql/schema/each_item_validator.rb
-- lib/graphql/schema/field_validator.rb
-- lib/graphql/schema/implementation_validator.rb
+- lib/graphql/schema/invalid_type_error.rb
 - lib/graphql/schema/middleware_chain.rb
 - lib/graphql/schema/possible_types.rb
 - lib/graphql/schema/printer.rb
+- lib/graphql/schema/reduce_types.rb
 - lib/graphql/schema/rescue_middleware.rb
 - lib/graphql/schema/type_expression.rb
 - lib/graphql/schema/type_map.rb
-- lib/graphql/schema/type_reducer.rb
-- lib/graphql/schema/type_validator.rb
+- lib/graphql/schema/validation.rb
 - lib/graphql/static_validation.rb
 - lib/graphql/static_validation/all_rules.rb
 - lib/graphql/static_validation/arguments_validator.rb
@@ -303,6 +302,7 @@ files:
 - lib/graphql/union_type.rb
 - lib/graphql/version.rb
 - readme.md
+- spec/graphql/argument_spec.rb
 - spec/graphql/base_type_spec.rb
 - spec/graphql/boolean_type_spec.rb
 - spec/graphql/define/instance_definable_spec.rb
@@ -320,6 +320,7 @@ files:
 - spec/graphql/introspection/introspection_query_spec.rb
 - spec/graphql/introspection/schema_type_spec.rb
 - spec/graphql/introspection/type_type_spec.rb
+- spec/graphql/language/generation_spec.rb
 - spec/graphql/language/parser_spec.rb
 - spec/graphql/language/visitor_spec.rb
 - spec/graphql/list_type_spec.rb
@@ -333,13 +334,12 @@ files:
 - spec/graphql/query/variables_spec.rb
 - spec/graphql/query_spec.rb
 - spec/graphql/scalar_type_spec.rb
-- spec/graphql/schema/field_validator_spec.rb
 - spec/graphql/schema/middleware_chain_spec.rb
 - spec/graphql/schema/printer_spec.rb
+- spec/graphql/schema/reduce_types_spec.rb
 - spec/graphql/schema/rescue_middleware_spec.rb
 - spec/graphql/schema/type_expression_spec.rb
-- spec/graphql/schema/type_reducer_spec.rb
-- spec/graphql/schema/type_validator_spec.rb
+- spec/graphql/schema/validation_spec.rb
 - spec/graphql/schema_spec.rb
 - spec/graphql/static_validation/rules/argument_literals_are_compatible_spec.rb
 - spec/graphql/static_validation/rules/arguments_are_defined_spec.rb
@@ -394,6 +394,7 @@ signing_key:
 specification_version: 4
 summary: A GraphQL server implementation for Ruby
 test_files:
+- spec/graphql/argument_spec.rb
 - spec/graphql/base_type_spec.rb
 - spec/graphql/boolean_type_spec.rb
 - spec/graphql/define/instance_definable_spec.rb
@@ -411,6 +412,7 @@ test_files:
 - spec/graphql/introspection/introspection_query_spec.rb
 - spec/graphql/introspection/schema_type_spec.rb
 - spec/graphql/introspection/type_type_spec.rb
+- spec/graphql/language/generation_spec.rb
 - spec/graphql/language/parser_spec.rb
 - spec/graphql/language/visitor_spec.rb
 - spec/graphql/list_type_spec.rb
@@ -424,13 +426,12 @@ test_files:
 - spec/graphql/query/variables_spec.rb
 - spec/graphql/query_spec.rb
 - spec/graphql/scalar_type_spec.rb
-- spec/graphql/schema/field_validator_spec.rb
 - spec/graphql/schema/middleware_chain_spec.rb
 - spec/graphql/schema/printer_spec.rb
+- spec/graphql/schema/reduce_types_spec.rb
 - spec/graphql/schema/rescue_middleware_spec.rb
 - spec/graphql/schema/type_expression_spec.rb
-- spec/graphql/schema/type_reducer_spec.rb
-- spec/graphql/schema/type_validator_spec.rb
+- spec/graphql/schema/validation_spec.rb
 - spec/graphql/schema_spec.rb
 - spec/graphql/static_validation/rules/argument_literals_are_compatible_spec.rb
 - spec/graphql/static_validation/rules/arguments_are_defined_spec.rb

data/lib/graphql/schema/each_item_validator.rb

@@ -1,21 +0,0 @@
-module GraphQL
-  class Schema
-    class EachItemValidator
-      def initialize(errors)
-        @errors = errors
-      end
-
-      def validate(items, as:, must_be:)
-        if !items.is_a?(Array)
-          @errors << "#{as} must be an Array, not #{items.inspect}"
-          return
-        else
-          invalid_items = items.select {|k| !yield(k) }
-          if invalid_items.any?
-            @errors << "#{as} must be #{must_be}, but some aren't: #{invalid_items.map(&:to_s).join(", ")}"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/graphql/schema/field_validator.rb

@@ -1,17 +0,0 @@
-module GraphQL
-  class Schema
-    class FieldValidator
-      def validate(field, errors)
-        implementation = GraphQL::Schema::ImplementationValidator.new(field, as: "Field", errors: errors)
-        implementation.must_respond_to(:name)
-        implementation.must_respond_to(:type)
-        implementation.must_respond_to(:description)
-        implementation.must_respond_to(:arguments) do |arguments|
-          validator = GraphQL::Schema::EachItemValidator.new(errors)
-          validator.validate(arguments.keys, as: "#{field.name}.arguments keys", must_be: "Strings") { |k| k.is_a?(String) }
-        end
-        implementation.must_respond_to(:deprecation_reason)
-      end
-    end
-  end
-end

data/lib/graphql/schema/implementation_validator.rb

@@ -1,31 +0,0 @@
-module GraphQL
-  class Schema
-    # A helper to ensure `object` implements the concept `as`
-    class ImplementationValidator
-      attr_reader :object, :errors, :implementation_as
-      def initialize(object, as:, errors:)
-        @object = object
-        @implementation_as = as
-        @errors = errors
-      end
-
-      # Ensure the object responds to `method_name`.
-      # If `block_given?`, yield the return value of that method
-      # If provided, use `as` in the error message, overriding class-level `as`.
-      def must_respond_to(method_name, args: [], as: nil)
-        local_as = as || implementation_as
-        method_signature = "##{method_name}(#{args.join(", ")})"
-        if !object.respond_to?(method_name)
-          errors << "#{object.to_s} must respond to #{method_signature} to be a #{local_as}"
-        elsif block_given?
-          return_value = object.public_send(method_name)
-          if return_value.nil?
-            errors << "#{object.to_s} must return a value for #{method_signature} to be a #{local_as}"
-          else
-            yield(return_value)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/graphql/schema/type_reducer.rb

@@ -1,79 +0,0 @@
-module GraphQL
-  class Schema
-    # Starting from a given type, discover other types in the system by
-    # traversing that type's fields, possible_types, etc
-    class TypeReducer
-      attr_reader :type, :existing_type_hash
-
-      def initialize(type, existing_type_hash)
-        validate_type(type)
-        if type.respond_to?(:name) && existing_type_hash.fetch(type.name, nil).equal?(type)
-          @result = existing_type_hash
-        else
-          @type = type
-        end
-        @existing_type_hash = existing_type_hash
-      end
-
-      def result
-        @result ||= find_types(type, existing_type_hash)
-      end
-
-      # Reduce all of `types` and return the combined result
-      def self.find_all(types)
-        type_map = GraphQL::Schema::TypeMap.new
-        types.reduce(type_map) do |memo, type|
-          self.new(type, memo).result
-        end
-      end
-
-      private
-
-      def find_types(type, type_hash)
-        type_hash[type.name] = type
-        if type.kind.fields?
-          type.all_fields.each do |field|
-            reduce_type(field.type, type_hash, "Field #{type.name}.#{field.name}")
-            field.arguments.each do |name, argument|
-              reduce_type(argument.type, type_hash, "Argument #{name} on #{type.name}.#{field.name}")
-            end
-          end
-        end
-        if type.kind.object?
-          type.interfaces.each do |interface|
-            reduce_type(interface, type_hash, "Interface on #{type.name}")
-          end
-        end
-        if type.kind.union?
-          type.possible_types.each do |possible_type|
-            reduce_type(possible_type, type_hash, "Possible type for #{type.name}")
-          end
-        end
-        if type.kind.input_object?
-          type.input_fields.each do |name, input_field|
-            reduce_type(input_field.type, type_hash, "Input field #{type.name}.#{name}")
-          end
-        end
-
-        type_hash
-      end
-
-      def reduce_type(type, type_hash, name = nil)
-        if type.is_a?(GraphQL::BaseType)
-          self.class.new(type.unwrap, type_hash).result
-        else
-          raise GraphQL::Schema::InvalidTypeError.new(type, name)
-        end
-      end
-
-      def validate_type(type)
-        errors = []
-        type_validator = GraphQL::Schema::TypeValidator.new
-        type_validator.validate(type, errors)
-        if errors.any?
-          raise GraphQL::Schema::InvalidTypeError.new(type, errors)
-        end
-      end
-    end
-  end
-end