graphql 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cd9ee8f70346b2d0419202f3997fd562149ab8f
-  data.tar.gz: a0faf5a06c605e3d44cd23b65e0e6b8cd8fc04a6
+  metadata.gz: dd3e3f13402965d47c58fd6a3bc5f4252a208417
+  data.tar.gz: 2b0d0396fdf6fbed1b234cefb21dfb50578b2b49
 SHA512:
-  metadata.gz: ac440bd4b73f1f5c3c9de705928bfb90f4498ad0d614c856c3d9ad74fcead1b1881b663176dd368b48cbe7b651dddc1e32258799d4c334ea9347b8c550ce69f9
-  data.tar.gz: 3e573c20b9ab0ba44fdbd1a2e73a373b4d5c6e822ee5c4ebfc21c08849ea4ac5c37ac5933ca9e5c8128f0415a908b2c30868d4b7830d4e67f8008ff70c4434d9
+  metadata.gz: 221f5b736dbdd2c43cb45b1000b5d843b2a4101d63733a6200b79cc87889c3c0619830bf26e8fba1fa0e980875cb4061246642b2c8cdf45e2f9a6c7bf916d52a
+  data.tar.gz: f67031ea6cb082c2b0906108fb8e772cb4f5464470c0bf0ca449d52b8eb1a21e6e2a8b6040633c99129fc82c7cda8850b30007ea7a137ffb12977b6127e66c37

data/lib/graphql/base_type.rb

@@ -77,8 +77,12 @@ module GraphQL
     alias :inspect :to_s
 
     def valid_input?(value)
-      return true if value.nil?
-      valid_non_null_input?(value)
+      validate_input(value).valid?
+    end
+
+    def validate_input(value)
+      return GraphQL::Query::InputValidationResult.new if value.nil?
+      validate_non_null_input(value)
     end
 
     def coerce_input(value)

data/lib/graphql/definition_helpers.rb

@@ -1,8 +1,3 @@
-module GraphQL
-  module DefinitionHelpers
-  end
-end
-
 require 'graphql/definition_helpers/non_null_with_bang'
 require 'graphql/definition_helpers/defined_by_config'
 require 'graphql/definition_helpers/string_named_hash'

data/lib/graphql/definition_helpers/defined_by_config.rb

@@ -1,119 +1,123 @@
-# Provide a two-step definition process.
-#
-# 1. Use a config object to gather definitions
-# 2. Transfer definitions to an actual instance of an object
-#
-module GraphQL::DefinitionHelpers::DefinedByConfig
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
+module GraphQL
+  module DefinitionHelpers
+    # Provide a two-step definition process.
+    #
+    # 1. Use a config object to gather definitions
+    # 2. Transfer definitions to an actual instance of an object
+    #
+    module DefinedByConfig
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
 
-  # This object is `instance_eval`'d  when defining _any_ object in the schema.
-  # Then, the applicable properties of this object are transfered to the given instance.
-  class DefinitionConfig
-    def self.attr_definable(*names)
-      attr_accessor(*names)
-      names.each do |name|
-        ivar_name = "@#{name}".to_sym
-        define_method(name) do |new_value=nil|
-          new_value && self.instance_variable_set(ivar_name, new_value)
-          instance_variable_get(ivar_name)
+      # This object is `instance_eval`'d  when defining _any_ object in the schema.
+      # Then, the applicable properties of this object are transfered to the given instance.
+      class DefinitionConfig
+        def self.attr_definable(*names)
+          attr_accessor(*names)
+          names.each do |name|
+            ivar_name = "@#{name}".to_sym
+            define_method(name) do |new_value=nil|
+              new_value && self.instance_variable_set(ivar_name, new_value)
+              instance_variable_get(ivar_name)
+            end
+          end
         end
-      end
-    end
 
-    attr_definable :name, :description,
-      :interfaces, # object
-      :deprecation_reason, # field
-      :type, # field / argument
-      :property, # field
-      :resolve, # field / directive
-      :resolve_type, # interface / union
-      :possible_types, # interface / union
-      :default_value, # argument
-      :on, # directive
-      :coerce, #scalar
-      :coerce_input, #scalar
-      :coerce_result #scalar
+        attr_definable :name, :description,
+          :interfaces, # object
+          :deprecation_reason, # field
+          :type, # field / argument
+          :property, # field
+          :resolve, # field / directive
+          :resolve_type, # interface / union
+          :possible_types, # interface / union
+          :default_value, # argument
+          :on, # directive
+          :coerce, #scalar
+          :coerce_input, #scalar
+          :coerce_result #scalar
 
-    attr_reader :fields, :input_fields, :arguments, :values
+        attr_reader :fields, :input_fields, :arguments, :values
 
-    def initialize
-      @interfaces = []
-      @possible_types = []
-      @on = []
-      @fields = {}
-      @arguments = {}
-      @values = []
-      @input_fields = {}
-    end
+        def initialize
+          @interfaces = []
+          @possible_types = []
+          @on = []
+          @fields = {}
+          @arguments = {}
+          @values = []
+          @input_fields = {}
+        end
 
-    def types
-      GraphQL::DefinitionHelpers::TypeDefiner.instance
-    end
+        def types
+          GraphQL::DefinitionHelpers::TypeDefiner.instance
+        end
 
-    def field(name, type = nil, desc = nil, field: nil, property: nil, &block)
-      if block_given?
-        field = GraphQL::Field.define(&block)
-      else
-        field ||= GraphQL::Field.new
-      end
-      type && field.type = type
-      desc && field.description = desc
-      property && field.property = property
-      field.name ||= name.to_s
-      fields[name.to_s] = field
-    end
+        def field(name, type = nil, desc = nil, field: nil, property: nil, &block)
+          if block_given?
+            field = GraphQL::Field.define(&block)
+          else
+            field ||= GraphQL::Field.new
+          end
+          type && field.type = type
+          desc && field.description = desc
+          property && field.property = property
+          field.name ||= name.to_s
+          fields[name.to_s] = field
+        end
 
-    # For EnumType
-    def value(name, desc = nil, deprecation_reason: nil, value: name)
-      values << GraphQL::EnumType::EnumValue.new(name: name, description: desc, deprecation_reason: deprecation_reason, value: value)
-    end
+        # For EnumType
+        def value(name, desc = nil, deprecation_reason: nil, value: name)
+          values << GraphQL::EnumType::EnumValue.new(name: name, description: desc, deprecation_reason: deprecation_reason, value: value)
+        end
 
-    # For InputObjectType
-    def input_field(name, type = nil, desc = nil, default_value: nil, &block)
-      argument = if block_given?
-        GraphQL::Argument.define(&block)
-      else
-        GraphQL::Argument.new
-      end
-      argument.name = name
-      type && argument.type = type
-      desc && argument.description = desc
-      default_value && argument.default_value = default_value
-      input_fields[name.to_s] = argument
-    end
+        # For InputObjectType
+        def input_field(name, type = nil, desc = nil, default_value: nil, &block)
+          argument = if block_given?
+                       GraphQL::Argument.define(&block)
+                     else
+                       GraphQL::Argument.new
+                     end
+          argument.name = name
+          type && argument.type = type
+          desc && argument.description = desc
+          default_value && argument.default_value = default_value
+          input_fields[name.to_s] = argument
+        end
 
-    def argument(name, type, description = nil, default_value: nil)
-       argument = GraphQL::Argument.new
-       argument.name = name.to_s
-       argument.type = type
-       argument.description = description
-       argument.default_value = default_value
-       @arguments[name.to_s] = argument
-     end
+        def argument(name, type, description = nil, default_value: nil)
+          argument = GraphQL::Argument.new
+          argument.name = name.to_s
+          argument.type = type
+          argument.description = description
+          argument.default_value = default_value
+          @arguments[name.to_s] = argument
+        end
 
-    def to_instance(object, attributes)
-      attributes.each do |attr_name|
-        configured_value = self.public_send(attr_name)
-        object.public_send("#{attr_name}=", configured_value)
+        def to_instance(object, attributes)
+          attributes.each do |attr_name|
+            configured_value = self.public_send(attr_name)
+            object.public_send("#{attr_name}=", configured_value)
+          end
+          object
+        end
       end
-      object
-    end
-  end
 
-  module ClassMethods
-    # Pass the block to this class's `DefinitionConfig`,
-    # The return the result of {DefinitionConfig#to_instance}
-    def define(&block)
-      config = DefinitionConfig.new
-      block && config.instance_eval(&block)
-      config.to_instance(self.new, @defined_attrs)
-    end
+      module ClassMethods
+        # Pass the block to this class's `DefinitionConfig`,
+        # The return the result of {DefinitionConfig#to_instance}
+        def define(&block)
+          config = DefinitionConfig.new
+          block && config.instance_eval(&block)
+          config.to_instance(self.new, @defined_attrs)
+        end
 
-    def defined_by_config(*defined_attrs)
-      @defined_attrs ||= []
-      @defined_attrs += defined_attrs
+        def defined_by_config(*defined_attrs)
+          @defined_attrs ||= []
+          @defined_attrs += defined_attrs
+        end
+      end
     end
   end
 end

data/lib/graphql/definition_helpers/non_null_with_bang.rb

@@ -1,11 +1,15 @@
-# Wrap the object in NonNullType in response to `!`
-# @example required Int type
-#   !GraphQL::INT_TYPE
-#
-module GraphQL::DefinitionHelpers::NonNullWithBang
-  # Make the type non-null
-  # @return [GraphQL::NonNullType] a non-null type which wraps the original type
-  def !
-    to_non_null_type
+module GraphQL
+  module DefinitionHelpers
+    # Wrap the object in NonNullType in response to `!`
+    # @example required Int type
+    #   !GraphQL::INT_TYPE
+    #
+    module NonNullWithBang
+      # Make the type non-null
+      # @return [GraphQL::NonNullType] a non-null type which wraps the original type
+      def !
+        to_non_null_type
+      end
+    end
   end
 end

data/lib/graphql/definition_helpers/string_named_hash.rb

@@ -1,18 +1,22 @@
-# Accepts a hash with symbol keys.
-# - convert keys to strings
-# - if the value responds to `name=`, then assign the hash key as `name`
-#
-# Used by {ObjectType#fields}, {Field#arguments} and others.
-class GraphQL::DefinitionHelpers::StringNamedHash
-  # Normalized hash for the input
-  # @return [Hash] Hash with string keys
-  attr_reader :to_h
+module GraphQL
+  module DefinitionHelpers
+    # Accepts a hash with symbol keys.
+    # - convert keys to strings
+    # - if the value responds to `name=`, then assign the hash key as `name`
+    #
+    # Used by {ObjectType#fields}, {Field#arguments} and others.
+    class StringNamedHash
+      # Normalized hash for the input
+      # @return [Hash] Hash with string keys
+      attr_reader :to_h
 
-  # @param input_hash [Hash] Hash to be normalized
-  def initialize(input_hash)
-    @to_h = input_hash
-      .reduce({}) { |memo, (key, value)| memo[key.to_s] = value; memo }
-    # Set the name of the value based on its key
-    @to_h.each {|k, v| v.respond_to?("name=") && v.name = k }
+      # @param input_hash [Hash] Hash to be normalized
+      def initialize(input_hash)
+        @to_h = input_hash
+                .reduce({}) { |memo, (key, value)| memo[key.to_s] = value; memo }
+        # Set the name of the value based on its key
+        @to_h.each {|k, v| v.respond_to?("name=") && v.name = k }
+      end
+    end
   end
 end

data/lib/graphql/definition_helpers/type_definer.rb

@@ -1,25 +1,29 @@
-# Some conveniences for definining return & argument types.
-#
-# Passed into initialization blocks, eg {ObjectType#initialize}, {Field#initialize}
-class GraphQL::DefinitionHelpers::TypeDefiner
-  include Singleton
+module GraphQL
+  module DefinitionHelpers
+    # Some conveniences for definining return & argument types.
+    #
+    # Passed into initialization blocks, eg {ObjectType#initialize}, {Field#initialize}
+    class TypeDefiner
+      include Singleton
 
-  def Int;      GraphQL::INT_TYPE;      end
-  def String;   GraphQL::STRING_TYPE;   end
-  def Float;    GraphQL::FLOAT_TYPE;    end
-  def Boolean;  GraphQL::BOOLEAN_TYPE;  end
-  def ID;       GraphQL::ID_TYPE;       end
+      def Int;      GraphQL::INT_TYPE;      end
+      def String;   GraphQL::STRING_TYPE;   end
+      def Float;    GraphQL::FLOAT_TYPE;    end
+      def Boolean;  GraphQL::BOOLEAN_TYPE;  end
+      def ID;       GraphQL::ID_TYPE;       end
 
-  # Make a {ListType} which wraps the input type
-  #
-  # @example making a list type
-  #   list_of_strings = types[types.String]
-  #   list_of_strings.inspect
-  #   # => "[String]"
-  #
-  # @param type [Type] A type to be wrapped in a ListType
-  # @return [GraphQL::ListType] A ListType wrapping `type`
-  def [](type)
-    type.to_list_type
+      # Make a {ListType} which wraps the input type
+      #
+      # @example making a list type
+      #   list_of_strings = types[types.String]
+      #   list_of_strings.inspect
+      #   # => "[String]"
+      #
+      # @param type [Type] A type to be wrapped in a ListType
+      # @return [GraphQL::ListType] A ListType wrapping `type`
+      def [](type)
+        type.to_list_type
+      end
+    end
   end
 end

data/lib/graphql/enum_type.rb

@@ -41,8 +41,14 @@ class GraphQL::EnumType < GraphQL::BaseType
     GraphQL::TypeKinds::ENUM
   end
 
-  def valid_non_null_input?(value_name)
-    @values_by_name.key?(value_name)
+  def validate_non_null_input(value_name)
+    result = GraphQL::Query::InputValidationResult.new
+
+    if !@values_by_name.key?(value_name)
+      result.add_problem("Expected #{JSON.dump(value_name)} to be one of: #{@values_by_name.keys.join(', ')}")
+    end
+
+    result
   end
 
   # Get the underlying value for this enum value

data/lib/graphql/float_type.rb

@@ -1,6 +1,6 @@
 GraphQL::FLOAT_TYPE = GraphQL::ScalarType.define do
   name "Float"
   coerce -> (value) do
-    value.respond_to?(:to_f) ? value.to_f : nil
+    value.is_a?(Numeric) ? value.to_f : nil
   end
 end

data/lib/graphql/input_object_type.rb

@@ -20,23 +20,44 @@ class GraphQL::InputObjectType < GraphQL::BaseType
     GraphQL::TypeKinds::INPUT_OBJECT
   end
 
-  # assert that all present fields are defined
-  # _and_ all defined fields have valid values
-  def valid_non_null_input?(input)
-    input.all? { |name, value| input_fields[name] } &&
-      input_fields.all? { |name, field| field.type.valid_input?(input[name]) }
+  def validate_non_null_input(input)
+    result = GraphQL::Query::InputValidationResult.new
+
+    # Items in the input that are unexpected
+    input.each do |name, value|
+      if input_fields[name].nil?
+        result.add_problem("Field is not defined on #{self.name}", [name])
+      end
+    end
+
+    # Items in the input that are expected, but have invalid values
+    invalid_fields = input_fields.map do |name, field|
+      field_result = field.type.validate_input(input[name])
+      if !field_result.valid?
+        result.merge_result!(name, field_result)
+      end
+    end
+
+    result
   end
 
   def coerce_non_null_input(value)
     input_values = {}
+
     input_fields.each do |input_key, input_field_defn|
       field_value = value[input_key]
       field_value = input_field_defn.type.coerce_input(field_value)
+
+      # Try getting the default value
       if field_value.nil?
         field_value = input_field_defn.default_value
       end
-      input_values[input_key] = field_value unless field_value.nil?
+
+      if !field_value.nil?
+        input_values[input_key] = field_value
+      end
     end
+
     GraphQL::Query::Arguments.new(input_values)
   end
 end