graphql 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8d3d315c998e0d44c6ebbcd186825a1d7c86639
-  data.tar.gz: adfa16f977635d988505202bee3ea8fe54ede003
+  metadata.gz: 7e4d95f2f01d1d24633dc5b6c062a67e6a752379
+  data.tar.gz: 19634030a6f735243babd83be75d9279c2987795
 SHA512:
-  metadata.gz: 34bad6ba6d2ff0e811b2d9abbddf3e834df69e8fb8d6a1b06581f446b8bffee325717df2731874bcec57581cac8d7808a9c97937d43e1d45386edf41f8824a4f
-  data.tar.gz: e11a5741e64138f68cac3ad51d14243bfa47c8f56b3b03144b685b1d2d71d4fea657221bcdffcfdaef5edd485b7df6262eb018b38ac4dcb0e01b22648c55a080
+  metadata.gz: 189c9d0eacdc54969b15f412dbb968c3a1d9aadedd0ccd4e74cc3e9afaf1af33c83c0f4a9b911ed563a3fc9dc8f256c75d74d013832273038087ae38734abeb2
+  data.tar.gz: 675427c4e5233153a58f6ff3a2abbe754e9216261872d666301ceeeeb1919b8098c4b7bdf2ee8065ccb781d3ad35c6a2bfa7f1e0e5e719486176655831032efb

data/lib/graphql/internal_representation/rewrite.rb

@@ -167,6 +167,7 @@ module GraphQL
       # Merge `node` into `parent_node`'s children, as `name`, applying `extra_directives`
       def deep_merge_child(parent_node, name, node, extra_directives)
         child_node = parent_node.children[name] ||= node.dup
+        child_node.on_types.merge(node.on_types)
         node.children.each do |merge_child_name, merge_child_node|
           deep_merge_child(child_node, merge_child_name, merge_child_node, [])
         end

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.16.0"
+  VERSION = "0.16.1"
 end

data/spec/graphql/analysis/query_complexity_spec.rb

@@ -132,7 +132,7 @@ describe GraphQL::Analysis::QueryComplexity do
 
       it "gets the max among options" do
         reduce_result
-        assert_equal 5, complexities.last
+        assert_equal 6, complexities.last
       end
     end
 

data/spec/graphql/introspection/schema_type_spec.rb

@@ -18,6 +18,7 @@ describe GraphQL::Introspection::SchemaType do
         "types" => DummySchema.types.values.map { |t| t.name.nil? ? (p t; raise("no name for #{t}")) : {"name" => t.name} },
         "queryType"=>{
           "fields"=>[
+            {"name"=>"allDairy"},
             {"name"=>"cheese"},
             {"name"=>"cow"},
             {"name"=>"dairy"},

data/spec/graphql/union_type_spec.rb

@@ -28,4 +28,47 @@ describe GraphQL::UnionType do
   it '#include? returns false if type is not in possible_types' do
     assert_equal(false, union.include?(type_3))
   end
+
+  describe "list of union type" do
+    describe "fragment spreads" do
+      let(:result) { DummySchema.execute(query_string) }
+      let(:query_string) {%|
+        {
+          allDairy {
+            __typename
+            ... milkFields
+            ... cheeseFields
+          }
+        }
+        fragment milkFields on Milk {
+          id
+          source
+          origin
+          flavors
+        }
+
+        fragment cheeseFields on Cheese {
+          id
+          source
+          origin
+          flavor
+        }
+      |}
+
+      it "resolves the right fragment on the right item" do
+        all_dairy = result["data"]["allDairy"]
+        cheeses = all_dairy.first(3)
+        cheeses.each do |cheese|
+          assert_equal "Cheese", cheese["__typename"]
+          assert_equal ["__typename", "id", "source", "origin", "flavor"], cheese.keys
+        end
+
+        milks = all_dairy.last(1)
+        milks.each do |milk|
+          assert_equal "Milk", milk["__typename"]
+          assert_equal ["__typename", "id", "source", "origin", "flavors"], milk.keys
+        end
+      end
+    end
+  end
 end

data/spec/support/dairy_app.rb

@@ -241,6 +241,10 @@ QueryType = GraphQL::ObjectType.define do
     }
   end
 
+  field :allDairy, types[DairyProductUnion] do
+    resolve -> (obj, args, ctx) { CHEESES.values + MILKS.values }
+  end
+
   field :error do
     description "Raise an error"
     type GraphQL::STRING_TYPE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -219,6 +219,7 @@ files:
 - lib/graphql/int_type.rb
 - lib/graphql/interface_type.rb
 - lib/graphql/internal_representation.rb
+- lib/graphql/internal_representation/definition.rb
 - lib/graphql/internal_representation/node.rb
 - lib/graphql/internal_representation/rewrite.rb
 - lib/graphql/introspection.rb