graphql 1.5.7 → 1.5.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d1445225e17cd94b149bf884103195d179505a0
-  data.tar.gz: 909292e9525c37d417b6a97106b0dbe49a899ca6
+  metadata.gz: 1d62327a63cfe014162e4914f6667336e606e8ff
+  data.tar.gz: 2605ce8d9b8c31b29ad2c539f4da250e02450f66
 SHA512:
-  metadata.gz: 7730356cc09f2b67a53096830fdb0faef1e8a3b122075a8775ec339375463a9e863dfb48b5fca7efffd9f81f598b486390a8439c1014edafdb1640956f82245c
-  data.tar.gz: c21a3b0f34745786c26c626403ffbfbfe528a61d19f12458d81ea3620932868efdcde017c61df16f6ac074401d48c19aea5a0bb578e6fd9b4e7d31b462f51f36
+  metadata.gz: dc114df5775f181f92b11aff4c4eaf022506b994d69889fd88643fa7f0b03348ffaddfe7e2851032a6a384259629d5484dfbabb9b7e7185875336390066037f4
+  data.tar.gz: 490d0958520560087668555b95e91d4188a068a32ab87f9d02d21924da843b9108da9cac3d558b36314705344737a4271a537ce66535f441030a240a6e02747a

data/lib/graphql/internal_representation/node.rb

@@ -113,8 +113,8 @@ module GraphQL
       # Selections are merged in place, not copied.
       def deep_merge_node(new_parent, 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
         new_parent.scoped_children.each do |obj_type, new_fields|
           prev_fields = @scoped_children[obj_type]

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "1.5.7"
+  VERSION = "1.5.7.1"
 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]
@@ -286,4 +291,36 @@ describe GraphQL::InternalRepresentation::Rewrite do
       end
     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[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
 end

metadata

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