graphql 0.10.6 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1781d6bb2fe71c08f2e82984d9b47cf7ebd7ee5e
-  data.tar.gz: ad4895dc6c53f7e5873c8fbad8affea55632c711
+  metadata.gz: 6f94bf39aba9a98caa4bf69c263eacb820d41b08
+  data.tar.gz: 4a11eb3ee5d554345942bab98098a623d33f0aad
 SHA512:
-  metadata.gz: 8134095601316e72a2ce226e08466452fc98a1474ba8b398e6298e9342d4a039ede9b960afdc7073ac298009673d9d6961b69c2f13b8095b121f549fa1ab22d1
-  data.tar.gz: 56ab2e53c131e7976532d33d35d009d693653ca5f4f60cd31efbbf3ba26236d814549c7778495c2bc9808b38acadba920518d4f61048b287908f2b28f7e9890f
+  metadata.gz: 33a339144c49cc616818d398248f8b6f75c507efde44975f8e03e758c7f3783887bddeadb8c094551bad3444f9c1eaa8ecf8966ef19c58fae8f6a23e95a226e0
+  data.tar.gz: b1d227ca3c1981e22a2b8be23e30c7d7eee78f3e8a13f8b6702ea29a842d4198eb929a38b01ae19e44c39e2cef81e2b322565035d7ecf7832c80ddecc4e5aac2

data/lib/graphql/language/transform.rb

@@ -1,31 +1,25 @@
 module GraphQL
   module Language
-    # Extend `Parslet::Context` with a convenience method
-    # for building AST nodes
-    module ParsletContextCreateNode
-      refine Parslet::Context do
-        # @param [Symbol] name of a node constant
-        # @param [Hash] attributes to initialize the {Node} with
-        # @return [GraphQL::Language::Node] a node of type `name` with attributes `attributes`
-        def create_node(name, attributes)
-          node_class = GraphQL::Language::Nodes.const_get(name)
-          node_class.new(attributes)
-        end
-      end
-    end
-
-    using ParsletContextCreateNode
 
     # {Transform} is a [parslet](http://kschiess.github.io/parslet/) transform for for turning the AST into objects in {GraphQL::Language::Nodes} objects.
     class Transform < Parslet::Transform
+
+      # @param [Symbol] name of a node constant
+      # @param [Hash] attributes to initialize the {Node} with
+      # @return [GraphQL::Language::Node] a node of type `name` with attributes `attributes`
+      CREATE_NODE = Proc.new do |name, attributes|
+        node_class = GraphQL::Language::Nodes.const_get(name)
+        node_class.new(attributes)
+      end
+
       def self.optional_sequence(name)
         rule(name => simple(:val)) { [] }
         rule(name => sequence(:val)) { val }
       end
 
       # Document
-      rule(document_parts: sequence(:p)) { create_node(:Document, parts: p, line: (p.first ? p.first.line : 1), col: (p.first ? p.first.col : 1))}
-      rule(document_parts: simple(:p)) { create_node(:Document, parts: [], line: 1, col: 1)}
+      rule(document_parts: sequence(:p)) { CREATE_NODE[:Document, parts: p, line: (p.first ? p.first.line : 1), col: (p.first ? p.first.col : 1)]}
+      rule(document_parts: simple(:p)) { CREATE_NODE[:Document, parts: [], line: 1, col: 1]}
 
       # Fragment Definition
       rule(
@@ -34,20 +28,20 @@ module GraphQL
         type_condition: simple(:type),
         directives:     sequence(:directives),
         selections:     sequence(:selections)
-      ) { create_node(:FragmentDefinition, name: name.to_s, type: type.to_s, directives: directives, selections: selections, position_source: kw)}
+      ) { CREATE_NODE[:FragmentDefinition, name: name.to_s, type: type.to_s, directives: directives, selections: selections, position_source: kw]}
 
       rule(
         fragment_spread_keyword: simple(:kw),
         fragment_spread_name: simple(:n),
         directives:           sequence(:d)
-      ) { create_node(:FragmentSpread, name: n.to_s, directives: d, position_source: kw)}
+      ) { CREATE_NODE[:FragmentSpread, name: n.to_s, directives: d, position_source: kw]}
 
       rule(
         fragment_spread_keyword: simple(:kw),
         inline_fragment_type: simple(:n),
         directives: sequence(:d),
         selections: sequence(:s),
-      ) { create_node(:InlineFragment, type: n.to_s, directives: d, selections: s, position_source: kw)}
+      ) { CREATE_NODE[:InlineFragment, type: n.to_s, directives: d, selections: s, position_source: kw]}
 
       # Operation Definition
       rule(
@@ -56,14 +50,14 @@ module GraphQL
         variables:      sequence(:v),
         directives:     sequence(:d),
         selections:     sequence(:s),
-      ) { create_node(:OperationDefinition, operation_type: ot.to_s, name: n.to_s, variables: v, directives: d, selections: s, position_source: ot) }
+      ) { CREATE_NODE[:OperationDefinition, operation_type: ot.to_s, name: n.to_s, variables: v, directives: d, selections: s, position_source: ot] }
       optional_sequence(:optional_variables)
-      rule(variable_name: simple(:n), variable_type: simple(:t), variable_optional_default_value: simple(:v)) { create_node(:Variable, name: n.name, type: t, default_value: v, line: n.line, col: n.col)}
-      rule(variable_name: simple(:n), variable_type: simple(:t), variable_optional_default_value: sequence(:v)) { create_node(:Variable, name: n.name, type: t, default_value: v, line: n.line, col: n.col)}
+      rule(variable_name: simple(:n), variable_type: simple(:t), variable_optional_default_value: simple(:v)) { CREATE_NODE.(:Variable, name: n.name, type: t, default_value: v, line: n.line, col: n.col)}
+      rule(variable_name: simple(:n), variable_type: simple(:t), variable_optional_default_value: sequence(:v)) { CREATE_NODE.(:Variable, name: n.name, type: t, default_value: v, line: n.line, col: n.col)}
       rule(variable_default_value: simple(:v) ) { v }
       rule(variable_default_value: sequence(:v) ) { v }
       # Query short-hand
-      rule(unnamed_selections: sequence(:s)) { create_node(:OperationDefinition, selections: s, operation_type: "query", name: nil, variables: [], directives: [], line: s.first.line, col: s.first.col)}
+      rule(unnamed_selections: sequence(:s)) { CREATE_NODE[:OperationDefinition, selections: s, operation_type: "query", name: nil, variables: [], directives: [], line: s.first.line, col: s.first.col]}
 
       # Field
       rule(
@@ -72,32 +66,32 @@ module GraphQL
         field_arguments: sequence(:args),
         directives: sequence(:dir),
         selections: sequence(:sel)
-      ) { create_node(:Field, alias: a && a.to_s, name: name.to_s, arguments: args, directives: dir, selections: sel, position_source: [a, name].find { |part| !part.nil? }) }
+      ) { CREATE_NODE[:Field, alias: a && a.to_s, name: name.to_s, arguments: args, directives: dir, selections: sel, position_source: [a, name].find { |part| !part.nil? }] }
 
       rule(alias_name: simple(:a)) { a }
       optional_sequence(:optional_field_arguments)
-      rule(field_argument_name: simple(:n), field_argument_value: simple(:v)) { create_node(:Argument, name: n.to_s, value: v, position_source: n)}
-      rule(field_argument_name: simple(:n), field_argument_value: sequence(:v)) { create_node(:Argument, name: n.to_s, value: v, position_source: n)}
+      rule(field_argument_name: simple(:n), field_argument_value: simple(:v)) { CREATE_NODE[:Argument, name: n.to_s, value: v, position_source: n]}
+      rule(field_argument_name: simple(:n), field_argument_value: sequence(:v)) { CREATE_NODE[:Argument, name: n.to_s, value: v, position_source: n]}
       optional_sequence(:optional_selections)
       optional_sequence(:optional_directives)
 
       # Directive
-      rule(directive_name: simple(:name), directive_arguments: sequence(:args)) { create_node(:Directive, name: name.to_s, arguments: args, position_source: name ) }
-      rule(directive_argument_name: simple(:n), directive_argument_value: simple(:v)) { create_node(:Argument, name: n.to_s, value: v, position_source: n)}
+      rule(directive_name: simple(:name), directive_arguments: sequence(:args)) { CREATE_NODE[:Directive, name: name.to_s, arguments: args, position_source: name ] }
+      rule(directive_argument_name: simple(:n), directive_argument_value: simple(:v)) { CREATE_NODE[:Argument, name: n.to_s, value: v, position_source: n]}
       optional_sequence(:optional_directive_arguments)
 
       # Type Defs
-      rule(type_name: simple(:n))     { create_node(:TypeName, name: n.to_s, position_source: n) }
-      rule(list_type: simple(:t))     { create_node(:ListType, of_type: t, line: t.line, col: t.col)}
-      rule(non_null_type: simple(:t)) { create_node(:NonNullType, of_type: t, line: t.line, col: t.col)}
+      rule(type_name: simple(:n))     { CREATE_NODE[:TypeName, name: n.to_s, position_source: n] }
+      rule(list_type: simple(:t))     { CREATE_NODE[:ListType, of_type: t, line: t.line, col: t.col] }
+      rule(non_null_type: simple(:t)) { CREATE_NODE[:NonNullType, of_type: t, line: t.line, col: t.col] }
 
       # 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 ? v.first.line : 1), col: (v.first ? v.first.col : 1)) }
-      rule(input_object_name: simple(:n), input_object_value: simple(:v)) { create_node(:Argument, name: n.to_s, value: v, position_source: n)}
-      rule(input_object_name: simple(:n), input_object_value: sequence(:v)) { create_node(:Argument, name: n.to_s, value: v, position_source: n)}
+      rule(input_object: sequence(:v)) { CREATE_NODE[:InputObject, pairs: v, line: (v.first ? v.first.line : 1), col: (v.first ? v.first.col : 1)] }
+      rule(input_object_name: simple(:n), input_object_value: simple(:v)) { CREATE_NODE[:Argument, name: n.to_s, value: v, position_source: n]}
+      rule(input_object_name: simple(:n), input_object_value: sequence(:v)) { CREATE_NODE[:Argument, name: n.to_s, value: v, position_source: n]}
       rule(int: simple(:v)) { v.to_i }
       rule(float: simple(:v)) { v.to_f }
 
@@ -112,8 +106,8 @@ module GraphQL
         string
       }
       rule(optional_string_content: simple(:v)) { v.to_s }
-      rule(variable: simple(:v)) { create_node(:VariableIdentifier, name: v.to_s, position_source: v) }
-      rule(enum: simple(:v)) { create_node(:Enum, name: v.to_s, position_source: v)}
+      rule(variable: simple(:v)) { CREATE_NODE[:VariableIdentifier, name: v.to_s, position_source: v] }
+      rule(enum: simple(:v)) { CREATE_NODE[:Enum, name: v.to_s, position_source: v] }
     end
   end
 end

data/lib/graphql/list_type.rb

@@ -18,11 +18,17 @@ class GraphQL::ListType < GraphQL::BaseType
   end
 
   def valid_non_null_input?(value)
-    return false unless value.is_a?(Array)
-    value.all?{ |item| of_type.valid_input?(item) }
+    ensure_array(value).all?{ |item| of_type.valid_input?(item) }
   end
 
   def coerce_non_null_input(value)
-    value.map{ |item| of_type.coerce_input(item) }
+    ensure_array(value).map{ |item| of_type.coerce_input(item) }
+  end
+
+
+  private
+
+  def ensure_array(value)
+    value.is_a?(Array) ? value : [value]
   end
 end

data/lib/graphql/static_validation/literal_validator.rb

@@ -3,9 +3,9 @@ class GraphQL::StaticValidation::LiteralValidator
   def validate(ast_value, type)
     if type.kind.non_null?
       (!ast_value.nil?) && validate(ast_value, type.of_type)
-    elsif type.kind.list? && ast_value.is_a?(Array)
+    elsif type.kind.list?
       item_type = type.of_type
-      ast_value.all? { |val| validate(val, item_type) }
+      ensure_array(ast_value).all? { |val| validate(val, item_type) }
     elsif type.kind.scalar? && !ast_value.is_a?(GraphQL::Language::Nodes::AbstractNode) && !ast_value.is_a?(Array)
       type.valid_input?(ast_value)
     elsif type.kind.enum? && ast_value.is_a?(GraphQL::Language::Nodes::Enum)
@@ -39,6 +39,10 @@ class GraphQL::StaticValidation::LiteralValidator
     ast_node.pairs.all? do |value|
      field_type = fields[value.name].type
      validate(value.value, field_type)
-   end
- end
+    end
+  end
+
+  def ensure_array(value)
+    value.is_a?(Array) ? value : [value]
+  end
 end

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.10.6"
+  VERSION = "0.10.7"
 end

data/spec/graphql/interface_type_spec.rb

@@ -28,7 +28,7 @@ describe GraphQL::InterfaceType do
     let(:interface) {
       GraphQL::InterfaceType.define do
         resolve_type -> (object) {
-          return :custom_resolve
+          :custom_resolve
         }
       end
     }

data/spec/graphql/query/variables_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+
+describe GraphQL::Query::Variables do
+  let(:query_string) {%|
+  query getCheese($animals: [DairyAnimal]) {
+    cheese(id: 1) {
+      similarCheese(source: $animals)
+    }
+  }
+  |}
+  let(:ast_variables) { GraphQL.parse(query_string).parts.first.variables }
+  let(:variables) { GraphQL::Query::Variables.new(
+    DummySchema,
+    ast_variables,
+    provided_variables)
+  }
+
+  describe "#initialize" do
+    describe "coercing inputs" do
+      let(:provided_variables) {
+        {"animals" => "YAK"}
+      }
+      it "coerces single items into one-element lists" do
+        assert_equal ["YAK"], variables["animals"]
+      end
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
       yakSource: searchDairy(product: [{source: COW, fatContent: 1.1}]) { source }
       badSource: searchDairy(product: [{source: 1.1}]) { source }
       missingSource: searchDairy(product: [{fatContent: 1.1}]) { source }
+      listCoerce: cheese(id: 1) { similarCheese(source: YAK) }
     }
 
     fragment cheeseFields on Cheese {
@@ -53,7 +54,7 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
 
     fragment_error = {
       "message"=>"Argument 'source' on Field 'similarCheese' has an invalid value",
-      "locations"=>[{"line"=>11, "column"=>7}]
+      "locations"=>[{"line"=>12, "column"=>7}]
     }
     assert_includes(errors, fragment_error)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -150,8 +150,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
-description: Full-fledged implementation of the GraphQL spec. Includes query parsing,
-  static validation, type definition, and query execution.
+description: A GraphQL server implementation for Ruby. Includes schema definition,
+  query parsing, static validation, type definition, and query execution.
 email:
 - rdmosolgo@gmail.com
 executables: []
@@ -283,6 +283,7 @@ files:
 - spec/graphql/query/context_spec.rb
 - spec/graphql/query/executor_spec.rb
 - spec/graphql/query/type_resolver_spec.rb
+- spec/graphql/query/variables_spec.rb
 - spec/graphql/query_spec.rb
 - spec/graphql/scalar_type_spec.rb
 - spec/graphql/schema/field_validator_spec.rb
@@ -341,7 +342,7 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: A GraphQL implementation for Ruby
+summary: A GraphQL server implementation for Ruby
 test_files:
 - spec/graphql/base_type_spec.rb
 - spec/graphql/directive_spec.rb
@@ -365,6 +366,7 @@ test_files:
 - spec/graphql/query/context_spec.rb
 - spec/graphql/query/executor_spec.rb
 - spec/graphql/query/type_resolver_spec.rb
+- spec/graphql/query/variables_spec.rb
 - spec/graphql/query_spec.rb
 - spec/graphql/scalar_type_spec.rb
 - spec/graphql/schema/field_validator_spec.rb