graphql 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d6f90d46a8163e9eff31701c295fc86de974f83
-  data.tar.gz: 4743996397fb5468ac91b4fffe3d914efd45de6c
+  metadata.gz: 06deb0560626e16a3df052a56924a3f541baed38
+  data.tar.gz: 2f8d1ffaca328783f129f9c9c031c5794cd629da
 SHA512:
-  metadata.gz: e8b722f7490e1bfed0a98dd48d0a09383d2e8358c89ed79b183bf857410bb2a241f610db225b9232cc4b8eca4ac61c4a7197627b5040f4c8448187ea8fd3d715
-  data.tar.gz: c207a187145c6d681669b2244f89e5c4b637b45c25c4e8d6bb3ebb8adab198b32d1df4728143880304e04d962ef63d08d40605d6691a524a4863adce150fddbf
+  metadata.gz: c221077dd7e949a7e021d941f70fb6f7424c3f563ad0c3abdb1473bf94089fb93949ca324bc20d610a3217e18cc8c9e2b4b9dc21e4b490a7b7363de60d7c4d48
+  data.tar.gz: a8b0880ef7498bc53168ba8864857c877d151825aeccfd50e07e1f58ad299c558a8bbda9b0ee0496ec35de274ac301fceef69996b1d99466c568358ef82ac53b

data/lib/graphql/base_type.rb

@@ -88,5 +88,21 @@ module GraphQL
       return nil if value.nil?
       coerce_non_null_input(value)
     end
+
+    # During schema definition, types can be defined inside procs or as strings.
+    # This function converts it to a type instance
+    # @return [GraphQL::BaseType]
+    def self.resolve_related_type(type_arg)
+      case type_arg
+      when Proc
+        # lazy-eval it
+        type_arg.call
+      when String
+        # Get a constant by this name
+        Object.const_get(type_arg)
+      else
+        type_arg
+      end
+    end
   end
 end

data/lib/graphql/field.rb

@@ -42,7 +42,7 @@ module GraphQL
     include GraphQL::Define::InstanceDefinable
     accepts_definitions :name, :description, :resolve, :type, :property, :deprecation_reason, argument: GraphQL::Define::AssignArgument
 
-    attr_accessor :deprecation_reason, :name, :description, :type, :property
+    attr_accessor :deprecation_reason, :name, :description, :property
     attr_reader :resolve_proc
 
     # @return [String] The name of this field on its {GraphQL::ObjectType} (or {GraphQL::InterfaceType})
@@ -71,18 +71,14 @@ module GraphQL
       @resolve_proc = resolve_proc || build_default_resolver
     end
 
+    def type=(new_return_type)
+      @clean_type = nil
+      @dirty_type = new_return_type
+    end
+
     # Get the return type for this field.
     def type
-      case @type
-      when Proc
-        # lazy-eval it
-        @type = @type.call
-      when String
-        # Get a constant by this name
-        @type = Object.const_get(@type)
-      else
-        @type
-      end
+      @clean_type ||= GraphQL::BaseType.resolve_related_type(@dirty_type)
     end
 
     # You can only set a field's name _once_ -- this to prevent

data/lib/graphql/object_type.rb

@@ -22,19 +22,28 @@ module GraphQL
   #
   class ObjectType < GraphQL::BaseType
     accepts_definitions :interfaces, field: GraphQL::Define::AssignObjectField
-    attr_accessor :name, :description, :interfaces
+    attr_accessor :name, :description
 
     # @return [Hash<String, GraphQL::Field>] Map String fieldnames to their {GraphQL::Field} implementations
     attr_accessor :fields
 
     def initialize
       @fields = {}
-      @interfaces = []
+      @dirty_interfaces = []
     end
 
     # @param new_interfaces [Array<GraphQL::Interface>] interfaces that this type implements
     def interfaces=(new_interfaces)
-      @interfaces = new_interfaces
+      @clean_interfaces = nil
+      @dirty_interfaces = new_interfaces
+    end
+
+    def interfaces
+      @clean_interfaces ||= begin
+        @dirty_interfaces.map { |i_type| GraphQL::BaseType.resolve_related_type(i_type) }
+      rescue
+        @dirty_interfaces
+      end
     end
 
     def kind

data/lib/graphql/schema/validation.rb

@@ -90,7 +90,7 @@ module GraphQL
         FIELDS_ARE_VALID = Rules.assert_named_items_are_valid("field", -> (type) { type.all_fields })
 
         HAS_ONE_OR_MORE_POSSIBLE_TYPES = -> (type) {
-          type.possible_types.length > 1 ? nil : "must have at least one possible type"
+          type.possible_types.length >= 1 ? nil : "must have at least one possible type"
         }
 
         NAME_IS_STRING = Rules.assert_property(:name, String)

data/lib/graphql/union_type.rb

@@ -11,7 +11,7 @@ module GraphQL
   #
   class UnionType < GraphQL::BaseType
     include GraphQL::BaseType::HasPossibleTypes
-    attr_accessor :name, :description, :possible_types
+    attr_accessor :name, :description
     accepts_definitions :possible_types, :resolve_type
 
     def kind
@@ -21,5 +21,18 @@ module GraphQL
     def include?(child_type_defn)
       possible_types.include?(child_type_defn)
     end
+
+    def possible_types=(new_possible_types)
+      @clean_possible_types = nil
+      @dirty_possible_types = new_possible_types
+    end
+
+    def possible_types
+      @clean_possible_types ||= begin
+        @dirty_possible_types.map { |type| GraphQL::BaseType.resolve_related_type(type) }
+      rescue
+        @dirty_possible_types
+      end
+    end
   end
 end

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.15.1"
+  VERSION = "0.15.2"
 end

data/readme.md

@@ -124,6 +124,7 @@ If you're building a backend for [Relay](http://facebook.github.io/relay/), you'
 - Add a complexity validator (reject queries if they're too big)
 - Add docs for shared behaviors & DRY code
 - Proper error on unknown directive
+- Non-nulls should _propagate_ to the next non-null field (all the way up to data, if need be)
 - __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)

data/spec/graphql/schema/validation_spec.rb

@@ -83,7 +83,7 @@ describe GraphQL::Schema::Validation do
     let(:invalid_interfaces_object) {
       GraphQL::ObjectType.define do
         name "InvalidInterfaces"
-        interfaces({a: 1})
+        interfaces(55)
       end
     }
     let(:invalid_interface_member_object) {
@@ -101,7 +101,7 @@ describe GraphQL::Schema::Validation do
     }
 
     it "requires an Array for interfaces" do
-      assert_error_includes invalid_interfaces_object, "must be an Array of GraphQL::InterfaceType, not a Hash"
+      assert_error_includes invalid_interfaces_object, "must be an Array of GraphQL::InterfaceType, not a Fixnum"
       assert_error_includes invalid_interface_member_object, "must contain GraphQL::InterfaceType, not Symbol"
     end
 

data/spec/support/dairy_app.rb

@@ -27,7 +27,7 @@ end
 CheeseType = GraphQL::ObjectType.define do
   name "Cheese"
   description "Cultured dairy product"
-  interfaces [EdibleInterface, AnimalProductInterface]
+  interfaces ["EdibleInterface", -> { AnimalProductInterface }]
 
   # Can have (name, type, desc)
   field :id, !types.Int, "Unique identifier"
@@ -107,7 +107,7 @@ end
 DairyProductUnion = GraphQL::UnionType.define do
   name "DairyProduct"
   description "Kinds of food made from milk"
-  possible_types [MilkType, CheeseType]
+  possible_types ["MilkType", -> { CheeseType }]
 end
 
 CowType = GraphQL::ObjectType.define do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter