graphql-relay 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 510d5fdf6df3443f504f9f3500a72c123e66af12
-  data.tar.gz: 47490930231ee88bf559225d5ca1bcfdb660d537
+  metadata.gz: 3cb85e8ce09b47b2744246ed62e75c66571da8aa
+  data.tar.gz: 5aa23b9143e8d18a668346bc52f9c7da6dd7f12f
 SHA512:
-  metadata.gz: 4b0be8853c488bd84622a2c69bbaf5a0ff8b18c5bac9cd34dc57a2b9ed0d6368f5e16b0b12d9779a104b3472fa407a94a382173ffa8d27258152fed26c79d416
-  data.tar.gz: 445cfec2d8da0f8b5b57c580036e0621453e724313619783212a402542cb10ff161a45223d6f8968b709ed5f140624396c324c6fb54924f423ce2b4d32116825
+  metadata.gz: dc3fda7351589e2769e908adcd6afb436f4ca94f917cd6815e539125e72b133e89b199ba581e110780fcdea1ad22713422be3bbb29a961fae4c220e90a24a5f0
+  data.tar.gz: 86b5a015dddec76252da2aa70d1f33970bf343fb10b759e3f08a0ab8b94ce71428e97f9a1c2419c17267f88fd1c3cf0a9ecd4fec73d23c6dbd9c00991afe0143

data/README.md

@@ -34,7 +34,9 @@ Global ids (or UUIDs) provide refetching & global identification for Relay.
 
 #### UUID Lookup
 
-Use `GraphQL::Relay::GlobalNodeIdentification` helper by defining `object_from_id(global_id, ctx)` & `type_from_object(object)`. The resulting `NodeIdentification` object is in your schema _and_ internally by `GraphQL::Relay`.
+Use `GraphQL::Relay::GlobalNodeIdentification` helper by defining `object_from_id(global_id, ctx)` & `type_from_object(object)`. Then, assign the result to `Schema#node_identification` so that it can be used for query execution.
+
+For example, define a node identification helper:
 
 
 ```ruby
@@ -59,6 +61,14 @@ NodeIdentification = GraphQL::Relay::GlobalNodeIdentification.define do
 end
 ```
 
+Then assign it to the schema:
+
+```ruby
+MySchema = GraphQL::Schema.new(...)
+# Assign your node identification helper:
+MySchema.node_identification = NodeIdentification
+```
+
 #### UUID fields
 
 ObjectTypes in your schema should implement `NodeIdentification.interface` with the `global_id_field` helper, for example:
@@ -107,9 +117,13 @@ NodeIdentification = GraphQL::Relay::GlobalNodeIdentification.define do
     type_name = id_parts[0]
     id        = id_parts[1]
     # Return *both*:
-    type_name, id
+    [type_name, id]
   }
 end
+
+# ...
+
+MySchema.node_identification = NodeIdentification
 ```
 
 `graphql-relay` will use those procs for interacting with global ids.
@@ -443,7 +457,6 @@ The resolve proc:
 ## Todo
 
 - `GlobalNodeIdentification.to_global_id` should receive the type name and _object_, not `id`. (Or, maintain the "`type_name, id` in, `type_name, id` out" pattern?)
-- Make GlobalId a property of the schema, not a global
 - Reduce duplication in ArrayConnection / RelationConnection
 - Improve API for creating edges (better RANGE_ADD support)
 - If the new edge isn't a member of the connection's objects, raise a nice error

data/lib/graphql/relay.rb

@@ -2,6 +2,7 @@ require 'base64'
 require 'graphql'
 # MONKEY PATCHES 😬
 require 'graphql/relay/monkey_patches/base_type'
+require 'graphql/relay/monkey_patches/schema'
 
 require 'graphql/relay/define'
 require 'graphql/relay/global_node_identification'

data/lib/graphql/relay/base_connection.rb

@@ -101,6 +101,24 @@ module GraphQL
         !!(last && sliced_nodes.count > last)
       end
 
+      # Used by `pageInfo`
+      def start_cursor
+        if start_node = (respond_to?(:paged_nodes_array, true) ? paged_nodes_array : paged_nodes).first
+          return cursor_from_node(start_node)
+        else
+          return nil
+        end
+      end
+
+      # Used by `pageInfo`
+      def end_cursor
+        if end_node = (respond_to?(:paged_nodes_array, true) ? paged_nodes_array : paged_nodes).last
+          return cursor_from_node(end_node)
+        else
+          return nil
+        end
+      end
+
       # An opaque operation which returns a connection-specific cursor.
       def cursor_from_node(object)
         raise NotImplementedError, "must return a cursor for this object/connection pair"

data/lib/graphql/relay/connection_type.rb

@@ -14,7 +14,7 @@ module GraphQL
               obj.edge_nodes.map { |item| edge_class.new(item, obj) }
             }
           end
-          field :pageInfo, PageInfo, property: :page_info
+          field :pageInfo, !PageInfo, property: :page_info
           block && instance_eval(&block)
         end
 

data/lib/graphql/relay/define.rb

@@ -2,8 +2,8 @@ module GraphQL
   module Relay
     module Define
       module AssignConnection
-        def self.call(type_defn, name, type = nil, desc = nil, property: nil, max_page_size: nil, &block)
-          underlying_field = GraphQL::Define::AssignObjectField.call(type_defn, name, type, desc, property: property, &block)
+        def self.call(type_defn, *field_args, max_page_size: nil, **field_kwargs, &field_block)
+          underlying_field = GraphQL::Define::AssignObjectField.call(type_defn, *field_args, **field_kwargs, &field_block)
           connection_field = GraphQL::Relay::ConnectionField.create(underlying_field, max_page_size: max_page_size)
           type_defn.fields[name.to_s] = connection_field
         end

data/lib/graphql/relay/global_id_field.rb

@@ -10,7 +10,7 @@ module GraphQL
         self.arguments = {}
         self.type = !GraphQL::ID_TYPE
         self.resolve = -> (obj, args, ctx) {
-          GraphQL::Relay::GlobalNodeIdentification.to_global_id(type_name, obj.public_send(property))
+          ctx.query.schema.node_identification.to_global_id(type_name, obj.public_send(property))
         }
       end
     end

data/lib/graphql/relay/global_node_identification.rb

@@ -10,21 +10,10 @@ module GraphQL
     class GlobalNodeIdentification
       include GraphQL::Define::InstanceDefinable
       accepts_definitions(:object_from_id, :type_from_object, :to_global_id, :from_global_id, :description)
-      attr_accessor :description
+      lazy_defined_attr_accessor :description
 
       class << self
-        attr_accessor :instance, :id_separator
-        def new(*args, &block)
-          @instance = super
-        end
-
-        def from_global_id(id)
-          instance.from_global_id(id)
-        end
-
-        def to_global_id(type_name, id)
-          instance.to_global_id(type_name, id)
-        end
+        attr_accessor :id_separator
       end
 
       self.id_separator = "-"
@@ -37,6 +26,7 @@ module GraphQL
       # Returns `NodeInterface`, which all Relay types must implement
       def interface
         @interface ||= begin
+          ensure_defined
           ident = self
           GraphQL::InterfaceType.define do
             name "Node"
@@ -50,12 +40,13 @@ module GraphQL
 
       # 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) {
-            ident.object_from_id(args[:id], ctx)
+            ctx.query.schema.node_identification.object_from_id(args[:id], ctx)
           }
           description ident.description
         end
@@ -76,26 +67,31 @@ module GraphQL
       # 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
       def type_from_object(object)
+        ensure_defined
         type_result = @type_from_object_proc.call(object)
         if type_result.nil?
           nil
@@ -108,16 +104,19 @@ module GraphQL
       end
 
       def type_from_object=(proc)
+        ensure_defined
         @type_from_object_proc = 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

data/lib/graphql/relay/monkey_patches/schema.rb

@@ -0,0 +1,3 @@
+class GraphQL::Schema
+  attr_accessor :node_identification
+end

data/lib/graphql/relay/mutation.rb

@@ -54,8 +54,8 @@ module GraphQL
         input_field: GraphQL::Define::AssignArgument,
         return_field: GraphQL::Define::AssignObjectField,
       )
-      attr_accessor :name, :description
-      attr_reader :fields, :arguments
+      lazy_defined_attr_accessor :name, :description
+      lazy_defined_attr_accessor :fields, :arguments
 
       # For backwards compat, but do we need this separate API?
       alias :return_fields :fields
@@ -67,11 +67,13 @@ module GraphQL
       end
 
       def resolve=(proc)
+        ensure_defined
         @resolve_proc = proc
       end
 
       def field
         @field ||= begin
+          ensure_defined
           field_return_type = self.return_type
           field_input_type = self.input_type
           field_resolve_proc = -> (obj, args, ctx){
@@ -88,6 +90,7 @@ module GraphQL
 
       def return_type
         @return_type ||= begin
+          ensure_defined
           mutation_name = name
           type_name = "#{mutation_name}Payload"
           type_fields = return_fields
@@ -104,6 +107,7 @@ module GraphQL
 
       def input_type
         @input_type ||= begin
+          ensure_defined
           mutation_name = name
           type_name = "#{mutation_name}Input"
           type_fields = input_fields

data/lib/graphql/relay/page_info.rb

@@ -6,6 +6,8 @@ module GraphQL
       description("Metadata about a connection")
       field :hasNextPage, !types.Boolean, "Indicates if there are more pages to fetch", property: :has_next_page
       field :hasPreviousPage, !types.Boolean, "Indicates if there are any pages prior to the current page", property: :has_previous_page
+      field :startCursor, types.String, "When paginating backwards, the cursor to continue", property: :start_cursor
+      field :endCursor, types.String, "When paginating forwards, the cursor to continue", property: :end_cursor
     end
   end
 end

data/lib/graphql/relay/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Relay
-    VERSION = "0.11.2"
+    VERSION = "0.12.0"
   end
 end

data/spec/graphql/relay/array_connection_spec.rb

@@ -22,6 +22,9 @@ describe GraphQL::Relay::ArrayConnection do
             }
             pageInfo {
               hasNextPage
+              hasPreviousPage
+              startCursor
+              endCursor
             }
           }
         }
@@ -33,6 +36,9 @@ describe GraphQL::Relay::ArrayConnection do
       number_of_ships = get_names(result).length
       assert_equal(2, number_of_ships)
       assert_equal(true, result["data"]["rebels"]["ships"]["pageInfo"]["hasNextPage"])
+      assert_equal(false, result["data"]["rebels"]["ships"]["pageInfo"]["hasPreviousPage"])
+      assert_equal("MQ==", result["data"]["rebels"]["ships"]["pageInfo"]["startCursor"])
+      assert_equal("Mg==", result["data"]["rebels"]["ships"]["pageInfo"]["endCursor"])
 
       result = query(query_string, "first" => 3)
       number_of_ships = get_names(result).length
@@ -42,9 +48,15 @@ describe GraphQL::Relay::ArrayConnection do
     it 'provides pageInfo' do
       result = query(query_string, "first" => 2)
       assert_equal(true, result["data"]["rebels"]["ships"]["pageInfo"]["hasNextPage"])
+      assert_equal(false, result["data"]["rebels"]["ships"]["pageInfo"]["hasPreviousPage"])
+      assert_equal("MQ==", result["data"]["rebels"]["ships"]["pageInfo"]["startCursor"])
+      assert_equal("Mg==", result["data"]["rebels"]["ships"]["pageInfo"]["endCursor"])
 
       result = query(query_string, "first" => 100)
       assert_equal(false, result["data"]["rebels"]["ships"]["pageInfo"]["hasNextPage"])
+      assert_equal(false, result["data"]["rebels"]["ships"]["pageInfo"]["hasPreviousPage"])
+      assert_equal("MQ==", result["data"]["rebels"]["ships"]["pageInfo"]["startCursor"])
+      assert_equal("NQ==", result["data"]["rebels"]["ships"]["pageInfo"]["endCursor"])
     end
 
     it 'slices the result' do
@@ -82,6 +94,9 @@ describe GraphQL::Relay::ArrayConnection do
       result = query(query_string)
 
       assert_equal(false, result["data"]["rebels"]["ships"]["pageInfo"]["hasNextPage"])
+      assert_equal(false, result["data"]["rebels"]["ships"]["pageInfo"]["hasPreviousPage"])
+      assert_equal("MQ==", result["data"]["rebels"]["ships"]["pageInfo"]["startCursor"])
+      assert_equal("NQ==", result["data"]["rebels"]["ships"]["pageInfo"]["endCursor"])
       assert_equal(5, result["data"]["rebels"]["ships"]["edges"].length)
     end
   end

data/spec/graphql/relay/global_node_identification_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe GraphQL::Relay::GlobalNodeIdentification do
-  let(:node_identification) { NodeIdentification }
+  let(:node_identification) { StarWarsSchema.node_identification }
   describe 'NodeField' do
     it 'finds objects by id' do
       global_id = node_identification.to_global_id("Faction", "1")
@@ -77,9 +77,8 @@ describe GraphQL::Relay::GlobalNodeIdentification do
     end
 
     describe "custom definitions" do
-      before do
-        @previous_global_node_id = GraphQL::Relay::GlobalNodeIdentification.instance
-        @new_node_id = GraphQL::Relay::GlobalNodeIdentification.define do
+      let(:custom_node_identification) {
+        ident = GraphQL::Relay::GlobalNodeIdentification.define do
           to_global_id -> (type_name, id) {
             "#{type_name}/#{id}"
           }
@@ -88,12 +87,22 @@ describe GraphQL::Relay::GlobalNodeIdentification do
             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
-        GraphQL::Relay::GlobalNodeIdentification.instance = @previous_global_node_id
+        StarWarsSchema.node_identification = @prev_node_identification
       end
 
       describe "generating IDs" do
@@ -114,17 +123,16 @@ describe GraphQL::Relay::GlobalNodeIdentification do
 
       describe "setting a description" do
         it "allows you to set a description" do
-          assert_equal "Hello, World!", @new_node_id.field.description
+          assert_equal "Hello, World!", custom_node_identification.field.description
         end
       end
     end
   end
 
   describe "type_from_object" do
-
     describe "when the return value is nil" do
       it "returns nil" do
-        result = GraphQL::Relay::GlobalNodeIdentification.instance.type_from_object(123)
+        result = node_identification.type_from_object(123)
         assert_equal(nil, result)
       end
     end
@@ -132,26 +140,10 @@ describe GraphQL::Relay::GlobalNodeIdentification do
     describe "when the return value is not a BaseType" do
       it "raises an error " do
         err = assert_raises(RuntimeError) {
-          GraphQL::Relay::GlobalNodeIdentification.instance.type_from_object(:test_error)
+          node_identification.type_from_object(:test_error)
         }
         assert_includes err.message, "not_a_type (Symbol)"
       end
     end
   end
-
-  describe 'making a second instance' do
-    before do
-      @first_instance = GraphQL::Relay::GlobalNodeIdentification.instance
-    end
-
-    after do
-      GraphQL::Relay::GlobalNodeIdentification.instance = @first_instance
-    end
-
-    it 'overrides the first instance' do
-      GraphQL::Relay::GlobalNodeIdentification.define {}
-      second_instance = GraphQL::Relay::GlobalNodeIdentification.instance
-      refute_equal(@first_instance, second_instance)
-    end
-  end
 end

data/spec/graphql/relay/page_info_spec.rb

@@ -5,6 +5,10 @@ describe GraphQL::Relay::PageInfo do
     result["data"]["empire"]["bases"]["pageInfo"]
   end
 
+  def get_first_cursor(result)
+    result["data"]["empire"]["bases"]["edges"].first["cursor"]
+  end
+
   def get_last_cursor(result)
     result["data"]["empire"]["bases"]["edges"].last["cursor"]
   end
@@ -24,6 +28,8 @@ describe GraphQL::Relay::PageInfo do
           pageInfo {
             hasNextPage
             hasPreviousPage
+            startCursor
+            endCursor
           }
         }
       }
@@ -35,28 +41,63 @@ describe GraphQL::Relay::PageInfo do
       result = query(query_string, "first" => 2)
       assert_equal(true, get_page_info(result)["hasNextPage"])
       assert_equal(false, get_page_info(result)["hasPreviousPage"], "hasPreviousPage is false if 'last' is missing")
+      assert_equal("MQ==", get_page_info(result)["startCursor"])
+      assert_equal("Mg==", get_page_info(result)["endCursor"])
 
       last_cursor = get_last_cursor(result)
       result = query(query_string, "first" => 100, "after" => last_cursor)
       assert_equal(false, get_page_info(result)["hasNextPage"])
       assert_equal(false, get_page_info(result)["hasPreviousPage"])
+      assert_equal("Mw==", get_page_info(result)["startCursor"])
+      assert_equal("Mw==", get_page_info(result)["endCursor"])
     end
 
     it "hasPreviousPage if there are more items" do
       result = query(query_string, "last" => 100, "before" => cursor_of_last_base)
       assert_equal(false, get_page_info(result)["hasNextPage"])
       assert_equal(false, get_page_info(result)["hasPreviousPage"])
+      assert_equal("MQ==", get_page_info(result)["startCursor"])
+      assert_equal("Mg==", get_page_info(result)["endCursor"])
 
       result = query(query_string, "last" => 1, "before" => cursor_of_last_base)
       assert_equal(false, get_page_info(result)["hasNextPage"])
       assert_equal(true, get_page_info(result)["hasPreviousPage"])
+      assert_equal("Mg==", get_page_info(result)["startCursor"])
+      assert_equal("Mg==", get_page_info(result)["endCursor"])
     end
 
-
     it "has both if first and last are present" do
       result = query(query_string, "last" => 1, "first" => 1, "before" => cursor_of_last_base)
       assert_equal(true, get_page_info(result)["hasNextPage"])
       assert_equal(true, get_page_info(result)["hasPreviousPage"])
+      assert_equal("Mg==", get_page_info(result)["startCursor"])
+      assert_equal("Mg==", get_page_info(result)["endCursor"])
+    end
+
+    it "startCursor and endCursor are the cursors of the first and last edge" do
+      result = query(query_string, "first" => 2)
+      assert_equal(true, get_page_info(result)["hasNextPage"])
+      assert_equal(false, get_page_info(result)["hasPreviousPage"])
+      assert_equal("MQ==", get_page_info(result)["startCursor"])
+      assert_equal("Mg==", get_page_info(result)["endCursor"])
+      assert_equal("MQ==", get_first_cursor(result))
+      assert_equal("Mg==", get_last_cursor(result))
+
+      result = query(query_string, "first" => 1, "after" => get_page_info(result)["endCursor"])
+      assert_equal(false, get_page_info(result)["hasNextPage"])
+      assert_equal(false, get_page_info(result)["hasPreviousPage"])
+      assert_equal("Mw==", get_page_info(result)["startCursor"])
+      assert_equal("Mw==", get_page_info(result)["endCursor"])
+      assert_equal("Mw==", get_first_cursor(result))
+      assert_equal("Mw==", get_last_cursor(result))
+
+      result = query(query_string, "last" => 1, "before" => get_page_info(result)["endCursor"])
+      assert_equal(false, get_page_info(result)["hasNextPage"])
+      assert_equal(true, get_page_info(result)["hasPreviousPage"])
+      assert_equal("Mg==", get_page_info(result)["startCursor"])
+      assert_equal("Mg==", get_page_info(result)["endCursor"])
+      assert_equal("Mg==", get_first_cursor(result))
+      assert_equal("Mg==", get_last_cursor(result))
     end
   end
 

data/spec/graphql/relay/relation_connection_spec.rb

@@ -6,6 +6,14 @@ describe GraphQL::Relay::RelationConnection do
     names = ships.map { |e| e["node"]["name"] }
   end
 
+  def get_page_info(result)
+    result["data"]["empire"]["bases"]["pageInfo"]
+  end
+
+  def get_first_cursor(result)
+    result["data"]["empire"]["bases"]["edges"].first["cursor"]
+  end
+
   def get_last_cursor(result)
     result["data"]["empire"]["bases"]["edges"].last["cursor"]
   end
@@ -30,6 +38,9 @@ describe GraphQL::Relay::RelationConnection do
         },
         pageInfo {
           hasNextPage
+          hasPreviousPage
+          startCursor
+          endCursor
         }
       }
     |}
@@ -37,12 +48,24 @@ describe GraphQL::Relay::RelationConnection do
     it 'limits the result' do
       result = query(query_string, "first" => 2)
       assert_equal(2, get_names(result).length)
+      assert_equal(true, get_page_info(result)["hasNextPage"])
+      assert_equal(false, get_page_info(result)["hasPreviousPage"])
+      assert_equal("MQ==", get_page_info(result)["startCursor"])
+      assert_equal("Mg==", get_page_info(result)["endCursor"])
+      assert_equal("MQ==", get_first_cursor(result))
+      assert_equal("Mg==", get_last_cursor(result))
 
       result = query(query_string, "first" => 3)
       assert_equal(3, get_names(result).length)
+      assert_equal(false, get_page_info(result)["hasNextPage"])
+      assert_equal(false, get_page_info(result)["hasPreviousPage"])
+      assert_equal("MQ==", get_page_info(result)["startCursor"])
+      assert_equal("Mw==", get_page_info(result)["endCursor"])
+      assert_equal("MQ==", get_first_cursor(result))
+      assert_equal("Mw==", get_last_cursor(result))
     end
 
-    it 'provides custom fileds on the connection type' do
+    it 'provides custom fields on the connection type' do
       result = query(query_string, "first" => 2)
       assert_equal(
         Base.where(faction_id: 2).count,
@@ -200,6 +223,14 @@ describe GraphQL::Relay::RelationConnection do
       names = ships.map { |e| e["node"]["name"] }
     end
 
+    def get_page_info(result)
+      result["data"]["empire"]["basesAsSequelDataset"]["pageInfo"]
+    end
+
+    def get_first_cursor(result)
+      result["data"]["empire"]["basesAsSequelDataset"]["edges"].first["cursor"]
+    end
+
     def get_last_cursor(result)
       result["data"]["empire"]["basesAsSequelDataset"]["edges"].last["cursor"]
     end
@@ -224,6 +255,9 @@ describe GraphQL::Relay::RelationConnection do
           },
           pageInfo {
             hasNextPage
+            hasPreviousPage
+            startCursor
+            endCursor
           }
         }
       |}
@@ -231,12 +265,24 @@ describe GraphQL::Relay::RelationConnection do
       it 'limits the result' do
         result = query(query_string, "first" => 2)
         assert_equal(2, get_names(result).length)
+        assert_equal(true, get_page_info(result)["hasNextPage"])
+        assert_equal(false, get_page_info(result)["hasPreviousPage"])
+        assert_equal("MQ==", get_page_info(result)["startCursor"])
+        assert_equal("Mg==", get_page_info(result)["endCursor"])
+        assert_equal("MQ==", get_first_cursor(result))
+        assert_equal("Mg==", get_last_cursor(result))
 
         result = query(query_string, "first" => 3)
         assert_equal(3, get_names(result).length)
+        assert_equal(false, get_page_info(result)["hasNextPage"])
+        assert_equal(false, get_page_info(result)["hasPreviousPage"])
+        assert_equal("MQ==", get_page_info(result)["startCursor"])
+        assert_equal("Mw==", get_page_info(result)["endCursor"])
+        assert_equal("MQ==", get_first_cursor(result))
+        assert_equal("Mw==", get_last_cursor(result))
       end
 
-      it 'provides custom fileds on the connection type' do
+      it 'provides custom fields on the connection type' do
         result = query(query_string, "first" => 2)
         assert_equal(
           Base.where(faction_id: 2).count,

data/spec/support/star_wars_schema.rb

@@ -7,12 +7,8 @@
 # - 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 -> (id, ctx) do
-    # In a normal app, you could call `from_global_id` on your defined object
-    # type_name, id = NodeIdentification.from_global_id(id)
-    #
-    # But to support our testing setup, reach for the global:
-    type_name, id = GraphQL::Relay::GlobalNodeIdentification.from_global_id(id)
+  object_from_id -> (node_id, ctx) do
+    type_name, id = NodeIdentification.from_global_id(node_id)
     STAR_WARS_DATA[type_name][id]
   end
 
@@ -84,25 +80,26 @@ CustomEdgeBaseConnectionType = BaseType.define_connection(edge_class: CustomBase
   end
 end
 
+FactionShipsField = GraphQL::Field.define do
+  # Resolve field should return an Array, the Connection
+  # will do the rest!
+  resolve -> (obj, args, ctx) {
+    all_ships = obj.ships.map {|ship_id| STAR_WARS_DATA["Ship"][ship_id] }
+    if args[:nameIncludes]
+      all_ships = all_ships.select { |ship| ship.name.include?(args[:nameIncludes])}
+    end
+    all_ships
+  }
+  # You can define arguments here and use them in the connection
+  argument :nameIncludes, types.String
+end
 
 Faction = GraphQL::ObjectType.define do
   name "Faction"
   interfaces [NodeIdentification.interface]
   field :id, field: GraphQL::Relay::GlobalIdField.new("Faction")
   field :name, types.String
-  connection :ships, Ship.connection_type do
-    # Resolve field should return an Array, the Connection
-    # will do the rest!
-    resolve -> (obj, args, ctx) {
-      all_ships = obj.ships.map {|ship_id| STAR_WARS_DATA["Ship"][ship_id] }
-      if args[:nameIncludes]
-        all_ships = all_ships.select { |ship| ship.name.include?(args[:nameIncludes])}
-      end
-      all_ships
-    }
-    # You can define arguments here and use them in the connection
-    argument :nameIncludes, types.String
-  end
+  connection :ships, Ship.connection_type, field: FactionShipsField
   connection :bases, BaseConnectionWithTotalCountType do
     # Resolve field should return an Array, the Connection
     # will do the rest!
@@ -206,3 +203,4 @@ MutationType = GraphQL::ObjectType.define do
 end
 
 StarWarsSchema = GraphQL::Schema.new(query: QueryType, mutation: MutationType)
+StarWarsSchema.node_identification = NodeIdentification

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-relay
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +227,7 @@ files:
 - lib/graphql/relay/global_id_field.rb
 - lib/graphql/relay/global_node_identification.rb
 - lib/graphql/relay/monkey_patches/base_type.rb
+- lib/graphql/relay/monkey_patches/schema.rb
 - lib/graphql/relay/mutation.rb
 - lib/graphql/relay/page_info.rb
 - lib/graphql/relay/range_add.rb