Merge branch 'features/middleware' into features/next

Author: syrusakbary

graphql/__init__.py

@@ -103,6 +103,8 @@
     # Execute GraphQL queries.
     from .execution import (  # no import order
         execute,
+        MiddlewareManager,
+        middlewares
     )
 
     # Validate GraphQL queries.
@@ -206,6 +208,8 @@
         'print_ast',
         'visit',
         'execute',
+        'MiddlewareManager',
+        'middlewares',
         'specified_rules',
         'validate',
         'GraphQLError',

graphql/execution/tests/test_executor.py

@@ -566,21 +566,62 @@ def resolver(*_):
 def test_middleware():
     doc = '''{
         ok
+        not_ok
     }'''
 
     class Data(object):
 
         def ok(self):
             return 'ok'
 
+        def not_ok(self):
+            return 'not_ok'
+
     doc_ast = parse(doc)
 
     Type = GraphQLObjectType('Type', {
         'ok': GraphQLField(GraphQLString),
+        'not_ok': GraphQLField(GraphQLString),
     })
-    middlewares = MiddlewareManager(lambda *_: None)
+
+    def reversed_middleware(next, *args, **kwargs):
+        p = next(*args, **kwargs)
+        return p.then(lambda x: x[::-1])
+
+    middlewares = MiddlewareManager(reversed_middleware)
+    result = execute(GraphQLSchema(Type), doc_ast, Data(), middlewares=middlewares)
+    assert result.data == {'ok': 'ko', 'not_ok': 'ko_ton'}
+
+
+def test_middleware_class():
+    doc = '''{
+        ok
+        not_ok
+    }'''
+
+    class Data(object):
+
+        def ok(self):
+            return 'ok'
+
+        def not_ok(self):
+            return 'not_ok'
+
+    doc_ast = parse(doc)
+
+    Type = GraphQLObjectType('Type', {
+        'ok': GraphQLField(GraphQLString),
+        'not_ok': GraphQLField(GraphQLString),
+    })
+
+    class MyMiddleware(object):
+        def resolve(self, next, *args, **kwargs):
+            p = next(*args, **kwargs)
+            return p.then(lambda x: x[::-1])
+
+    middlewares = MiddlewareManager(MyMiddleware())
     result = execute(GraphQLSchema(Type), doc_ast, Data(), middlewares=middlewares)
-    assert result.data == {'ok': None}
+    assert result.data == {'ok': 'ko', 'not_ok': 'ko_ton'}
 
 
 def test_middleware_wrong():

graphql/graphql.py

@@ -28,7 +28,7 @@
 #    one operation.
 def graphql(schema, request_string='', root_value=None, context_value=None,
             variable_values=None, operation_name=None, executor=None,
-            return_promise=False):
+            return_promise=False, middlewares=None):
     try:
         source = Source(request_string, 'GraphQL request')
         ast = parse(source)
@@ -46,7 +46,8 @@ def graphql(schema, request_string='', root_value=None, context_value=None,
             operation_name=operation_name,
             variable_values=variable_values or {},
             executor=executor,
-            return_promise=return_promise
+            return_promise=return_promise,
+            middlewares=middlewares,
         )
     except Exception as e:
         return ExecutionResult(