graphql 0.18.15 → 0.19.0

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require "minitest/autorun"
 require "minitest/focus"
 require "minitest/reporters"
 require "pry"
+require 'pry-stack_explorer'
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 
 Minitest::Spec.make_my_diffs_pretty!

data/spec/support/dairy_app.rb

@@ -62,7 +62,7 @@ CheeseType = GraphQL::ObjectType.define do
   field :similarCheese, CheeseType, "Cheeses like this one", property: :this_should_be_overriden  do
     # metadata test
     joins [:cheeses, :milks]
-    argument :source, !types[!DairyAnimalEnum]
+    argument :source, !types[!DairyAnimalEnum], default_value: [1]
     resolve -> (t, a, c) {
       # get the strings out:
       sources = a["source"]
@@ -235,7 +235,7 @@ end
 SourceFieldDefn = Proc.new {
   type GraphQL::ListType.new(of_type: CheeseType)
   description "Cheese from source"
-  argument :source, DairyAnimalEnum, default_value: "COW"
+  argument :source, DairyAnimalEnum, default_value: 1
   resolve -> (target, arguments, context) {
     CHEESES.values.select{ |c| c.source == arguments["source"] }
   }

data/spec/support/star_wars_schema.rb

@@ -1,28 +1,16 @@
 # Adapted from graphql-relay-js
 # https://github.com/graphql/graphql-relay-js/blob/master/src/__tests__/starWarsSchema.js
 
-# This object exposes helpers for working with global IDs:
-# - global id creation & "decrypting"
-# - a find-object-by-global ID field
-# - an interface for Relay ObjectTypes to implement
-# See global_node_identification.rb for the full API.
-NodeIdentification = GraphQL::Relay::GlobalNodeIdentification.define do
-  object_from_id -> (node_id, ctx) do
-    type_name, id = NodeIdentification.from_global_id(node_id)
-    STAR_WARS_DATA[type_name][id]
-  end
-end
-
 Ship = GraphQL::ObjectType.define do
   name "Ship"
-  interfaces [NodeIdentification.interface]
+  interfaces [GraphQL::Relay::Node.interface]
   global_id_field :id
   field :name, types.String
 end
 
 BaseType = GraphQL::ObjectType.define do
   name "Base"
-  interfaces [NodeIdentification.interface]
+  interfaces [GraphQL::Relay::Node.interface]
   global_id_field :id
   field :name, types.String
   field :planet, types.String
@@ -69,9 +57,9 @@ end
 
 Faction = GraphQL::ObjectType.define do
   name "Faction"
-  interfaces [NodeIdentification.interface]
+  interfaces [GraphQL::Relay::Node.interface]
 
-  field :id, !types.ID, resolve: GraphQL::Relay::GlobalIdResolve.new(type_name: "Faction", property: :id)
+  field :id, !types.ID, resolve: GraphQL::Relay::GlobalIdResolve.new(type: Faction)
   field :name, types.String
   connection :ships, Ship.connection_type do
     resolve -> (obj, args, ctx) {
@@ -192,7 +180,7 @@ QueryType = GraphQL::ObjectType.define do
     resolve -> (obj, args, ctx) { Base.find(3) }
   end
 
-  field :node, field: NodeIdentification.field
+  field :node, GraphQL::Relay::Node.field
 end
 
 MutationType = GraphQL::ObjectType.define do
@@ -204,7 +192,7 @@ end
 StarWarsSchema = GraphQL::Schema.define do
   query(QueryType)
   mutation(MutationType)
-  node_identification(NodeIdentification)
+
   resolve_type -> (object, ctx) {
     if object == :test_error
       :not_a_type
@@ -218,4 +206,13 @@ StarWarsSchema = GraphQL::Schema.define do
       nil
     end
   }
+
+  object_from_id -> (node_id, ctx) do
+    type_name, id = GraphQL::Schema::UniqueWithinType.decode(node_id)
+    STAR_WARS_DATA[type_name][id]
+  end
+
+  id_from_object -> (object, type, ctx) do
+    GraphQL::Schema::UniqueWithinType.encode(type.name, object.id)
+  end
 end

data/spec/support/static_validation_helpers.rb

@@ -0,0 +1,27 @@
+# This module assumes you have `let(:query_string)` in your spec.
+# It provides `errors` which are the validation errors for that string,
+# as validated against `DummySchema`.
+# You can override `schema` to provide another schema
+# @example testing static validation
+#   include StaticValidationHelpers
+#   let(:query_string) { " ... " }
+#   it "validates" do
+#     assert_equal(errors, [ ... ])
+#     assert_equal(error_messages, [ ... ])
+#   end
+module StaticValidationHelpers
+  def errors
+    target_schema = schema
+    validator = GraphQL::StaticValidation::Validator.new(schema: target_schema)
+    query = GraphQL::Query.new(target_schema, query_string)
+    validator.validate(query)[:errors]
+  end
+
+  def error_messages
+    errors.map { |e| e["message"] }
+  end
+
+  def schema
+    DummySchema
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.18.15
+  version: 0.19.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -295,6 +309,7 @@ files:
 - lib/graphql/define/non_null_with_bang.rb
 - lib/graphql/define/type_definer.rb
 - lib/graphql/directive.rb
+- lib/graphql/directive/deprecated_directive.rb
 - lib/graphql/directive/include_directive.rb
 - lib/graphql/directive/skip_directive.rb
 - lib/graphql/enum_type.rb
@@ -370,8 +385,8 @@ files:
 - lib/graphql/relay/edge.rb
 - lib/graphql/relay/edge_type.rb
 - lib/graphql/relay/global_id_resolve.rb
-- lib/graphql/relay/global_node_identification.rb
 - lib/graphql/relay/mutation.rb
+- lib/graphql/relay/node.rb
 - lib/graphql/relay/page_info.rb
 - lib/graphql/relay/relation_connection.rb
 - lib/graphql/scalar_type.rb
@@ -387,6 +402,7 @@ files:
 - lib/graphql/schema/timeout_middleware.rb
 - lib/graphql/schema/type_expression.rb
 - lib/graphql/schema/type_map.rb
+- lib/graphql/schema/unique_within_type.rb
 - lib/graphql/schema/validation.rb
 - lib/graphql/static_validation.rb
 - lib/graphql/static_validation/all_rules.rb
@@ -466,8 +482,8 @@ files:
 - spec/graphql/relay/array_connection_spec.rb
 - spec/graphql/relay/connection_field_spec.rb
 - spec/graphql/relay/connection_type_spec.rb
-- spec/graphql/relay/global_node_identification_spec.rb
 - spec/graphql/relay/mutation_spec.rb
+- spec/graphql/relay/node_spec.rb
 - spec/graphql/relay/page_info_spec.rb
 - spec/graphql/relay/relation_connection_spec.rb
 - spec/graphql/scalar_type_spec.rb
@@ -479,6 +495,7 @@ files:
 - spec/graphql/schema/rescue_middleware_spec.rb
 - spec/graphql/schema/timeout_middleware_spec.rb
 - spec/graphql/schema/type_expression_spec.rb
+- spec/graphql/schema/unique_within_type_spec.rb
 - spec/graphql/schema/validation_spec.rb
 - spec/graphql/schema_spec.rb
 - spec/graphql/static_validation/rules/argument_literals_are_compatible_spec.rb
@@ -511,6 +528,7 @@ files:
 - spec/support/minimum_input_object.rb
 - spec/support/star_wars_data.rb
 - spec/support/star_wars_schema.rb
+- spec/support/static_validation_helpers.rb
 homepage: http://github.com/rmosolgo/graphql-ruby
 licenses:
 - MIT
@@ -581,8 +599,8 @@ test_files:
 - spec/graphql/relay/array_connection_spec.rb
 - spec/graphql/relay/connection_field_spec.rb
 - spec/graphql/relay/connection_type_spec.rb
-- spec/graphql/relay/global_node_identification_spec.rb
 - spec/graphql/relay/mutation_spec.rb
+- spec/graphql/relay/node_spec.rb
 - spec/graphql/relay/page_info_spec.rb
 - spec/graphql/relay/relation_connection_spec.rb
 - spec/graphql/scalar_type_spec.rb
@@ -594,6 +612,7 @@ test_files:
 - spec/graphql/schema/rescue_middleware_spec.rb
 - spec/graphql/schema/timeout_middleware_spec.rb
 - spec/graphql/schema/type_expression_spec.rb
+- spec/graphql/schema/unique_within_type_spec.rb
 - spec/graphql/schema/validation_spec.rb
 - spec/graphql/schema_spec.rb
 - spec/graphql/static_validation/rules/argument_literals_are_compatible_spec.rb
@@ -626,3 +645,4 @@ test_files:
 - spec/support/minimum_input_object.rb
 - spec/support/star_wars_data.rb
 - spec/support/star_wars_schema.rb
+- spec/support/static_validation_helpers.rb

data/lib/graphql/relay/global_node_identification.rb

@@ -1,138 +0,0 @@
-require 'singleton'
-module GraphQL
-  module Relay
-    # This object provides helpers for working with global IDs.
-    # It's assumed you'll only have 1!
-    #
-    # GlobalIdField depends on that, since it calls class methods
-    # which delegate to the singleton instance.
-    #
-    class GlobalNodeIdentification
-      include GraphQL::Define::InstanceDefinable
-      accepts_definitions(:object_from_id, :type_from_object, :to_global_id, :from_global_id, :description)
-      lazy_defined_attr_accessor :description
-
-      # Memoize the schema to support deprecated node_ident-level resolve functions
-      # TODO: remove after Schema.resolve_type is required
-      attr_accessor :schema
-
-      class << self
-        attr_accessor :id_separator
-      end
-
-      self.id_separator = "-"
-
-      def initialize
-        @to_global_id_proc = DEFAULT_TO_GLOBAL_ID
-        @from_global_id_proc = DEFAULT_FROM_GLOBAL_ID
-      end
-
-      # Returns `NodeInterface`, which all Relay types must implement
-      def interface
-        @interface ||= begin
-          ensure_defined
-          ident = self
-          if @type_from_object_proc
-            # TODO: remove after Schema.resolve_type is required
-            GraphQL::InterfaceType.define do
-              name "Node"
-              field :id, !types.ID
-              resolve_type -> (obj, ctx) {
-                ident.type_from_object(obj)
-              }
-            end
-          else
-            GraphQL::InterfaceType.define do
-              name "Node"
-              field :id, !types.ID
-            end
-          end
-        end
-      end
-
-      # Returns a field for finding objects from a global ID, which Relay needs
-      def field
-        ensure_defined
-        ident = self
-        GraphQL::Field.define do
-          type(ident.interface)
-          argument :id, !types.ID
-          resolve -> (obj, args, ctx) {
-            ctx.query.schema.node_identification.object_from_id(args[:id], ctx)
-          }
-          description ident.description
-        end
-      end
-
-      DEFAULT_TO_GLOBAL_ID = -> (type_name, id) {
-        id_str = id.to_s
-        if type_name.include?(self.id_separator) || id_str.include?(self.id_separator)
-          raise "to_global_id(#{type_name}, #{id}) contains reserved characters `#{self.id_separator}`"
-        end
-        Base64.strict_encode64([type_name, id_str].join(self.id_separator))
-      }
-
-      DEFAULT_FROM_GLOBAL_ID = -> (global_id) {
-        Base64.decode64(global_id).split(self.id_separator)
-      }
-
-      # Create a global ID for type-name & ID
-      # (This is an opaque transform)
-      def to_global_id(type_name, id)
-        ensure_defined
-        @to_global_id_proc.call(type_name, id)
-      end
-
-      def to_global_id=(proc)
-        ensure_defined
-        @to_global_id_proc = proc
-      end
-
-      # Get type-name & ID from global ID
-      # (This reverts the opaque transform)
-      def from_global_id(global_id)
-        ensure_defined
-        @from_global_id_proc.call(global_id)
-      end
-
-      def from_global_id=(proc)
-        ensure_defined
-        @from_global_id_proc = proc
-      end
-
-      # Use the provided config to
-      # get a type for a given object
-      # TODO: remove after Schema.resolve_type is required
-      def type_from_object(object)
-        ensure_defined
-        warn("type_from_object(object) is deprecated; use Schema.resolve_type(object) instead")
-
-        if @type_from_object_proc
-          type_from_obj = @type_from_object_proc
-          schema.resolve_type = -> (obj, ctx) { type_from_obj.call(obj) }
-          @type_from_object_proc = nil
-        end
-
-        schema.resolve_type(object, nil)
-      end
-
-      def type_from_object=(new_type_from_object_proc)
-        ensure_defined
-        warn("type_from_object(object) is deprecated; use Schema.resolve_type(object) instead")
-        @type_from_object_proc = new_type_from_object_proc
-      end
-
-      # Use the provided config to
-      # get an object from a UUID
-      def object_from_id(id, ctx)
-        ensure_defined
-        @object_from_id_proc.call(id, ctx)
-      end
-
-      def object_from_id=(proc)
-        ensure_defined
-        @object_from_id_proc = proc
-      end
-    end
-  end
-end

data/spec/graphql/relay/global_node_identification_spec.rb

@@ -1,153 +0,0 @@
-require 'spec_helper'
-
-describe GraphQL::Relay::GlobalNodeIdentification do
-  let(:node_identification) { StarWarsSchema.node_identification }
-  describe 'NodeField' do
-    it 'finds objects by id' do
-      global_id = node_identification.to_global_id("Faction", "1")
-      result = star_wars_query(%|{
-        node(id: "#{global_id}") {
-          id,
-          ... on Faction {
-            name
-            ships(first: 1) {
-              edges {
-               node {
-                 name
-                 }
-              }
-            }
-          }
-        }
-      }|)
-      expected = {"data" => {
-        "node"=>{
-          "id"=>"RmFjdGlvbi0x",
-          "name"=>"Alliance to Restore the Republic",
-          "ships"=>{
-            "edges"=>[
-              {"node"=>{
-                  "name" => "X-Wing"
-                }
-              }
-            ]
-          }
-        }
-      }}
-      assert_equal(expected, result)
-    end
-  end
-
-  after do
-    # Set the id_separator back to it's default after each spec, since some of
-    # them change it at runtime
-    GraphQL::Relay::GlobalNodeIdentification.id_separator = "-"
-  end
-
-  describe 'id_separator' do
-    it "allows you to change it at runtime" do
-      GraphQL::Relay::GlobalNodeIdentification.id_separator = "-zomg-"
-
-      assert_equal("-zomg-", GraphQL::Relay::GlobalNodeIdentification.id_separator)
-    end
-  end
-
-  describe "type_from_object" do
-    it "works even though it's deprecated" do
-      thing_type = GraphQL::ObjectType.define do
-        name "Thing"
-        global_id_field :id
-        field :object_id, types.Int
-      end
-
-      node_ident = GraphQL::Relay::GlobalNodeIdentification.define do
-        type_from_object -> (obj) { thing_type }
-      end
-
-      schema = GraphQL::Schema.define do
-        node_identification(node_ident)
-      end
-
-      schema.send(:ensure_defined)
-      assert_equal thing_type, node_ident.type_from_object(nil)
-      assert_equal thing_type, schema.resolve_type(nil, nil)
-    end
-  end
-
-  describe 'to_global_id / from_global_id ' do
-    it 'Converts typename and ID to and from ID' do
-      global_id = node_identification.to_global_id("SomeType", 123)
-      type_name, id = node_identification.from_global_id(global_id)
-      assert_equal("SomeType", type_name)
-      assert_equal("123", id)
-    end
-
-    it "allows you to change the id_separator" do
-      GraphQL::Relay::GlobalNodeIdentification.id_separator = "---"
-
-      global_id = node_identification.to_global_id("Type-With-UUID", "250cda0e-a89d-41cf-99e1-2872d89f1100")
-      type_name, id = node_identification.from_global_id(global_id)
-      assert_equal("Type-With-UUID", type_name)
-      assert_equal("250cda0e-a89d-41cf-99e1-2872d89f1100", id)
-    end
-
-    it "raises an error if you try and use a reserved character in the ID" do
-      err = assert_raises(RuntimeError) {
-        node_identification.to_global_id("Best-Thing", "234")
-      }
-      assert_includes err.message, "to_global_id(Best-Thing, 234) contains reserved characters `-`"
-    end
-
-    describe "custom definitions" do
-      let(:custom_node_identification) {
-        ident = GraphQL::Relay::GlobalNodeIdentification.define do
-          to_global_id -> (type_name, id) {
-            "#{type_name}/#{id}"
-          }
-
-          from_global_id -> (global_id) {
-            global_id.split("/")
-          }
-
-          object_from_id -> (node_id, ctx) do
-            type_name, id = ident.from_global_id(node_id)
-            STAR_WARS_DATA[type_name][id]
-          end
-
-          description "Hello, World!"
-        end
-      }
-
-      before do
-        @prev_node_identification = StarWarsSchema.node_identification
-        StarWarsSchema.node_identification = custom_node_identification
-      end
-
-      after do
-        StarWarsSchema.node_identification = @prev_node_identification
-      end
-
-      describe "generating IDs" do
-        it "Applies custom-defined ID generation" do
-          result = star_wars_query(%| { largestBase { id } }|)
-          generated_id = result["data"]["largestBase"]["id"]
-          assert_equal "Base/3", generated_id
-        end
-      end
-
-      describe "fetching by ID" do
-        it "Deconstructs the ID by the custom proc" do
-          result = star_wars_query(%| { node(id: "Base/1") { ... on Base { name } } }|)
-          base_name = result["data"]["node"]["name"]
-          assert_equal "Yavin", base_name
-        end
-      end
-
-      describe "setting a description" do
-        it "allows you to set a description" do
-          assert_equal "Hello, World!", custom_node_identification.field.description
-        end
-      end
-    end
-  end
-end