graphql 0.18.6 → 0.18.7

data/lib/graphql/language/parser.y

@@ -228,7 +228,7 @@ rule
       }
 
   fragment_definition:
-    FRAGMENT name ON name_without_on directives_list_opt selection_set {
+    FRAGMENT fragment_name_opt ON name_without_on directives_list_opt selection_set {
       return make_node(:FragmentDefinition, {
           name:       val[1],
           type:       val[3],
@@ -239,6 +239,9 @@ rule
       )
     }
 
+  fragment_name_opt:
+      /* none */ { return nil }
+    | name_without_on
 
   type_system_definition:
      schema_definition

data/lib/graphql/relay/mutation.rb

@@ -80,7 +80,7 @@ module GraphQL
             results_hash = @resolve_proc.call(args[:input], ctx)
             Result.new(arguments: args, result: results_hash)
           }
-          GraphQL::Field.define do
+          GraphQL::Field.define(description: self.description) do
             type(field_return_type)
             argument :input, !field_input_type
             resolve(field_resolve_proc)

data/lib/graphql/schema/loader.rb

@@ -22,9 +22,13 @@ module GraphQL
           types[type_object.name] = type_object
         end
 
-        query = types.fetch(schema.fetch("queryType").fetch("name"))
+        kargs = { :orphan_types => types.values }
+        [:query, :mutation, :subscription].each do |root|
+          type = schema["#{root}Type"]
+          kargs[root] = types.fetch(type.fetch("name")) if type
+        end
 
-        Schema.new(query: query, types: types.values)
+        Schema.define(**kargs)
       end
 
       class << self
@@ -61,7 +65,7 @@ module GraphQL
             InterfaceType.define(
               name: type["name"],
               description: type["description"],
-              fields: Hash[type["fields"].map { |field|
+              fields: Hash[(type["fields"] || []).map { |field|
                 [field["name"], define_type(field.merge("kind" => "FIELD"), type_resolver)]
               }]
             )
@@ -77,6 +81,9 @@ module GraphQL
             ObjectType.define(
               name: type["name"],
               description: type["description"],
+              interfaces: (type["interfaces"] || []).map { |interface|
+                type_resolver.call(interface)
+              },
               fields: Hash[type["fields"].map { |field|
                 [field["name"], define_type(field.merge("kind" => "FIELD"), type_resolver)]
               }]

data/lib/graphql/static_validation/all_rules.rb

@@ -9,6 +9,7 @@ module GraphQL
       GraphQL::StaticValidation::DirectivesAreDefined,
       GraphQL::StaticValidation::DirectivesAreInValidLocations,
       GraphQL::StaticValidation::FragmentsAreFinite,
+      GraphQL::StaticValidation::FragmentsAreNamed,
       GraphQL::StaticValidation::FragmentsAreUsed,
       GraphQL::StaticValidation::FragmentTypesExist,
       GraphQL::StaticValidation::FragmentsAreOnCompositeTypes,

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

@@ -0,0 +1,19 @@
+module GraphQL
+  module StaticValidation
+    class FragmentsAreNamed
+      include GraphQL::StaticValidation::Message::MessageHelper
+
+      def validate(context)
+        context.visitor[GraphQL::Language::Nodes::FragmentDefinition] << -> (node, parent) { validate_name_exists(node, context) }
+      end
+
+      private
+
+      def validate_name_exists(node, context)
+        if node.name.nil?
+          context.errors << message("Fragment definition has no name", node, context: context)
+        end
+      end
+    end
+  end
+end

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

@@ -38,7 +38,7 @@ module GraphQL
       end
 
       def find_difference(fragments, allowed_fragment_names)
-        fragments.select {|f| !allowed_fragment_names.include?(f.name) }
+        fragments.select {|f| f.name && !allowed_fragment_names.include?(f.name) }
       end
 
       class FragmentInstance

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.18.6"
+  VERSION = "0.18.7"
 end

data/readme.md

@@ -63,8 +63,8 @@ end
 
 # Then create your schema
 Schema = GraphQL::Schema.define do
-  query QueryType,
-  max_depth 8,
+  query QueryType
+  max_depth 8
 end
 ```
 
@@ -135,3 +135,5 @@ If you're building a backend for [Relay](http://facebook.github.io/relay/), you'
   - Reduce duplication in ArrayConnection / RelationConnection
   - Improve API for creating edges (better RANGE_ADD support)
   - If the new edge isn't a member of the connection's objects, raise a nice error
+- Missing Enum value should raise a descriptive error, not "key not found"
+- `args` should whitelist keys -- if you request a key that isn't defined for the field, it should 💥

data/spec/graphql/introspection/type_type_spec.rb

@@ -8,6 +8,7 @@ describe GraphQL::Introspection::TypeType do
        dairyAnimal:   __type(name: "DairyAnimal") { name, kind, enumValues(includeDeprecated: false) { name, isDeprecated } }
        dairyProduct:  __type(name: "DairyProduct") { name, kind, possibleTypes { name } }
        animalProduct: __type(name: "AnimalProduct") { name, kind, possibleTypes { name }, fields { name } }
+       missingType:   __type(name: "NotAType") { name }
      }
   |}
   let(:result) { DummySchema.execute(query_string, context: {}, variables: {"cheeseId" => 2}) }
@@ -64,7 +65,8 @@ describe GraphQL::Introspection::TypeType do
         "fields"=>[
           {"name"=>"source"},
         ]
-      }
+      },
+      "missingType" => nil,
     }}
     assert_equal(expected, result)
   end

data/spec/graphql/language/generation_spec.rb

@@ -7,7 +7,7 @@ describe GraphQL::Language::Generation do
       myField: someField(someArg: $someVar, ok: 1.4) @skip(if: $anotherVar) @thing(or: "Whatever")
       anotherField(someArg: [1, 2, 3]) {
         nestedField
-        ... moreNestedFields @skip(if: $skipNested)
+        ...moreNestedFields @skip(if: $skipNested)
       }
       ... on OtherType @include(unless: false) {
         field(arg: [{ key: "value", anotherKey: 0.9, anotherAnotherKey: WHATEVER }])

data/spec/graphql/language/parser_spec.rb

@@ -4,4 +4,32 @@ require 'graphql/language/parser_tests'
 describe GraphQL::Language::Parser do
   include GraphQL::Language::ParserTests
   subject { GraphQL::Language::Parser }
+
+  describe "anonymous fragment extension" do
+    let(:document) { GraphQL.parse(query_string) }
+    let(:query_string) {%|
+      fragment on NestedType @or(something: "ok") {
+        anotherNestedField
+      }
+    |}
+
+    describe ".parse" do
+      it "parses queries" do
+        assert document
+      end
+
+      describe "visited nodes" do
+        let(:fragment) { document.definitions.first }
+
+        it "creates an anonymous fragment definition" do
+          assert fragment.is_a?(GraphQL::Language::Nodes::FragmentDefinition)
+          assert_equal nil, fragment.name
+          assert_equal 1, fragment.selections.length
+          assert_equal "NestedType", fragment.type
+          assert_equal 1, fragment.directives.length
+          assert_equal [2, 7], fragment.position
+        end
+      end
+    end
+  end
 end

data/spec/graphql/relay/mutation_spec.rb

@@ -47,4 +47,8 @@ describe GraphQL::Relay::Mutation do
     new_ship_name = result["data"]["introduceShip"]["shipEdge"]["node"]["name"]
     assert_equal("Bagel", new_ship_name)
   end
+
+  it "applies the description to the derived field" do
+    assert_equal "Add a ship to this faction", IntroduceShipMutation.field.description
+  end
 end

data/spec/graphql/schema/loader_spec.rb

@@ -45,6 +45,22 @@ describe GraphQL::Schema::Loader do
       field :body, !types.String
     end
 
+    media_type = GraphQL::InterfaceType.define do
+      name "Media"
+      description "!!!"
+      field :type, !types.String
+    end
+
+    video_type = GraphQL::ObjectType.define do
+      name "Video"
+      interfaces [media_type]
+    end
+
+    audio_type = GraphQL::ObjectType.define do
+      name "Audio"
+      interfaces [media_type]
+    end
+
     post_type = GraphQL::ObjectType.define do
       name "Post"
       description "A blog post"
@@ -53,6 +69,7 @@ describe GraphQL::Schema::Loader do
       field :title, !types.String
       field :body, !types.String
       field :comments, types[!comment_type]
+      field :attachment, media_type
     end
 
     content_type = GraphQL::UnionType.define do
@@ -76,7 +93,16 @@ describe GraphQL::Schema::Loader do
       end
     end
 
-    GraphQL::Schema.new(query: query_root)
+    ping_mutation = GraphQL::Relay::Mutation.define do
+      name "Ping"
+    end
+
+    mutation_root = GraphQL::ObjectType.define do
+      name "Mutation"
+      field :ping, field: ping_mutation.field
+    end
+
+    GraphQL::Schema.define(query: query_root, mutation: mutation_root, orphan_types: [audio_type, video_type])
   }
 
   let(:schema_json) {

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

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe GraphQL::StaticValidation::FragmentTypesExist do
+  let(:query_string) {"
+    fragment on Cheese {
+      id
+      flavor
+    }
+  "}
+
+  let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::FragmentsAreNamed]) }
+  let(:query) { GraphQL::Query.new(DummySchema, query_string) }
+  let(:errors) { validator.validate(query)[:errors] }
+
+  it "finds non-existent types on fragments" do
+    assert_equal(1, errors.length)
+    fragment_def_error = {
+      "message"=>"Fragment definition has no name",
+      "locations"=>[{"line"=>2, "column"=>5}],
+      "path"=>["fragment "],
+    }
+    assert_includes(errors, fragment_def_error, "on fragment definitions")
+  end
+end

data/spec/graphql/static_validation/validator_spec.rb

@@ -65,5 +65,17 @@ describe GraphQL::StaticValidation::Validator do
         assert_equal(1, errors.length)
       end
     end
+
+    describe "fragments with no names" do
+      let(:query_string) {%|
+        fragment on Cheese {
+          id
+          flavor
+        }
+      |}
+      it "marks an error" do
+        assert_equal(1, errors.length)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.18.6
+  version: 0.18.7
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -372,6 +372,7 @@ files:
 - lib/graphql/static_validation/rules/fragment_spreads_are_possible.rb
 - lib/graphql/static_validation/rules/fragment_types_exist.rb
 - lib/graphql/static_validation/rules/fragments_are_finite.rb
+- lib/graphql/static_validation/rules/fragments_are_named.rb
 - lib/graphql/static_validation/rules/fragments_are_on_composite_types.rb
 - lib/graphql/static_validation/rules/fragments_are_used.rb
 - lib/graphql/static_validation/rules/required_arguments_are_present.rb
@@ -452,6 +453,7 @@ files:
 - spec/graphql/static_validation/rules/fragment_spreads_are_possible_spec.rb
 - spec/graphql/static_validation/rules/fragment_types_exist_spec.rb
 - spec/graphql/static_validation/rules/fragments_are_finite_spec.rb
+- spec/graphql/static_validation/rules/fragments_are_named_spec.rb
 - spec/graphql/static_validation/rules/fragments_are_on_composite_types_spec.rb
 - spec/graphql/static_validation/rules/fragments_are_used_spec.rb
 - spec/graphql/static_validation/rules/required_arguments_are_present_spec.rb
@@ -559,6 +561,7 @@ test_files:
 - spec/graphql/static_validation/rules/fragment_spreads_are_possible_spec.rb
 - spec/graphql/static_validation/rules/fragment_types_exist_spec.rb
 - spec/graphql/static_validation/rules/fragments_are_finite_spec.rb
+- spec/graphql/static_validation/rules/fragments_are_named_spec.rb
 - spec/graphql/static_validation/rules/fragments_are_on_composite_types_spec.rb
 - spec/graphql/static_validation/rules/fragments_are_used_spec.rb
 - spec/graphql/static_validation/rules/required_arguments_are_present_spec.rb