graphql 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cace79bd801a58fbf53eb0ff5a5ef4ea501b1208
-  data.tar.gz: 495b61e0510a41d880db3a99008446650196742a
+  metadata.gz: 47e57c2465fd5d01d22c69ddfc1e964dc0b93239
+  data.tar.gz: c759b0a07b75f19ac51f31c77c89be361c5ab897
 SHA512:
-  metadata.gz: 635f9a6cbc5d9093227b3699cb93271526c105fff445bacc4e1a39777a51a6b8db1fcc5c692271a0de4d00045b2dd3d33b39dfea90f33c74176ef6ea3e7a57cb
-  data.tar.gz: 8ca5879203ad6178ad7fff7e3ef12e76de2c90825b1de2e5efd831afe654f49bb3d02b0f9ef6a5d5654586ee20693452ba971e645717d2e561caba396c6c1e3d
+  metadata.gz: e16ebf74d11acb3deece7cab048c89b99a1d564b2daba526bc0234609c56fded00beb8fa38066aa8c0330dc29c5aef532e4231cfd485ff615547ee6eb60ae538
+  data.tar.gz: 84c3ec086585193859acc914e29cf74f62473360994394125e12b83a0ee67d3e5382fc0c4c1f537a706f5a4d0c6c9f07ad8f6c3b6cb762f8de4cb9cbd02d7dd5

data/lib/graphql.rb

@@ -22,7 +22,11 @@ module GraphQL
   def self.parse(string, as: nil)
     parser = as ? GraphQL::PARSER.send(as) : GraphQL::PARSER
     tree = parser.parse(string)
-    GraphQL::TRANSFORM.apply(tree)
+    document = GraphQL::TRANSFORM.apply(tree)
+    if !document.is_a?(GraphQL::Language::Nodes::Document)
+      raise("Parse failed! Sorry, somehow we failed to turn this string into a document. Please report this bug!")
+    end
+    document
   rescue Parslet::ParseFailed => error
     line, col = error.cause.source.line_and_column(error.cause.pos)
     raise GraphQL::ParseError.new(error.message, line, col, string)

data/lib/graphql/definition_helpers/defined_by_config.rb

@@ -78,7 +78,7 @@ module GraphQL::DefinitionHelpers::DefinedByConfig
       end
       argument.name = name
       type && argument.type = type
-      desc && argument.desc = desc
+      desc && argument.description = desc
       default_value && argument.default_value = default_value
       input_fields[name.to_s] = argument
     end

data/lib/graphql/language/parser.rb

@@ -91,7 +91,7 @@ module GraphQL
         value_enum
       )}
       rule(:value_sign?) { match('[\-\+]').maybe }
-      rule(:value_array) { (str("[") >> (value >> separator?).repeat(0) >> str("]")).as(:array) }
+      rule(:value_array) { (str("[") >> space? >> (value >> separator?).repeat(0) >> str("]")).as(:array) }
       rule(:value_boolean) { (str("true") | str("false")).as(:boolean) }
       rule(:value_float) { (value_sign? >> match('\d').repeat(1) >> str(".") >> match('\d').repeat(1) >> (match("[eE]") >> value_sign? >> match('\d').repeat(1)).maybe).as(:float) }
       rule(:value_input_object) { str("{") >> space? >> value_input_object_pair.repeat(1).as(:input_object) >> space? >> str("}") }

data/lib/graphql/language/transform.rb

@@ -93,6 +93,7 @@ module GraphQL
 
       # Values
       rule(array: sequence(:v)) { v }
+      rule(array: simple(:v)) { [] } # just `nil`
       rule(boolean: simple(:v)) { v == "true" ? true : false }
       rule(input_object: sequence(:v)) { create_node(:InputObject, pairs: v, line: v.first.line, col: v.first.col) }
       rule(input_object_name: simple(:n), input_object_value: simple(:v)) { create_node(:Argument, name: n.to_s, value: v, position_source: n)}

data/lib/graphql/query.rb

@@ -37,7 +37,7 @@ class GraphQL::Query
   def initialize(schema, query_string, context: nil, variables: {}, debug: false, validate: true, operation_name: nil)
     @schema = schema
     @debug = debug
-    @context = Context.new(values: context)
+    @context = Context.new(query: self, values: context)
     @validate = validate
     @operation_name = operation_name
     @fragments = {}

data/lib/graphql/query/arguments.rb

@@ -7,6 +7,7 @@ module GraphQL
       extend Forwardable
 
       def initialize(values)
+        @hash = values
         @values = values.inject({}) do |memo, (inner_key, inner_value)|
           memo[inner_key.to_s] = wrap_value(inner_value)
           memo
@@ -19,6 +20,12 @@ module GraphQL
         @values[key.to_s]
       end
 
+      # Get the original Ruby hash
+      # @return [Hash] the original values hash
+      def to_h
+        @hash
+      end
+
       def_delegators :@values, :keys, :values, :each
 
       private

data/lib/graphql/query/context.rb

@@ -12,9 +12,14 @@ module GraphQL
       # @return [Array<GraphQL::ExecutionError>] errors returned during execution
       attr_reader :errors
 
+      # @return [GraphQL::Query] The query whose context this is
+      attr_reader :query
+
       # Make a new context which delegates key lookup to `values`
-      # @param [Hash] A hash of arbitrary values which will be accessible at query-time
-      def initialize(values:)
+      # @param query [GraphQL::Query] the query who owns this context
+      # @param values [Hash] A hash of arbitrary values which will be accessible at query-time
+      def initialize(query:, values:)
+        @query = query
         @values = values
         @errors = []
       end

data/lib/graphql/static_validation/literal_validator.rb

@@ -11,16 +11,34 @@ class GraphQL::StaticValidation::LiteralValidator
     elsif type.kind.enum? && ast_value.is_a?(GraphQL::Language::Nodes::Enum)
       type.valid_input?(ast_value.name)
     elsif type.kind.input_object? && ast_value.is_a?(GraphQL::Language::Nodes::InputObject)
-      fields = type.input_fields
-      ast_value.pairs.all? do |value|
-        field_type = fields[value.name].type
-        present_if_required = field_type.kind.non_null? ? !value.nil? : true
-        present_if_required && validate(value.value, field_type)
-      end
+      required_input_fields_are_present(type, ast_value) &&
+        present_input_field_values_are_valid(type, ast_value)
     elsif ast_value.is_a?(GraphQL::Language::Nodes::VariableIdentifier)
       true
     else
       false
     end
   end
+
+
+  private
+
+
+  def required_input_fields_are_present(type, ast_node)
+    required_field_names = type.input_fields
+      .values
+      .select { |f| f.type.kind.non_null? }
+      .map(&:name)
+    present_field_names = ast_node.pairs.map(&:name)
+    missing_required_field_names = required_field_names - present_field_names
+    missing_required_field_names.none?
+  end
+
+  def present_input_field_values_are_valid(type, ast_node)
+    fields = type.input_fields
+    ast_node.pairs.all? do |value|
+     field_type = fields[value.name].type
+     validate(value.value, field_type)
+   end
+ end
 end

data/lib/graphql/static_validation/rules/argument_literals_are_compatible.rb

@@ -5,7 +5,12 @@ class GraphQL::StaticValidation::ArgumentLiteralsAreCompatible < GraphQL::Static
     arg_defn = defn.arguments[node.name]
     valid = validator.validate(node.value, arg_defn.type)
     if !valid
-      context.errors << message("Argument #{node.name} on #{parent.class.name.split("::").last} '#{parent.name}' has an invalid value", parent)
+      field_name = if parent.respond_to?(:alias)
+        parent.alias || parent.name
+      else
+        parent.name
+      end
+      context.errors << message("Argument #{node.name} on #{parent.class.name.split("::").last} '#{field_name}' has an invalid value", parent)
     end
   end
 end

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.10.3"
+  VERSION = "0.10.4"
 end

data/spec/graphql/introspection/type_type_spec.rb

@@ -103,7 +103,7 @@ describe GraphQL::Introspection::TypeType do
               "description"=>"Properties for finding a dairy product",
               "kind"=>"INPUT_OBJECT",
               "inputFields"=>[
-                {"name"=>"source", "type"=>{ "name" => "DairyAnimal"}, "defaultValue"=>nil},
+                {"name"=>"source", "type"=>{ "name" => "Non-Null"}, "defaultValue"=>nil},
                 {"name"=>"fatContent", "type"=>{ "name" => "Float"}, "defaultValue"=>nil}
               ]
             }

data/spec/graphql/language/parser_spec.rb

@@ -112,6 +112,7 @@ describe GraphQL::Language::Parser do
 
     it 'gets arrays' do
       assert(parser.value.parse_with_debug('[true, 1, "my string", -5.123e56]'), 'array of values')
+      assert(parser.value.parse_with_debug('[ -5.123e56, $myVar ]'), 'array of values with whitespace')
       assert(parser.value.parse_with_debug('[]'), 'empty array')
       assert(parser.value.parse_with_debug('[[true, 1], ["my string", -5.123e56]]'), 'array of arrays')
     end

data/spec/graphql/language/transform_spec.rb

@@ -29,6 +29,7 @@ describe GraphQL::Language::Transform do
       # assign fragments:
       fragment personInfo on Person {
         birthdate, name # with fields
+        hobbies(names: [])
       }
 
       fragment petInfo on Pet { isHousebroken, species } # all on one line

data/spec/graphql/query/arguments_spec.rb

@@ -18,4 +18,8 @@ describe GraphQL::Query::Arguments do
     end
     assert_equal([['a', 1], ['b', 2]], pairs)
   end
+
+  it 'returns original Ruby hash values with to_h' do
+    assert_equal({ a: 1, b: 2 }, arguments.to_h)
+  end
 end

data/spec/graphql/query/context_spec.rb

@@ -9,6 +9,10 @@ describe GraphQL::Query::Context do
     field :contextAstNodeName, types.String do
       resolve -> (target, args, ctx) { ctx.ast_node.class.name }
     end
+
+    field :queryName, types.String do
+      resolve -> (target, args, ctx) { ctx.query.class.name }
+    end
   }}
   let(:schema) { GraphQL::Schema.new(query: query_type, mutation: nil)}
   let(:result) { schema.execute(query_string, context: {"some_key" => "some value"})}
@@ -34,4 +38,15 @@ describe GraphQL::Query::Context do
       assert_equal(expected, result)
     end
   end
+
+  describe "access to the query" do
+    let(:query_string) { %|
+      query getCtx { queryName }
+    |}
+
+    it 'provides access to the AST node' do
+      expected = {"data" => {"queryName" => "GraphQL::Query"}}
+      assert_equal(expected, result)
+    end
+  end
 end

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

@@ -7,6 +7,7 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
       cheese(id: 1) { source @skip(if: {id: 1})}
       yakSource: searchDairy(product: [{source: YAK, fatContent: 1.1}]) { source }
       badSource: searchDairy(product: [{source: 1.1}]) { source }
+      missingSource: searchDairy(product: [{fatContent: 1.1}]) { source }
     }
 
     fragment cheeseFields on Cheese {
@@ -17,8 +18,8 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::ArgumentLiteralsAreCompatible]) }
   let(:errors) { validator.validate(document) }
 
-  it 'finds undefined arguments to fields and directives' do
-    assert_equal(4, errors.length)
+  it 'finds undefined or missing-required arguments to fields and directives' do
+    assert_equal(5, errors.length)
 
     query_root_error = {
       "message"=>"Argument id on Field 'cheese' has an invalid value",
@@ -33,14 +34,20 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
     assert_includes(errors, directive_error)
 
     input_object_error = {
-      "message"=>"Argument product on Field 'searchDairy' has an invalid value",
+      "message"=>"Argument product on Field 'badSource' has an invalid value",
       "locations"=>[{"line"=>6, "column"=>7}]
     }
     assert_includes(errors, input_object_error)
 
+    missing_required_field_error = {
+      "message"=>"Argument product on Field 'missingSource' has an invalid value",
+      "locations"=>[{"line"=>7, "column"=>7}]
+    }
+    assert_includes(errors, missing_required_field_error)
+
     fragment_error = {
       "message"=>"Argument source on Field 'similarCheese' has an invalid value",
-      "locations"=>[{"line"=>10, "column"=>7}]
+      "locations"=>[{"line"=>11, "column"=>7}]
     }
     assert_includes(errors, fragment_error)
   end

data/spec/support/dairy_app.rb

@@ -102,8 +102,11 @@ end
 DairyProductInputType = GraphQL::InputObjectType.define {
   name "DairyProductInput"
   description "Properties for finding a dairy product"
-  input_field :source, DairyAnimalEnum
-  input_field :fatContent, types.Float
+  input_field :source, !DairyAnimalEnum do
+    description "Where it came from"
+  end
+
+  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.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet