Django integration finished

Author: syrusakbary

bin/autolinter

@@ -1,4 +1,5 @@
 #!/bin/bash
 
-autoflake ./ -r  --remove-unused-variables --remove-all-unused-imports --in-place
+autoflake ./ -r --remove-unused-variables --remove-all-unused-imports --in-place
+autopep8 ./ -r --in-place
 isort -rc .

examples/starwars_django/schema.py

@@ -12,6 +12,7 @@
 
 
 class Ship(DjangoNode):
+
     class Meta:
         model = ShipModel
 
@@ -21,11 +22,13 @@ def get_node(cls, id):
 
 
 class Character(DjangoObjectType):
+
     class Meta:
         model = CharacterModel
 
 
 class Faction(DjangoNode):
+
     class Meta:
         model = FactionModel
 
@@ -35,6 +38,7 @@ def get_node(cls, id):
 
 
 class IntroduceShip(relay.ClientIDMutation):
+
     class Input:
         ship_name = graphene.StringField(required=True)
         faction_id = graphene.StringField(required=True)
@@ -48,7 +52,7 @@ def mutate_and_get_payload(cls, input, info):
         faction_id = input.get('faction_id')
         ship = create_ship(ship_name, faction_id)
         faction = get_faction(faction_id)
-        return IntroduceShip(ship=ship, faction=faction)
+        return IntroduceShip(ship=Ship(ship), faction=Faction(faction))
 
 
 class Query(graphene.ObjectType):

graphene/__init__.py

@@ -14,7 +14,6 @@
     Mutation,
     BaseType,
     LazyType,
-    OrderedType,
     Argument,
     Field,
     InputField,
@@ -28,7 +27,6 @@
 )
 
 from graphene.core.fields import (
-    Field,
     StringField,
     IntField,
     BooleanField,
@@ -42,7 +40,7 @@
     resolve_only_args
 )
 
-__all__ = ['Enum', 'Argument', 'String', 'Int', 'ID', 'signals', 'Schema',
-           'ObjectType', 'Interface', 'Mutation', 'Field', 'StringField',
+__all__ = ['Enum', 'Argument', 'String', 'Int', 'Boolean', 'Float', 'ID', 'List', 'NonNull', 'signals', 'Schema',
+           'BaseType', 'LazyType', 'ObjectType', 'Interface', 'Mutation', 'Field', 'InputField', 'StringField',
            'IntField', 'BooleanField', 'IDField', 'ListField', 'NonNullField',
            'FloatField', 'resolve_only_args']

graphene/contrib/django/converter.py

@@ -3,9 +3,7 @@
 
 from graphene.contrib.django.fields import (ConnectionOrListField,
                                             DjangoModelField)
-from graphene.core.fields import (BooleanField, FloatField, IDField, IntField,
-                                  StringField)
-from graphene.core.types.scalars import Boolean, Float, ID, Int, String
+from graphene.core.types.scalars import ID, Boolean, Float, Int, String
 
 try:
     UUIDField = models.UUIDField

graphene/contrib/django/fields.py

@@ -1,7 +1,9 @@
 from graphene import relay
 from graphene.contrib.django.utils import get_type_for_model, lazy_map
-from graphene.core.fields import Field, ListField
+from graphene.core.exceptions import SkipField
+from graphene.core.fields import Field
 from graphene.core.types.base import FieldType
+from graphene.core.types.definitions import List
 from graphene.relay.utils import is_node
 
 
@@ -12,7 +14,10 @@ def wrap_resolved(self, value, instance, args, info):
         return lazy_map(value, self.type.get_object_type(schema))
 
 
-class LazyListField(ListField):
+class LazyListField(Field):
+
+    def get_type(self, schema):
+        return List(self.type)
 
     def resolver(self, instance, args, info):
         schema = info.schema.graphene_schema
@@ -51,6 +56,8 @@ def internal_type(self, schema):
                     self.parent,
                 )
             )
+        if not _type:
+            raise SkipField()
         return schema.T(_type)
 
     def get_object_type(self, schema):

tests/contrib_django/__init__.py renamed to graphene/contrib/django/tests/__init__.py

@@ -1,7 +1,6 @@
 
 from django.db import models
 from py.test import raises
-from pytest import raises
 
 import graphene
 from graphene.contrib.django.converter import convert_django_field

tests/contrib_django/data.py renamed to graphene/contrib/django/tests/data.py

@@ -1,40 +1,21 @@
-
 from py.test import raises
-from pytest import raises
 
 import graphene
 from graphene import relay
 from graphene.contrib.django import DjangoNode, DjangoObjectType
-from tests.utils import assert_equal_lists
 
 from .models import Article, Reporter
 
 
-def test_should_raise_if_no_model():
-    with raises(Exception) as excinfo:
-        class Character1(DjangoObjectType):
-            pass
-    assert 'model in the Meta' in str(excinfo.value)
-
-
-def test_should_raise_if_model_is_invalid():
-    with raises(Exception) as excinfo:
-        class Character2(DjangoObjectType):
-
-            class Meta:
-                model = 1
-    assert 'not a Django model' in str(excinfo.value)
-
-
-def test_should_raise_if_model_is_invalid():
-    with raises(Exception) as excinfo:
-        class ReporterTypeError(DjangoObjectType):
+def test_should_query_only_fields():
+    with raises(Exception):
+        class ReporterType(DjangoObjectType):
 
             class Meta:
                 model = Reporter
                 only_fields = ('articles', )
 
-        schema = graphene.Schema(query=ReporterTypeError)
+        schema = graphene.Schema(query=ReporterType)
         query = '''
             query ReporterQuery {
               articles
@@ -44,24 +25,13 @@ class Meta:
         assert not result.errors
 
 
-def test_should_map_fields_correctly():
-    class ReporterType2(DjangoObjectType):
-
-        class Meta:
-            model = Reporter
-    assert_equal_lists(
-        ReporterType2._meta.fields_map.keys(),
-        ['articles', 'first_name', 'last_name', 'email', 'pets', 'id']
-    )
-
-
-def test_should_map_fields():
+def test_should_query_well():
     class ReporterType(DjangoObjectType):
 
         class Meta:
             model = Reporter
 
-    class Query2(graphene.ObjectType):
+    class Query(graphene.ObjectType):
         reporter = graphene.Field(ReporterType)
 
         def resolve_reporter(self, *args, **kwargs):
@@ -83,53 +53,41 @@ def resolve_reporter(self, *args, **kwargs):
             'email': ''
         }
     }
-    Schema = graphene.Schema(query=Query2)
-    result = Schema.execute(query)
+    schema = graphene.Schema(query=Query)
+    result = schema.execute(query)
     assert not result.errors
     assert result.data == expected
 
 
-def test_should_map_only_few_fields():
-    class Reporter2(DjangoObjectType):
-
-        class Meta:
-            model = Reporter
-            only_fields = ('id', 'email')
-    assert_equal_lists(
-        Reporter2._meta.fields_map.keys(),
-        ['id', 'email']
-    )
-
-
 def test_should_node():
-    class ReporterNodeType(DjangoNode):
+    class ReporterNode(DjangoNode):
 
         class Meta:
             model = Reporter
 
         @classmethod
         def get_node(cls, id):
-            return ReporterNodeType(Reporter(id=2, first_name='Cookie Monster'))
+            return ReporterNode(Reporter(id=2, first_name='Cookie Monster'))
 
         def resolve_articles(self, *args, **kwargs):
-            return [ArticleNodeType(Article(headline='Hi!'))]
+            return [ArticleNode(Article(headline='Hi!'))]
 
-    class ArticleNodeType(DjangoNode):
+    class ArticleNode(DjangoNode):
 
         class Meta:
             model = Article
 
         @classmethod
         def get_node(cls, id):
-            return ArticleNodeType(Article(id=1, headline='Article node'))
+            return ArticleNode(Article(id=1, headline='Article node'))
 
-    class Query1(graphene.ObjectType):
+    class Query(graphene.ObjectType):
         node = relay.NodeField()
-        reporter = graphene.Field(ReporterNodeType)
-        article = graphene.Field(ArticleNodeType)
+        reporter = graphene.Field(ReporterNode)
+        article = graphene.Field(ArticleNode)
 
         def resolve_reporter(self, *args, **kwargs):
-            return ReporterNodeType(Reporter(id=1, first_name='ABA', last_name='X'))
+            return ReporterNode(Reporter(id=1, first_name='ABA', last_name='X'))
 
     query = '''
         query ReporterQuery {
@@ -146,20 +104,20 @@ def resolve_reporter(self, *args, **kwargs):
             lastName,
             email
           }
-          myArticle: node(id:"QXJ0aWNsZU5vZGVUeXBlOjE=") {
+          myArticle: node(id:"QXJ0aWNsZU5vZGU6MQ==") {
             id
-            ... on ReporterNodeType {
+            ... on ReporterNode {
                 firstName
             }
-            ... on ArticleNodeType {
+            ... on ArticleNode {
                 headline
             }
           }
         }
     '''
     expected = {
         'reporter': {
-            'id': 'UmVwb3J0ZXJOb2RlVHlwZTox',
+            'id': 'UmVwb3J0ZXJOb2RlOjE=',
             'firstName': 'ABA',
             'lastName': 'X',
             'email': '',
@@ -172,11 +130,11 @@ def resolve_reporter(self, *args, **kwargs):
             },
         },
         'myArticle': {
-            'id': 'QXJ0aWNsZU5vZGVUeXBlOjE=',
+            'id': 'QXJ0aWNsZU5vZGU6MQ==',
             'headline': 'Article node'
         }
     }
-    Schema = graphene.Schema(query=Query1)
-    result = Schema.execute(query)
+    schema = graphene.Schema(query=Query)
+    result = schema.execute(query)
     assert not result.errors
     assert result.data == expected