Improved integration with latest version of graphql-core

Author: syrusakbary

README.md

@@ -49,12 +49,12 @@ Helper functions are provided for both building the GraphQL types
 for connections and for implementing the `resolver` method for fields
 returning those types.
 
- - `connectionArgs` returns the arguments that fields should provide when
+ - `connection_args` returns the arguments that fields should provide when
 they return a connection type.
  - `connection_definitions` returns a `connection_type` and its associated
 `edgeType`, given a name and a node type.
  - `connection_from_list` is a helper method that takes an array and the
-arguments from `connectionArgs`, does pagination and filtering, and returns
+arguments from `connection_args`, does pagination and filtering, and returns
 an object in the shape expected by a `connection_type`'s `resolver` function.
  - `connection_from_promised_list` is similar to `connection_from_list`, but
 it takes a promise that resolves to an array, and returns a promise that
@@ -79,7 +79,7 @@ factionType = GraphQLObjectType(
         'ships': GraphQLField(
             shipConnection,
             description= 'The ships used by the faction.',
-            args= connectionArgs,
+            args= connection_args,
             resolver= lambda faction, args, *_: connection_from_list(
                 map(getShip, faction.ships),
                 args
@@ -92,7 +92,7 @@ factionType = GraphQLObjectType(
 
 This shows adding a `ships` field to the `Faction` object that is a connection.
 It uses `connection_definitions({name: 'Ship', nodeType: shipType})` to create
-the connection type, adds `connectionArgs` as arguments on this function, and
+the connection type, adds `connection_args` as arguments on this function, and
 then implements the resolver function by passing the array of ships and the
 arguments to `connection_from_list`.
 

README.rst

@@ -56,12 +56,12 @@ Helper functions are provided for both building the GraphQL types for
 connections and for implementing the ``resolver`` method for fields
 returning those types.
 
--  ``connectionArgs`` returns the arguments that fields should provide
+-  ``connection_args`` returns the arguments that fields should provide
    when they return a connection type.
 -  ``connection_definitions`` returns a ``connection_type`` and its
    associated ``edgeType``, given a name and a node type.
 -  ``connection_from_list`` is a helper method that takes an array and
-   the arguments from ``connectionArgs``, does pagination and filtering,
+   the arguments from ``connection_args``, does pagination and filtering,
    and returns an object in the shape expected by a ``connection_type``'s
    ``resolver`` function.
 -  ``connection_from_promised_list`` is similar to
@@ -91,7 +91,7 @@ schema <tests/starwars/schema.py>`__:
             'ships': GraphQLField(
                 shipConnection,
                 description= 'The ships used by the faction.',
-                args= connectionArgs,
+                args= connection_args,
                 resolver= lambda faction, args, *_: connection_from_list(
                     map(getShip, faction.ships),
                     args
@@ -104,7 +104,7 @@ schema <tests/starwars/schema.py>`__:
 This shows adding a ``ships`` field to the ``Faction`` object that is a
 connection. It uses
 ``connection_definitions({name: 'Ship', nodeType: shipType})`` to create
-the connection type, adds ``connectionArgs`` as arguments on this
+the connection type, adds ``connection_args`` as arguments on this
 function, and then implements the resolver function by passing the array
 of ships and the arguments to ``connection_from_list``.
 

graphql_relay/__init__.py

@@ -1,5 +1,5 @@
 from .connection.connection import (
-    connectionArgs,
+    connection_args,
     connection_definitions
 )
 from .connection.arrayconnection import (
@@ -19,7 +19,7 @@
 
 __all__ = [
     # Helpers for creating connection types in the schema
-    'connectionArgs', 'connection_definitions',
+    'connection_args', 'connection_definitions',
     # Helpers for creating connections from arrays
     'connection_from_list', 'connection_from_promised_list', 'cursor_for_object_in_connection',
     # Helper for creating node definitions

graphql_relay/connection/arrayconnection.py

@@ -3,12 +3,17 @@
 from .connectiontypes import Connection, PageInfo, Edge
 
 
-def connection_from_list(data, args={}, **kwargs):
+def connection_from_list(data, args={}, connection_type=None,
+                         edge_type=None, pageinfo_type=None, **kwargs):
     '''
     A simple function that accepts an array and connection arguments, and returns
     a connection object for use in GraphQL. It uses array offsets as pagination,
     so pagination will only work if the array is static.
     '''
+    connection_type = connection_type or Connection
+    edge_type = edge_type or Edge
+    pageinfo_type = pageinfo_type or PageInfo
+
     full_args = dict(args, **kwargs)
 
     before = full_args.get('before')
@@ -21,7 +26,7 @@ def connection_from_list(data, args={}, **kwargs):
     begin = max(get_offset(after, -1), -1) + 1
     end = min(get_offset(before, count + 1), count)
     if begin >= count or begin >= end:
-        return empty_connection()
+        return empty_connection(connection_type, pageinfo_type)
 
     # Save the pre-slice cursors
     first_preslice_cursor = offset_to_cursor(begin)
@@ -34,24 +39,24 @@ def connection_from_list(data, args={}, **kwargs):
         begin = max(end - last, begin)
 
     if begin >= count or begin >= end:
-        return empty_connection()
+        return empty_connection(connection_type, pageinfo_type)
 
     sliced_data = data[begin:end]
     edges = [
-        Edge(node, cursor=offset_to_cursor(i + begin))
+        edge_type(node=node, cursor=offset_to_cursor(i + begin))
         for i, node in enumerate(sliced_data)
     ]
 
     # Construct the connection
     first_edge = edges[0]
     last_edge = edges[len(edges) - 1]
-    return Connection(
-        edges,
-        PageInfo(
-            startCursor=first_edge.cursor,
-            endCursor=last_edge.cursor,
-            hasPreviousPage=(first_edge.cursor != first_preslice_cursor),
-            hasNextPage=(last_edge.cursor != last_preslice_cursor)
+    return connection_type(
+        edges=edges,
+        page_info=pageinfo_type(
+            start_cursor=first_edge.cursor,
+            end_cursor=last_edge.cursor,
+            has_previous_page=(first_edge.cursor != first_preslice_cursor),
+            has_next_page=(last_edge.cursor != last_preslice_cursor)
         )
     )
 
@@ -66,17 +71,20 @@ def connection_from_promised_list(data_promise, args={}, **kwargs):
     # return dataPromise.then(lambda data:connection_from_list(data, args))
 
 
-def empty_connection():
+def empty_connection(connection_type=None, pageinfo_type=None):
     '''
     Helper to get an empty connection.
     '''
-    return Connection(
-        [],
-        PageInfo(
-            startCursor=None,
-            endCursor=None,
-            hasPreviousPage=False,
-            hasNextPage=False,
+    connection_type = connection_type or Connection
+    pageinfo_type = pageinfo_type or PageInfo
+
+    return connection_type(
+        edges=[],
+        page_info=pageinfo_type(
+            start_cursor=None,
+            end_cursor=None,
+            has_previous_page=False,
+            has_next_page=False,
         )
     )
 

graphql_relay/connection/connection.py

@@ -31,7 +31,7 @@ def __init__(self, edge_type, connection_type):
         self.connection_type = connection_type
 
 
-connectionArgs = {
+connection_args = {
     'before': GraphQLArgument(GraphQLString),
     'after': GraphQLArgument(GraphQLString),
     'first': GraphQLArgument(GraphQLInt),

graphql_relay/connection/connectiontypes.py

@@ -13,12 +13,12 @@ def to_dict(self):
 
 class PageInfo(object):
 
-    def __init__(self, startCursor="", endCursor="",
-                 hasPreviousPage=False, hasNextPage=False):
-        self.startCursor = startCursor
-        self.endCursor = endCursor
-        self.hasPreviousPage = hasPreviousPage
-        self.hasNextPage = hasNextPage
+    def __init__(self, start_cursor="", end_cursor="",
+                 has_previous_page=False, has_next_page=False):
+        self.startCursor = start_cursor
+        self.endCursor = end_cursor
+        self.hasPreviousPage = has_previous_page
+        self.hasNextPage = has_next_page
 
     def to_dict(self):
         return {

setup.py

@@ -54,7 +54,7 @@ def run_tests(self):
     packages=find_packages(exclude=['tests']),
 
     install_requires=[
-        'graphql-core'
+        'graphql-core>=0.4.7a0'
     ],
     tests_require=['pytest>=2.7.2'],
     extras_require={

tests/connection/test_connection.py

@@ -16,7 +16,7 @@
 
 from graphql_relay.connection.arrayconnection import connection_from_list
 from graphql_relay.connection.connection import (
-    connectionArgs,
+    connection_args,
     connection_definitions
 )
 
@@ -36,7 +36,7 @@
         'name': GraphQLField(GraphQLString),
         'friends': GraphQLField(
             friendConnection,
-            args=connectionArgs,
+            args=connection_args,
             resolver=lambda user, args, *
             _: connection_from_list(allUsers, args),
         ),

tests/node/test_global.py

@@ -35,15 +35,15 @@
 
 
 def get_node(global_id, *args):
-    resolvedGlobalId = from_global_id(global_id)
-    _type, _id = resolvedGlobalId.type, resolvedGlobalId.id
+    resolved_global_id = from_global_id(global_id)
+    _type, _id = resolved_global_id.type, resolved_global_id.id
     if _type == 'User':
         return userData[_id]
     else:
         return photoData[_id]
 
 
-def get_node_type(obj):
+def get_node_type(obj, info):
     if isinstance(obj, User):
         return userType
     else:

tests/node/test_node.py

@@ -38,7 +38,7 @@ def get_node(id, info):
         return photoData[id]
 
 
-def get_node_type(obj):
+def get_node_type(obj, info):
     if obj.id in userData:
         return userType
     else: