graphql 0.2.0 → 0.3.0

data/lib/graph_ql/{union.rb → types/union.rb}

@@ -17,8 +17,4 @@ class GraphQL::Union
     type_name = object.class.name
     possible_types.find {|t| t.name == type_name}
   end
-
-  def to_s
-    "<GraphQL::Union #{name}>"
-  end
 end

data/lib/graph_ql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/graphql.rb

@@ -12,56 +12,26 @@ module GraphQL
     raise [line, col, string].join(", ")
   end
 
-  module Definable
-    def 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
-  end
-
-  module Forwardable
-    def delegate(*methods, to:)
-      methods.each do |method_name|
-        define_method(method_name) do |*args|
-          self.public_send(to).public_send(method_name, *args)
-        end
-      end
-    end
-  end
-
   module Introspection; end
 end
 
+def require_dir(dir)
+  Dir.glob(File.expand_path("../graph_ql/#{dir}/*.rb", __FILE__)).each do |file|
+    require file
+  end
+end
 # Order matters for these:
 
-require 'graph_ql/types/non_null_with_bang'
+require_dir('definition_helpers')
 require 'graph_ql/types/object_type'
-require 'graph_ql/types/list_type'
-require 'graph_ql/types/scalar_type'
-require 'graph_ql/types/non_null_type'
-require 'graph_ql/types/input_value'
-require 'graph_ql/types/input_object_type'
-
-require 'graph_ql/types/type_definer'
-require 'graph_ql/types/field_definer'
-require 'graph_ql/types/argument_definer'
+require_dir('types')
 
-require 'graph_ql/enum'
 require 'graph_ql/field'
-require 'graph_ql/union'
 require 'graph_ql/type_kinds'
 require 'graph_ql/introspection/typename_field'
 
-require 'graph_ql/types/int_type'
-require 'graph_ql/types/string_type'
-require 'graph_ql/types/float_type'
-require 'graph_ql/types/boolean_type'
+require 'graph_ql/scalars/scalar_type'
+require_dir('scalars')
 
 require 'graph_ql/introspection/input_value_type'
 require 'graph_ql/introspection/enum_value_type'
@@ -87,7 +57,6 @@ require 'graph_ql/schema'
 
 # Order does not matter for these:
 
-require 'graph_ql/interface'
 require 'graph_ql/query'
 require 'graph_ql/repl'
 require 'graph_ql/static_validation'

data/readme.md

@@ -27,7 +27,7 @@
     t.name "Post"
     t.description "A blog post"
     t.fields({
-      id:       field.build(type: !types.Int)
+      id:       field.build(type: !types.Int),
       title:    field.build(type: !types.String),
       body:     field.build(type: !types.String),
       comments: field.build(type: types[!CommentType])
@@ -76,29 +76,35 @@
   -  [`queries_controller.rb`](https://github.com/rmosolgo/graphql-ruby-demo/blob/master/app/controllers/queries_controller.rb) for a Rails example
   - Try it on [heroku](http://graphql-ruby-demo.herokuapp.com)
 
-## To Do:
-
-- Validations:
-  - Implement validations:
-    - [Fragment spreads are on Object/Union/Interface](http://facebook.github.io/graphql/#sec-Fragments-On-Composite-Types)
-    - [Fragments don't go infinite](http://facebook.github.io/graphql/#sec-Fragment-spreads-must-not-form-cycles)
-    - [Fragment spreads are possible](http://facebook.github.io/graphql/#sec-Fragment-spread-is-possible)
-    - [In object scope, object-typed fragments are the same type](http://facebook.github.io/graphql/#sec-Object-Spreads-In-Object-Scope)
-    - [In object scope, abstract-typed fragments fit that object](http://facebook.github.io/graphql/#sec-Abstract-Spreads-in-Object-Scope)
-    - [In abstract scope, object-typed fragments fit that type](http://facebook.github.io/graphql/#sec-Object-Spreads-In-Abstract-Scope)
-    - [In abstract scope, abstract-typed fragments must share a type](http://facebook.github.io/graphql/#sec-Abstract-Spreads-in-Abstract-Scope)
-    - everything in [Variables](http://facebook.github.io/graphql/#sec-Validation.Operations.Variables)
-- directives:
-  - `@skip` has precedence over `@include`
-  - directives on fragments: http://facebook.github.io/graphql/#sec-Fragment-Directives
-- Support any "real" value for enum, not just stringified name (see `Character::EPISODES` in demo)
-- field merging (https://github.com/graphql/graphql-js/issues/19#issuecomment-118515077)
+## To Do
+
+- To match spec:
+  - Directives:
+    - `@skip` has precedence over `@include`
+    - directives on fragments: http://facebook.github.io/graphql/#sec-Fragment-Directives
+- Field merging
+  - if you were to request a field, then request it in a fragment, it would get looked up twice
+  - https://github.com/graphql/graphql-js/issues/19#issuecomment-118515077
 - Code clean-up
   - Unify unwrapping types (It's on `TypeKind` but it's still not right)
-  - de-dup stringify keys logic in `Field` and `ObjectType` and `Directive`
+- Cook up some path other than "n+1s everywhere"
 
-## Goals:
+## Goals
 
 - Implement the GraphQL spec & support a Relay front end
 - Provide idiomatic, plain-Ruby API with similarities to reference implementation where possible
 - Support `graphql-rails`
+
+## Getting Involved
+
+- __Say hi & ask questions__ in the [#ruby channel on Slack](https://graphql-slack.herokuapp.com/) or [on Twitter](https://twitter.com/rmosolgo)!
+- __Report bugs__ by posting a description, full stack trace, and all relevant code in a  [GitHub issue](https://github.com/rmosolgo/graphql-ruby/issues).
+- __Features & patches__ are welcome! Consider discussing it in an [issue](https://github.com/rmosolgo/graphql-ruby/issues) or in the [#ruby channel on Slack](https://graphql-slack.herokuapp.com/) to make sure we're on the same page.
+- __Run the tests__ with `rake test` or start up guard with `bundle exec guard`.
+
+## Other Resources
+
+- [GraphQL Spec](http://facebook.github.io/graphql/)
+- Other implementations: [graphql-links](https://github.com/emmenko/graphql-links)
+- `graphql-ruby` + Rails demo ([src](https://github.com/rmosolgo/graphql-ruby-demo) / [heroku](http://graphql-ruby-demo.herokuapp.com))
+- [GraphQL Slack](https://graphql-slack.herokuapp.com/)

data/spec/graph_ql/directive_spec.rb

@@ -23,14 +23,14 @@ describe GraphQL::Directive do
       fragment dontSkipIdField on Cheese { dontSkipId: id @skip(if: false) }
     |}
     it 'intercepts fields' do
-      expected = { "data" => {"directives" => {
+      expected = { "data" =>{
         "cheese" => {
           "dontSkipFlavor" => "Brie",
           "includeFlavor" => "Brie",
           "includeId" => 1,
           "dontSkipId" => 1,
         },
-      }}}
+      }}
       assert_equal(expected, result)
     end
   end
@@ -65,7 +65,7 @@ describe GraphQL::Directive do
     |}
 
     it 'intercepts fragment spreads' do
-      expected = { "data" => {"directives" => {
+      expected = { "data" => {
         "cheese" => {
           "dontSkipFlavor" => "Brie",
           "includeFlavor" => "Brie",
@@ -74,7 +74,7 @@ describe GraphQL::Directive do
           "dontSkipInlineId" => 1,
           "includeInlineId" => 1,
         },
-      }}}
+      }}
       assert_equal(expected, result)
     end
   end

data/spec/graph_ql/introspection/directive_type_spec.rb

@@ -11,7 +11,7 @@ describe GraphQL::Introspection::DirectiveType do
   let(:result) { GraphQL::Query.new(DummySchema, query_string).result }
 
   it 'shows directive info ' do
-    expected = { "data" => {"getDirectives" => {
+    expected = { "data" => {
       "__schema" => {
         "directives" => [
           {
@@ -34,7 +34,7 @@ describe GraphQL::Introspection::DirectiveType do
           },
         ]
       }
-    }}}
+    }}
     assert_equal(expected, result)
   end
 end

data/spec/graph_ql/introspection/schema_type_spec.rb

@@ -12,12 +12,13 @@ describe GraphQL::Introspection::SchemaType do
   |}
   let(:result) { GraphQL::Query.new(DummySchema, query_string).result }
   it 'exposes the schema' do
-    expected = { "data" => { "getSchema" => {
+    expected = { "data" => {
       "__schema" => {
         "types" => DummySchema.types.values.map { |t| t.name.nil? ? (p t; raise("no name for #{t}")) : {"name" => t.name} },
         "queryType"=>{
           "fields"=>[
             {"name"=>"cheese"},
+            {"name"=>"milk"},
             {"name"=>"fromSource"},
             {"name"=>"favoriteEdible"},
             {"name"=>"searchDairy"},
@@ -34,7 +35,7 @@ describe GraphQL::Introspection::SchemaType do
           ]
         },
       }
-    }}}
+    }}
     assert_equal(expected, result)
   end
 end

data/spec/graph_ql/introspection/type_type_spec.rb

@@ -25,7 +25,7 @@ describe GraphQL::Introspection::TypeType do
     {"name"=>"SHEEP", "isDeprecated"=> false },
   ]}
   it 'exposes metadata about types' do
-    expected = {"data"=> { "introspectionQuery" => {
+    expected = {"data"=> {
       "cheeseType" => {
         "name"=> "Cheese",
         "kind" => "OBJECT",
@@ -37,7 +37,7 @@ describe GraphQL::Introspection::TypeType do
           {"name"=>"AnimalProduct"}
         ],
         "fields"=>[
-          {"type"=>{"name"=>"Non-Null", "ofType"=>{"name"=>"Int"}}},
+          {"type"=>{"name"=>"Non-Null", "ofType"=>{"name"=>"ID"}}},
           {"type"=>{"name"=>"DairyAnimal", "ofType"=>nil}},
           {"type"=>{"name"=>"Non-Null", "ofType"=>{"name"=>"Float"}}},
           {"type"=>{"name"=>"List", "ofType"=>{"name"=>"String"}}},
@@ -63,7 +63,7 @@ describe GraphQL::Introspection::TypeType do
           {"name"=>"__typename"},
         ]
       }
-    }}}
+    }}
     assert_equal(expected, query.result)
   end
 
@@ -78,7 +78,7 @@ describe GraphQL::Introspection::TypeType do
     it 'can expose deprecated fields' do
       typename = cheese_fields.pop
       new_cheese_fields = cheese_fields + [deprecated_fields, typename]
-      expected = { "data" => { "introspectionQuery" => {
+      expected = { "data" => {
         "cheeseType" => {
           "name"=> "Cheese",
           "kind" => "OBJECT",
@@ -89,7 +89,7 @@ describe GraphQL::Introspection::TypeType do
           "kind"=>"ENUM",
           "enumValues"=> dairy_animals + [{"name" => "YAK", "isDeprecated" => true}],
         },
-      }}}
+      }}
       assert_equal(expected, query.result)
     end
 
@@ -101,7 +101,7 @@ describe GraphQL::Introspection::TypeType do
       |}
 
       it 'exposes metadata about input objects' do
-        expected = { "data" => { "introspectionQuery" => {
+        expected = { "data" => {
             "__type" => {
               "name"=>"DairyProductInput",
               "description"=>"Properties for finding a dairy product",
@@ -111,7 +111,7 @@ describe GraphQL::Introspection::TypeType do
                 {"name"=>"fatContent", "type"=>{ "name" => "Float"}, "defaultValue"=>nil}
               ]
             }
-          }}}
+          }}
         assert_equal(expected, query.result)
       end
     end

data/spec/graph_ql/parser/parser_spec.rb

@@ -9,7 +9,11 @@ describe GraphQL::Parser do
     # a read-only:
     query getStuff {id, name @skip(if: true)}
     # a mutation:
-    mutation changeStuff($override: Boolean!, $cucumbers: [Vegetable]!) @veggie, @healthy(vitamins: true) {
+    mutation changeStuff(
+      $override: Boolean = true,
+      $cucumbers: [Vegetable]!,
+      $input: SomeInputType = {key: "value"},
+    ) @veggie, @healthy(vitamins: true) {
       # change the cucumber
       changeStuff(thing: $cucumbers) {
         id,
@@ -72,7 +76,7 @@ describe GraphQL::Parser do
     assert(parser.operation_variable_definition.parse_with_debug("$myVar: [Int]"), "it gets list variables")
     assert(parser.operation_variable_definition.parse_with_debug("$myVar: Elephant!"), "it gets non-null variables")
     assert(parser.operation_variable_definition.parse_with_debug("$myVar: [Food]!"), "it gets non-null list variables")
-    assert(parser.operation_variable_definitions.parse_with_debug(%|($myVar: Elephant!, $myList: [Float], $myString: String="Cheese")|), "it gets a list of defns")
+    assert(parser.operation_variable_definitions.parse_with_debug(%|($myVar: Elephant!, $myList: [Float], $myString: String = "Cheese")|), "it gets a list of defns")
   end
 
   describe 'value' do

data/spec/graph_ql/query_spec.rb

@@ -4,17 +4,17 @@ describe GraphQL::Query do
   describe '#execute' do
     let(:query_string) { %|
       query getFlavor($cheeseId: Int!) {
-        brie: cheese(id: 1)   { ...cheeseFields, ... milkFields, taste: flavor },
+        brie: cheese(id: 1)   { ...cheeseFields, taste: flavor },
         cheese(id: $cheeseId)  {
           __typename,
           id,
           ...cheeseFields,
           ... edibleFields,
           ... on Cheese { cheeseKind: flavor },
-          ... on Milk { source }
         }
         fromSource(source: COW) { id }
-        firstSheep: searchDairy(product: {source: SHEEP}) { ... dairyFields }
+        fromSheep: fromSource(source: SHEEP) { id }
+        firstSheep: searchDairy(product: {source: SHEEP}) { ... dairyFields, ... milkFields }
         favoriteEdible { __typename, fatContent }
       }
       fragment cheeseFields on Cheese { flavor }
@@ -26,11 +26,11 @@ describe GraphQL::Query do
       }
     |}
     let(:debug) { false }
-    let(:query) { GraphQL::Query.new(DummySchema, query_string, context: {}, params: {"cheeseId" => 2}, debug: debug)}
+    let(:query) { GraphQL::Query.new(DummySchema, query_string, params: {"cheeseId" => 2}, debug: debug)}
     let(:result) { query.result }
 
     it 'returns fields on objects' do
-      expected = {"data"=> { "getFlavor" => {
+      expected = {"data"=> {
           "brie" =>   { "flavor" => "Brie", "taste" => "Brie" },
           "cheese" => {
             "__typename" => "Cheese",
@@ -40,9 +40,10 @@ describe GraphQL::Query do
             "cheeseKind" => "Gouda",
           },
           "fromSource" => [{ "id" => 1 }, {"id" => 2}],
+          "fromSheep"=>[{"id"=>3}],
           "firstSheep" => { "flavor" => "Manchego" },
           "favoriteEdible"=>{"__typename"=>"Milk", "fatContent"=>0.04},
-      }}}
+      }}
       assert_equal(expected, result)
     end
 
@@ -81,14 +82,31 @@ describe GraphQL::Query do
       |}
       it 'executes mutations in order' do
         expected = {"data"=>{
-          "setInOrder"=>{
             "first"=> [1],
             "second"=>[1, 5],
             "third"=> [1, 5, 2],
-          }
         }}
         assert_equal(expected, result)
       end
     end
   end
+
+  describe 'context' do
+    let(:context_field) { GraphQL::Field.new do |f, types, field, args|
+      f.type(GraphQL::STRING_TYPE)
+      f.arguments(key: args.build(type: types.String))
+      f.resolve -> (target, args, ctx) { ctx[args["key"]] }
+    end}
+    let(:query_type) { GraphQL::ObjectType.new {|t| t.fields({context: context_field})}}
+    let(:schema) { GraphQL::Schema.new(query: query_type, mutation: nil)}
+    let(:query) { GraphQL::Query.new(schema, query_string, context: {"some_key" => "some value"})}
+    let(:query_string) { %|
+      query getCtx { context(key: "some_key") }
+    |}
+
+    it 'passes context to fields' do
+      expected = {"data" => {"context" => "some value"}}
+      assert_equal(expected, query.result)
+    end
+  end
 end

data/spec/graph_ql/scalars/id_type_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe GraphQL::ID_TYPE do
+  let(:query) { GraphQL::Query.new(DummySchema, query_string)}
+  let(:result) { query.result }
+
+  describe 'coercion for int inputs' do
+    let(:query_string) { %|query getMilk { cow: milk(id: 1) { id } }| }
+
+    it 'coerces IDs from ints and serializes as strings' do
+      expected = {"data" => {"cow" => {"id" => "1"}}}
+      assert_equal(expected, result)
+    end
+  end
+
+  describe 'coercion for string inputs' do
+    let(:query_string) { %|query getMilk { cow: milk(id: "1") { id } }| }
+
+    it 'coerces IDs from strings and serializes as strings' do
+      expected = {"data" => {"cow" => {"id" => "1"}}}
+      assert_equal(expected, result)
+    end
+  end
+end

data/spec/graph_ql/schema/type_reducer_spec.rb

@@ -11,6 +11,7 @@ describe GraphQL::Schema::TypeReducer do
       "Float" => GraphQL::FLOAT_TYPE,
       "Edible" => EdibleInterface,
       "Milk" => MilkType,
+      "ID" => GraphQL::ID_TYPE,
       "AnimalProduct" => AnimalProductInterface,
     }
     assert_equal(expected.keys, reducer.result.keys)

data/spec/graph_ql/schema/type_validator_spec.rb

@@ -45,7 +45,7 @@ describe GraphQL::Schema::TypeValidator do
     let(:errors) { e = []; GraphQL::Schema::TypeValidator.new.validate(object, e); e;}
     it 'must be 2+ types, must be only object types' do
       expected = [
-        "Something.possible_types must be objects, but some aren't: <GraphQL::InputObjectType DairyProductInput>",
+        "Something.possible_types must be objects, but some aren't: DairyProductInput",
         "Union Something must be defined with 2 or more types, not 1",
       ]
       assert_equal(expected, errors)

data/spec/graph_ql/static_validation/{argument_literals_are_compatible_spec.rb → rules/argument_literals_are_compatible_spec.rb}

@@ -14,7 +14,7 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
     }
   |)}
 
-  let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, validators: [GraphQL::StaticValidation::ArgumentLiteralsAreCompatible]) }
+  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