graphql 0.11.1 → 0.12.0

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe GraphQL::StaticValidation::RequiredArgumentsArePresent do
-  let(:document) { GraphQL.parse("
+  let(:query_string) {"
     query getCheese {
       cheese(id: 1) { source }
       cheese { source }
@@ -12,10 +12,11 @@ describe GraphQL::StaticValidation::RequiredArgumentsArePresent do
       flavor @include(if: true)
       id @skip
     }
-  ")}
+  "}
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::RequiredArgumentsArePresent]) }
-  let(:errors) { validator.validate(document) }
+  let(:query) { GraphQL::Query.new(DummySchema, query_string) }
+  let(:errors) { validator.validate(query) }
 
   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

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe GraphQL::StaticValidation::VariableDefaultValuesAreCorrectlyTyped do
-  let(:document) { GraphQL.parse('
+  let(:query_string) {%|
     query getCheese(
       $id:        Int = 1,
-      $bool:      Boolean = 3.4e24, # can be coerced
+      $int:       Int = 3.4e24, # can be coerced
       $str:       String!,
       $badFloat:  Float = true,
       $badInt:    Int = "abc",
@@ -14,10 +14,11 @@ describe GraphQL::StaticValidation::VariableDefaultValuesAreCorrectlyTyped do
     ) {
       cheese(id: $id) { source }
     }
-  ')}
+  |}
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::VariableDefaultValuesAreCorrectlyTyped]) }
-  let(:errors) { validator.validate(document) }
+  let(:query) { GraphQL::Query.new(DummySchema, query_string) }
+  let(:errors) { validator.validate(query) }
 
   it "finds default values that don't match their types" do
     expected = [

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe GraphQL::StaticValidation::VariableUsagesAreAllowed do
-  let(:document) { GraphQL.parse('
+  let(:query_string) {'
     query getCheese(
         $goodInt: Int = 1,
         $okInt: Int!,
@@ -30,10 +30,11 @@ describe GraphQL::StaticValidation::VariableUsagesAreAllowed do
         ... on Cheese { id }
       }
     }
-  ')}
+  '}
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::VariableUsagesAreAllowed]) }
-  let(:errors) { validator.validate(document) }
+  let(:query) { GraphQL::Query.new(DummySchema, query_string) }
+  let(:errors) { validator.validate(query) }
 
   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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe GraphQL::StaticValidation::VariablesAreInputTypes do
-  let(:document) { GraphQL.parse('
+  let(:query_string) {'
     query getCheese(
       $id:        Int = 1,
       $str:       [String!],
@@ -11,10 +11,11 @@ describe GraphQL::StaticValidation::VariablesAreInputTypes do
     ) {
       cheese(id: $id) { source }
     }
-  ')}
+  '}
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::VariablesAreInputTypes]) }
-  let(:errors) { validator.validate(document) }
+  let(:query) { GraphQL::Query.new(DummySchema, query_string) }
+  let(:errors) { validator.validate(query) }
 
   it "finds variables whose types are invalid" do
     expected = [

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe GraphQL::StaticValidation::VariablesAreUsedAndDefined do
-  let(:document) { GraphQL.parse('
+  let(:query_string) {'
     query getCheese(
       $usedVar: Int,
       $usedInnerVar: String,
@@ -27,10 +27,11 @@ describe GraphQL::StaticValidation::VariablesAreUsedAndDefined do
       source(notDefined: $undefinedFragmentVar)
       someField(someArg: $usedFragmentVar)
     }
-  ')}
+  '}
 
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::VariablesAreUsedAndDefined]) }
-  let(:errors) { validator.validate(document) }
+  let(:query) { GraphQL::Query.new(DummySchema, query_string) }
+  let(:errors) { validator.validate(query) }
 
   it "finds variables which are used-but-not-defined or defined-but-not-used" do
     expected = [

data/spec/graphql/static_validation/type_stack_spec.rb

@@ -20,11 +20,12 @@ describe GraphQL::StaticValidation::TypeStack do
     }
     fragment edibleFields on Edible { fatContent @skip(if: false)}
   |}
-  let(:document) { GraphQL.parse(query_string) }
+
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [TypeCheckValidator]) }
+  let(:query) { GraphQL::Query.new(DummySchema, query_string) }
 
   it 'stores up types' do
-    validator.validate(document)
+    validator.validate(query)
     expected = [
       ["Query", "Cheese"],
       ["Query", "Cheese", "Non-Null"],

data/spec/graphql/static_validation/validator_spec.rb

@@ -1,33 +1,11 @@
 require 'spec_helper'
 
-class SchemaErrorValidator
-  def validate(context)
-    context.errors << GraphQL::StaticValidation::Message.new("Something is wrong: #{context.schema}", line: 100, col: 4)
-  end
-end
-
-class DocumentErrorValidator
-  include
-  def validate(context)
-    context.errors << GraphQL::StaticValidation::Message.new("Something is wrong: #{context.document.name}", line: 1, col: 1)
-  end
-end
-
 describe GraphQL::StaticValidation::Validator do
-  let(:document)  { OpenStruct.new(name: "This is not a document", children: [], definitions: []) }
-  let(:validator) { GraphQL::StaticValidation::Validator.new(schema: "This is not a schema", rules: [SchemaErrorValidator, DocumentErrorValidator]) }
-  let(:errors) { validator.validate(document) }
-  it 'uses rules' do
-    expected_errors = [
-      {"message" => "Something is wrong: This is not a schema", "locations" => [{"line" => 100, "column" => 4}]},
-      {"message" => "Something is wrong: This is not a document", "locations" => [{"line" => 1, "column" => 1}]}
-    ]
-    assert_equal(expected_errors, errors)
-  end
+  let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema) }
+  let(:query) { GraphQL::Query.new(DummySchema, query_string) }
+  let(:errors) { validator.validate(query) }
 
   describe 'validation order' do
-    let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema) }
-    let(:document) { GraphQL.parse(query_string)}
 
     describe 'fields & arguments' do
       let(:query_string) { %|

data/spec/graphql/string_type_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe GraphQL::STRING_TYPE do
+  describe "coerce_input" do
+    it "accepts strings" do
+      assert_equal "str", GraphQL::STRING_TYPE.coerce_input("str")
+    end
+
+    it "doesn't accept other types" do
+      assert_equal nil, GraphQL::STRING_TYPE.coerce_input(100)
+      assert_equal nil, GraphQL::STRING_TYPE.coerce_input(true)
+      assert_equal nil, GraphQL::STRING_TYPE.coerce_input(0.999)
+    end
+  end
+end

data/spec/support/dairy_app.rb

@@ -118,6 +118,8 @@ DairyProductInputType = GraphQL::InputObjectType.define {
     description "Where it came from"
   end
 
+  input_field :originDairy, types.String, "Dairy which produced it", default_value: "Sugar Hollow Dairy"
+
   input_field :fatContent, types.Float, "How much fat it has"
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '11.0'
 description: A GraphQL server implementation for Ruby. Includes schema definition,
   query parsing, static validation, type definition, and query execution.
 email:
@@ -163,11 +163,15 @@ files:
 - lib/graphql/argument.rb
 - lib/graphql/base_type.rb
 - lib/graphql/boolean_type.rb
-- lib/graphql/definition_helpers.rb
-- lib/graphql/definition_helpers/defined_by_config.rb
-- lib/graphql/definition_helpers/non_null_with_bang.rb
-- lib/graphql/definition_helpers/string_named_hash.rb
-- lib/graphql/definition_helpers/type_definer.rb
+- lib/graphql/define.rb
+- lib/graphql/define/assign_argument.rb
+- lib/graphql/define/assign_enum_value.rb
+- lib/graphql/define/assign_object_field.rb
+- lib/graphql/define/assignment_dictionary.rb
+- lib/graphql/define/defined_object_proxy.rb
+- lib/graphql/define/instance_definable.rb
+- lib/graphql/define/non_null_with_bang.rb
+- lib/graphql/define/type_definer.rb
 - lib/graphql/directive.rb
 - lib/graphql/directive/include_directive.rb
 - lib/graphql/directive/skip_directive.rb
@@ -268,14 +272,19 @@ files:
 - lib/graphql/version.rb
 - readme.md
 - spec/graphql/base_type_spec.rb
+- spec/graphql/boolean_type_spec.rb
+- spec/graphql/define/instance_definable_spec.rb
 - spec/graphql/directive_spec.rb
 - spec/graphql/enum_type_spec.rb
 - spec/graphql/execution_error_spec.rb
 - spec/graphql/field_spec.rb
+- spec/graphql/float_type_spec.rb
 - spec/graphql/id_type_spec.rb
 - spec/graphql/input_object_type_spec.rb
+- spec/graphql/int_type_spec.rb
 - spec/graphql/interface_type_spec.rb
 - spec/graphql/introspection/directive_type_spec.rb
+- spec/graphql/introspection/input_value_type_spec.rb
 - spec/graphql/introspection/introspection_query_spec.rb
 - spec/graphql/introspection/schema_type_spec.rb
 - spec/graphql/introspection/type_type_spec.rb
@@ -321,6 +330,7 @@ files:
 - spec/graphql/static_validation/rules/variables_are_used_and_defined_spec.rb
 - spec/graphql/static_validation/type_stack_spec.rb
 - spec/graphql/static_validation/validator_spec.rb
+- spec/graphql/string_type_spec.rb
 - spec/graphql/union_type_spec.rb
 - spec/spec_helper.rb
 - spec/support/calculator_schema.rb
@@ -355,14 +365,19 @@ specification_version: 4
 summary: A GraphQL server implementation for Ruby
 test_files:
 - spec/graphql/base_type_spec.rb
+- spec/graphql/boolean_type_spec.rb
+- spec/graphql/define/instance_definable_spec.rb
 - spec/graphql/directive_spec.rb
 - spec/graphql/enum_type_spec.rb
 - spec/graphql/execution_error_spec.rb
 - spec/graphql/field_spec.rb
+- spec/graphql/float_type_spec.rb
 - spec/graphql/id_type_spec.rb
 - spec/graphql/input_object_type_spec.rb
+- spec/graphql/int_type_spec.rb
 - spec/graphql/interface_type_spec.rb
 - spec/graphql/introspection/directive_type_spec.rb
+- spec/graphql/introspection/input_value_type_spec.rb
 - spec/graphql/introspection/introspection_query_spec.rb
 - spec/graphql/introspection/schema_type_spec.rb
 - spec/graphql/introspection/type_type_spec.rb
@@ -408,6 +423,7 @@ test_files:
 - spec/graphql/static_validation/rules/variables_are_used_and_defined_spec.rb
 - spec/graphql/static_validation/type_stack_spec.rb
 - spec/graphql/static_validation/validator_spec.rb
+- spec/graphql/string_type_spec.rb
 - spec/graphql/union_type_spec.rb
 - spec/spec_helper.rb
 - spec/support/calculator_schema.rb

data/lib/graphql/definition_helpers.rb

@@ -1,4 +0,0 @@
-require 'graphql/definition_helpers/non_null_with_bang'
-require 'graphql/definition_helpers/defined_by_config'
-require 'graphql/definition_helpers/string_named_hash'
-require 'graphql/definition_helpers/type_definer'

data/lib/graphql/definition_helpers/defined_by_config.rb

@@ -1,123 +0,0 @@
-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)
-            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_reader :fields, :input_fields, :arguments, :values
-
-        def initialize
-          @interfaces = []
-          @possible_types = []
-          @on = []
-          @fields = {}
-          @arguments = {}
-          @values = []
-          @input_fields = {}
-        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
-
-        # 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
-
-        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)
-          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
-
-        def defined_by_config(*defined_attrs)
-          @defined_attrs ||= []
-          @defined_attrs += defined_attrs
-        end
-      end
-    end
-  end
-end

data/lib/graphql/definition_helpers/string_named_hash.rb

@@ -1,22 +0,0 @@
-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 }
-      end
-    end
-  end
-end