graphql 0.18.14 → 0.18.15

data/lib/graphql/language/parser.y

@@ -146,9 +146,12 @@ rule
       name             { return [val[0].to_s]}
     | name_list name   { val[0] << val[1].to_s }
 
-  enum_name_list:
-      enum_name                  { return [val[0].to_s]}
-    | enum_name_list enum_name   { return val[0] << val[1].to_s }
+  enum_value_definition:
+    enum_name directives_list_opt { return make_node(:EnumValueDefinition, name: val[0], directives: val[1]) }
+
+  enum_value_definitions:
+      enum_value_definition                        { return [val[0]] }
+    | enum_value_definitions enum_value_definition { return val[0] << val[1] }
 
   arguments_opt:
       /* none */                    { return [] }
@@ -194,7 +197,7 @@ rule
   object_value_field:
       name COLON input_value { return make_node(:Argument, name: val[0], value: val[2], position_source: val[0])}
 
-  enum_value: enum_name { return make_node(:Enum, name: val[0], position_source: val[0])}
+  enum_value: enum_name { return make_node(:Enum, name: val[0], position_source: val[0]) }
 
   directives_list_opt:
       /* none */      { return [] }
@@ -265,11 +268,11 @@ rule
     | enum_type_definition
     | input_object_type_definition
 
-  scalar_type_definition: SCALAR name { return make_node(:ScalarTypeDefinition, name: val[1]) }
+  scalar_type_definition: SCALAR name directives_list_opt { return make_node(:ScalarTypeDefinition, name: val[1], directives: val[2]) }
 
   object_type_definition:
-      TYPE name implements_opt RCURLY field_definition_list LCURLY {
-        return make_node(:ObjectTypeDefinition, name: val[1], interfaces: val[2], fields: val[4])
+      TYPE name implements_opt directives_list_opt RCURLY field_definition_list LCURLY {
+        return make_node(:ObjectTypeDefinition, name: val[1], interfaces: val[2], directives: val[3], fields: val[5])
       }
 
   implements_opt:
@@ -277,8 +280,8 @@ rule
     | IMPLEMENTS name_list { return val[1] }
 
   input_value_definition:
-      name COLON type default_value_opt {
-        return make_node(:InputValueDefinition, name: val[0], type: val[2], default_value: val[3])
+      name COLON type default_value_opt directives_list_opt {
+        return make_node(:InputValueDefinition, name: val[0], type: val[2], default_value: val[3], directives: val[4])
       }
 
   input_value_definition_list:
@@ -290,8 +293,8 @@ rule
     | RPAREN input_value_definition_list LPAREN { return val[1] }
 
   field_definition:
-      name arguments_definitions_opt COLON type {
-        return make_node(:FieldDefinition, name: val[0], arguments: val[1], type: val[3])
+      name arguments_definitions_opt COLON type directives_list_opt {
+        return make_node(:FieldDefinition, name: val[0], arguments: val[1], type: val[3], directives: val[4])
       }
 
   field_definition_list:
@@ -299,8 +302,8 @@ rule
     | field_definition_list field_definition { val[0] << val[1] }
 
   interface_type_definition:
-      INTERFACE name RCURLY field_definition_list LCURLY {
-        return make_node(:InterfaceTypeDefinition, name: val[1], fields: val[3])
+      INTERFACE name directives_list_opt RCURLY field_definition_list LCURLY {
+        return make_node(:InterfaceTypeDefinition, name: val[1], directives: val[2], fields: val[4])
       }
 
   union_members:
@@ -308,18 +311,18 @@ rule
     | union_members PIPE name { val[0] << val[2].to_s }
 
   union_type_definition:
-      UNION name EQUALS union_members {
-        return make_node(:UnionTypeDefinition, name: val[1], types: val[3])
+      UNION name directives_list_opt EQUALS union_members {
+        return make_node(:UnionTypeDefinition, name: val[1], directives: val[2], types: val[4])
       }
 
   enum_type_definition:
-      ENUM name RCURLY enum_name_list LCURLY {
-         return make_node(:EnumTypeDefinition, name: val[1], values: val[3])
+      ENUM name directives_list_opt RCURLY enum_value_definitions LCURLY {
+         return make_node(:EnumTypeDefinition, name: val[1], directives: val[2], values: val[4])
       }
 
   input_object_type_definition:
-      INPUT name RCURLY input_value_definition_list LCURLY {
-        return make_node(:InputObjectTypeDefinition, name: val[1], fields: val[3])
+      INPUT name directives_list_opt RCURLY input_value_definition_list LCURLY {
+        return make_node(:InputObjectTypeDefinition, name: val[1], directives: val[2], fields: val[4])
       }
 end
 

data/lib/graphql/language/parser_tests.rb

@@ -279,6 +279,7 @@ module GraphQL
               it "parses the test schema" do
                 schema = DummySchema
                 schema_string = GraphQL::Schema::Printer.print_schema(schema)
+
                 document = subject.parse(schema_string)
 
                 assert_equal schema_string, document.to_query_string
@@ -324,6 +325,28 @@ module GraphQL
                 assert_equal 'ID', type.fields[0].type.of_type.name
               end
 
+              it "parses object types with directives" do
+                document = subject.parse('
+                  type Comment implements Node @deprecated(reason: "No longer supported") {
+                    id: ID!
+                  }
+                ')
+
+                type = document.definitions.first
+                assert_equal GraphQL::Language::Nodes::ObjectTypeDefinition, type.class
+                assert_equal 'Comment', type.name
+                assert_equal ['Node'], type.interfaces
+                assert_equal ['id'], type.fields.map(&:name)
+                assert_equal [], type.fields[0].arguments
+                assert_equal 'ID', type.fields[0].type.of_type.name
+                assert_equal 1, type.directives.length
+
+                deprecated_directive = type.directives[0]
+                assert_equal 'deprecated', deprecated_directive.name
+                assert_equal 'reason', deprecated_directive.arguments[0].name
+                assert_equal 'No longer supported', deprecated_directive.arguments[0].value
+              end
+
               it "parses field arguments" do
                 document = subject.parse('
                   type Mutation {
@@ -340,6 +363,23 @@ module GraphQL
                 assert_equal ['Test', 'Annoying'], tags_arg.value
               end
 
+              it "parses field arguments with directives" do
+                document = subject.parse('
+                  type Mutation {
+                    post(id: ID! @deprecated(reason: "No longer supported"), data: String): Post
+                  }
+                ')
+
+                field = document.definitions.first.fields.first
+                assert_equal ['id', 'data'], field.arguments.map(&:name)
+                id_arg = field.arguments[0]
+
+                deprecated_directive = id_arg.directives[0]
+                assert_equal 'deprecated', deprecated_directive.name
+                assert_equal 'reason', deprecated_directive.arguments[0].name
+                assert_equal 'No longer supported', deprecated_directive.arguments[0].value
+              end
+
               it "parses scalar types" do
                 document = subject.parse('scalar DateTime')
 
@@ -348,6 +388,20 @@ module GraphQL
                 assert_equal 'DateTime', type.name
               end
 
+              it "parses scalar types with directives" do
+                document = subject.parse('scalar DateTime @deprecated(reason: "No longer supported")')
+
+                type = document.definitions.first
+                assert_equal GraphQL::Language::Nodes::ScalarTypeDefinition, type.class
+                assert_equal 'DateTime', type.name
+                assert_equal 1, type.directives.length
+
+                deprecated_directive = type.directives[0]
+                assert_equal 'deprecated', deprecated_directive.name
+                assert_equal 'reason', deprecated_directive.arguments[0].name
+                assert_equal 'No longer supported', deprecated_directive.arguments[0].value
+              end
+
               it "parses interface types" do
                 document = subject.parse('
                   interface Node {
@@ -363,15 +417,68 @@ module GraphQL
                 assert_equal 'ID', type.fields[0].type.of_type.name
               end
 
+              it "parses interface types with directives" do
+                document = subject.parse('
+                  interface Node @deprecated(reason: "No longer supported") {
+                    id: ID!
+                  }
+                ')
+
+                type = document.definitions.first
+                assert_equal GraphQL::Language::Nodes::InterfaceTypeDefinition, type.class
+                assert_equal 'Node', type.name
+                assert_equal 1, type.directives.length
+
+                deprecated_directive = type.directives[0]
+                assert_equal 'deprecated', deprecated_directive.name
+                assert_equal 'reason', deprecated_directive.arguments[0].name
+                assert_equal 'No longer supported', deprecated_directive.arguments[0].value
+              end
+
               it "parses enum types" do
                 document = subject.parse('
-                  enum DogCommand { SIT, DOWN, HEEL }
+                  enum DogCommand {
+                    SIT
+                    DOWN @deprecated(reason: "No longer supported")
+                    HEEL
+                  }
+                ')
+
+                type = document.definitions.first
+                assert_equal GraphQL::Language::Nodes::EnumTypeDefinition, type.class
+                assert_equal 'DogCommand', type.name
+                assert_equal 3, type.values.length
+
+                assert_equal 'SIT', type.values[0].name
+                assert_equal [], type.values[0].directives
+
+                assert_equal 'DOWN', type.values[1].name
+                assert_equal 1, type.values[1].directives.length
+                deprecated_directive = type.values[1].directives[0]
+                assert_equal 'deprecated', deprecated_directive.name
+                assert_equal 'reason', deprecated_directive.arguments[0].name
+                assert_equal 'No longer supported', deprecated_directive.arguments[0].value
+
+                assert_equal 'HEEL', type.values[2].name
+                assert_equal [], type.values[2].directives
+              end
+
+              it "parses enum types with directives" do
+                document = subject.parse('
+                  enum DogCommand @deprecated(reason: "No longer supported") {
+                    SIT
+                  }
                 ')
 
                 type = document.definitions.first
                 assert_equal GraphQL::Language::Nodes::EnumTypeDefinition, type.class
                 assert_equal 'DogCommand', type.name
-                assert_equal ['SIT', 'DOWN', 'HEEL'], type.values
+                assert_equal 1, type.directives.length
+
+                deprecated_directive = type.directives[0]
+                assert_equal 'deprecated', deprecated_directive.name
+                assert_equal 'reason', deprecated_directive.arguments[0].name
+                assert_equal 'No longer supported', deprecated_directive.arguments[0].value
               end
 
               it "parses input object types" do
@@ -388,6 +495,28 @@ module GraphQL
                 assert_equal 'String', type.fields[0].type.name
                 assert_equal nil, type.fields[0].default_value
               end
+
+              it "parses input object types with directives" do
+                document = subject.parse('
+                  input EmptyMutationInput @deprecated(reason: "No longer supported") {
+                    clientMutationId: String
+                  }
+                ')
+
+                type = document.definitions.first
+                assert_equal GraphQL::Language::Nodes::InputObjectTypeDefinition, type.class
+                assert_equal 'EmptyMutationInput', type.name
+                assert_equal ['clientMutationId'], type.fields.map(&:name)
+                assert_equal 'String', type.fields[0].type.name
+                assert_equal nil, type.fields[0].default_value
+                assert_equal 1, type.directives.length
+
+                deprecated_directive = type.directives[0]
+                assert_equal 'deprecated', deprecated_directive.name
+                assert_equal 'reason', deprecated_directive.arguments[0].name
+                assert_equal 'No longer supported', deprecated_directive.arguments[0].value
+
+              end
             end
           end
 

data/lib/graphql/query/serial_execution/field_resolution.rb

@@ -35,6 +35,7 @@ module GraphQL
         def get_finished_value(raw_value)
           if raw_value.is_a?(GraphQL::ExecutionError)
             raw_value.ast_node = irep_node.ast_node
+            raw_value.path = irep_node.path
             execution_context.add_error(raw_value)
           end
 

data/lib/graphql/query/serial_execution/selection_resolution.rb

@@ -13,7 +13,7 @@ module GraphQL
 
         def result
           irep_node.children.each_with_object({}) do |(name, irep_node), memo|
-            if GraphQL::Execution::DirectiveChecks.include?(irep_node, execution_context.query) && applies_to_type?(irep_node, type)
+            if irep_node.included? && applies_to_type?(irep_node, type)
               field_result = execution_context.strategy.field_resolution.new(
                 irep_node,
                 type,

data/lib/graphql/query/serial_execution/value_resolution.rb

@@ -45,10 +45,13 @@ module GraphQL
           def non_null_result
             wrapped_type = field_type.of_type
             strategy_class = get_strategy_for_kind(wrapped_type.kind)
-            value.map do |item|
+            result = value.each_with_index.map do |item, index|
+              irep_node.index = index
               inner_strategy = strategy_class.new(item, wrapped_type, target, parent_type, irep_node, execution_context)
               inner_strategy.result
             end
+            irep_node.index = nil
+            result
           end
         end
 

data/lib/graphql/schema/printer.rb

@@ -94,7 +94,7 @@ module GraphQL
                 field_type = type.input_fields.fetch(field_name.to_s).type
                 "#{field_name}: #{print_value(field_value, field_type)}"
               }.join(", ")
-              "{ #{fields} }"
+              "{#{fields}}"
             when NonNullType
               print_value(value, type.of_type)
             when ListType

data/lib/graphql/static_validation/message.rb

@@ -26,7 +26,7 @@ module GraphQL
         {
           "message" => message,
           "locations" => locations,
-          "path" => path,
+          "fields" => path,
         }
       end
 

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.18.14"
+  VERSION = "0.18.15"
 end

data/readme.md

@@ -1,4 +1,4 @@
-# graphql <img src="https://cloud.githubusercontent.com/assets/2231765/9094460/cb43861e-3b66-11e5-9fbf-71066ff3ab13.png" height=40 alt="graphql-ruby"/>
+# graphql <img src="https://cloud.githubusercontent.com/assets/2231765/9094460/cb43861e-3b66-11e5-9fbf-71066ff3ab13.png" height="40" alt="graphql-ruby"/>
 
 [![Build Status](https://travis-ci.org/rmosolgo/graphql-ruby.svg?branch=master)](https://travis-ci.org/rmosolgo/graphql-ruby)
 [![Gem Version](https://badge.fury.io/rb/graphql.svg)](https://rubygems.org/gems/graphql)
@@ -8,16 +8,7 @@
 
 A Ruby implementation of [GraphQL](http://graphql.org/).
 
- - Guides
-     - [Introduction](http://www.rubydoc.info/github/rmosolgo/graphql-ruby/file/guides/introduction.md)
-     - [Defining Your Schema](http://www.rubydoc.info/github/rmosolgo/graphql-ruby/file/guides/defining_your_schema.md)
-     - [Executing Queries](http://www.rubydoc.info/github/rmosolgo/graphql-ruby/file/guides/executing_queries.md)
-     - [Testing](http://www.rubydoc.info/github/rmosolgo/graphql-ruby/file/guides/testing.md)
-     - [Code Reuse](http://www.rubydoc.info/github/rmosolgo/graphql-ruby/file/guides/code_reuse.md)
-     - [Security](http://www.rubydoc.info/github/rmosolgo/graphql-ruby/file/guides/security.md)
-     - [Relay](http://www.rubydoc.info/github/rmosolgo/graphql-ruby/file/guides/relay.md)
-
-
+ - [Website](https://rmosolgo.github.io/graphql-ruby)
  - [API Documentation](http://www.rubydoc.info/github/rmosolgo/graphql-ruby)
 
 ## Installation
@@ -103,6 +94,7 @@ If you're building a backend for [Relay](http://facebook.github.io/relay/), you'
 - __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`.
+- __Build the site__ with `rake site:serve`, then visit `localhost:4000`.
 
 ## Related Projects
 
@@ -110,7 +102,7 @@ If you're building a backend for [Relay](http://facebook.github.io/relay/), you'
 
 - `graphql-ruby` + Rails demo ([src](https://github.com/rmosolgo/graphql-ruby-demo) / [heroku](http://graphql-ruby-demo.herokuapp.com))
 - [`graphql-batch`](https://github.com/shopify/graphql-batch), a batched query execution strategy
-- [`graphql-libgraphqlparser`](https://github.com/rmosolgo/graphql-libgraphqlparser), bindings to [libgraphqlparser](https://github.com/graphql/libgraphqlparser), a C-level parser.
+- [`graphql-libgraphqlparser`](https://github.com/rmosolgo/graphql-libgraphqlparser-ruby), bindings to [libgraphqlparser](https://github.com/graphql/libgraphqlparser), a C-level parser.
 
 ### Blog Posts
 
@@ -150,3 +142,9 @@ If you're building a backend for [Relay](http://facebook.github.io/relay/), you'
   - Renaming fragments from local names to unique names
 - Support AST subclasses? This would be hard, I think classes are used as hash keys in many places.
 - Support object deep-copy (schema, type, field, argument)? To support multiple schemas based on the same types.
+- Improve the website
+  - Feature the logo in the header
+  - Split `readme.md` into `index.md` (a homepage with code samples) and a technical readme (how to install, link to homepage)
+  - Move "Related projects" to a guide
+  - Revisit guides, maybe split them into smaller, more specific pages
+  - Put guide titles into the `<title />`

data/spec/graphql/directive_spec.rb

@@ -1,7 +1,8 @@
 require "spec_helper"
 
 describe GraphQL::Directive do
-  let(:result) { DummySchema.execute(query_string, variables: {"t" => true, "f" => false}) }
+  let(:variables) { {"t" => true, "f" => false} }
+  let(:result) { DummySchema.execute(query_string, variables: variables) }
   describe "on fields" do
     let(:query_string) { %|query directives($t: Boolean!, $f: Boolean!) {
       cheese(id: 1) {
@@ -74,4 +75,141 @@ describe GraphQL::Directive do
       assert_equal(expected, result)
     end
   end
+  describe "merging @skip and @include" do
+    let(:field_included?) { r = result["data"]["cheese"]; r.has_key?('flavor') && r.has_key?('withVariables') }
+    let(:skip?) { false }
+    let(:include?) { true }
+    let(:variables) { {"skip" => skip?, "include" => include?} }
+    let(:query_string) {"
+      query getCheese ($include: Boolean!, $skip: Boolean!) {
+        cheese(id: 1) {
+          flavor @include(if: #{include?}) @skip(if: #{skip?}),
+          withVariables: flavor @include(if: $include) @skip(if: $skip)
+        }
+      }
+    "}
+    # behavior as defined in
+    # https://github.com/facebook/graphql/blob/master/spec/Section%203%20--%20Type%20System.md#include
+    describe "when @skip=false and @include=true" do
+      let(:skip?) { false }
+      let(:include?) { true }
+      it "is included" do assert field_included? end
+    end
+    describe "when @skip=false and @include=false" do
+      let(:skip?) { false }
+      let(:include?) { false }
+      it "is not included" do assert !field_included? end
+    end
+    describe "when @skip=true and @include=true" do
+      let(:skip?) { true }
+      let(:include?) { true }
+      it "is not included" do assert !field_included? end
+    end
+    describe "when @skip=true and @include=false" do
+      let(:skip?) { true }
+      let(:include?) { false }
+      it "is not included" do assert !field_included? end
+    end
+    describe "when evaluating skip on query selection and fragment" do
+      describe "with @skip" do
+        let(:query_string) {"
+          query getCheese ($skip: Boolean!) {
+            cheese(id: 1) {
+              flavor,
+              withVariables: flavor,
+              ...F0
+            }
+          }
+          fragment F0 on Cheese {
+            flavor @skip(if: #{skip?})
+            withVariables: flavor @skip(if: $skip)
+          }
+        "}
+        describe "and @skip=false" do
+          let(:skip?) { false }
+          it "is included" do assert field_included? end
+        end
+        describe "and @skip=true" do
+          let(:skip?) { true }
+          it "is included" do assert field_included? end
+        end
+      end      
+    end
+    describe "when evaluating conflicting @skip and @include on query selection and fragment" do
+      let(:query_string) {"
+        query getCheese ($include: Boolean!, $skip: Boolean!) {
+          cheese(id: 1) {
+            ... on Cheese @include(if: #{include?}) {
+              flavor
+            }
+            withVariables: flavor @include(if: $include),
+            ...F0
+          }
+        }
+        fragment F0 on Cheese {
+          flavor @skip(if: #{skip?}),
+          withVariables: flavor @skip(if: $skip)
+        }
+      "}
+      describe "when @skip=false and @include=true" do
+        let(:skip?) { false }
+        let(:include?) { true }
+        it "is included" do assert field_included? end
+      end
+      describe "when @skip=false and @include=false" do
+        let(:skip?) { false }
+        let(:include?) { false }
+        it "is included" do assert field_included? end
+      end
+      describe "when @skip=true and @include=true" do
+        let(:skip?) { true }
+        let(:include?) { true }
+        it "is included" do assert field_included? end
+      end
+      describe "when @skip=true and @include=false" do
+        let(:skip?) { true }
+        let(:include?) { false }
+        it "is not included" do
+          assert !field_included?
+        end
+      end
+    end
+
+    describe "when handling multiple fields at the same level" do
+      describe "when at least one occurrence would be included" do
+        let(:query_string) {"
+          query getCheese ($include: Boolean!, $skip: Boolean!) {
+            cheese(id: 1) {
+              ... on Cheese {
+                flavor
+              }
+              flavor @include(if: #{include?}),
+              flavor @skip(if: #{skip?}),
+              withVariables: flavor,
+              withVariables: flavor @include(if: $include),
+              withVariables: flavor @skip(if: $skip)
+            }
+          }
+        "}
+        let(:skip?) { true }
+        let(:include?) { false }
+        it "is included" do assert field_included? end
+      end
+      describe "when no occurrence would be included" do
+        let(:query_string) {"
+          query getCheese ($include: Boolean!, $skip: Boolean!) {
+            cheese(id: 1) {
+              flavor @include(if: #{include?}),
+              flavor @skip(if: #{skip?}),
+              withVariables: flavor @include(if: $include),
+              withVariables: flavor @skip(if: $skip)
+            }
+          }
+        "}
+        let(:skip?) { true }
+        let(:include?) { false }
+        it "is not included" do assert !field_included? end
+      end
+    end
+  end
 end