graphql 1.5.11 → 1.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb2841b1c8677bc9188757eca08b2f365f0e0af8
-  data.tar.gz: 12bc61f9684e3bae2a4d06c22f9378064fcf191d
+  metadata.gz: 3e204a82f5db905b17eeaa50f14e7b2af0ddff12
+  data.tar.gz: 6c7029686c56fb6ad2ef90084381131f1f06a68c
 SHA512:
-  metadata.gz: 7859ae0afed299edb29dedc59d014f057b85dde4e3547a300d312c0ba137f23cc23d6c70c664a3afd6985c3b393483aa012c8e7ba6e70e0713ad203163dbc089
-  data.tar.gz: 61ab9c38a66e013b09bec6f5865aae178110ba99b230b2a94b325ea1afef7b1bb9beb98744c52cee0d8b2c2813b377a39dbef13c920bf319cddfeef1ba2f3e07
+  metadata.gz: d4de6aa1e85f4e2b51ae00866c00fd3ef0b201059ccb6a28a74a97cfe1528b1739086585db4488911893a781b8a0857fd318175e95fd135e91e5cb091cfc55d6
+  data.tar.gz: 59ef188909e4f03b6793cf00c935e05bc4fd45f91e1910b068529a4661e7261d778c7e3d78b5b55cd563cc5e23fe5be8cb1a989a56180dff4df48380c3aea286

data/lib/graphql/internal_representation/node.rb

@@ -116,8 +116,8 @@ module GraphQL
       # Selections are merged in place, not copied.
       def deep_merge_node(new_parent, scope: nil, merge_self: true)
         if merge_self
-          @ast_nodes.concat(new_parent.ast_nodes)
-          @definitions.concat(new_parent.definitions)
+          @ast_nodes |= new_parent.ast_nodes
+          @definitions |= new_parent.definitions
         end
         scope ||= Scope.new(@query, @return_type)
         new_parent.scoped_children.each do |obj_type, new_fields|

data/lib/graphql/relay/connection_resolve.rb

@@ -10,7 +10,10 @@ module GraphQL
 
       def call(obj, args, ctx)
         nodes = @underlying_resolve.call(obj, args, ctx)
-        if ctx.schema.lazy?(nodes)
+
+        if nodes.nil?
+          nil
+        elsif ctx.schema.lazy?(nodes)
           nodes
         else
           build_connection(nodes, args, obj, ctx)

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "1.5.11"
+  VERSION = "1.5.12"
 end

data/spec/graphql/internal_representation/rewrite_spec.rb

@@ -6,6 +6,7 @@ describe GraphQL::InternalRepresentation::Rewrite do
     GraphQL::Schema.from_definition <<-GRAPHQL
     type Query {
       plant(id: ID!): Plant
+      fruit(id: ID!): [Fruit!]
     }
 
     union Plant = Grain | Fruit | Vegetable | Nut
@@ -44,7 +45,11 @@ describe GraphQL::InternalRepresentation::Rewrite do
       habitats: [Habitat]
     }
 
-    type Habitat {
+    interface Environ {
+      seasons: [String]
+    }
+
+    type Habitat implements Environ {
       residentName: String!
       averageWeight: Int!
       seasons: [String]
@@ -287,6 +292,38 @@ describe GraphQL::InternalRepresentation::Rewrite do
     end
   end
 
+  describe "fragment merging bug" do
+    let(:query_string) {
+      <<-GRAPHQL
+      {
+        ...Frag1
+        __type(name: "Query") {
+          ...Frag2
+        }
+      }
+
+      fragment Frag1 on Query {
+        __type(name: "Query") {
+          ...Frag2
+        }
+      }
+
+      fragment Frag2 on __Type {
+        __typename
+      }
+      GRAPHQL
+    }
+
+    it "finishes" do
+      doc = rewrite_result.operation_definitions[nil]
+      type_node = doc.typed_children[schema.types["Query"]]["__type"]
+      typename_node = type_node.typed_children[schema.types["__Type"]]["__typename"]
+      assert_equal 1, typename_node.ast_nodes.size
+      assert_equal 15, typename_node.ast_node.line
+      assert_equal 9, typename_node.ast_node.col
+    end
+  end
+
   describe "fragment definition without query" do
     let(:query_string) {
       <<-GRAPHQL

data/spec/graphql/relay/connection_resolve_spec.rb

@@ -2,44 +2,52 @@
 require "spec_helper"
 
 describe GraphQL::Relay::ConnectionResolve do
-  describe "when an execution error is returned" do
-    let(:query_string) { <<-GRAPHQL
-      query getError($error: String!){
-        rebels {
-          ships(nameIncludes: $error) {
-            edges {
-              node {
-                name
-              }
+  let(:query_string) { <<-GRAPHQL
+    query getShips($name: String!){
+      rebels {
+        ships(nameIncludes: $name) {
+          edges {
+            node {
+              name
             }
           }
         }
       }
-    GRAPHQL
     }
+    GRAPHQL
+  }
 
+  describe "when an execution error is returned" do
     it "adds an error" do
-      result = star_wars_query(query_string, { "error" => "error"})
+      result = star_wars_query(query_string, { "name" => "error"})
       assert_equal 1, result["errors"].length
       assert_equal "error from within connection", result["errors"][0]["message"]
     end
 
     it "adds an error for a lazy error" do
-      result = star_wars_query(query_string, { "error" => "lazyError"})
+      result = star_wars_query(query_string, { "name" => "lazyError"})
       assert_equal 1, result["errors"].length
       assert_equal "lazy error from within connection", result["errors"][0]["message"]
     end
 
     it "adds an error for a lazy raised error" do
-      result = star_wars_query(query_string, { "error" => "lazyRaisedError"})
+      result = star_wars_query(query_string, { "name" => "lazyRaisedError"})
       assert_equal 1, result["errors"].length
       assert_equal "lazy raised error from within connection", result["errors"][0]["message"]
     end
 
     it "adds an error for a raised error" do
-      result = star_wars_query(query_string, { "error" => "raisedError"})
+      result = star_wars_query(query_string, { "name" => "raisedError"})
       assert_equal 1, result["errors"].length
       assert_equal "error raised from within connection", result["errors"][0]["message"]
     end
   end
+
+  describe "when nil is returned" do
+    it "becomes null" do
+      result = star_wars_query(query_string, { "name" => "null" })
+      conn = result["data"]["rebels"]["ships"]
+      assert_equal nil, conn
+    end
+  end
 end

data/spec/support/star_wars/schema.rb

@@ -102,6 +102,8 @@ module StarWars
             all_ships = LazyWrapper.new { GraphQL::ExecutionError.new("lazy error from within connection") }
           when "lazyRaisedError"
             all_ships = LazyWrapper.new { raise GraphQL::ExecutionError.new("lazy raised error from within connection") }
+          when "null"
+            all_ships = nil
           else
             all_ships = all_ships.select { |ship| ship.name.include?(args[:nameIncludes])}
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.5.11
+  version: 1.5.12
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips