Updated middleware syntax

Author: syrusakbary

graphql/execution/base.py

@@ -19,9 +19,9 @@ class ExecutionContext(object):
     and the fragments defined in the query document"""
 
     __slots__ = 'schema', 'fragments', 'root_value', 'operation', 'variable_values', 'errors', 'context_value', \
-                'argument_values_cache', 'executor', 'middleware_manager', '_subfields_cache'
+                'argument_values_cache', 'executor', 'middleware', '_subfields_cache'
 
-    def __init__(self, schema, document_ast, root_value, context_value, variable_values, operation_name, executor, middleware_manager):
+    def __init__(self, schema, document_ast, root_value, context_value, variable_values, operation_name, executor, middleware):
         """Constructs a ExecutionContext object from the arguments passed
         to execute, which we will pass throughout the other execution
         methods."""
@@ -64,13 +64,13 @@ def __init__(self, schema, document_ast, root_value, context_value, variable_val
         self.context_value = context_value
         self.argument_values_cache = {}
         self.executor = executor
-        self.middleware_manager = middleware_manager
+        self.middleware = middleware
         self._subfields_cache = {}
 
     def get_field_resolver(self, field_resolver):
-        if not self.middleware_manager:
+        if not self.middleware:
             return field_resolver
-        return self.middleware_manager.get_field_resolver(field_resolver)
+        return self.middleware.get_field_resolver(field_resolver)
 
     def get_argument_values(self, field_def, field_ast):
         k = field_def, field_ast

graphql/execution/executor.py

@@ -26,14 +26,17 @@ def is_promise(obj):
 
 def execute(schema, document_ast, root_value=None, context_value=None,
             variable_values=None, operation_name=None, executor=None,
-            return_promise=False, middlewares=None):
+            return_promise=False, middleware=None):
     assert schema, 'Must provide schema'
     assert isinstance(schema, GraphQLSchema), (
         'Schema must be an instance of GraphQLSchema. Also ensure that there are ' +
         'not multiple versions of GraphQL installed in your node_modules directory.'
     )
-    if middlewares:
-        assert isinstance(middlewares, MiddlewareManager), (
+    if middleware:
+        if not isinstance(middleware, MiddlewareManager):
+            middleware = MiddlewareManager(*middleware)
+
+        assert isinstance(middleware, MiddlewareManager), (
             'middlewares have to be an instance'
             ' of MiddlewareManager. Received "{}".'.format(middlewares)
         )
@@ -49,7 +52,7 @@ def execute(schema, document_ast, root_value=None, context_value=None,
         variable_values,
         operation_name,
         executor,
-        middlewares
+        middleware
     )
 
     def executor(resolve, reject):
@@ -249,6 +252,7 @@ def complete_value(exe_context, return_type, field_asts, info, result):
             lambda error: Promise.rejected(GraphQLLocatedError(field_asts, original_error=error))
         )
 
+    # print return_type, type(result)
     if isinstance(result, Exception):
         raise GraphQLLocatedError(field_asts, original_error=result)
 

graphql/execution/tests/test_executor.py

@@ -574,7 +574,7 @@ def reversed_middleware(next, *args, **kwargs):
         return p.then(lambda x: x[::-1])
 
     middlewares = MiddlewareManager(reversed_middleware)
-    result = execute(GraphQLSchema(Type), doc_ast, Data(), middlewares=middlewares)
+    result = execute(GraphQLSchema(Type), doc_ast, Data(), middleware=middlewares)
     assert result.data == {'ok': 'ko', 'not_ok': 'ko_ton'}
 
 
@@ -605,27 +605,5 @@ def resolve(self, next, *args, **kwargs):
             return p.then(lambda x: x[::-1])
 
     middlewares = MiddlewareManager(MyMiddleware())
-    result = execute(GraphQLSchema(Type), doc_ast, Data(), middlewares=middlewares)
+    result = execute(GraphQLSchema(Type), doc_ast, Data(), middleware=middlewares)
     assert result.data == {'ok': 'ko', 'not_ok': 'ko_ton'}
-
-
-def test_middleware_wrong():
-    doc = '''{
-        ok
-    }'''
-
-    class Data(object):
-
-        def ok(self):
-            return 'ok'
-
-    doc_ast = parse(doc)
-
-    Type = GraphQLObjectType('Type', {
-        'ok': GraphQLField(GraphQLString),
-    })
-    middlewares = [None]
-    with raises(AssertionError) as excinfo:
-        execute(GraphQLSchema(Type), doc_ast, Data(), middlewares=middlewares)
-
-    assert 'middlewares have to be an instance of MiddlewareManager. Received "[None]".' == str(excinfo.value)

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, middlewares=None):
+            return_promise=False, middleware=None):
     try:
         source = Source(request_string, 'GraphQL request')
         ast = parse(source)
@@ -47,7 +47,7 @@ def graphql(schema, request_string='', root_value=None, context_value=None,
             variable_values=variable_values or {},
             executor=executor,
             return_promise=return_promise,
-            middlewares=middlewares,
+            middleware=middleware,
         )
     except Exception as e:
         return ExecutionResult(