Merge pull request #70 from Globegitter/road-to-v0.6.0

Road to v0.6.0

Author: syrusakbary

.gitignore

@@ -4,6 +4,7 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
+venv
 
 # C extensions
 *.so
@@ -61,6 +62,7 @@ target/
 
 # IntelliJ
 .idea
+*.iml
 
 # OS X
 .DS_Store

graphql/__init__.py

@@ -61,13 +61,46 @@
         GraphQLInputObjectField,
         GraphQLArgument,
 
+        # "Enum" of Type Kinds
+        TypeKind,
+
+        # "Enum" of Directive locations
+        DirectiveLocation,
+
         # Scalars
         GraphQLInt,
         GraphQLFloat,
         GraphQLString,
         GraphQLBoolean,
         GraphQLID,
 
+        # Directive definition
+        GraphQLDirective,
+
+        # Built-in directives defined by the Spec
+        specified_directives,
+        GraphQLSkipDirective,
+        GraphQLIncludeDirective,
+        GraphQLDeprecatedDirective,
+
+        # Constant Deprecation Reason
+        DEFAULT_DEPRECATION_REASON,
+
+        # GraphQL Types for introspection.
+        __Schema,
+        __Directive,
+        __DirectiveLocation,
+        __Type,
+        __Field,
+        __InputValue,
+        __EnumValue,
+        __TypeKind,
+
+        # Meta-field definitions.
+        SchemaMetaFieldDef,
+        TypeMetaFieldDef,
+        TypeNameMetaFieldDef,
+
         # Predicates
         is_type,
         is_input_type,
@@ -190,6 +223,25 @@
         'GraphQLSchema',
         'GraphQLString',
         'GraphQLUnionType',
+        'GraphQLDirective',
+        'specified_directives',
+        'GraphQLSkipDirective',
+        'GraphQLIncludeDirective',
+        'GraphQLDeprecatedDirective',
+        'DEFAULT_DEPRECATION_REASON',
+        'TypeKind',
+        'DirectiveLocation',
+        '__Schema',
+        '__Directive',
+        '__DirectiveLocation',
+        '__Type',
+        '__Field',
+        '__InputValue',
+        '__EnumValue',
+        '__TypeKind',
+        'SchemaMetaFieldDef',
+        'TypeMetaFieldDef',
+        'TypeNameMetaFieldDef',
         'get_named_type',
         'get_nullable_type',
         'is_abstract_type',

graphql/execution/executor.py

@@ -321,16 +321,18 @@ def complete_abstract_value(exe_context, return_type, field_asts, info, result):
         else:
             runtime_type = get_default_resolve_type_fn(result, exe_context.context_value, info, return_type)
 
-    assert isinstance(runtime_type, GraphQLObjectType), (
-        'Abstract type {} must resolve to an Object type at runtime ' +
-        'for field {}.{} with value "{}", received "{}".'
-    ).format(
-        return_type,
-        info.parent_type,
-        info.field_name,
-        result,
-        runtime_type,
-    )
+    if not isinstance(runtime_type, GraphQLObjectType):
+        raise GraphQLError(
+            ('Abstract type {} must resolve to an Object type at runtime ' +
+             'for field {}.{} with value "{}", received "{}".').format(
+                 return_type,
+                 info.parent_type,
+                 info.field_name,
+                 result,
+                 runtime_type,
+                 ),
+            field_asts
+        )
 
     if not exe_context.schema.is_possible_type(return_type, runtime_type):
         raise GraphQLError(

graphql/execution/tests/test_executor.py

@@ -285,21 +285,6 @@ class Data(object):
     assert result.data == {'second': 'b'}
 
 
-def test_uses_the_named_operation_if_operation_name_is_provided():
-    doc = 'query Example { first: a } query OtherExample { second: a }'
-
-    class Data(object):
-        a = 'b'
-
-    ast = parse(doc)
-    Type = GraphQLObjectType('Type', {
-        'a': GraphQLField(GraphQLString)
-    })
-    result = execute(GraphQLSchema(Type), ast, Data(), operation_name='OtherExample')
-    assert not result.errors
-    assert result.data == {'second': 'b'}
-
-
 def test_raises_if_no_operation_is_provided():
     doc = 'fragment Example on Type { a }'
 

graphql/execution/values.py

@@ -29,7 +29,7 @@ def get_variable_values(schema, definition_asts, inputs):
     return values
 
 
-def get_argument_values(arg_defs, arg_asts, variables):
+def get_argument_values(arg_defs, arg_asts, variables=None):
     """Prepares an object map of argument values given a list of argument
     definitions and list of argument AST nodes."""
     if not arg_defs: