graphql 0.10.8 → 0.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed91d2fd1d191758d362b06dd3af5bcc53589fad
-  data.tar.gz: a5b9d8f9ff219f4db84e24a569a6b396d034cd87
+  metadata.gz: f073abd68886cc4042f66cff4457c9adcae153f7
+  data.tar.gz: 895ea36770f92665af805b9181c8641fb5614567
 SHA512:
-  metadata.gz: bb2d62a66e88dc88e52ff05cb00317b79ee05a9aa0a3a36280d2f6aab2f6d7df1205c32e327d743227f9a491ce9d7ea66283e147633482a6f0973ce27abbe125
-  data.tar.gz: 31400a2541cbf1673b7b83c823d5be985daab47ec68085345b248cdbcd9373f4e1b31ef94f31da14e3468a177ab36998a5b84a37e24a99b47c73c9bd7dede970
+  metadata.gz: ce609e9c9523281b908378697e48344ffdc4e8c0597b69b30ddcea15f51468fa971805e4346f6aad5c36536f760bfefccd6449abcaf1825e80f925af149682c1
+  data.tar.gz: 78611caafff37f1b1a142aa74af6eadac62b5cfdd35c0099f5afda063a95142ed1d036004e6eb7d2904762459b2c38cb97e36944af2b636f33fe7ef8ef15e69d

data/lib/graphql/object_type.rb

@@ -31,10 +31,11 @@ class GraphQL::ObjectType < GraphQL::BaseType
 
   #   Shovel this type into each interface's `possible_types` array.
   #
-  #   (There's a bug here: if you define interfaces twice, it won't remove previous definitions.)
   #   @param new_interfaces [Array<GraphQL::Interface>] interfaces that this type implements
   def interfaces=(new_interfaces)
-    new_interfaces.each {|i| i.possible_types << self }
+    @interfaces ||= []
+    (@interfaces - new_interfaces).each { |i| i.possible_types.delete(self) }
+    (new_interfaces - @interfaces).each { |i| i.possible_types << self }
     @interfaces = new_interfaces
   end
 

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

@@ -88,7 +88,7 @@ module GraphQL
         def merge_fields(field1, field2)
           field_type = query.schema.get_field(type, field2.name).type.unwrap
 
-          if field_type.is_a?(GraphQL::ObjectType)
+          if field_type.kind.fields?
             # create a new ast field node merging selections from each field.
             # Because of static validation, we can assume that name, alias,
             # arguments, and directives are exactly the same for fields 1 and 2.

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.10.8"
+  VERSION = "0.10.9"
 end

data/readme.md

@@ -112,17 +112,6 @@ https://medium.com/@gauravtiwari/graphql-and-relay-on-rails-first-relay-powered-
 - Code clean-up
   - Raise if you try to configure an attribute which doesn't suit the type (ie, if you try to define `resolve` on an ObjectType, it should somehow raise)
   - Clean up file structure in `lib/query` (don't need serial_execution namespace anymore)
-  - Overriding `!` on types breaks ActiveSupport `.blank?`
-
-    ```ruby
-    my_type = GraphQL::ObjectType.define { name("MyType") }
-    # => MyType
-    my_type.present?
-    # => MyType!!
-    my_type.blank?
-    # => MyType!
-    ```
-
 - Accept strings for circular type references
 - Interface's possible types should be a property of the schema, not the interface
 - Statically validate type of variables (see early return in LiteralValidator)
@@ -132,7 +121,6 @@ https://medium.com/@gauravtiwari/graphql-and-relay-on-rails-first-relay-powered-
   - __Subscriptions__
     - This is a good chance to make an `Operation` abstraction of which `query`, `mutation` and `subscription` are members
     - For a subscription, `graphql` would send an outbound message to the system (allow the host application to manage its own subscriptions via Pusher, ActionCable, whatever)
-- Documentation
 
 ## Goals
 

data/spec/graphql/interface_type_spec.rb

@@ -11,6 +11,24 @@ describe GraphQL::InterfaceType do
     assert_equal(MilkType, interface.resolve_type(MILKS.values.first))
   end
 
+  it 'handles when interfaces are re-assigned' do
+    iface = GraphQL::InterfaceType.define do
+    end
+    type = GraphQL::ObjectType.define do
+      interfaces [iface]
+    end
+    assert_equal([type], iface.possible_types)
+
+    type.interfaces = []
+    assert_equal([], iface.possible_types)
+
+    type.interfaces = [iface]
+    assert_equal([type], iface.possible_types)
+
+    type.interfaces = [iface]
+    assert_equal([type], iface.possible_types)
+  end
+
   describe 'query evaluation' do
     let(:result) { DummySchema.execute(query_string, context: {}, variables: {"cheeseId" => 2})}
     let(:query_string) {%|
@@ -24,6 +42,20 @@ describe GraphQL::InterfaceType do
     end
   end
 
+  describe 'mergable query evaluation' do
+    let(:result) { DummySchema.execute(query_string, context: {}, variables: {"cheeseId" => 2})}
+    let(:query_string) {%|
+      query fav {
+        favoriteEdible { fatContent }
+        favoriteEdible { origin }
+      }
+    |}
+    it 'gets fields from the type for the given object' do
+      expected = {"data"=>{"favoriteEdible"=>{"fatContent"=>0.04, "origin"=>"Antiquity"}}}
+      assert_equal(expected, result)
+    end
+  end
+
   describe '#resolve_type' do
     let(:interface) {
       GraphQL::InterfaceType.define do

data/spec/graphql/introspection/type_type_spec.rb

@@ -14,6 +14,7 @@ describe GraphQL::Introspection::TypeType do
   let(:cheese_fields) {[
     {"name"=>"id",          "isDeprecated" => false, "type" => { "name" => "Non-Null", "ofType" => { "name" => "Int"}}},
     {"name"=>"flavor",      "isDeprecated" => false, "type" => { "name" => "Non-Null", "ofType" => { "name" => "String"}}},
+    {"name"=>"origin",      "isDeprecated" => false, "type" => { "name" => "Non-Null", "ofType" => { "name" => "String"}}},
     {"name"=>"source",      "isDeprecated" => false, "type" => { "name" => "Non-Null", "ofType" => { "name" => "DairyAnimal"}}},
     {"name"=>"similarCheese", "isDeprecated"=>false, "type"=>{"name"=>"Cheese", "ofType"=>nil}},
   ]}
@@ -38,6 +39,7 @@ describe GraphQL::Introspection::TypeType do
         "fields"=>[
           {"type"=>{"name"=>"Non-Null", "ofType"=>{"name"=>"ID"}}},
           {"type"=>{"name"=>"DairyAnimal", "ofType"=>nil}},
+          {"type"=>{"name"=>"Non-Null", "ofType"=>{"name"=>"String"}}},
           {"type"=>{"name"=>"Non-Null", "ofType"=>{"name"=>"Float"}}},
           {"type"=>{"name"=>"List", "ofType"=>{"name"=>"String"}}},
         ]

data/spec/spec_helper.rb

@@ -8,6 +8,8 @@ require "minitest/reporters"
 require 'pry'
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 
+Minitest::Spec.make_my_diffs_pretty!
+
 # Filter out Minitest backtrace while allowing backtrace from other libraries
 # to be shown.
 Minitest.backtrace_filter = Minitest::BacktraceFilter.new

data/spec/support/dairy_app.rb

@@ -6,6 +6,7 @@ EdibleInterface = GraphQL::InterfaceType.define do
   name "Edible"
   description "Something you can eat, yum"
   field :fatContent, !types.Float, "Percentage which is fat", property: :bogus_property
+  field :origin, !types.String, "Place the edible comes from"
 end
 
 AnimalProductInterface = GraphQL::InterfaceType.define do
@@ -31,6 +32,7 @@ CheeseType = GraphQL::ObjectType.define do
   # Can have (name, type, desc)
   field :id, !types.Int, "Unique identifier"
   field :flavor, !types.String, "Kind of Cheese"
+  field :origin, !types.String, "Place the cheese comes from"
 
   field :source, !DairyAnimalEnum,
     "Animal which produced the milk for this cheese"
@@ -62,6 +64,7 @@ MilkType = GraphQL::ObjectType.define do
   interfaces [EdibleInterface, AnimalProductInterface]
   field :id, !types.ID
   field :source, DairyAnimalEnum, "Animal which produced this milk"
+  field :origin, !types.String, "Place the milk comes from"
   field :fatContent, !types.Float, "Percentage which is milkfat"
   field :flavors, types[types.String], "Chocolate, Strawberry, etc" do
     argument :limit, types.Int

data/spec/support/dairy_data.rb

@@ -1,13 +1,13 @@
-Cheese = Struct.new(:id, :flavor, :fat_content, :source)
+Cheese = Struct.new(:id, :flavor, :origin, :fat_content, :source)
 CHEESES = {
-  1 => Cheese.new(1, "Brie", 0.19, 1),
-  2 => Cheese.new(2, "Gouda", 0.3, 1),
-  3 => Cheese.new(3, "Manchego", 0.065, "SHEEP")
+  1 => Cheese.new(1, "Brie", "France", 0.19, 1),
+  2 => Cheese.new(2, "Gouda", "Netherlands", 0.3, 1),
+  3 => Cheese.new(3, "Manchego", "Spain", 0.065, "SHEEP")
 }
 
-Milk = Struct.new(:id, :fatContent, :source, :flavors)
+Milk = Struct.new(:id, :fatContent, :origin, :source, :flavors)
 MILKS = {
-  1 => Milk.new(1, 0.04, 1, ["Natural", "Chocolate", "Strawberry"]),
+  1 => Milk.new(1, 0.04, "Antiquity", 1, ["Natural", "Chocolate", "Strawberry"]),
 }
 
 DAIRY = OpenStruct.new(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.10.8
+  version: 0.10.9
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet