graphql 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 597ceac7f7f1c006aaaf98ff69fb2320e80c08fb
-  data.tar.gz: 8145bb6df94810a05738c2dbde3753c7c8e8e26d
+  metadata.gz: 361de5aace2ae0ad425b1c59da22dbc53128020e
+  data.tar.gz: d2927200177cdc6c5d26f82feb195180d9e631da
 SHA512:
-  metadata.gz: 1127f6886b67be9890dfef2db3708210a319f292fafb35d49dd4f0092330717c783e886710f7573353b7582e8a3fa743367c70ca69e0740afbc11f5a87b77920
-  data.tar.gz: 2ff711f09df54c8e91c97045c72780d6921fcfefce04ebadeb8368b56452e4300680c64689f48b2acadd38686ec3e9b50c72dde5bfe6e780ff891d687367afe1
+  metadata.gz: a9b4d287ff8fe030fdb5b7693b1e418cbdbd8f4c2f50c99f6e2daef14501a39b60afbdaba2ec1a6958cf4f7ef6cf9cd13028779565f34cc81ffc08df01ceffd8
+  data.tar.gz: d775e65e4736ab0ed9fb9502c4f42d0a59ea5703efc3c9174e68a9f25300377b3c6236e7f818967e6a6cccd83ad5316c1b9259c70313972a313bc93aed2c90f8

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

@@ -21,12 +21,26 @@ module GraphQL
         def result
           selections.reduce({}) do |memo, ast_field|
             field_value = resolve_field(ast_field)
-            memo.merge(field_value)
+            deep_merge memo, field_value
           end
         end
 
         private
 
+        def deep_merge(h1, h2)
+          h1.merge(h2) do |key, oldval, newval|
+            if oldval.is_a?(Array) && newval.is_a?(Array)
+              oldval.each_index.map do |i|
+                deep_merge oldval[i], newval[i]
+              end
+            elsif oldval.is_a?(Hash) && newval.is_a?(Hash)
+              deep_merge(oldval, newval)
+            else
+              newval
+            end
+          end
+        end
+
         def resolve_field(ast_field)
           chain = GraphQL::Query::DirectiveChain.new(ast_field, query) {
             strategy_name = RESOLUTION_STRATEGIES[ast_field.class]

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/graphql/introspection/schema_type_spec.rb

@@ -19,6 +19,7 @@ describe GraphQL::Introspection::SchemaType do
           "fields"=>[
             {"name"=>"cheese"},
             {"name"=>"milk"},
+            {"name"=>"dairy"},
             {"name"=>"fromSource"},
             {"name"=>"favoriteEdible"},
             {"name"=>"searchDairy"},

data/spec/graphql/query_spec.rb

@@ -82,6 +82,52 @@ describe GraphQL::Query do
     assert_equal(GraphQL::Language::Nodes::FragmentDefinition, query.fragments['cheeseFields'].class)
   end
 
+  describe "merging fragments with different keys" do
+    let(:query_string) { %|
+      query getCheeseFieldsThroughDairy {
+        dairy {
+          ...flavorFragment
+          ...fatContentFragment
+        }
+      }
+      fragment flavorFragment on Dairy {
+        cheese {
+          flavor
+        }
+        milks {
+          id
+        }
+      }
+
+      fragment fatContentFragment on Dairy {
+        cheese {
+          fatContent
+        }
+        milks {
+          fatContent
+        }
+      }
+
+    |}
+
+    it "should include keys from each fragment" do
+      expected = {"data" => {
+        "dairy" => {
+          "cheese" => {
+            "flavor" => "Brie",
+            "fatContent" => 0.19
+          },
+          "milks" => [
+            {
+              "id" => "1",
+              "fatContent" => 0.04,
+            }
+          ],
+        }
+      }}
+      assert_equal(expected, result)
+    end
+  end
 
   describe "malformed queries" do
     describe "whitespace-only" do

data/spec/support/dairy_app.rb

@@ -62,6 +62,14 @@ MilkType = GraphQL::ObjectType.define do
   end
 end
 
+DairyType = GraphQL::ObjectType.define do
+  name 'Dairy'
+  description 'A farm where milk is harvested and cheese is produced'
+  field :id, !types.ID
+  field :cheese, CheeseType
+  field :milks, types[MilkType]
+end
+
 MaybeNullType = GraphQL::ObjectType.define do
   name "MaybeNull"
   description "An object whose fields return nil"
@@ -96,6 +104,19 @@ class FetchField
   end
 end
 
+class SingletonField
+  def self.create(type:, data:)
+    desc = "Find the only #{type.name}"
+    return_type = type
+    GraphQL::Field.define do
+      type(return_type)
+      description(desc)
+
+      resolve -> (t, a, c) {data}
+    end
+  end
+end
+
 SourceFieldDefn = Proc.new {
   type GraphQL::ListType.new(of_type: CheeseType)
   description "Cheese from source"
@@ -116,6 +137,7 @@ QueryType = GraphQL::ObjectType.define do
   description "Query root of the system"
   field :cheese, field: FetchField.create(type: CheeseType, data: CHEESES)
   field :milk, field: FetchField.create(type: MilkType, data: MILKS, id_type: !types.ID)
+  field :dairy, field: SingletonField.create(type: DairyType, data: DAIRY)
   field :fromSource, &SourceFieldDefn
   field :favoriteEdible, &FavoriteFieldDefn
   field :searchDairy do

data/spec/support/dairy_data.rb

@@ -9,3 +9,5 @@ Milk = Struct.new(:id, :fatContent, :source)
 MILKS = {
   1 => Milk.new(1, 0.04, 1),
 }
+
+DAIRY = OpenStruct.new(cheese: CHEESES[1], milks: [MILKS[1]])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet