graphql 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5651b5fa2ec7dde473a9747b9899bcb99a71b1d5
-  data.tar.gz: a3c045b8d41109f2867090f68c0868eb68671d55
+  metadata.gz: a8c997dbb80987c2b0312c95913b8cb7bef898be
+  data.tar.gz: f77f1a3b90d96887a93ee560f8dd5ba5370a4453
 SHA512:
-  metadata.gz: e4ca9364a51bc9d85927d3a00f9d06514a386a482078366167f647eb483455d0bb052041a921f0c107e84cb872a26343d26684c6c625a5fcc8ba19132191ffae
-  data.tar.gz: 6c60beeafb45f1246293c4aa559e04a0240ca1e2a9d82f3323f3a34320bd2d5703f3b38aa647ad21b57128a9121cb9ec2a1c213dd0d42400a1bce801a3da31f0
+  metadata.gz: 4f20614f4bcefc6ed7771c516046ae24581785ea25579e0bd5a8bdcad1cbd7d5eca7c981e59b4eec08bb54772cdb15c3f5f44f62eee1ea51d224e2c87608c821
+  data.tar.gz: a525157abbc09c4b1abd6e55a18b975305dbb93d8583709850bc159cb2e7d87ee62dd3b3d7fddf9188daa3e6c07f1bb83f2c8715c921c8b12b1e898e823dfbf0

data/lib/graphql/language/parser.rb

@@ -97,7 +97,7 @@ module GraphQL
       rule(:value_input_object) { str("{") >> space? >> value_input_object_pair.repeat(1).as(:input_object) >> space? >> str("}") }
       rule(:value_input_object_pair) { space? >> name.as(:input_object_name) >>  space? >> str(":") >> space? >> value.as(:input_object_value) >> separator? }
       rule(:value_int) { (value_sign? >> match('\d').repeat(1)).as(:int) }
-      rule(:value_string) { str('"') >> value_string_char.repeat.as(:string) >> str('"')}
+      rule(:value_string) { str('"') >> value_string_char.repeat.maybe.as(:optional_string_content).as(:string) >> str('"')}
       rule(:value_string_char) { value_string_escaped_char | value_string_escaped_unicode | value_string_source_char}
       rule(:value_string_escaped_char) { str("\\") >> match('["\/bfnrt]') }
       rule(:value_string_escaped_unicode) { str("\\") >> match('u[\dA-Fa-f]{4}')}

data/lib/graphql/language/transform.rb

@@ -110,6 +110,7 @@ module GraphQL
         string.gsub!(UTF_8, &UTF_8_REPLACE)
         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)}
     end

data/lib/graphql/schema/type_reducer.rb

@@ -4,7 +4,6 @@ class GraphQL::Schema::TypeReducer
   attr_reader :type, :existing_type_hash
 
   def initialize(type, existing_type_hash)
-    type = type.nil? ? nil : type.unwrap
     validate_type(type)
     if type.respond_to?(:name) && existing_type_hash.fetch(type.name, nil).equal?(type)
       @result = existing_type_hash
@@ -58,7 +57,10 @@ class GraphQL::Schema::TypeReducer
   end
 
   def reduce_type(type, type_hash)
-    self.class.new(type, type_hash).result
+    unless type.is_a?(GraphQL::BaseType)
+      raise GraphQL::Schema::InvalidTypeError.new(type, ["Must be a GraphQL::BaseType"])
+    end
+    self.class.new(type.unwrap, type_hash).result
   end
 
   def validate_type(type)

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

data/readme.md

@@ -8,7 +8,11 @@
 
 A Ruby implementation of [GraphQL](http://graphql.org/).
 
- - [Introduction](https://github.com/rmosolgo/graphql-ruby/blob/master/guides/introduction.md)
+ - Guides
+     - [Introduction](https://github.com/rmosolgo/graphql-ruby/blob/master/guides/introduction.md)
+     - [Defining Your Schema](https://github.com/rmosolgo/graphql-ruby/blob/master/guides/defining_your_schema.md)
+     - [Executing Queries](https://github.com/rmosolgo/graphql-ruby/blob/master/guides/executing_queries.md)
+
  - [API Documentation](http://www.rubydoc.info/github/rmosolgo/graphql-ruby)
 
 ## Installation

data/spec/graphql/language/parser_spec.rb

@@ -68,7 +68,7 @@ describe GraphQL::Language::Parser do
     assert(parser.field.parse_with_debug(%|myField { name, id }|), 'gets subselections')
     assert(parser.field.parse_with_debug(%{myAlias: myField}), 'gets an alias')
     assert(parser.field.parse_with_debug(%{myField(intKey: 1, floatKey: 1.1e5)}), 'gets arguments')
-    assert(parser.field.parse_with_debug('myAlias: myField(stringKey: "\"my_string\"", boolKey: false, objKey: { key : true }, otherObjKey: {key: true})'), 'gets alias and arguments')
+    assert(parser.field.parse_with_debug('myAlias: myField(stringKey: "\"my_string\"", emptyStringKey: "", boolKey: false, objKey: { key : true }, otherObjKey: {key: true})'), 'gets alias and arguments')
     assert(parser.field.parse_with_debug(%|myField @withFlag, @skip(if: true) { name, id }|), 'gets with directive')
   end
 

data/spec/graphql/language/transform_spec.rb

@@ -88,7 +88,7 @@ describe GraphQL::Language::Transform do
   end
 
   it 'transforms fields' do
-    res = get_result(%|best_pals: friends(first: 3, coolnessLevel: SO_COOL, query: {nice: {very: true}})|, parse: :field)
+    res = get_result(%|best_pals: friends(first: 3, coolnessLevel: SO_COOL, query: {nice: {very: true}}, emptyStr: "")|, parse: :field)
     assert_equal(GraphQL::Language::Nodes::Field, res.class)
     assert_equal(1, res.line)
     assert_equal(1, res.col)

data/spec/graphql/schema/type_reducer_spec.rb

@@ -51,10 +51,22 @@ describe GraphQL::Schema::TypeReducer do
       end
     }
 
-    it 'raises an InvalidTypeError' do
+    let(:another_invalid_type) {
+      GraphQL::ObjectType.define do
+        name "AnotherInvalidType"
+        field :someField, String
+      end
+    }
+
+    it 'raises an InvalidTypeError when passed nil' do
       reducer = GraphQL::Schema::TypeReducer.new(invalid_type, {})
       assert_raises(GraphQL::Schema::InvalidTypeError) { reducer.result }
     end
+
+    it 'raises an InvalidTypeError when passed an object that isnt a GraphQL::BaseType' do
+      reducer = GraphQL::Schema::TypeReducer.new(another_invalid_type, {})
+      assert_raises(GraphQL::Schema::InvalidTypeError) { reducer.result }
+    end
   end
 
   describe 'when a schema has multiple types with the same name' do

data/spec/support/calculator_schema.rb

@@ -0,0 +1,73 @@
+# This GraphQL Schema performs operations on numbers.
+# It can perform operations on values you give it and return values
+# It also maintains some state which can be updated or read
+
+# You can reduce a list of values to a single value
+REDUCERS = {
+  "SUM" => -> (values) { [values.inject(&:+)] },
+  "MAX" => :max.to_proc,
+  "MIN" => :min.to_proc,
+}
+
+ReducerEnum = GraphQL::EnumType.define do
+  REDUCERS.map do |op_name, op_proc|
+    value(op_name)
+  end
+end
+
+# You can make a new list by transforming each member
+MAPPERS = {
+  "ADD" => -> (val, arg) { val + arg },
+  "SUB" => -> (val, arg) { val - arg },
+  "EQ" => -> (val, arg) { val == arg ? 1 : 0},
+}
+
+MapperEnum = GraphQL::EnumType.define do
+  MAPPERS.map do |op_name, op_proc|
+    value(op_name)
+  end
+end
+
+# Input a list of integers
+ListOfInts = GraphQL::INT_TYPE.to_list_type
+
+# Expose a list of values and perform operations
+ValuesType = GraphQL::ObjectType.define do
+  field :values, ListOfInts do
+    resolve -> (obj, _args, _ctx) { obj }
+  end
+
+  # Get a single value based on the values in this list
+  field :reduce, types.Int do
+    argument :operation, !ReducerEnum
+    resolve -> (obj, args, ctx)  {
+      reduce_name = args[:operation]
+      reduce_fn = REDUCERS[reduce_name]
+      reduce_fn.call(obj)
+    }
+  end
+
+  # Handle self-referential fields by wrapping the type in a proc.
+  # It will be lazy-eval'ed
+  field :map, -> { ValuesType } do
+    argument :operation, !MapperEnum
+    argument :argument, !types.Int
+    resolve -> (obj, args, ctx) {
+      op_arg = args[:argument]
+      op_name = args[:operation]
+      op_func = MAPPERS[op_name]
+      obj.map { |item| op_func.call(item, op_arg) }
+    }
+  end
+end
+
+QueryType = GraphQL::ObjectType.define do
+  name("Query")
+
+  field :perform, ValuesType do
+    argument :initial, !ListOfInts
+    resolve -> (obj, args, ctx) { args[:initial] }
+  end
+end
+
+CalculatorSchema = GraphQL::Schema.new(query: QueryType)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -313,6 +313,7 @@ files:
 - spec/graphql/static_validation/validator_spec.rb
 - spec/graphql/union_type_spec.rb
 - spec/spec_helper.rb
+- spec/support/calculator_schema.rb
 - spec/support/dairy_app.rb
 - spec/support/dairy_data.rb
 - spec/support/star_wars_data.rb
@@ -394,6 +395,7 @@ test_files:
 - spec/graphql/static_validation/validator_spec.rb
 - spec/graphql/union_type_spec.rb
 - spec/spec_helper.rb
+- spec/support/calculator_schema.rb
 - spec/support/dairy_app.rb
 - spec/support/dairy_data.rb
 - spec/support/star_wars_data.rb