graphql 0.12.1 → 0.13.0

data/lib/graphql/execution_error.rb

@@ -11,9 +11,7 @@ module GraphQL
       hash = {
         "message" => message,
       }
-      if ast_node.nil?
-        hash["locations"] = []
-      else
+      if ast_node
         hash["locations"] = [
           {
             "line" => ast_node.line,

data/lib/graphql/field.rb

@@ -1,111 +1,115 @@
-# {Field}s belong to {ObjectType}s and {InterfaceType}s.
-#
-# They're usually created with the `field` helper. If you create it by hand, make sure {#name} is a String.
-#
-#
-# @example creating a field
-#   GraphQL::ObjectType.define do
-#     field :name, types.String, "The name of this thing "
-#   end
-#
-# @example handling a circular reference
-#   # If the field's type isn't defined yet, you have two options:
-#
-#   GraphQL::ObjectType.define do
-#     # If you pass a Proc, it will be evaluated at schema build-time
-#     field :city, -> { CityType }
-#     # If you pass a String, it will be looked up in the global namespace at schema build-time
-#     field :country, "CountryType"
-#   end
-#
-# @example creating a field that accesses a different property on the object
-#   GraphQL::ObjectType.define do
-#     # use the `property` option:
-#     field :firstName, types.String, property: :first_name
-#   end
-#
-# @example defining a field, then attaching it to a type
-#   name_field = GraphQL::Field.define do
-#     name("Name")
-#     type(!types.String)
-#     description("The name of this thing")
-#     resolve -> (object, arguments, context) { object.name }
-#   end
-#
-#   NamedType = GraphQL::ObjectType.define do
-#     # use the `field` option:
-#     field :name, field: name_field
-#   end
-#
-class GraphQL::Field
-  include GraphQL::Define::InstanceDefinable
-  accepts_definitions :name, :description, :resolve, :type, :property, :deprecation_reason, argument: GraphQL::Define::AssignArgument
+module GraphQL
+  # {Field}s belong to {ObjectType}s and {InterfaceType}s.
+  #
+  # They're usually created with the `field` helper. If you create it by hand, make sure {#name} is a String.
+  #
+  #
+  # @example creating a field
+  #   GraphQL::ObjectType.define do
+  #     field :name, types.String, "The name of this thing "
+  #   end
+  #
+  # @example handling a circular reference
+  #   # If the field's type isn't defined yet, you have two options:
+  #
+  #   GraphQL::ObjectType.define do
+  #     # If you pass a Proc, it will be evaluated at schema build-time
+  #     field :city, -> { CityType }
+  #     # If you pass a String, it will be looked up in the global namespace at schema build-time
+  #     field :country, "CountryType"
+  #   end
+  #
+  # @example creating a field that accesses a different property on the object
+  #   GraphQL::ObjectType.define do
+  #     # use the `property` option:
+  #     field :firstName, types.String, property: :first_name
+  #   end
+  #
+  # @example defining a field, then attaching it to a type
+  #   name_field = GraphQL::Field.define do
+  #     name("Name")
+  #     type(!types.String)
+  #     description("The name of this thing")
+  #     resolve -> (object, arguments, context) { object.name }
+  #   end
+  #
+  #   NamedType = GraphQL::ObjectType.define do
+  #     # use the `field` option:
+  #     field :name, field: name_field
+  #   end
+  #
+  class Field
+    include GraphQL::Define::InstanceDefinable
+    accepts_definitions :name, :description, :resolve, :type, :property, :deprecation_reason, argument: GraphQL::Define::AssignArgument
 
-  attr_accessor :deprecation_reason, :name, :description, :type, :property
-  attr_reader :resolve_proc
+    attr_accessor :deprecation_reason, :name, :description, :type, :property
+    attr_reader :resolve_proc
 
-  # @return [String] The name of this field on its {GraphQL::ObjectType} (or {GraphQL::InterfaceType})
-  attr_reader :name
+    # @return [String] The name of this field on its {GraphQL::ObjectType} (or {GraphQL::InterfaceType})
+    attr_reader :name
 
-  # @return [Hash<String, GraphQL::Argument>] Map String argument names to their {GraphQL::Argument} implementations
-  attr_accessor :arguments
+    # @return [Hash<String, GraphQL::Argument>] Map String argument names to their {GraphQL::Argument} implementations
+    attr_accessor :arguments
 
-  def initialize
-    @arguments = {}
-    @resolve_proc = build_default_resolver
-  end
+    def initialize
+      @arguments = {}
+      @resolve_proc = build_default_resolver
+    end
 
-  # Get a value for this field
-  # @example resolving a field value
-  #   field.resolve(obj, args, ctx)
-  #
-  # @param object [Object] The object this field belongs to
-  # @param arguments [Hash] Arguments declared in the query
-  # @param context [GraphQL::Query::Context]
-  def resolve(object, arguments, context)
-    @resolve_proc.call(object, arguments, context)
-  end
+    # Get a value for this field
+    # @example resolving a field value
+    #   field.resolve(obj, args, ctx)
+    #
+    # @param object [Object] The object this field belongs to
+    # @param arguments [Hash] Arguments declared in the query
+    # @param context [GraphQL::Query::Context]
+    def resolve(object, arguments, context)
+      @resolve_proc.call(object, arguments, context)
+    end
 
-  def resolve=(resolve_proc)
-    @resolve_proc = resolve_proc || build_default_resolver
-  end
+    def resolve=(resolve_proc)
+      @resolve_proc = resolve_proc || build_default_resolver
+    end
 
-  # Get the return type for this field.
-  def type
-    case @type
-    when Proc
-      # lazy-eval it
-      @type = @type.call
-    when String
-      # Get a constant by this name
-      @type = Object.const_get(@type)
-    else
-      @type
+    # Get the return type for this field.
+    def type
+      case @type
+      when Proc
+        # lazy-eval it
+        @type = @type.call
+      when String
+        # Get a constant by this name
+        @type = Object.const_get(@type)
+      else
+        @type
+      end
     end
-  end
 
-  # You can only set a field's name _once_ -- this to prevent
-  # passing the same {Field} to multiple `.field` calls.
-  #
-  # This is important because {#name} may be used by {#resolve}.
-  def name=(new_name)
-    if @name.nil?
-      @name = new_name
-    else
-      raise("Can't rename an already-named field. (Tried to rename \"#{@name}\" to \"#{new_name}\".) If you're passing a field with the `field:` argument, make sure it's an unused instance of GraphQL::Field.")
+    # You can only set a field's name _once_ -- this to prevent
+    # passing the same {Field} to multiple `.field` calls.
+    #
+    # This is important because {#name} may be used by {#resolve}.
+    def name=(new_name)
+      if !new_name.is_a?(String)
+        raise ArgumentError.new("GraphQL field names must be strings; cannot use #{new_name.inspect} (#{new_name.class.name}) as a field name.") unless new_name.is_a?(String)
+      elsif @name.nil?
+        @name = new_name
+      else
+        raise("Can't rename an already-named field. (Tried to rename \"#{@name}\" to \"#{new_name}\".) If you're passing a field with the `field:` argument, make sure it's an unused instance of GraphQL::Field.")
+      end
     end
-  end
 
-  def to_s
-    "<Field: #{name || "not-named"}>"
-  end
+    def to_s
+      "<Field: #{name || "not-named"}>"
+    end
 
-  private
+    private
 
-  def build_default_resolver
-    -> (obj, args, ctx) do
-      resolve_method = self.property || self.name
-      obj.public_send(resolve_method)
+    def build_default_resolver
+      -> (obj, args, ctx) do
+        resolve_method = self.property || self.name
+        obj.public_send(resolve_method)
+      end
     end
   end
 end

data/lib/graphql/input_object_type.rb

@@ -1,66 +1,68 @@
-# A complex input type for a field argument.
-#
-# @example An input type with name and number
-#   PlayerInput = GraphQL::InputObjectType.define do
-#     name("Player")
-#     input_field :name, !types.String
-#     input_field :number, !types.Int
-#   end
-#
-class GraphQL::InputObjectType < GraphQL::BaseType
-  accepts_definitions input_field: GraphQL::Define::AssignArgument
+module GraphQL
+  # A complex input type for a field argument.
+  #
+  # @example An input type with name and number
+  #   PlayerInput = GraphQL::InputObjectType.define do
+  #     name("Player")
+  #     input_field :name, !types.String
+  #     input_field :number, !types.Int
+  #   end
+  #
+  class InputObjectType < GraphQL::BaseType
+    accepts_definitions input_field: GraphQL::Define::AssignArgument
 
-  # @return [Hash<String, GraphQL::Argument>] Map String argument names to their {GraphQL::Argument} implementations
-  attr_accessor :arguments
+    # @return [Hash<String, GraphQL::Argument>] Map String argument names to their {GraphQL::Argument} implementations
+    attr_accessor :arguments
 
-  alias :input_fields :arguments
+    alias :input_fields :arguments
 
-  def initialize
-    @arguments = {}
-  end
+    def initialize
+      @arguments = {}
+    end
 
-  def kind
-    GraphQL::TypeKinds::INPUT_OBJECT
-  end
+    def kind
+      GraphQL::TypeKinds::INPUT_OBJECT
+    end
 
-  def validate_non_null_input(input)
-    result = GraphQL::Query::InputValidationResult.new
+    def validate_non_null_input(input)
+      result = GraphQL::Query::InputValidationResult.new
 
-    # Items in the input that are unexpected
-    input.each do |name, value|
-      if arguments[name].nil?
-        result.add_problem("Field is not defined on #{self.name}", [name])
+      # Items in the input that are unexpected
+      input.each do |name, value|
+        if arguments[name].nil?
+          result.add_problem("Field is not defined on #{self.name}", [name])
+        end
       end
-    end
 
-    # Items in the input that are expected, but have invalid values
-    invalid_fields = arguments.map do |name, field|
-      field_result = field.type.validate_input(input[name])
-      if !field_result.valid?
-        result.merge_result!(name, field_result)
+      # Items in the input that are expected, but have invalid values
+      invalid_fields = arguments.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
 
-    result
-  end
+    def coerce_non_null_input(value)
+      input_values = {}
 
-  def coerce_non_null_input(value)
-    input_values = {}
+      arguments.each do |input_key, input_field_defn|
+        field_value = value[input_key]
+        field_value = input_field_defn.type.coerce_input(field_value)
 
-    arguments.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
 
-      # Try getting the default value
-      if field_value.nil?
-        field_value = input_field_defn.default_value
+        if !field_value.nil?
+          input_values[input_key] = field_value
+        end
       end
 
-      if !field_value.nil?
-        input_values[input_key] = field_value
-      end
+      GraphQL::Query::Arguments.new(input_values)
     end
-
-    GraphQL::Query::Arguments.new(input_values)
   end
 end

data/lib/graphql/interface_type.rb

@@ -1,41 +1,38 @@
-# A collection of types which implement the same fields
-#
-# @example An interface with three required fields
-#   DeviceInterface = GraphQL::InterfaceType.define do
-#     name("Device")
-#     description("Hardware devices for computing")
-#
-#     field :ram, types.String
-#     field :processor, ProcessorType
-#     field :release_year, types.Int
-#   end
-#
-class GraphQL::InterfaceType < GraphQL::BaseType
-  include GraphQL::BaseType::HasPossibleTypes
-  accepts_definitions :resolve_type, field: GraphQL::Define::AssignObjectField
+module GraphQL
+  # A collection of types which implement the same fields
+  #
+  # @example An interface with three required fields
+  #   DeviceInterface = GraphQL::InterfaceType.define do
+  #     name("Device")
+  #     description("Hardware devices for computing")
+  #
+  #     field :ram, types.String
+  #     field :processor, ProcessorType
+  #     field :release_year, types.Int
+  #   end
+  #
+  class InterfaceType < GraphQL::BaseType
+    include GraphQL::BaseType::HasPossibleTypes
+    accepts_definitions :resolve_type, field: GraphQL::Define::AssignObjectField
 
-  attr_accessor :fields
+    attr_accessor :fields
 
-  def initialize
-    @fields = {}
-  end
+    def initialize
+      @fields = {}
+    end
 
-  def kind
-    GraphQL::TypeKinds::INTERFACE
-  end
+    def kind
+      GraphQL::TypeKinds::INTERFACE
+    end
 
-  # @return [Array<GraphQL::ObjectType>] Types which declare that they implement this interface
-  def possible_types
-    @possible_types ||= []
-  end
-
-  # @return [GraphQL::Field] The defined field for `field_name`
-  def get_field(field_name)
-    fields[field_name]
-  end
+    # @return [GraphQL::Field] The defined field for `field_name`
+    def get_field(field_name)
+      fields[field_name]
+    end
 
-  # @return [Array<GraphQL::Field>] All fields on this type
-  def all_fields
-    fields.values
+    # @return [Array<GraphQL::Field>] All fields on this type
+    def all_fields
+      fields.values
+    end
   end
 end

data/lib/graphql/introspection.rb

@@ -3,24 +3,25 @@ module GraphQL
   end
 end
 
-require 'graphql/introspection/typename_field'
-require 'graphql/introspection/input_value_type'
-require 'graphql/introspection/enum_value_type'
-require 'graphql/introspection/type_kind_enum'
+require "graphql/introspection/typename_field"
+require "graphql/introspection/input_value_type"
+require "graphql/introspection/enum_value_type"
+require "graphql/introspection/type_kind_enum"
 
-require 'graphql/introspection/fields_field'
-require 'graphql/introspection/of_type_field'
-require 'graphql/introspection/input_fields_field'
-require 'graphql/introspection/possible_types_field'
-require 'graphql/introspection/enum_values_field'
-require 'graphql/introspection/interfaces_field'
+require "graphql/introspection/fields_field"
+require "graphql/introspection/of_type_field"
+require "graphql/introspection/input_fields_field"
+require "graphql/introspection/possible_types_field"
+require "graphql/introspection/enum_values_field"
+require "graphql/introspection/interfaces_field"
 
-require 'graphql/introspection/type_type'
-require 'graphql/introspection/arguments_field'
-require 'graphql/introspection/field_type'
+require "graphql/introspection/type_type"
+require "graphql/introspection/arguments_field"
+require "graphql/introspection/field_type"
 
-require 'graphql/introspection/directive_type'
-require 'graphql/introspection/schema_type'
-require 'graphql/introspection/schema_field'
-require 'graphql/introspection/type_by_name_field'
-require 'graphql/introspection/introspection_query'
+require "graphql/introspection/directive_location_enum"
+require "graphql/introspection/directive_type"
+require "graphql/introspection/schema_type"
+require "graphql/introspection/schema_field"
+require "graphql/introspection/type_by_name_field"
+require "graphql/introspection/introspection_query"