From 732b1aec1ba65bca8d57f3ce78794e67f564dc67 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 20 Nov 2015 16:12:11 -0800
Subject: [PATCH 001/173] Update Connections

---
 graphene/contrib/django/fields.py |  4 +---
 graphene/contrib/django/types.py  | 13 +++++++++++--
 graphene/core/types/objecttype.py |  4 ++++
 graphene/relay/fields.py          | 22 +++-------------------
 graphene/relay/types.py           | 12 ++++++++++++
 5 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index c64b9547..0b719586 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -8,9 +8,7 @@ from .utils import get_type_for_model, lazy_map
 
 
 class DjangoConnectionField(ConnectionField):
-
-    def wrap_resolved(self, value, instance, args, info):
-        return lazy_map(value, self.type)
+    pass
 
 
 class LazyListField(Field):
diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py
index f17893f0..8ef2a6a3 100644
--- a/graphene/contrib/django/types.py
+++ b/graphene/contrib/django/types.py
@@ -2,10 +2,10 @@ import six
 
 from ...core.types import BaseObjectType, ObjectTypeMeta
 from ...relay.fields import GlobalIDField
-from ...relay.types import BaseNode
+from ...relay.types import BaseNode, Connection
 from .converter import convert_django_field
 from .options import DjangoOptions
-from .utils import get_reverse_fields
+from .utils import get_reverse_fields, lazy_map
 
 
 class DjangoObjectTypeMeta(ObjectTypeMeta):
@@ -71,6 +71,13 @@ class DjangoInterface(six.with_metaclass(
     pass
 
 
+class DjangoConnection(Connection):
+    @classmethod
+    def from_list(cls, iterable, *args, **kwargs):
+        iterable = lazy_map(iterable, cls.edge_type.node_type)
+        return super(DjangoConnection, cls).from_list(iterable, *args, **kwargs)
+
+
 class DjangoNode(BaseNode, DjangoInterface):
     id = GlobalIDField()
 
@@ -81,3 +88,5 @@ class DjangoNode(BaseNode, DjangoInterface):
             return cls(instance)
         except cls._meta.model.DoesNotExist:
             return None
+
+    connection_type = DjangoConnection
diff --git a/graphene/core/types/objecttype.py b/graphene/core/types/objecttype.py
index e18518e9..14283af5 100644
--- a/graphene/core/types/objecttype.py
+++ b/graphene/core/types/objecttype.py
@@ -219,6 +219,10 @@ class BaseObjectType(BaseType):
 
         return OrderedDict(fields)
 
+    @classmethod
+    def wrap(cls, instance, args, info):
+        return cls(_root=instance)
+
 
 class Interface(six.with_metaclass(ObjectTypeMeta, BaseObjectType)):
     pass
diff --git a/graphene/relay/fields.py b/graphene/relay/fields.py
index 58e0e8bd..a54140ee 100644
--- a/graphene/relay/fields.py
+++ b/graphene/relay/fields.py
@@ -1,6 +1,3 @@
-from collections import Iterable
-
-from graphql_relay.connection.arrayconnection import connection_from_list
 from graphql_relay.node.node import from_global_id
 
 from ..core.fields import Field
@@ -30,24 +27,11 @@ class ConnectionField(Field):
         return value
 
     def resolver(self, instance, args, info):
-        from graphene.relay.types import PageInfo
         schema = info.schema.graphene_schema
-
+        connection_type = self.get_type(schema)
         resolved = super(ConnectionField, self).resolver(instance, args, info)
-        if resolved:
-            resolved = self.wrap_resolved(resolved, instance, args, info)
-            assert isinstance(
-                resolved, Iterable), 'Resolved value from the connection field have to be iterable'
-            type = schema.T(self.type)
-            node = schema.objecttype(type)
-            connection_type = self.get_connection_type(node)
-            edge_type = self.get_edge_type(node)
-
-            connection = connection_from_list(
-                resolved, args, connection_type=connection_type,
-                edge_type=edge_type, pageinfo_type=PageInfo)
-            connection.set_connection_data(resolved)
-            return connection
+        if not isinstance(resolved, connection_type):
+            return connection_type.from_list(resolved, args, info)
 
     def get_connection_type(self, node):
         connection_type = self.connection_type or node.get_connection_type()
diff --git a/graphene/relay/types.py b/graphene/relay/types.py
index a803d2f3..3969a09e 100644
--- a/graphene/relay/types.py
+++ b/graphene/relay/types.py
@@ -1,6 +1,8 @@
 import inspect
 import warnings
+from collections import Iterable
 from functools import wraps
+from graphql_relay.connection.arrayconnection import connection_from_list
 from graphql_relay.node.node import to_global_id
 
 from ..core.types import (Boolean, Field, InputObjectType, Interface, List,
@@ -63,6 +65,16 @@ class Connection(ObjectType):
             (cls,),
             {'edge_type': edge_type, 'edges': edges})
 
+    @classmethod
+    def from_list(cls, iterable, args, info):
+        assert isinstance(
+            iterable, Iterable), 'Resolved value from the connection field have to be iterable'
+        connection = connection_from_list(
+            iterable, args, connection_type=cls,
+            edge_type=cls.edge_type, pageinfo_type=PageInfo)
+        connection.set_connection_data(iterable)
+        return connection
+
     def set_connection_data(self, data):
         self._connection_data = data
 

From c521e181c8da49017d0f5074267d81fe95247a8c Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 21 Nov 2015 10:51:49 -0800
Subject: [PATCH 002/173] Simplified Django grapheme types removing LazyMap

---
 graphene/contrib/django/fields.py | 22 ++++++++++------------
 graphene/contrib/django/types.py  |  6 +++---
 graphene/contrib/django/utils.py  |  7 +------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index 0b719586..7b990b86 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -1,24 +1,22 @@
+import warnings
+
 from ...core.exceptions import SkipField
 from ...core.fields import Field
 from ...core.types.base import FieldType
 from ...core.types.definitions import List
 from ...relay import ConnectionField
 from ...relay.utils import is_node
-from .utils import get_type_for_model, lazy_map
+from .utils import get_type_for_model
 
 
 class DjangoConnectionField(ConnectionField):
-    pass
 
-
-class LazyListField(Field):
-
-    def get_type(self, schema):
-        return List(self.type)
-
-    def resolver(self, instance, args, info):
-        resolved = super(LazyListField, self).resolver(instance, args, info)
-        return lazy_map(resolved, self.type)
+    def __init__(self, *args, **kwargs):
+        cls = self.__class__
+        warnings.warn("Using {} will be not longer supported."
+                      " Use relay.ConnectionField instead".format(cls.__name__),
+                      FutureWarning)
+        return super(DjangoConnectionField, self).__init__(*args, **kwargs)
 
 
 class ConnectionOrListField(Field):
@@ -31,7 +29,7 @@ class ConnectionOrListField(Field):
         if is_node(field_object_type):
             field = DjangoConnectionField(field_object_type)
         else:
-            field = LazyListField(field_object_type)
+            field = Field(List(field_object_type))
         field.contribute_to_class(self.object_type, self.attname)
         return schema.T(field)
 
diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py
index 8ef2a6a3..55b76fa7 100644
--- a/graphene/contrib/django/types.py
+++ b/graphene/contrib/django/types.py
@@ -5,7 +5,7 @@ from ...relay.fields import GlobalIDField
 from ...relay.types import BaseNode, Connection
 from .converter import convert_django_field
 from .options import DjangoOptions
-from .utils import get_reverse_fields, lazy_map
+from .utils import get_reverse_fields, maybe_queryset
 
 
 class DjangoObjectTypeMeta(ObjectTypeMeta):
@@ -30,7 +30,7 @@ class DjangoObjectTypeMeta(ObjectTypeMeta):
             is_excluded = field.name in cls._meta.exclude_fields or is_already_created
             if is_not_in_only or is_excluded:
                 # We skip this field if we specify only_fields and is not
-                # in there. Or when we excldue this field in exclude_fields
+                # in there. Or when we exclude this field in exclude_fields
                 continue
             converted_field = convert_django_field(field)
             cls.add_to_class(field.name, converted_field)
@@ -74,7 +74,7 @@ class DjangoInterface(six.with_metaclass(
 class DjangoConnection(Connection):
     @classmethod
     def from_list(cls, iterable, *args, **kwargs):
-        iterable = lazy_map(iterable, cls.edge_type.node_type)
+        iterable = maybe_queryset(iterable)
         return super(DjangoConnection, cls).from_list(iterable, *args, **kwargs)
 
 
diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index 0d557e9a..54c6420c 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -1,8 +1,5 @@
 from django.db import models
 from django.db.models.manager import Manager
-from django.db.models.query import QuerySet
-
-from ...utils import LazyMap
 
 
 def get_type_for_model(schema, model):
@@ -22,9 +19,7 @@ def get_reverse_fields(model):
             yield related
 
 
-def lazy_map(value, func):
+def maybe_queryset(value):
     if isinstance(value, Manager):
         value = value.get_queryset()
-    if isinstance(value, QuerySet):
-        return LazyMap(value, func)
     return value

From 137ba498682a1b559f0e746da2a503f6add37eb4 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 21 Nov 2015 10:58:49 -0800
Subject: [PATCH 003/173] Removed LazyMap

---
 graphene/utils/__init__.py           |  3 +-
 graphene/utils/lazymap.py            | 43 ----------------------------
 graphene/utils/tests/test_lazymap.py | 23 ---------------
 3 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 graphene/utils/lazymap.py
 delete mode 100644 graphene/utils/tests/test_lazymap.py

diff --git a/graphene/utils/__init__.py b/graphene/utils/__init__.py
index bb1a2150..52fb6417 100644
--- a/graphene/utils/__init__.py
+++ b/graphene/utils/__init__.py
@@ -1,11 +1,10 @@
 from .str_converters import to_camel_case, to_snake_case
 from .proxy_snake_dict import ProxySnakeDict
 from .caching import cached_property, memoize
-from .lazymap import LazyMap
 from .misc import enum_to_graphql_enum
 from .resolve_only_args import resolve_only_args
 
 
 __all__ = ['to_camel_case', 'to_snake_case', 'ProxySnakeDict',
-           'cached_property', 'memoize', 'LazyMap', 'enum_to_graphql_enum',
+           'cached_property', 'memoize', 'enum_to_graphql_enum',
            'resolve_only_args']
diff --git a/graphene/utils/lazymap.py b/graphene/utils/lazymap.py
deleted file mode 100644
index 236f91eb..00000000
--- a/graphene/utils/lazymap.py
+++ /dev/null
@@ -1,43 +0,0 @@
-class LazyMap(object):
-
-    def __init__(self, origin, _map, state=None):
-        self._origin = origin
-        self._origin_iter = origin.__iter__()
-        self._state = state or []
-        self._finished = False
-        self._map = _map
-
-    def __iter__(self):
-        return self if not self._finished else iter(self._state)
-
-    def iter(self):
-        return self.__iter__()
-
-    def __len__(self):
-        return self._origin.__len__()
-
-    def __next__(self):
-        try:
-            n = next(self._origin_iter)
-            n = self._map(n)
-        except StopIteration as e:
-            self._finished = True
-            raise e
-        else:
-            self._state.append(n)
-            return n
-
-    def next(self):
-        return self.__next__()
-
-    def __getitem__(self, key):
-        item = self._origin[key]
-        if isinstance(key, slice):
-            return LazyMap(item, self._map)
-        return self._map(item)
-
-    def __getattr__(self, name):
-        return getattr(self._origin, name)
-
-    def __repr__(self):
-        return "<LazyMap %s>" % repr(self._origin)
diff --git a/graphene/utils/tests/test_lazymap.py b/graphene/utils/tests/test_lazymap.py
deleted file mode 100644
index e6ee1f36..00000000
--- a/graphene/utils/tests/test_lazymap.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from py.test import raises
-
-from ..lazymap import LazyMap
-
-
-def test_lazymap():
-    data = list(range(10))
-    lm = LazyMap(data, lambda x: 2 * x)
-    assert len(lm) == 10
-    assert lm[1] == 2
-    assert isinstance(lm[1:4], LazyMap)
-    assert lm.append == data.append
-    assert repr(lm) == '<LazyMap [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]>'
-
-
-def test_lazymap_iter():
-    data = list(range(2))
-    lm = LazyMap(data, lambda x: 2 * x)
-    iter_lm = iter(lm)
-    assert iter_lm.next() == 0
-    assert iter_lm.next() == 2
-    with raises(StopIteration):
-        iter_lm.next()

From 79c7d070db664c864a74b7f4d2faa13cfb8472c8 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 21 Nov 2015 18:16:31 -0800
Subject: [PATCH 004/173] Fixed isort

---
 graphene/contrib/django/types.py | 1 +
 graphene/relay/types.py          | 1 +
 setup.cfg                        | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py
index 55b76fa7..b5097c72 100644
--- a/graphene/contrib/django/types.py
+++ b/graphene/contrib/django/types.py
@@ -72,6 +72,7 @@ class DjangoInterface(six.with_metaclass(
 
 
 class DjangoConnection(Connection):
+
     @classmethod
     def from_list(cls, iterable, *args, **kwargs):
         iterable = maybe_queryset(iterable)
diff --git a/graphene/relay/types.py b/graphene/relay/types.py
index 3969a09e..9fa673ef 100644
--- a/graphene/relay/types.py
+++ b/graphene/relay/types.py
@@ -2,6 +2,7 @@ import inspect
 import warnings
 from collections import Iterable
 from functools import wraps
+
 from graphql_relay.connection.arrayconnection import connection_from_list
 from graphql_relay.node.node import to_global_id
 
diff --git a/setup.cfg b/setup.cfg
index 11382a78..21db934b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,3 +4,6 @@ max-line-length = 120
 
 [coverage:run]
 omit = core/ntypes/tests/*
+
+[isort]
+known_first_party=graphene

From c28b0466061bd91d3cba0b4814eea0d2df508414 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 21 Nov 2015 19:04:58 -0800
Subject: [PATCH 005/173] Added DjangoConnection to the public

---
 graphene/contrib/django/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/graphene/contrib/django/__init__.py b/graphene/contrib/django/__init__.py
index ca89906a..ec39b7f9 100644
--- a/graphene/contrib/django/__init__.py
+++ b/graphene/contrib/django/__init__.py
@@ -1,4 +1,5 @@
 from graphene.contrib.django.types import (
+    DjangoConnection,
     DjangoObjectType,
     DjangoInterface,
     DjangoNode
@@ -9,4 +10,4 @@ from graphene.contrib.django.fields import (
 )
 
 __all__ = ['DjangoObjectType', 'DjangoInterface', 'DjangoNode',
-           'DjangoConnectionField', 'DjangoModelField']
+           'DjangoConnection', 'DjangoConnectionField', 'DjangoModelField']

From 36ab537bf28e4164dba663f5b1540eb12e25f5f2 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 21 Nov 2015 19:14:45 -0800
Subject: [PATCH 006/173] Updated to version 0.4.2

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 100e2321..4be1ad98 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ class PyTest(TestCommand):
 
 setup(
     name='graphene',
-    version='0.4.1.1',
+    version='0.4.2',
 
     description='Graphene: Python DSL for GraphQL',
     long_description=open('README.rst').read(),

From fe860774e8525cb50095f857c6013cffbc41f117 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 22 Nov 2015 16:04:14 -0800
Subject: [PATCH 007/173] Fixed return ConnectionType instance in
 ConnectionField resolver

---
 graphene/relay/fields.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/graphene/relay/fields.py b/graphene/relay/fields.py
index a54140ee..b3829ad8 100644
--- a/graphene/relay/fields.py
+++ b/graphene/relay/fields.py
@@ -30,8 +30,9 @@ class ConnectionField(Field):
         schema = info.schema.graphene_schema
         connection_type = self.get_type(schema)
         resolved = super(ConnectionField, self).resolver(instance, args, info)
-        if not isinstance(resolved, connection_type):
-            return connection_type.from_list(resolved, args, info)
+        if isinstance(resolved, connection_type):
+            return resolved
+        return connection_type.from_list(resolved, args, info)
 
     def get_connection_type(self, node):
         connection_type = self.connection_type or node.get_connection_type()

From b564e144dfea7c28047ae609de4af72b7d984ffd Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 22 Nov 2015 17:29:30 -0800
Subject: [PATCH 008/173] Improved examples. Fixed #45

---
 examples/complex_example.py                   | 31 +++++++++++++++++++
 .../{field_example.py => simple_example.py}   |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 examples/complex_example.py
 rename examples/{field_example.py => simple_example.py} (98%)

diff --git a/examples/complex_example.py b/examples/complex_example.py
new file mode 100644
index 00000000..dd801fff
--- /dev/null
+++ b/examples/complex_example.py
@@ -0,0 +1,31 @@
+import graphene
+
+
+class GeoInput(graphene.InputObjectType):
+    lat = graphene.Float(required=True)
+    lng = graphene.Float(required=True)
+
+
+class Address(graphene.ObjectType):
+    latlng = graphene.String()
+
+
+class Query(graphene.ObjectType):
+    address = graphene.Field(Address, geo=graphene.Argument(GeoInput))
+
+    def resolve_address(self, args, info):
+        geo = args.get('geo')
+        return Address(latlng="({},{})".format(geo.get('lat'), geo.get('lng')))
+
+
+schema = graphene.Schema(query=Query)
+query = '''
+    query something{
+      address(geo: {lat:32.2, lng:12}) {
+        latlng
+      }
+    }
+'''
+
+result = schema.execute(query)
+print(result.data['address']['latlng'])
diff --git a/examples/field_example.py b/examples/simple_example.py
similarity index 98%
rename from examples/field_example.py
rename to examples/simple_example.py
index be41969d..bc4b9d34 100644
--- a/examples/field_example.py
+++ b/examples/simple_example.py
@@ -21,7 +21,7 @@ query = '''
         id
         name
       }
-}
+    }
 '''
 result = schema.execute(query)
 print(result.data['patron'])

From a0d8b7162abd27e544f8de1eb2501e76e0e2b77a Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Tue, 24 Nov 2015 23:57:27 -0800
Subject: [PATCH 009/173] Remove blinker dependency

---
 graphene/signals.py | 7 ++++++-
 setup.py            | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/graphene/signals.py b/graphene/signals.py
index ccb9ef0f..cdfa3d06 100644
--- a/graphene/signals.py
+++ b/graphene/signals.py
@@ -1,4 +1,9 @@
-from blinker import Signal
+try:
+    from blinker import Signal
+except ImportError:
+    class Signal(object):
+        def send(self, *args, **kwargs):
+            pass
 
 init_schema = Signal()
 class_prepared = Signal()
diff --git a/setup.py b/setup.py
index 4be1ad98..e8c61433 100644
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,6 @@ setup(
 
     install_requires=[
         'six>=1.10.0',
-        'blinker',
         'graphql-core==0.4.9',
         'graphql-relay==0.3.3'
     ],

From 0cf6cd65c7d54dc54536b22be23bf69bcaae98ec Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 21 Nov 2015 10:33:29 -0800
Subject: [PATCH 010/173] First draft for docs

---
 .travis.yml                          |   16 +-
 docs/.babelrc                        |    3 +
 docs/.gitignore                      |   29 +
 docs/README.md                       |   16 +
 docs/app.js                          |   11 +
 docs/assets/icon.js                  |    7 +
 docs/assets/logo.svg                 |   10 +
 docs/assets/starwars-icon.png        |  Bin 0 -> 1771 bytes
 docs/assets/starwars-icon@2x.png     |  Bin 0 -> 3899 bytes
 docs/config.toml                     |    1 +
 docs/css/main.styl                   |  212 ++++
 docs/gatsby.config.js                |   26 +
 docs/html.js                         |   25 +
 docs/package.json                    |   25 +
 docs/pages/_header.js                |  150 +++
 docs/pages/_template.js              |   44 +
 docs/pages/community.md              |   25 +
 docs/pages/docs/django_quickstart.md |  125 +++
 docs/pages/docs/quickstart.md        |   58 +
 docs/pages/guide/interface.md        |   49 +
 docs/pages/guide/mutation.md         |   67 ++
 docs/pages/guide/objecttype.md       |   45 +
 docs/pages/index.md                  |   14 +
 docs/vendor/glfx.optim.js            |  796 +++++++++++++
 docs/vendor/particles.js             | 1545 ++++++++++++++++++++++++++
 docs/wrappers/html.js                |   15 +
 docs/wrappers/md.js                  |   27 +
 27 files changed, 3338 insertions(+), 3 deletions(-)
 create mode 100644 docs/.babelrc
 create mode 100644 docs/.gitignore
 create mode 100644 docs/README.md
 create mode 100644 docs/app.js
 create mode 100644 docs/assets/icon.js
 create mode 100644 docs/assets/logo.svg
 create mode 100644 docs/assets/starwars-icon.png
 create mode 100644 docs/assets/starwars-icon@2x.png
 create mode 100644 docs/config.toml
 create mode 100644 docs/css/main.styl
 create mode 100644 docs/gatsby.config.js
 create mode 100644 docs/html.js
 create mode 100644 docs/package.json
 create mode 100644 docs/pages/_header.js
 create mode 100644 docs/pages/_template.js
 create mode 100644 docs/pages/community.md
 create mode 100644 docs/pages/docs/django_quickstart.md
 create mode 100644 docs/pages/docs/quickstart.md
 create mode 100644 docs/pages/guide/interface.md
 create mode 100644 docs/pages/guide/mutation.md
 create mode 100644 docs/pages/guide/objecttype.md
 create mode 100644 docs/pages/index.md
 create mode 100644 docs/vendor/glfx.optim.js
 create mode 100644 docs/vendor/particles.js
 create mode 100644 docs/wrappers/html.js
 create mode 100644 docs/wrappers/md.js

diff --git a/.travis.yml b/.travis.yml
index 6e25621b..afc82b45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,13 +6,23 @@ python:
 - 3.4
 - 3.5
 - pypy
-cache: pip
+cache:
+  - pip
+  - directories:
+    - .cache/pip/
+    - docs/node_modules
 install:
-- pip install --cache-dir $HOME/.cache/pip pytest pytest-cov coveralls flake8 six blinker pytest-django
-- pip install --cache-dir $HOME/.cache/pip -e .[django]
+- pip install --download-cache .cache/pip/ pytest pytest-cov coveralls flake8 six
+  blinker pytest-django
+- pip install --download-cache .cache/pip/ -e .[django]
 - python setup.py develop
 script:
 - py.test --cov=graphene
 - flake8
 after_success:
 - coveralls
+- cd docs && npm run deploy
+
+env:
+  matrix:
+    secure: e0iu1FvUcGNcsKEDsGQiGTJZMJ8tJMAQ+c+KCuh7I11likoJbninI9FX85efMglG93Xu4GtND1rUwKWnANM94Cz5IrLrT9ga62Cg1sinbzD+JUOG9EobtmcYcLbfNvA1ybkZf4K0KvkYfH1XUxtL3v6jFI6lLjZ1vKa2M6i5t/38pjgUOOh9KlVGi+rqSp2TUsCyjZkMxE2Wwceen5N/B1yZJDn9yHPA+kiV2ScOMgZOuVMqQd0IAPcjhqTbNdaW2VjNQFtS8CQ8FOjJh9NepRAyA42oII7Aq65YzZbifzYL1eSPKKfUHHdc7Bs+vq1kGuaWz+XBqByZAQvw7OtpkecG+KrcO7XDV38y6z33vgCC5MPu9e0BZwITIvyuUOKmFA9vTAx/w963vBDSzHgskgqYtYswxzOoE55TS9tHsc5rgoSatEGW2VXyI8ytWpgkuluCNwT+/ZvNaQ33SCPTwN7mQGWx+DC+eyMBjI1sP9s4aYCaTggCSFNtwhRpQqqM/0HFa7hHDksK/zJhl4fhFUrbmyrJo6wm6Z7/s/WiSulk+zZkrLC9eBs1+XNtU7PzcmgfFmcsJnPGBmBF8WOa8WiX9hOn9DutBT4mLtlOod3YvU22U0Vwj2TjzhDvx8uyYCpDA03a/q9QjE4+klcI2Mw5UNhJsmTpCZQE06aHDKg=
diff --git a/docs/.babelrc b/docs/.babelrc
new file mode 100644
index 00000000..ce840ab8
--- /dev/null
+++ b/docs/.babelrc
@@ -0,0 +1,3 @@
+{
+  "stage": 0
+}
\ No newline at end of file
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 00000000..548fd2f1
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1,29 @@
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
+node_modules
+
+public/
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 00000000..2a8f240f
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,16 @@
+# Graphene Docs
+Docs for Graphene
+
+
+## Installation
+
+For running locally this docs. You have to execute
+```bash
+npm install -g gatsby && npm install
+```
+
+And then
+
+```bash
+gatsby develop
+```
\ No newline at end of file
diff --git a/docs/app.js b/docs/app.js
new file mode 100644
index 00000000..148e5fd5
--- /dev/null
+++ b/docs/app.js
@@ -0,0 +1,11 @@
+exports.loadContext = function(callback) {
+  var context;
+  context = require.context('./pages', true);
+  if (module.hot) {
+    module.hot.accept(context.id, function() {
+      context = require.context('./pages', true);
+      return callback(context);
+    });
+  }
+  return callback(context);
+};
diff --git a/docs/assets/icon.js b/docs/assets/icon.js
new file mode 100644
index 00000000..1d0b3c61
--- /dev/null
+++ b/docs/assets/icon.js
@@ -0,0 +1,7 @@
+import React from 'react';
+
+export default class Icon extends React.Component {
+    render() {
+        return <span {...this.props} src={null} dangerouslySetInnerHTML={{__html:this.props.src}} />
+    }
+}
diff --git a/docs/assets/logo.svg b/docs/assets/logo.svg
new file mode 100644
index 00000000..297830fe
--- /dev/null
+++ b/docs/assets/logo.svg
@@ -0,0 +1,10 @@
+<svg width="100%" height="100%" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" class="logo"><g fill="none" fill-rule="evenodd"><path class="logo-path" d="M49.17 10.915L15.415 30.29l.058 39.252 34.633 20.082 33.345-18.95-.023-39.79-34.185 19.238" stroke="white" stroke-width="4.987"/>
+    <g transform="translate(41.5 3)"><ellipse cx="7.934" cy="7.97" rx="7.934" ry="7.97" fill="white"/></g>
+    <g transform="translate(8 22.482)"><ellipse cx="7.934" cy="7.97" rx="7.934" ry="7.97" fill="white"/></g>
+    <g transform="translate(8 62.33)"><ellipse cx="7.934" cy="7.97" rx="7.934" ry="7.97" fill="white"/></g>
+    <g transform="translate(42.382 81.813)"><ellipse cx="7.934" cy="7.97" rx="7.934" ry="7.97" fill="white"/></g>
+    <g transform="translate(75.882 62.33)"><ellipse cx="7.934" cy="7.97" rx="7.934" ry="7.97" fill="white"/></g>
+    <g transform="translate(75.882 22.482)"><ellipse cx="7.934" cy="7.97" rx="7.934" ry="7.97" fill="white"/></g>
+    <g transform="translate(42.382 41.964)"><ellipse cx="7.934" cy="7.97" rx="7.934" ry="7.97" fill="white"/></g>
+    </g>
+</svg>
diff --git a/docs/assets/starwars-icon.png b/docs/assets/starwars-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b99a2a0a0ebd6560be3686debdca3a91488bacf6
GIT binary patch
literal 1771
zcmV<H1{C>;P)<h;3K|Lk000e1NJLTq0018V001Hg1^@s6r%D1!00001b5ch_0Itp)
z=>Px*rAb6VR9FeES7~fiRTO^9yjj}mEYvP^q3zH@S!yjbjfj65gZwZ?Nespa2t<Pr
z4GBh#Q4``46E#(f{=r0K2^f9|Q6XZLl!CTtS_-liTFOjky3fA9H}l^0oY&4UebZ%%
zoaD^A_iW$2=bm@&Jepb{5kgepf=r`pyTd^(j>n1BYK=EGHpWqwDairmGoAvh2D|5g
z*8t<#JmK<LBaz5bicl_^rh6$OUFLcE6h#I5tE#Gau$hzQ1P4$xc&`V36ZlzR+;Nhe
zE^lWf5^YEdCI>{4qz;NOpE#XEE%o*FF@-)kWs)Ps0DucX^b_!T;7!2OfMGrx(G0_^
zV_51;US84hTMkF=Y=$#}PXV`p6M{Z4(G2~9o-n@*3=H5#(kKlafVE(C1h^*6`T+!l
zqMu+@+M|7aeHx{E8aNod2>i6t@c+!A7&oYOdW<`brh!it7#7z<Cn8F(D|bH)91xcQ
zuYKsq5D<${tJRjK##VwWUz=3hv@wALO%u)`kR%oMh$Jb&E0dZG1~d)rWdY>%x*tn5
zSH8PBsml4rVmwas{Jf1U8K(bk{}PyF1BXzUOj~W;+I^gg-ODg6i;7H$=c7Y5>%HPk
zY|%y(MJgVTH$h8o!nwS2sPg;^7uwc)JZ@(!CNi)ai3Q^Mn0!$XN<v#ok_gld4HJga
z>vf#l<uQ(qj*Z7-F#@j>QEN1eAn=lW93Vj-hQ*VmX|vg=CNv`y78W(s)>P-NSh2z-
z8vr;~`E7X0hX}!jC!8J@z|uMsn8eg-?rM%+r<riN<H10P^Lf2|G%C~qoU(=hmL4rx
zQYwK@5sYz81p|@tl`Ac_#F>Y2m9i3^9LE*G7JDQ~Oa&KJD%I88MaDdiQ`MtwBr0^W
ztg6mnG*FOA+t|pMI~I%ArY-_}Ml>2VEG&7#l)<15B3=SqE&voDp<zx=Hs|&FCuo}S
za%#0_kx5?+C$T0q$fWh8eO6XhS-GXW4AMU8obU`r!l7KqlHOo4ata^O<#I*QHvx_%
zI}BWeLZs|0-Rdlz78jC-b436Yr4ia_G}^-AlEsB7%GB(Em<$^X1`hR!Gs241qaZ;T
z2vR?J6e%f7=pXb6eaRGyX%?eD14V|b_!QWHf(6q3gUrwo9CCCz`irivE{+E9XTa~b
z41HxYd@Fcf=(P?E@{k^_E=#u@v$PP3Nx}v^^S3f}g1<-cKp^sOFci|mxZ39rc7{Sh
zsBZeM$!zihKMF;uEU+2Fv$T32g0GxWJ0+CgeM0;mkH0q(jh4fvr(F(c1~yAQZV%;g
zd&l)T*|xmAyk)G4HO^I}kf&M%?*~>?q#O`~`rU2><)I0Y3~oG<9}EPM16kSn&isN$
zs^L91%(Mt-XV>tcJ_nxcpD;ke-TM9E?xEoc0=orJVw%)s{F@UF1skjbR?#^=(T(vG
zM2JKmK=3ob9|Ox4Xy|fzyZwOx{HY*Dh0{W(X0O+`c4TN|+5#j(KJ4tg_&WnB5h3D7
zz<Yp&Xq3k^*Ug9G_xt(Q*7Ka-@0<5d4TVB$!l6(vY>XErviHXy4t}<I^JWouj*SG<
zeh@17n9JkC#mI8hIUEkxJMX@I`Gfc0>+pKL@-5fi-frFY%9h}r{@d)<Z7&6SuJqW@
z7H-4Xk)ww@o4)$8%WfYWMcEY56Jz7NM5IH94;}n=|Ni~*F(*NA0pW1?7<_J2B|Pxi
z-2C<3>({PTo<99^?up~auA|Iq?YD2+x@AP4t?%8v=Z(?s?oKDl+b*^BUb))S(9!X?
z^i6XUw(BItMRAEB3da+`s7Qk21iH>eIPw!XPLSDbRu9_ljX+i^R;^ks7oOAUW;hiW
zgESJj;RK)0Bll{v$*dh2cEI-<-(ay=rWLUyQh&9!v~(om;xny1_VqbR)LQmWP%K9S
zEWmT;&h=U<EQ>0uD)X_EK^Fc{u}t2L8@Fy5O@?ZlZBW>`{nf|O{^re_gS^0tHLGhX
z;59=L#^@76(Wf>(ztJuWrhd}EQ9dv*T*k2E1OTl|HBO9&9QNMk?+)0Pl$H%%YHKat
zx&5{B@`{S;gg*5Ne@HG!;pkQ+Fxt!rj*5Tmc3mmOZjvbaWq1jp3lbAFhCxcAf0ZQa
zdyA#WhIUA2&z>z&tFm^(x7m{rvIYQM6ixaeX-9^J$f+GW8s+<Y()#}Itl$X~ynTd%
z0+o7<rH#gr2;bcT=+e3d$mo+NPjWh)PUUp!B|*3&?%K6$*3V;%{~sgU?RguAgn<A6
N002ovPDHLkV1f~HOc($F

literal 0
HcmV?d00001

diff --git a/docs/assets/starwars-icon@2x.png b/docs/assets/starwars-icon@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f2239c3f6582c1e8fd62db66beedefe01530cec
GIT binary patch
literal 3899
zcmV-B55(|^P)<h;3K|Lk000e1NJLTq002G!002Y?1^@s6*?5NI00001b5ch_0Itp)
z=>Px@^+`lQRCodHTM3X{MHzl??wOt0+1Z&Ll0A~$Y&J0$DItLb3=)yjN+}SKlxR^N
z5WzbNT3QGOp$ZBqIm#fS6^T|M2_`5~S{fj!!Vn075_446WRGk%yF16ueZJH0pUs<{
z*?IHk$SjB2RsX)X-GBf6f8Bro{de~phWQ^&?7M|qmSq##(ic)R8kNK0u$;|i#YCc6
zWSB92)v8teyP?yp00&4Nly3q#K&wEjK}$d`5al@}Np_8m`?KKXWk!xOG8<=Dd4grx
z6S64&i($mK6N!X>*|KE`@Had)6gWT-sAZs=K$nA-f~=sDBnYB3J`tey%jqD>4Eu(T
zk^d%1%<f3UKfH3~%4CV4Iy1^OT9Y^cZbgMJf^Gy|3aTg<z(oKj)2}88vLqjrb?h#Y
zOZ~35w>Mf%B`uzc3TjmbU?<8qg6;&-NLQU|1U@ZSmJbQCeE)<_dg-#RuJm+4ZEtl0
z2WSHNIOt=wH95syH}I+I68yq$Nnq~j>1pprmRze2<b-NU0IUaHgGzq|)djky2GyB$
zEW_TY)3f_VM#ioMOU(mV6L0_~{_lXE1$BYm)5NmO96)~N^y#s0?c2A{P>V8E0|#j8
z)$2j`fmA(pEe$u0m$d@?g9{e)eSX)jUDZ0v>P-Z|*Fo7mAWtKdKDV4z-SL&$gnmg`
zCw;oRvvXf1UMjDuVF;z=iX2%(KvTnwP6&LOSV?!^z`y{lG!;`t(>Q11--M)_D@v<@
z0g;=WNTh0ZN?J_-{5)2#54AX(U*Erfzow_J*f4<4M`N#n+O-<3wXD&muCy=9%!Dju
zFY4~@9#`_zp4FK8mr${xpw$#<R33SHR&V@FC3%{_G1?S+f1;9*_g%TnZaQ}Cm|aUR
zP2i~52f9Q{!27WbbNzCM!|@?4-6{e96e?HZ(USjOm9Y|IxI(M(vY=q*6bWhenwH?o
zWx0T;GFzP-0Jcginkx$&?O8wz>TLHtuZFd(&+GLP2Gyhm+>9DD$3LKn?b7L-gh4fF
z1@?4CMiJWwGDV}23-;{ZLovvt8UU>kx2aY5pyY8}mYJLkmK`{)5vRk#Sxu=_YS!fQ
zyugTJmUfX8yC*<6#hp$iA?xDBiyc;5(@vw&=xS+cbu+Rw&0XnD$7;sMh1EqtG@TwE
zl#qnN{6@VabY(-KP+SoBF?8@3AU9MfyJW<%_+xIf7bBMT27`e@-bTL*!C=rJibVs_
z=r$OgPDk^+WJ;F+pK4iV(PQQ8u*6CVwMEAj{!8zL83+$>UMe#%BUxZs9nRTj7dYA{
zCtaum=~SEnr9O+ihm*;q2|Xq8yl99-A~8{t%v_es!j5smtJ8_HB$DcdNzKN=rYCmd
zgABbM?|Qx7Ku3cdpS7GlGe)PR91adyy-sfsB_S_YZ!qdbQ4ny+a87CUX{5_T02>bC
zptr%+WRsmPr`>9{NEis&XfjEHB;CGXe#f5`oo9|XUEg#xHBI?7D_n!!(d5P$F+9(Y
zrL$Z-5l?!-gORE|>2$0gzQYgw;COgGoy<VA#F6||D(yBH3`JhpV5oRpkW&IiHrecS
z2B2%R*<@*FaTJLTC{obCvf09nnZQeKDs*JJdX~}a&FyBhiOHt9<GjGv2%L>H+03I(
zr(+Qm^3rs`+)nd?lsmhFr7;38r2Rhs5jdh=C|J`{YBZXBZQiz}D$^{F6*pBy*eU|g
z*Tf46Hkx!YR*Gs<+H5wTYIQk!VB*UQ6$94%a8AiJTH8C@SMVGc_WAsSnRI3$8Yvrc
z7Aj!1=1jUUtK?l2^|Ykr(@fyy99q7D*<!Y)QbksiFH>FsBxy1l2U}Vk?M9<vMIm5?
z2hTikC6D+_X0xlatJ9UqWD$P^Po`68>Hy7CU5nMCx%Vdddc85Ov_sFCz$;$KSj^@Q
z)T0h6F-LgmvsQ~S43qB02$us)?IOt~z^C%3EDNLP?&$1ra~z+Dh9gJg@q}HH#BPO0
zd7{mz#bPC$w2~}I#nIAC;6?L5O%gn_x!KWlDv?YhwvnxHqe+X|$l02#F0;wlfl(t;
zt6Fm&$$?+7d*^tUyW8AMI+-59oq7x_f(ZdoGgg?C)9r%SHj-b^N@+o`6s?;xfzwFR
zsFyV@Ql`1tzR=;Aj%X>b4zRQWR^3CeAjaNop9j(cSgtH(G-ivi7W;gL$)M&-<!USW
z1d^5uh3WvUh<cZv@~cU`zQ{2Z^#Zh@kzVlbXjAoIpT9aX+p9}rv<gyw#Icqdk^e)`
zvV!tid!^YiYr<y=W|<3ZHr<_tM^Sm;;Qa{b_L+75TmDBh_s#C^zEujI9B_;_d5pV2
zRRs)6<@0$WfZ@)kejRn2aG!qfJMX-c^UBJI(?$PPbqK4g3hvFAY?hnMX1E0Q<8{fX
zrxMoutDR2wl~fnoPq_up{h*bgSxXd;(|$CSOr4A;GGaEH=^Gjt;<0HNYHo4ro0}bd
z*rd$*yoVlt5BQml1pG@tyM4A06JTselCgMVD4pV5*p20)ECD-C0H0pVS#}KIL#|fW
z0(6FL7MDm_WP}X_oW5oGWTSx-V2%@mk!Wm!<G60fFN!?Q0at4_hW+$ux7*WUG8<cG
zZZFj;)Sf3lPr!#zvAg!l>NRN2X0q8cv1l^R3j&?X(=u6-G=M9-8H>eos@3gkwc2d$
z4eo$b6u?xB&lOFyo;kpo>`)|{;9%N|wRo#6vt%-v<zr{ZWrVB!Zjakwci4L=bUojM
z6Q2YDrxC9^Xd%F<Om;99P2gKaaZ$BO!P2JZw{|6#IueHzOfV1_a=G1{)7iZEd^!M!
zSc3%oRnVuj+b%7g8ewh#M{*L*)9Sfusup;@aV&#9lYt-;o(v7c3G&VsXJ0)XfMsnz
z&GC7VOyKERG0{L}GTiBKBt|A(58zxIIBF7y28YheZn6BG^t82EaMspU!zwVy$ox7A
zV9tQ<0Tu06bK1@LL!%rFMveq0!yV@Xn#5vFrx8D|1P9qSF+M&g;PW4?MjUvuI3d1k
z`}XY<xqtx~boNXkD|LWsBEi96s6UhC8{xPZo)d)Op`n?(L)Esc$+TK5$J@I)mTGu^
zQDT@aLEqV5(vJahAuG&;;^v=#ehex(N+i&sP^4j?b3oYgM^Cx(8vmp-nWX_=;27zu
zl0-(99~e4y;z{Kf5K630Cn#j<4}!i1Dq7<3(}{^>DpQpYP-#>(3+<7$Rh(X`mCIzt
zVzEUy_ot~_m=dBSe|=z}|K9cM*XIYd$kb@$(PP_Di|&-Sf#zT?OOxSP3T1N&rPcdR
zH>5+u!+~AT{+>%D;^O6(U13?YsLyLQH)LaI3<mt^CcEw2g@SyR(aCqbdGNp=Hf`Ee
z)XBLyt_A`fum$;##N)|-N1}1f^%=J;%+Vu9CJr5bGt}ns=&!iqqYFG9Pf5h)^G&3F
za^JnfBO@apvfJ%K(C;&jj*c?(ySn@DzWd&J-V3}XC%2JESa|dB;el8@B7At|#cf?(
zonBlZsHvRKYx8;rT3oJPQINje)6?;rd_lpB7H~KC-X5O_CgDAo6x1ntCD1?n*~2GZ
zd+jw^+UQ$$#OT?9U;S!3l<aC&m{X~wy!p1xBk@>lKIJW2y6lBDm#$gygCBgahyHJC
z^A11y=+Ean?2f!nqoZdgpLlXx7O{Tr14CT-rWf`u9R2F;-_TsYO(xUv&Usz-Oj^EZ
z$&${RzlaFK%wGoR+-{1LQ%lE>ANL(NaDY604s;|O9ymQbH22Osw&dp;ErUCLyW{xH
zpa0zCj;EjQCpi<oi2(NGxpVwK{^^C2*IaY0_}p_lPZT<*XMX=oXd1L2jGh@8-n;j2
zT}O`|@vG^g<Y6#cC0TrB=gwb;mAskHymOmbfH^I}S?orBiTM@so;=wf0xtzZOf(WX
z83_2=@vp7FzdwJ!2IZN9uOBpdJl?p+-HKJEIJsLr3_eESUVU}H4vsWm2s6)3d<+0U
zpFRyhWO<gi-Z~V_GpW4bCfXrz>0Mj5ZY^m`VJ{1u7;t$1G6Ibk6=t>PoH-qK0v!p5
z2L1ktPJqsx$-CX|n8HuMW6@|EPNa(zDL(gPm`Ehr0&`ZXF-=W&nr0#fdH|q%m4coH
z3#SkDmCS-CHX+aB^X*p(vPxbxf%o+EWMonIAlAULCbN3=#a%9!YY<;g%vC_+nf%`O
zzn|*>rA6e?-FT5_Rm!H%TcL8nG7Kl#JTX2t1km}QY3|&)r!HB2Y0gjN>leR7cwYC@
z4I4I0n@(|g?!ThtOr@OJvE#`%Z@FdjJ@};LF_f2d6fHwfJ@xCJUp%qx#GylP2u`O{
zf9vL3y%$}yI<Fj@4dZmS1OXnvrY`!=9WNKa#IFE6ZIdRG@d8DUbst&R?s2>PyZ1bI
z6w{7bvEoAW4cBj4XtSvgIAkLtW$t+6jeSQI8Rec8fuEZvPuz0LZB5Yfeh4b5gR5Y6
z%Xhw8*7KvB`S?{=(^n69k3FT(bU*5GF>~E@*BfT8=S!9>_x|Xv<@7OvW+Kq&%!fl!
z-wv(0tq7TJS;<j(lAu^D^a#$&wx9t`6H=+3yI0$|apR(7D(%6VT+-(22VZ9ePGr|#
zc~yQMtH~*shv|XORhZi*L%w@v1}f$1lqgY-5kGF_g8uQR@cqhWIJ}W^eC6`#^OA*q
zi@3)hd;9>lW{<31y*3evgbslJp@$xN;4hb4vNmnAX)Yk;L=WIJ^M+{D_cTCPeO5oi
z^vcPe&d2EMZoc^|odyGbf5x&m!MyTwa+<674Oa3NX7{#iHnqF2uP^WI3%U00-Roo|
z(+#YS`8IsPg@t8m@96vh)`%UvC_T1e!}?J*9<98Zfh)r3H(qPjthqp9^c%4iT!*{z
z<v6By1E3j-`vBIDwd<J7iaRBa`)9R3gnj<`eJyso{&JY&weazf$;?ORk~ho1FZ$tU
zjza!FvRPqIG8qU|Yubw5%Cm0ZiU4{ZK77~+Z*CO?s}Y^R8VqSZ9JcZ=zW7w88b?zo
zOL-^DTDx|w6&+~id9%)H6=lQ&{GmhE)Yh%jyDWwO|IaFW;6F7NMtB_kk9+_C002ov
JPDHLkV1j!wkqrO<

literal 0
HcmV?d00001

diff --git a/docs/config.toml b/docs/config.toml
new file mode 100644
index 00000000..08df109a
--- /dev/null
+++ b/docs/config.toml
@@ -0,0 +1 @@
+siteTitle="Graphene"
diff --git a/docs/css/main.styl b/docs/css/main.styl
new file mode 100644
index 00000000..71c00739
--- /dev/null
+++ b/docs/css/main.styl
@@ -0,0 +1,212 @@
+@import 'nib'
+@import 'jeet'
+
+@import 'https://fonts.googleapis.com/css?family=Raleway:400,500,600,200,100&.css'
+
+normalize-css()
+
+$wrapper
+  center(960px, pad:20px)
+
+.wrapper
+  @extend $wrapper
+  position relative
+
+a, a:hover
+  text-decoration none
+
+html, body
+  font-family "Helvetica Neue", Helvetica, Arial, sans-serif
+  font-weight 300
+  font-size 16px
+  color #606060
+  line-height 1.5
+
+.header
+  clearfix()
+  position relative
+  text-align center
+  background: #DB594C;
+  background-image: radial-gradient(95% 101%, #E46643 5%, rgba(226,91,72,0.00) 100%)
+  .logo
+    width 42px
+    height @width
+    vertical-align middle
+
+  h1
+    max-width 380px
+    font-family 'Raleway', sans-serif
+    font-weight 200
+    font-size 42px
+    color #FFFFFF
+    line-height 49px
+    margin 80px auto 40px
+    z-index 110
+  
+  .get-started
+    font-family 'Raleway'
+    display inline-block
+    margin 0 auto
+    font-size 13px
+    color #FFFFFF
+    padding 0 18px
+    text-transform uppercase
+    font-weight 600
+    line-height 15px
+    border 1px solid #FFFFFF
+    border-radius 2px
+    padding 12px 18px
+    z-index 111
+    position relative
+    &:hover
+      background white
+      color #E05B49
+      text-decoration none
+
+.header-wrapper
+  @extend $wrapper
+  text-align left
+  padding-top 32px
+  padding-bottom 32px
+  position relative
+  z-index 100
+
+.header-extended
+  padding-bottom 100px
+
+.header-nav
+  margin-top 8px
+  a
+    font-family 'Raleway'
+    font-size 13px
+    color #FFFFFF
+    margin 0 16px
+    padding 0 2px
+    text-transform uppercase
+    font-weight 600
+    line-height 15px
+
+.header-logo
+  font-family 'Raleway'
+  font-size 22px
+  color #FFFFFF
+  float left
+  font-weight 500
+  text-transform uppercase
+  text-decoration none
+
+.header-nav
+  float right
+
+.logo
+  path
+    stroke-dasharray 250
+    stroke-dashoffset 250
+    animation logo-dash .9s ease-in-out forwards
+    animation-delay .12s
+  g
+    ellipse
+      animation logo-dot .3s ease forwards
+      animation-fill-mode both
+      transform-origin 50% 50%
+    &:nth-child(2)
+      ellipse
+        animation-delay .1s
+    &:nth-child(3)
+      ellipse
+        animation-delay .2s
+    &:nth-child(4)
+      ellipse
+        animation-delay .3s
+    &:nth-child(5)
+      ellipse
+        animation-delay .4s
+    &:nth-child(6)
+      ellipse
+        animation-delay .5s
+    &:nth-child(7)
+      ellipse
+        animation-delay .6s
+    &:nth-child(8)
+      ellipse
+        animation-delay .7s
+
+@keyframes logo-dash
+  to
+    stroke-dashoffset 0
+
+@keyframes logo-dot
+  from
+    opacity 0.5
+    transform scale(0)
+  to
+    opacity 1
+    transform scale(1)
+
+#header-background
+  z-index 0
+  display block
+  position absolute
+  width 100%
+  top 0
+  bottom 0
+  right 0
+  left 0
+
+.particles-js-canvas-el
+  display block
+  opacity 0
+  position absolute
+
+.starwars-example
+  background: #3C3C3C
+  display inline-block
+  position absolute
+  right 20px
+  top -100px
+  box-shadow: 0px 2px 5px 0px rgba(0,0,0,0.25);
+  border-radius: 100px
+  font-size 13px
+  padding 17px 17px 17px 71px
+  width 226px
+  box-sizing border-box
+  color white
+  font-family 'Raleway'
+  font-weight 500
+  &:before
+    content: ''
+    display block
+    position absolute
+    left 0
+    top 0
+    height 32px
+    width 32px
+    image '../assets/starwars-icon.png'
+
+.improve-document-link
+  @extend $wrapper
+
+.markdown
+  .wrapper
+    margin-top 60px
+
+    h1, h2, h3, h4, h5, h6
+      font-family: 'Raleway';
+      font-weight 600
+      color #4A4A4A
+    strong
+      font-weight 500
+  
+  margin-bottom 40px
+
+.title
+  background: #F9F9F9;
+  padding 30px 0
+
+  h1
+    @extend $wrapper
+    font-family: 'Raleway';
+    font-size: 42px;
+    font-weight 200
+    color: #585858;
+    line-height: 49px;
diff --git a/docs/gatsby.config.js b/docs/gatsby.config.js
new file mode 100644
index 00000000..80be7b41
--- /dev/null
+++ b/docs/gatsby.config.js
@@ -0,0 +1,26 @@
+var nib = require("nib");
+var jeet = require("jeet");
+var ExtractTextPlugin = require("extract-text-webpack-plugin");
+
+module.exports = function(config, env) {
+  var IS_STATIC = env === 'static';
+  config.merge({
+     stylus: {
+        use: [nib(), jeet()]
+    }
+  });
+  if (IS_STATIC) {
+    config.plugin('extract-css', ExtractTextPlugin, ["app.css"]);
+  }
+  config.loader('stylus', function(cfg) {
+    cfg.test = /\.styl$/;
+    if (IS_STATIC) {
+      cfg.loader = ExtractTextPlugin.extract('style-loader', 'css-loader!stylus-loader', { allChunks: true });
+    }
+    else {
+      cfg.loader = 'style-loader!css-loader!stylus-loader';
+    }
+    return cfg
+  });
+  return config;
+};
diff --git a/docs/html.js b/docs/html.js
new file mode 100644
index 00000000..e93eda04
--- /dev/null
+++ b/docs/html.js
@@ -0,0 +1,25 @@
+import React from 'react';
+import DocumentTitle from 'react-document-title';
+
+export default class Html extends React.Component {
+  render() {
+    var title = this.props.title || DocumentTitle.rewind();
+    return (
+      <html lang={this.props.lang}>
+        <head>
+          <meta charSet="utf-8"/>
+          <meta httpEquiv="X-UA-Compatible" content="IE=edge"/>
+          <meta name='viewport' content='width=device-width, initial-scale=1.0 maximum-scale=1.0'/>
+          <title>{title}</title>
+          <link rel="shortcut icon" href={this.props.favicon}/>
+          <link href='https://fonts.googleapis.com/css?family=Raleway:400,600,200,100' rel='stylesheet' type='text/css' />
+          <link href='/app.css' rel='stylesheet' type='text/css' />
+        </head>
+        <body>
+          <div id="react-mount" dangerouslySetInnerHTML={{__html: this.props.body}} />
+          <script src="/bundle.js"/>
+        </body>
+      </html>
+    );
+  }
+}
diff --git a/docs/package.json b/docs/package.json
new file mode 100644
index 00000000..7ef2b3b9
--- /dev/null
+++ b/docs/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "graphene-docs",
+  "version": "1.0.0",
+  "description": "Graphene docs",
+  "main": "n/a",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "npm install -g gatsby && npm install",
+    "deploy": "npm run build"
+  },
+  "keywords": [
+    "graphene"
+  ],
+  "license": "MIT",
+  "dependencies": {
+    "extract-text-webpack-plugin": "^0.9.1",
+    "jeet": "^6.1.2",
+    "nib": "^1.1.0",
+    "react": "^0.14.3",
+    "react-document-title": "^2.0.1",
+    "react-router": "^0.13.5",
+    "stylus-loader": "^1.4.2",
+    "webpack": "^1.12.9"
+  }
+}
diff --git a/docs/pages/_header.js b/docs/pages/_header.js
new file mode 100644
index 00000000..9d70ef03
--- /dev/null
+++ b/docs/pages/_header.js
@@ -0,0 +1,150 @@
+var IN_BROWSER = typeof window != 'undefined';
+import React from 'react';
+if (IN_BROWSER) {
+  var glfx = require('../vendor/glfx.optim')
+  var particlesJS = require('../vendor/particles.js')
+}
+
+class Header extends React.Component {
+  update() {
+    if (!this.mounted) return;
+    var w = this.video.width;
+    var h = this.video.height;
+    if (window.devicePixelRatio > 1) {
+        w = w/2;
+        h = h/2;
+    }
+    this.texture._.initFromCanvas(w, h, this.video);
+
+    this.canvas.draw(this.texture).tiltShift(0, h*2/3, 10, h*2/3, 15, 200).update();
+    requestAnimationFrame(this.update.bind(this));
+  }
+  componentWillUnmount() {
+    this.mounted = false;
+  }
+  componentDidMount() {
+    if (!IN_BROWSER) return;
+    this.mounted = true;
+    new particlesJS('header-background', {
+      "particles": {
+        "number": {
+          "value": 36,
+          "density": {
+            "enable": true,
+            "value_area": 800
+          }
+        },
+        "color": {
+          "value": "#ffffff"
+        },
+        "shape": {
+          "type": "circle",
+          "stroke": {
+            "width": 0,
+            "color": "#000000"
+          },
+          "polygon": {
+            "nb_sides": 8
+          }
+        },
+        "opacity": {
+          "value": 1,
+          "random": true,
+          "anim": {
+            "enable": true,
+            "speed": .1,
+            "opacity_min": .1,
+            "sync": true
+          }
+        },
+        "size": {
+          "value": 2.2,
+          "random": false,
+          "anim": {
+            "enable": false,
+            "speed": .2,
+            "size_min": 2.44,
+            "sync": true
+          }
+        },
+        "line_linked": {
+          "enable": true,
+          "distance": 240,
+          "color": "#ffffff",
+          "opacity": .2,
+          "width": 3
+        },
+        "move": {
+          "enable": true,
+          "speed": 1.1,
+          "direction": "none",
+          "random": true,
+          "straight": false,
+          "out_mode": "bounce",
+          "bounce": false,
+          "attract": {
+            "enable": false,
+            "rotateX": 600,
+            "rotateY": 600
+          }
+        }
+      },
+      "interactivity": {
+        "detect_on": "canvas",
+        "events": {
+          "onhover": {
+            "enable": true,
+            "mode": "repulse"
+          },
+          "onclick": {
+            "enable": true,
+            "mode": "repulse"
+          },
+          "resize": true
+        },
+        "modes": {
+          "grab": {
+            "distance": 400,
+            "line_linked": {
+              "opacity": 1
+            }
+          },
+          "bubble": {
+            "distance": 250,
+            "size": 0,
+            "duration": 2,
+            "opacity": 0,
+            "speed": 3
+          },
+          "repulse": {
+            "distance": 73.08694910712113,
+            "duration": 0.4
+          },
+          "push": {
+            "particles_nb": 4
+          },
+          "remove": {
+            "particles_nb": 2
+          }
+        }
+      },
+      "retina_detect": true
+    });
+    var header_background = document.getElementById('header-background');
+    this.canvas = glfx.canvas();
+    this.video = header_background.children[0];
+    this.context = window.pJSDom[0].pJS.canvas.ctx;
+    this.texture = this.canvas.texture(this.video);
+    header_background.appendChild(this.canvas);
+    requestAnimationFrame(this.update.bind(this));
+  }
+
+  render() {
+    return (
+      <div id="header-background">
+      </div>
+    );
+  }
+}
+
+module.exports = Header;
diff --git a/docs/pages/_template.js b/docs/pages/_template.js
new file mode 100644
index 00000000..e077d005
--- /dev/null
+++ b/docs/pages/_template.js
@@ -0,0 +1,44 @@
+import React from 'react';
+import { RouteHandler, Link, State } from 'react-router';
+import Icon from 'assets/icon'
+
+import Header from './_header'
+import logo from '!raw!assets/logo.svg'
+import styles from '../css/main.styl'
+
+class Template extends React.Component {
+  render() {
+    var path = this.props.page.path;
+    var isIndex = path == '/';
+    return (
+      <div>
+        <header className="header">
+            <div className="header-wrapper">
+                <Link className="header-logo" to="/">
+                    <Icon src={logo} />
+                    Graphene
+                </Link>
+                <nav className="header-nav">
+                    <Link to="/docs/quickstart/">Get started</Link>
+                    <Link to="/">Playground</Link>
+                    <Link to="/">Docs</Link>
+                    <Link to="/community/">Community</Link>
+                </nav>
+            </div>
+            {isIndex?
+            <div className="header-extended">
+                <h1>
+                    GraphQL in Python<br />
+                    made <strong>simple</strong>
+                </h1>
+                <Link to="/docs/quickstart/" className="get-started">Get Started</Link>
+                <Header />
+            </div>:null}
+        </header>
+        <RouteHandler {...this.props}/>
+      </div>
+    );
+  }
+}
+
+module.exports = Template;
diff --git a/docs/pages/community.md b/docs/pages/community.md
new file mode 100644
index 00000000..5ad38de1
--- /dev/null
+++ b/docs/pages/community.md
@@ -0,0 +1,25 @@
+---
+layout: page
+title: Community
+active_tab: community
+description: The biggest GraphQL Community in Python
+---
+
+Graphene is constantly developing thanks to an active volunteer community, There are many different places where you discuss Graphene, share your experiences or ask for help. Your feedback and participation are very welcome!
+
+If you think working with Graphene is fun, there are many ways you can contribute to it. Please join us in the Slack community and help us shape the next generation API’s.
+
+[![Public Slack Discussion](https://graphql-slack.herokuapp.com/badge.svg)](https://graphql-slack.herokuapp.com/)
+
+## Our Repositories
+
+-   **GraphQL Core**: [Source Code] - [PyPI package]
+-   **GraphQL Relay**: [Source Code][1] - [PyPI package][2]
+-   **Graphene**: [Source Code][3] - [PyPI package][4]
+
+  [Source Code]: https://github.com/graphql-python/graphql-core
+  [PyPI package]: https://pypi.python.org/pypi/graphql-core
+  [1]: https://github.com/graphql-python/graphql-relay
+  [2]: https://pypi.python.org/pypi/graphql-relay
+  [3]: https://github.com/graphql-python/graphene
+  [4]: https://pypi.python.org/pypi/graphene
diff --git a/docs/pages/docs/django_quickstart.md b/docs/pages/docs/django_quickstart.md
new file mode 100644
index 00000000..e88fbcdf
--- /dev/null
+++ b/docs/pages/docs/django_quickstart.md
@@ -0,0 +1,125 @@
+---
+title: Django Quickstart Guide
+active_tab: quickstart
+description: A Quick guide to Graphene in Django
+---
+
+## Django Quickstart
+
+In our previous quickstart page we created a very simple schema.
+Now we will adapt the schema for our Django models.
+
+## Project setup
+
+```bash
+# Create the project directory
+mkdir tutorial
+cd tutorial
+
+# Create a virtualenv to isolate our package dependencies locally
+virtualenv env
+source env/bin/activate  # On Windows use `env\Scripts\activate`
+
+# Install Django and Graphene with Django support
+pip install django
+pip install graphene[django]
+pip install django-graphiql
+
+# Set up a new project with a single application
+django-admin.py startproject tutorial .  # Note the trailing '.' character
+cd tutorial
+django-admin.py startapp quickstart
+```
+
+Now sync your database for the first time:
+
+```bash
+python manage.py migrate
+```
+
+We'll also create an initial user named `admin` with a password of `password`.
+
+```bash
+python manage.py createsuperuser
+```
+
+Once you've set up a database and initial user created and ready to go, open up the app's directory and we'll get coding...
+
+
+
+## Schema
+
+Right, we'd better write some types then. Open `tutorial/quickstart/schema.py` and get typing.
+
+```python
+import graphene
+from graphene.contrib.django import DjangoObjectType
+
+from django.contrib.auth.models import User, Group
+
+# Graphene will map automaticall the User model to UserType with
+# the specified fields
+class UserType(DjangoObjectType):
+    class Meta:
+        model = User
+        only_fields = ('username', 'email', 'groups')
+
+
+class GroupType(DjangoObjectType):
+    class Meta:
+        model = User
+        only_fields = ('name', )
+
+
+class Query(graphene.ObjectType):
+    all_users = graphene.List(UserType)
+    get_user = graphene.Field(UserType
+                              id=graphene.String(required=True))
+
+    def resolve_all_users(self, args, info):
+        return User.objects.all()
+
+    def resolve_get_user(self, args, info):
+        return User.objects.get(id=args.get('id'))
+
+schema = graphene.Schema(query=Query)
+```
+
+
+## Creating GraphQL and GraphiQL views
+
+Okay, now let's wire up the GraphQL and GraphiQL urls. On to `tutorial/urls.py`...
+
+
+```python
+from django.conf.urls import url, include
+from django.views.decorators.csrf import csrf_exempt
+from graphene.contrib.django.views import GraphQLView
+from tutorial.quickstart.schema import schema
+
+
+# Wire up our GraphQL schema in /graphql.
+# Additionally, we include GraphiQL view for querying easily our schema.
+urlpatterns = [
+    url(r'^graphql', csrf_exempt(GraphQLView.as_view(schema=schema))),
+    url(r'^graphiql', include('django_graphiql.urls')),
+]
+```
+
+## Testing our GraphQL schema
+
+We're now ready to test the API we've built. Let's fire up the server from the command line.
+
+```bash
+python ./manage.py runserver
+```
+
+Go to [localhost:8080/graphiql](http://localhost:8080/graphiql) and type your first query!
+
+```graphql
+myQuery {
+    getUser(id:"1") {
+        username
+    }
+}
+```
diff --git a/docs/pages/docs/quickstart.md b/docs/pages/docs/quickstart.md
new file mode 100644
index 00000000..f408a851
--- /dev/null
+++ b/docs/pages/docs/quickstart.md
@@ -0,0 +1,58 @@
+---
+title: Quickstart Guide
+active_tab: quickstart
+description: A Quick guide to Graphene
+---
+
+Graphene is a powerful framework for creating GraphQL schemas easily in Python.
+
+## Requirements
+
+- Python (2.6.5+, 2.7, 3.2, 3.3, 3.4, 3.5, pypy)
+- Graphene (0.4+)
+
+
+## Project setup
+
+```bash
+# Create the project directory
+mkdir tutorial
+cd tutorial
+
+# Create a virtualenv to isolate our package dependencies locally
+virtualenv env
+source env/bin/activate  # On Windows use `env\Scripts\activate`
+
+pip install graphene
+```
+
+## Creating a basic Schema
+
+A GraphQL schema describes your data model, and provides a GraphQL server with an associated set of resolve methods that know how to fetch data.
+
+We are going to create a very simple schema, with a `Query` with only one field: `hello`. And when we query it should return 'World'.
+
+
+```python
+import graphene
+
+class Query(graphene.ObjectType):
+    hello = graphene.String()
+
+    def resolve_hello(self, args, info):
+        return 'World'
+
+schema = graphene.Schema(query=Query)
+```
+
+
+## Querying
+
+Then, we can start querying our schema:
+
+```python
+result = schema.execute('{ hello }')
+print result.data['hello'] # "World"
+```
+
+Congrats! You got your first graphene schema working!
diff --git a/docs/pages/guide/interface.md b/docs/pages/guide/interface.md
new file mode 100644
index 00000000..9f5ff2b9
--- /dev/null
+++ b/docs/pages/guide/interface.md
@@ -0,0 +1,49 @@
+# Interfaces
+
+An Interface contains the essential fields that will be shared among multiple ObjectTypes.
+
+The basics:
+
+- Each Interface is a Python class that inherits from graphene.Interface.
+- Each attribute of the Interface represents a GraphQL field.
+
+## Quick example
+
+This example model defines a Character, which has a name. `Human` and `Droid` inherit from it.
+
+```python
+import graphene
+
+# Character is an Interface
+class Character(graphene.Interface):
+	name = graphene.String()
+
+# Human is an ObjectType, as inherits an interface
+class Human(Character):
+	born_in = graphene.String()
+
+# Droid is an ObjectType, as inherits an interface
+class Droid(Character):
+	function = graphene.String()
+
+```
+
+**name** is a field in the `Character` interface that will be in both `Human` and `Droid` ObjectTypes (as those inherit from Character). Each ObjectType also define extra fields at the same time.
+
+The above types would have the following representation in a schema:
+
+```graphql
+interface Character {
+  name: String
+}
+
+type Droid implements Character {
+  name: String
+  function: String
+}
+
+type Human implements Character {
+  name: String
+  bornIn: String
+}
+```
diff --git a/docs/pages/guide/mutation.md b/docs/pages/guide/mutation.md
new file mode 100644
index 00000000..788cadfd
--- /dev/null
+++ b/docs/pages/guide/mutation.md
@@ -0,0 +1,67 @@
+# Mutations
+
+A Mutation is a special ObjectType that define also an Input.
+
+## Quick example
+
+This example model defines a Mutation:
+
+```python
+import graphene
+
+class CreatePerson(graphene.Mutation):
+	class Input:
+		name = graphene.String()
+
+    ok = graphene.String()
+    person = graphene.Field('Person')
+
+    @classmethod
+    def mutate(cls, args, info):
+    	person = Person(name=args.get('name'))
+    	ok = True
+    	return CreatePerson(person=person, ok=ok)
+```
+
+**person** and **ok** are the output fields of the Mutation when is resolved.
+**Input** attributes are the arguments that the Mutation needs for resolving. **mutate** is the function that will be applied once the mutation is called.
+
+So, we can finish our schema like this:
+
+```python
+# ... the Mutation Class
+
+class Person(graphene.ObjectType):
+	name = graphene.String()
+
+class MyMutations(graphene.ObjectType):
+	create_person = graphene.Field(CreatePerson)
+
+schema = graphene.Schema(mutation=MyMutations)
+```
+
+## Executing the Mutation
+
+Then, if we query (`schema.execute(query_str)`) the following:
+```graphql
+mutation myFirstMutation {
+	createPerson(name:"Peter") {
+		person {
+			name
+		}
+		ok
+	}
+}
+```
+
+We should receive:
+
+```json
+{
+	"createPerson": {
+		"person" : {
+			name: "Peter"
+		},
+		"ok": true
+	}
+}
diff --git a/docs/pages/guide/objecttype.md b/docs/pages/guide/objecttype.md
new file mode 100644
index 00000000..191094ae
--- /dev/null
+++ b/docs/pages/guide/objecttype.md
@@ -0,0 +1,45 @@
+# ObjectTypes
+
+An ObjectType is the single, definitive source of information about your data. It contains the essential fields and behaviors of the data you’re querying.
+
+The basics:
+
+- Each ObjectType is a Python class that inherits graphene.ObjectType or inherits an implemented [interface](/docs/interface).
+- Each attribute of the ObjectType represents a GraphQL field.
+
+## Quick example
+
+This example model defines a Person, which has a first_name and last_name:
+
+```python
+import graphene
+
+class Person(graphene.ObjectType):
+    first_name = graphene.String()
+    last_name = graphene.String()
+    full_name = graphene.String()
+
+    def resolve_full_name(self, args, info):
+    	return '{} {}'.format(self.first_name, self.last_name)
+```
+
+**first_name** and **last_name** are fields of the ObjectType. Each field is specified as a class attribute, and each attribute maps to a GraphQL field.
+
+The above `Person` ObjectType would have the following representation in a schema:
+
+```graphql
+type Person {
+  firstName: String
+  lastName: String
+  fullName: String
+}
+```
+
+## Instances as containers
+
+Graphene `ObjectType`s could act as containers too.
+So with the previous example you could do.
+
+```python
+peter = Person(first_name='Peter', last_name='Griffin')
+```
\ No newline at end of file
diff --git a/docs/pages/index.md b/docs/pages/index.md
new file mode 100644
index 00000000..80444d40
--- /dev/null
+++ b/docs/pages/index.md
@@ -0,0 +1,14 @@
+---
+path: /
+---
+<a class="starwars-example" href="http://swapi.graphene-python.org/">Check our starwars API example!</a>
+
+## About Graphene
+
+Graphene is a Python library for building GraphQL schemas/types fast and easily.
+
+**What is GraphQL?** A GraphQL query is a string interpreted by a server that returns data in a specified format.
+
+- **Easy to use:** Graphene helps you use GraphQL in Python without effort.
+- **Relay:** Graphene has builtin support for Relay
+- **Django:** Automatic *Django model* mapping to Graphene Types.
diff --git a/docs/vendor/glfx.optim.js b/docs/vendor/glfx.optim.js
new file mode 100644
index 00000000..dc489f10
--- /dev/null
+++ b/docs/vendor/glfx.optim.js
@@ -0,0 +1,796 @@
+/*
+ * glfx.js
+ * http://evanw.github.com/glfx.js/
+ *
+ * Copyright 2011 Evan Wallace
+ * Released under the MIT license
+ */
+module.exports = function() {
+    function q(a, d, c) {
+        return Math.max(a, Math.min(d, c))
+    }
+
+    function w(b) {
+        return {
+            _: b,
+            loadContentsOf: function(b) {
+                a = this._.gl;
+                this._.loadContentsOf(b)
+            },
+            destroy: function() {
+                a = this._.gl;
+                this._.destroy()
+            }
+        }
+    }
+
+    function A(a) {
+        return w(r.fromElement(a))
+    }
+
+    function B(b, d) {
+        var c = a.UNSIGNED_BYTE;
+        if (a.getExtension("OES_texture_float") && a.getExtension("OES_texture_float_linear")) {
+            var e = new r(100, 100, a.RGBA, a.FLOAT);
+            try {
+                e.drawTo(function() {
+                    c = a.FLOAT
+                })
+            } catch (g) {}
+            e.destroy()
+        }
+        this._.texture && this._.texture.destroy();
+        this._.spareTexture && this._.spareTexture.destroy();
+        this.width = b;
+        this.height = d;
+        this._.texture = new r(b, d, a.RGBA, c);
+        this._.spareTexture = new r(b, d, a.RGBA, c);
+        this._.extraTexture = this._.extraTexture || new r(0, 0, a.RGBA, c);
+        this._.flippedShader = this._.flippedShader || new h(null, "uniform sampler2D texture;varying vec2 texCoord;void main(){gl_FragColor=texture2D(texture,vec2(texCoord.x,1.0-texCoord.y));}");
+        this._.isInitialized = !0
+    }
+
+    function C(a, d, c) {
+        this._.isInitialized &&
+            a._.width == this.width && a._.height == this.height || B.call(this, d ? d : a._.width, c ? c : a._.height);
+        a._.use();
+        this._.texture.drawTo(function() {
+            h.getDefaultShader().drawRect()
+        });
+        return this
+    }
+
+    function D() {
+        this._.texture.use();
+        this._.flippedShader.drawRect();
+        return this
+    }
+
+    function f(a, d, c, e) {
+        (c || this._.texture).use();
+        this._.spareTexture.drawTo(function() {
+            a.uniforms(d).drawRect()
+        });
+        this._.spareTexture.swapWith(e || this._.texture)
+    }
+
+    function E(a) {
+        a.parentNode.insertBefore(this, a);
+        a.parentNode.removeChild(a);
+        return this
+    }
+
+    function F() {
+        var b = new r(this._.texture.width, this._.texture.height, a.RGBA, a.UNSIGNED_BYTE);
+        this._.texture.use();
+        b.drawTo(function() {
+            h.getDefaultShader().drawRect()
+        });
+        return w(b)
+    }
+
+    function G() {
+        var b = this._.texture.width,
+            d = this._.texture.height,
+            c = new Uint8Array(4 * b * d);
+        this._.texture.drawTo(function() {
+            a.readPixels(0, 0, b, d, a.RGBA, a.UNSIGNED_BYTE, c)
+        });
+        return c
+    }
+
+    function k(b) {
+        return function() {
+            a = this._.gl;
+            return b.apply(this, arguments)
+        }
+    }
+
+    function x(a, d, c, e, g, l, n, p) {
+        var m = c - g,
+            h = e - l,
+            f = n - g,
+            k = p - l;
+        g = a - c + g - n;
+        l =
+            d - e + l - p;
+        var q = m * k - f * h,
+            f = (g * k - f * l) / q,
+            m = (m * l - g * h) / q;
+        return [c - a + f * c, e - d + f * e, f, n - a + m * n, p - d + m * p, m, a, d, 1]
+    }
+
+    function y(a) {
+        var d = a[0],
+            c = a[1],
+            e = a[2],
+            g = a[3],
+            l = a[4],
+            n = a[5],
+            p = a[6],
+            m = a[7];
+        a = a[8];
+        var f = d * l * a - d * n * m - c * g * a + c * n * p + e * g * m - e * l * p;
+        return [(l * a - n * m) / f, (e * m - c * a) / f, (c * n - e * l) / f, (n * p - g * a) / f, (d * a - e * p) / f, (e * g - d * n) / f, (g * m - l * p) / f, (c * p - d * m) / f, (d * l - c * g) / f]
+    }
+
+    function z(a) {
+        var d = a.length;
+        this.xa = [];
+        this.ya = [];
+        this.u = [];
+        this.y2 = [];
+        a.sort(function(a, b) {
+            return a[0] - b[0]
+        });
+        for (var c = 0; c < d; c++) this.xa.push(a[c][0]), this.ya.push(a[c][1]);
+        this.u[0] = 0;
+        this.y2[0] = 0;
+        for (c = 1; c < d - 1; ++c) {
+            a = this.xa[c + 1] - this.xa[c - 1];
+            var e = (this.xa[c] - this.xa[c - 1]) / a,
+                g = e * this.y2[c - 1] + 2;
+            this.y2[c] = (e - 1) / g;
+            this.u[c] = (6 * ((this.ya[c + 1] - this.ya[c]) / (this.xa[c + 1] - this.xa[c]) - (this.ya[c] - this.ya[c - 1]) / (this.xa[c] - this.xa[c - 1])) / a - e * this.u[c - 1]) / g
+        }
+        this.y2[d - 1] = 0;
+        for (c = d - 2; 0 <= c; --c) this.y2[c] = this.y2[c] * this.y2[c + 1] + this.u[c]
+    }
+
+    function u(a, d) {
+        return new h(null, a + "uniform sampler2D texture;uniform vec2 texSize;varying vec2 texCoord;void main(){vec2 coord=texCoord*texSize;" +
+            d + "gl_FragColor=texture2D(texture,coord/texSize);vec2 clampedCoord=clamp(coord,vec2(0.0),texSize);if(coord!=clampedCoord){gl_FragColor.a*=max(0.0,1.0-length(coord-clampedCoord));}}")
+    }
+
+    function H(b, d) {
+        a.brightnessContrast = a.brightnessContrast || new h(null, "uniform sampler2D texture;uniform float brightness;uniform float contrast;varying vec2 texCoord;void main(){vec4 color=texture2D(texture,texCoord);color.rgb+=brightness;if(contrast>0.0){color.rgb=(color.rgb-0.5)/(1.0-contrast)+0.5;}else{color.rgb=(color.rgb-0.5)*(1.0+contrast)+0.5;}gl_FragColor=color;}");
+        f.call(this, a.brightnessContrast, {
+            brightness: q(-1, b, 1),
+            contrast: q(-1, d, 1)
+        });
+        return this
+    }
+
+    function t(a) {
+        a = new z(a);
+        for (var d = [], c = 0; 256 > c; c++) d.push(q(0, Math.floor(256 * a.interpolate(c / 255)), 255));
+        return d
+    }
+
+    function I(b, d, c) {
+        b = t(b);
+        1 == arguments.length ? d = c = b : (d = t(d), c = t(c));
+        for (var e = [], g = 0; 256 > g; g++) e.splice(e.length, 0, b[g], d[g], c[g], 255);
+        this._.extraTexture.initFromBytes(256, 1, e);
+        this._.extraTexture.use(1);
+        a.curves = a.curves || new h(null, "uniform sampler2D texture;uniform sampler2D map;varying vec2 texCoord;void main(){vec4 color=texture2D(texture,texCoord);color.r=texture2D(map,vec2(color.r)).r;color.g=texture2D(map,vec2(color.g)).g;color.b=texture2D(map,vec2(color.b)).b;gl_FragColor=color;}");
+        a.curves.textures({
+            map: 1
+        });
+        f.call(this, a.curves, {});
+        return this
+    }
+
+    function J(b) {
+        a.denoise = a.denoise || new h(null, "uniform sampler2D texture;uniform float exponent;uniform float strength;uniform vec2 texSize;varying vec2 texCoord;void main(){vec4 center=texture2D(texture,texCoord);vec4 color=vec4(0.0);float total=0.0;for(float x=-4.0;x<=4.0;x+=1.0){for(float y=-4.0;y<=4.0;y+=1.0){vec4 sample=texture2D(texture,texCoord+vec2(x,y)/texSize);float weight=1.0-abs(dot(sample.rgb-center.rgb,vec3(0.25)));weight=pow(weight,exponent);color+=sample*weight;total+=weight;}}gl_FragColor=color/total;}");
+        for (var d = 0; 2 > d; d++) f.call(this, a.denoise, {
+            exponent: Math.max(0, b),
+            texSize: [this.width, this.height]
+        });
+        return this
+    }
+
+    function K(b, d) {
+        a.hueSaturation = a.hueSaturation || new h(null, "uniform sampler2D texture;uniform float hue;uniform float saturation;varying vec2 texCoord;void main(){vec4 color=texture2D(texture,texCoord);float angle=hue*3.14159265;float s=sin(angle),c=cos(angle);vec3 weights=(vec3(2.0*c,-sqrt(3.0)*s-c,sqrt(3.0)*s-c)+1.0)/3.0;float len=length(color.rgb);color.rgb=vec3(dot(color.rgb,weights.xyz),dot(color.rgb,weights.zxy),dot(color.rgb,weights.yzx));float average=(color.r+color.g+color.b)/3.0;if(saturation>0.0){color.rgb+=(average-color.rgb)*(1.0-1.0/(1.001-saturation));}else{color.rgb+=(average-color.rgb)*(-saturation);}gl_FragColor=color;}");
+        f.call(this, a.hueSaturation, {
+            hue: q(-1, b, 1),
+            saturation: q(-1, d, 1)
+        });
+        return this
+    }
+
+    function L(b) {
+        a.noise = a.noise || new h(null, "uniform sampler2D texture;uniform float amount;varying vec2 texCoord;float rand(vec2 co){return fract(sin(dot(co.xy,vec2(12.9898,78.233)))*43758.5453);}void main(){vec4 color=texture2D(texture,texCoord);float diff=(rand(texCoord)-0.5)*amount;color.r+=diff;color.g+=diff;color.b+=diff;gl_FragColor=color;}");
+        f.call(this, a.noise, {
+            amount: q(0, b, 1)
+        });
+        return this
+    }
+
+    function M(b) {
+        a.sepia = a.sepia || new h(null, "uniform sampler2D texture;uniform float amount;varying vec2 texCoord;void main(){vec4 color=texture2D(texture,texCoord);float r=color.r;float g=color.g;float b=color.b;color.r=min(1.0,(r*(1.0-(0.607*amount)))+(g*(0.769*amount))+(b*(0.189*amount)));color.g=min(1.0,(r*0.349*amount)+(g*(1.0-(0.314*amount)))+(b*0.168*amount));color.b=min(1.0,(r*0.272*amount)+(g*0.534*amount)+(b*(1.0-(0.869*amount))));gl_FragColor=color;}");
+        f.call(this, a.sepia, {
+            amount: q(0, b, 1)
+        });
+        return this
+    }
+
+    function N(b, d) {
+        a.unsharpMask = a.unsharpMask || new h(null, "uniform sampler2D blurredTexture;uniform sampler2D originalTexture;uniform float strength;uniform float threshold;varying vec2 texCoord;void main(){vec4 blurred=texture2D(blurredTexture,texCoord);vec4 original=texture2D(originalTexture,texCoord);gl_FragColor=mix(blurred,original,1.0+strength);}");
+        this._.extraTexture.ensureFormat(this._.texture);
+        this._.texture.use();
+        this._.extraTexture.drawTo(function() {
+            h.getDefaultShader().drawRect()
+        });
+        this._.extraTexture.use(1);
+        this.triangleBlur(b);
+        a.unsharpMask.textures({
+            originalTexture: 1
+        });
+        f.call(this, a.unsharpMask, {
+            strength: d
+        });
+        this._.extraTexture.unuse(1);
+        return this
+    }
+
+    function O(b) {
+        a.vibrance = a.vibrance || new h(null, "uniform sampler2D texture;uniform float amount;varying vec2 texCoord;void main(){vec4 color=texture2D(texture,texCoord);float average=(color.r+color.g+color.b)/3.0;float mx=max(color.r,max(color.g,color.b));float amt=(mx-average)*(-amount*3.0);color.rgb=mix(color.rgb,vec3(mx),amt);gl_FragColor=color;}");
+        f.call(this, a.vibrance, {
+            amount: q(-1, b, 1)
+        });
+        return this
+    }
+
+    function P(b, d) {
+        a.vignette = a.vignette || new h(null, "uniform sampler2D texture;uniform float size;uniform float amount;varying vec2 texCoord;void main(){vec4 color=texture2D(texture,texCoord);float dist=distance(texCoord,vec2(0.5,0.5));color.rgb*=smoothstep(0.8,size*0.799,dist*(amount+size));gl_FragColor=color;}");
+        f.call(this, a.vignette, {
+            size: q(0, b, 1),
+            amount: q(0, d, 1)
+        });
+        return this
+    }
+
+    function Q(b, d, c) {
+        a.lensBlurPrePass = a.lensBlurPrePass || new h(null, "uniform sampler2D texture;uniform float power;varying vec2 texCoord;void main(){vec4 color=texture2D(texture,texCoord);color=pow(color,vec4(power));gl_FragColor=vec4(color);}");
+        var e = "uniform sampler2D texture0;uniform sampler2D texture1;uniform vec2 delta0;uniform vec2 delta1;uniform float power;varying vec2 texCoord;" +
+            s + "vec4 sample(vec2 delta){float offset=random(vec3(delta,151.7182),0.0);vec4 color=vec4(0.0);float total=0.0;for(float t=0.0;t<=30.0;t++){float percent=(t+offset)/30.0;color+=texture2D(texture0,texCoord+delta*percent);total+=1.0;}return color/total;}";
+        a.lensBlur0 = a.lensBlur0 || new h(null, e + "void main(){gl_FragColor=sample(delta0);}");
+        a.lensBlur1 = a.lensBlur1 || new h(null, e + "void main(){gl_FragColor=(sample(delta0)+sample(delta1))*0.5;}");
+        a.lensBlur2 = a.lensBlur2 || (new h(null, e + "void main(){vec4 color=(sample(delta0)+2.0*texture2D(texture1,texCoord))/3.0;gl_FragColor=pow(color,vec4(power));}")).textures({
+            texture1: 1
+        });
+        for (var e = [], g = 0; 3 > g; g++) {
+            var l = c + 2 * g * Math.PI / 3;
+            e.push([b * Math.sin(l) / this.width, b * Math.cos(l) / this.height])
+        }
+        b = Math.pow(10, q(-1, d, 1));
+        f.call(this, a.lensBlurPrePass, {
+            power: b
+        });
+        this._.extraTexture.ensureFormat(this._.texture);
+        f.call(this, a.lensBlur0, {
+            delta0: e[0]
+        }, this._.texture, this._.extraTexture);
+        f.call(this, a.lensBlur1, {
+            delta0: e[1],
+            delta1: e[2]
+        }, this._.extraTexture, this._.extraTexture);
+        f.call(this, a.lensBlur0, {
+            delta0: e[1]
+        });
+        this._.extraTexture.use(1);
+        f.call(this, a.lensBlur2, {
+            power: 1 / b,
+            delta0: e[2]
+        });
+        return this
+    }
+
+    function R(b, d, c, e, g, l) {
+        a.tiltShift = a.tiltShift || new h(null, "uniform sampler2D texture;uniform float blurRadius;uniform float gradientRadius;uniform vec2 start;uniform vec2 end;uniform vec2 delta;uniform vec2 texSize;varying vec2 texCoord;" + s + "void main(){vec4 color=vec4(0.0);float total=0.0;float offset=random(vec3(12.9898,78.233,151.7182),0.0);vec2 normal=normalize(vec2(start.y-end.y,end.x-start.x));float radius=smoothstep(0.0,1.0,abs(dot(texCoord*texSize-start,normal))/gradientRadius)*blurRadius;for(float t=-30.0;t<=30.0;t++){float percent=(t+offset-0.5)/30.0;float weight=1.0-abs(percent);vec4 sample=texture2D(texture,texCoord+delta/texSize*percent*radius);sample.rgb*=sample.a;color+=sample*weight;total+=weight;}gl_FragColor=color/total;gl_FragColor.rgb/=gl_FragColor.a+0.00001;}");
+        var n = c - b,
+            p = e - d,
+            m = Math.sqrt(n * n + p * p);
+        f.call(this, a.tiltShift, {
+            blurRadius: g,
+            gradientRadius: l,
+            start: [b, d],
+            end: [c, e],
+            delta: [n / m, p / m],
+            texSize: [this.width, this.height]
+        });
+        f.call(this, a.tiltShift, {
+            blurRadius: g,
+            gradientRadius: l,
+            start: [b, d],
+            end: [c, e],
+            delta: [-p / m, n / m],
+            texSize: [this.width, this.height]
+        });
+        return this
+    }
+
+    function S(b) {
+        a.triangleBlur = a.triangleBlur || new h(null, "uniform sampler2D texture;uniform vec2 delta;varying vec2 texCoord;" + s + "void main(){vec4 color=vec4(0.0);float total=0.0;float offset=random(vec3(12.9898,78.233,151.7182),0.0);for(float t=-30.0;t<=30.0;t++){float percent=(t+offset-0.5)/30.0;float weight=1.0-abs(percent);vec4 sample=texture2D(texture,texCoord+delta*percent);sample.rgb*=sample.a;color+=sample*weight;total+=weight;}gl_FragColor=color/total;gl_FragColor.rgb/=gl_FragColor.a+0.00001;}");
+        f.call(this, a.triangleBlur, {
+            delta: [b / this.width, 0]
+        });
+        f.call(this, a.triangleBlur, {
+            delta: [0, b / this.height]
+        });
+        return this
+    }
+
+    function T(b, d, c) {
+        a.zoomBlur = a.zoomBlur || new h(null, "uniform sampler2D texture;uniform vec2 center;uniform float strength;uniform vec2 texSize;varying vec2 texCoord;" + s + "void main(){vec4 color=vec4(0.0);float total=0.0;vec2 toCenter=center-texCoord*texSize;float offset=random(vec3(12.9898,78.233,151.7182),0.0);for(float t=0.0;t<=40.0;t++){float percent=(t+offset)/40.0;float weight=4.0*(percent-percent*percent);vec4 sample=texture2D(texture,texCoord+toCenter*percent*strength/texSize);sample.rgb*=sample.a;color+=sample*weight;total+=weight;}gl_FragColor=color/total;gl_FragColor.rgb/=gl_FragColor.a+0.00001;}");
+        f.call(this, a.zoomBlur, {
+            center: [b, d],
+            strength: c,
+            texSize: [this.width, this.height]
+        });
+        return this
+    }
+
+    function U(b, d, c, e) {
+        a.colorHalftone = a.colorHalftone || new h(null, "uniform sampler2D texture;uniform vec2 center;uniform float angle;uniform float scale;uniform vec2 texSize;varying vec2 texCoord;float pattern(float angle){float s=sin(angle),c=cos(angle);vec2 tex=texCoord*texSize-center;vec2 point=vec2(c*tex.x-s*tex.y,s*tex.x+c*tex.y)*scale;return(sin(point.x)*sin(point.y))*4.0;}void main(){vec4 color=texture2D(texture,texCoord);vec3 cmy=1.0-color.rgb;float k=min(cmy.x,min(cmy.y,cmy.z));cmy=(cmy-k)/(1.0-k);cmy=clamp(cmy*10.0-3.0+vec3(pattern(angle+0.26179),pattern(angle+1.30899),pattern(angle)),0.0,1.0);k=clamp(k*10.0-5.0+pattern(angle+0.78539),0.0,1.0);gl_FragColor=vec4(1.0-cmy-k,color.a);}");
+        f.call(this, a.colorHalftone, {
+            center: [b, d],
+            angle: c,
+            scale: Math.PI / e,
+            texSize: [this.width, this.height]
+        });
+        return this
+    }
+
+    function V(b, d, c, e) {
+        a.dotScreen = a.dotScreen || new h(null, "uniform sampler2D texture;uniform vec2 center;uniform float angle;uniform float scale;uniform vec2 texSize;varying vec2 texCoord;float pattern(){float s=sin(angle),c=cos(angle);vec2 tex=texCoord*texSize-center;vec2 point=vec2(c*tex.x-s*tex.y,s*tex.x+c*tex.y)*scale;return(sin(point.x)*sin(point.y))*4.0;}void main(){vec4 color=texture2D(texture,texCoord);float average=(color.r+color.g+color.b)/3.0;gl_FragColor=vec4(vec3(average*10.0-5.0+pattern()),color.a);}");
+        f.call(this, a.dotScreen, {
+            center: [b, d],
+            angle: c,
+            scale: Math.PI / e,
+            texSize: [this.width, this.height]
+        });
+        return this
+    }
+
+    function W(b) {
+        a.edgeWork1 = a.edgeWork1 || new h(null, "uniform sampler2D texture;uniform vec2 delta;varying vec2 texCoord;" + s + "void main(){vec2 color=vec2(0.0);vec2 total=vec2(0.0);float offset=random(vec3(12.9898,78.233,151.7182),0.0);for(float t=-30.0;t<=30.0;t++){float percent=(t+offset-0.5)/30.0;float weight=1.0-abs(percent);vec3 sample=texture2D(texture,texCoord+delta*percent).rgb;float average=(sample.r+sample.g+sample.b)/3.0;color.x+=average*weight;total.x+=weight;if(abs(t)<15.0){weight=weight*2.0-1.0;color.y+=average*weight;total.y+=weight;}}gl_FragColor=vec4(color/total,0.0,1.0);}");
+        a.edgeWork2 = a.edgeWork2 || new h(null, "uniform sampler2D texture;uniform vec2 delta;varying vec2 texCoord;" + s + "void main(){vec2 color=vec2(0.0);vec2 total=vec2(0.0);float offset=random(vec3(12.9898,78.233,151.7182),0.0);for(float t=-30.0;t<=30.0;t++){float percent=(t+offset-0.5)/30.0;float weight=1.0-abs(percent);vec2 sample=texture2D(texture,texCoord+delta*percent).xy;color.x+=sample.x*weight;total.x+=weight;if(abs(t)<15.0){weight=weight*2.0-1.0;color.y+=sample.y*weight;total.y+=weight;}}float c=clamp(10000.0*(color.y/total.y-color.x/total.x)+0.5,0.0,1.0);gl_FragColor=vec4(c,c,c,1.0);}");
+        f.call(this, a.edgeWork1, {
+            delta: [b / this.width, 0]
+        });
+        f.call(this, a.edgeWork2, {
+            delta: [0, b / this.height]
+        });
+        return this
+    }
+
+    function X(b, d, c) {
+        a.hexagonalPixelate = a.hexagonalPixelate || new h(null, "uniform sampler2D texture;uniform vec2 center;uniform float scale;uniform vec2 texSize;varying vec2 texCoord;void main(){vec2 tex=(texCoord*texSize-center)/scale;tex.y/=0.866025404;tex.x-=tex.y*0.5;vec2 a;if(tex.x+tex.y-floor(tex.x)-floor(tex.y)<1.0)a=vec2(floor(tex.x),floor(tex.y));else a=vec2(ceil(tex.x),ceil(tex.y));vec2 b=vec2(ceil(tex.x),floor(tex.y));vec2 c=vec2(floor(tex.x),ceil(tex.y));vec3 TEX=vec3(tex.x,tex.y,1.0-tex.x-tex.y);vec3 A=vec3(a.x,a.y,1.0-a.x-a.y);vec3 B=vec3(b.x,b.y,1.0-b.x-b.y);vec3 C=vec3(c.x,c.y,1.0-c.x-c.y);float alen=length(TEX-A);float blen=length(TEX-B);float clen=length(TEX-C);vec2 choice;if(alen<blen){if(alen<clen)choice=a;else choice=c;}else{if(blen<clen)choice=b;else choice=c;}choice.x+=choice.y*0.5;choice.y*=0.866025404;choice*=scale/texSize;gl_FragColor=texture2D(texture,choice+center/texSize);}");
+        f.call(this, a.hexagonalPixelate, {
+            center: [b, d],
+            scale: c,
+            texSize: [this.width, this.height]
+        });
+        return this
+    }
+
+    function Y(b) {
+        a.ink = a.ink || new h(null, "uniform sampler2D texture;uniform float strength;uniform vec2 texSize;varying vec2 texCoord;void main(){vec2 dx=vec2(1.0/texSize.x,0.0);vec2 dy=vec2(0.0,1.0/texSize.y);vec4 color=texture2D(texture,texCoord);float bigTotal=0.0;float smallTotal=0.0;vec3 bigAverage=vec3(0.0);vec3 smallAverage=vec3(0.0);for(float x=-2.0;x<=2.0;x+=1.0){for(float y=-2.0;y<=2.0;y+=1.0){vec3 sample=texture2D(texture,texCoord+dx*x+dy*y).rgb;bigAverage+=sample;bigTotal+=1.0;if(abs(x)+abs(y)<2.0){smallAverage+=sample;smallTotal+=1.0;}}}vec3 edge=max(vec3(0.0),bigAverage/bigTotal-smallAverage/smallTotal);gl_FragColor=vec4(color.rgb-dot(edge,edge)*strength*100000.0,color.a);}");
+        f.call(this, a.ink, {
+            strength: b * b * b * b * b,
+            texSize: [this.width, this.height]
+        });
+        return this
+    }
+
+    function Z(b, d, c, e) {
+        a.bulgePinch = a.bulgePinch || u("uniform float radius;uniform float strength;uniform vec2 center;", "coord-=center;float distance=length(coord);if(distance<radius){float percent=distance/radius;if(strength>0.0){coord*=mix(1.0,smoothstep(0.0,radius/distance,percent),strength*0.75);}else{coord*=mix(1.0,pow(percent,1.0+strength*0.75)*radius/distance,1.0-percent);}}coord+=center;");
+        f.call(this, a.bulgePinch, {
+            radius: c,
+            strength: q(-1, e, 1),
+            center: [b, d],
+            texSize: [this.width, this.height]
+        });
+        return this
+    }
+
+    function $(b, d, c) {
+        a.matrixWarp = a.matrixWarp || u("uniform mat3 matrix;uniform bool useTextureSpace;", "if(useTextureSpace)coord=coord/texSize*2.0-1.0;vec3 warp=matrix*vec3(coord,1.0);coord=warp.xy/warp.z;if(useTextureSpace)coord=(coord*0.5+0.5)*texSize;");
+        b = Array.prototype.concat.apply([], b);
+        if (4 == b.length) b = [b[0], b[1], 0, b[2], b[3], 0, 0, 0, 1];
+        else if (9 != b.length) throw "can only warp with 2x2 or 3x3 matrix";
+        f.call(this, a.matrixWarp, {
+            matrix: d ? y(b) : b,
+            texSize: [this.width, this.height],
+            useTextureSpace: c | 0
+        });
+        return this
+    }
+
+    function aa(a, d) {
+        var c = x.apply(null, d),
+            e = x.apply(null, a),
+            c = y(c);
+        return this.matrixWarp([c[0] * e[0] + c[1] * e[3] + c[2] * e[6], c[0] * e[1] + c[1] * e[4] + c[2] * e[7], c[0] * e[2] + c[1] * e[5] + c[2] * e[8], c[3] * e[0] + c[4] * e[3] + c[5] * e[6], c[3] * e[1] + c[4] * e[4] + c[5] * e[7], c[3] * e[2] + c[4] * e[5] + c[5] * e[8], c[6] * e[0] + c[7] * e[3] + c[8] * e[6],
+            c[6] * e[1] + c[7] * e[4] + c[8] * e[7], c[6] * e[2] + c[7] * e[5] + c[8] * e[8]
+        ])
+    }
+
+    function ba(b, d, c, e) {
+        a.swirl = a.swirl || u("uniform float radius;uniform float angle;uniform vec2 center;", "coord-=center;float distance=length(coord);if(distance<radius){float percent=(radius-distance)/radius;float theta=percent*percent*angle;float s=sin(theta);float c=cos(theta);coord=vec2(coord.x*c-coord.y*s,coord.x*s+coord.y*c);}coord+=center;");
+        f.call(this, a.swirl, {
+            radius: c,
+            center: [b, d],
+            angle: e,
+            texSize: [this.width, this.height]
+        });
+        return this
+    }
+    var v = {};
+    (function() {
+        function a(b) {
+            if (!b.getExtension("OES_texture_float")) return !1;
+            var c = b.createFramebuffer(),
+                e = b.createTexture();
+            b.bindTexture(b.TEXTURE_2D, e);
+            b.texParameteri(b.TEXTURE_2D, b.TEXTURE_MAG_FILTER, b.NEAREST);
+            b.texParameteri(b.TEXTURE_2D, b.TEXTURE_MIN_FILTER, b.NEAREST);
+            b.texParameteri(b.TEXTURE_2D, b.TEXTURE_WRAP_S, b.CLAMP_TO_EDGE);
+            b.texParameteri(b.TEXTURE_2D, b.TEXTURE_WRAP_T, b.CLAMP_TO_EDGE);
+            b.texImage2D(b.TEXTURE_2D, 0, b.RGBA, 1, 1, 0, b.RGBA, b.UNSIGNED_BYTE, null);
+            b.bindFramebuffer(b.FRAMEBUFFER, c);
+            b.framebufferTexture2D(b.FRAMEBUFFER, b.COLOR_ATTACHMENT0, b.TEXTURE_2D, e, 0);
+            c = b.createTexture();
+            b.bindTexture(b.TEXTURE_2D, c);
+            b.texParameteri(b.TEXTURE_2D, b.TEXTURE_MAG_FILTER, b.LINEAR);
+            b.texParameteri(b.TEXTURE_2D, b.TEXTURE_MIN_FILTER, b.LINEAR);
+            b.texParameteri(b.TEXTURE_2D, b.TEXTURE_WRAP_S, b.CLAMP_TO_EDGE);
+            b.texParameteri(b.TEXTURE_2D, b.TEXTURE_WRAP_T, b.CLAMP_TO_EDGE);
+            b.texImage2D(b.TEXTURE_2D,
+                0, b.RGBA, 2, 2, 0, b.RGBA, b.FLOAT, new Float32Array([2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]));
+            var e = b.createProgram(),
+                d = b.createShader(b.VERTEX_SHADER),
+                g = b.createShader(b.FRAGMENT_SHADER);
+            b.shaderSource(d, "attribute vec2 vertex;void main(){gl_Position=vec4(vertex,0.0,1.0);}");
+            b.shaderSource(g, "uniform sampler2D texture;void main(){gl_FragColor=texture2D(texture,vec2(0.5));}");
+            b.compileShader(d);
+            b.compileShader(g);
+            b.attachShader(e, d);
+            b.attachShader(e,
+                g);
+            b.linkProgram(e);
+            d = b.createBuffer();
+            b.bindBuffer(b.ARRAY_BUFFER, d);
+            b.bufferData(b.ARRAY_BUFFER, new Float32Array([0, 0]), b.STREAM_DRAW);
+            b.enableVertexAttribArray(0);
+            b.vertexAttribPointer(0, 2, b.FLOAT, !1, 0, 0);
+            d = new Uint8Array(4);
+            b.useProgram(e);
+            b.viewport(0, 0, 1, 1);
+            b.bindTexture(b.TEXTURE_2D, c);
+            b.drawArrays(b.POINTS, 0, 1);
+            b.readPixels(0, 0, 1, 1, b.RGBA, b.UNSIGNED_BYTE, d);
+            return 127 === d[0] || 128 === d[0]
+        }
+
+        function d() {}
+
+        function c(a) {
+            "OES_texture_float_linear" === a ? (void 0 === this.$OES_texture_float_linear$ && Object.defineProperty(this,
+                "$OES_texture_float_linear$", {
+                    enumerable: !1,
+                    configurable: !1,
+                    writable: !1,
+                    value: new d
+                }), a = this.$OES_texture_float_linear$) : a = n.call(this, a);
+            return a
+        }
+
+        function e() {
+            var a = f.call(this); - 1 === a.indexOf("OES_texture_float_linear") && a.push("OES_texture_float_linear");
+            return a
+        }
+        try {
+            var g = document.createElement("canvas").getContext("experimental-webgl")
+        } catch (l) {}
+        if (g && -1 === g.getSupportedExtensions().indexOf("OES_texture_float_linear") && a(g)) {
+            var n = WebGLRenderingContext.prototype.getExtension,
+                f = WebGLRenderingContext.prototype.getSupportedExtensions;
+            WebGLRenderingContext.prototype.getExtension = c;
+            WebGLRenderingContext.prototype.getSupportedExtensions = e
+        }
+    })();
+    var a;
+    v.canvas = function() {
+        var b = document.createElement("canvas");
+        try {
+            a = b.getContext("experimental-webgl", {
+                premultipliedAlpha: !1
+            })
+        } catch (d) {
+            a = null
+        }
+        if (!a) throw "This browser does not support WebGL";
+        b._ = {
+            gl: a,
+            isInitialized: !1,
+            texture: null,
+            spareTexture: null,
+            flippedShader: null
+        };
+        b.texture = k(A);
+        b.draw = k(C);
+        b.update = k(D);
+        b.replace = k(E);
+        b.contents = k(F);
+        b.getPixelArray = k(G);
+        b.brightnessContrast = k(H);
+        b.hexagonalPixelate = k(X);
+        b.hueSaturation = k(K);
+        b.colorHalftone = k(U);
+        b.triangleBlur = k(S);
+        b.unsharpMask = k(N);
+        b.perspective = k(aa);
+        b.matrixWarp = k($);
+        b.bulgePinch = k(Z);
+        b.tiltShift = k(R);
+        b.dotScreen = k(V);
+        b.edgeWork = k(W);
+        b.lensBlur = k(Q);
+        b.zoomBlur = k(T);
+        b.noise = k(L);
+        b.denoise = k(J);
+        b.curves = k(I);
+        b.swirl = k(ba);
+        b.ink = k(Y);
+        b.vignette = k(P);
+        b.vibrance = k(O);
+        b.sepia = k(M);
+        return b
+    };
+    v.splineInterpolate = t;
+    var h = function() {
+        function b(b, c) {
+            var e = a.createShader(b);
+            a.shaderSource(e, c);
+            a.compileShader(e);
+            if (!a.getShaderParameter(e,
+                    a.COMPILE_STATUS)) throw "compile error: " + a.getShaderInfoLog(e);
+            return e
+        }
+
+        function d(d, l) {
+            this.texCoordAttribute = this.vertexAttribute = null;
+            this.program = a.createProgram();
+            d = d || c;
+            l = l || e;
+            l = "precision highp float;" + l;
+            a.attachShader(this.program, b(a.VERTEX_SHADER, d));
+            a.attachShader(this.program, b(a.FRAGMENT_SHADER, l));
+            a.linkProgram(this.program);
+            if (!a.getProgramParameter(this.program, a.LINK_STATUS)) throw "link error: " + a.getProgramInfoLog(this.program);
+        }
+        var c = "attribute vec2 vertex;attribute vec2 _texCoord;varying vec2 texCoord;void main(){texCoord=_texCoord;gl_Position=vec4(vertex*2.0-1.0,0.0,1.0);}",
+            e = "uniform sampler2D texture;varying vec2 texCoord;void main(){gl_FragColor=texture2D(texture,texCoord);}";
+        d.prototype.destroy = function() {
+            a.deleteProgram(this.program);
+            this.program = null
+        };
+        d.prototype.uniforms = function(b) {
+            a.useProgram(this.program);
+            for (var e in b)
+                if (b.hasOwnProperty(e)) {
+                    var c = a.getUniformLocation(this.program, e);
+                    if (null !== c) {
+                        var d = b[e];
+                        if ("[object Array]" == Object.prototype.toString.call(d)) switch (d.length) {
+                                case 1:
+                                    a.uniform1fv(c, new Float32Array(d));
+                                    break;
+                                case 2:
+                                    a.uniform2fv(c, new Float32Array(d));
+                                    break;
+                                case 3:
+                                    a.uniform3fv(c, new Float32Array(d));
+                                    break;
+                                case 4:
+                                    a.uniform4fv(c, new Float32Array(d));
+                                    break;
+                                case 9:
+                                    a.uniformMatrix3fv(c, !1, new Float32Array(d));
+                                    break;
+                                case 16:
+                                    a.uniformMatrix4fv(c, !1, new Float32Array(d));
+                                    break;
+                                default:
+                                    throw "dont't know how to load uniform \"" + e + '" of length ' + d.length;
+                            } else if ("[object Number]" == Object.prototype.toString.call(d)) a.uniform1f(c, d);
+                            else throw 'attempted to set uniform "' + e + '" to invalid value ' + (d || "undefined").toString();
+                    }
+                }
+            return this
+        };
+        d.prototype.textures = function(b) {
+            a.useProgram(this.program);
+            for (var c in b) b.hasOwnProperty(c) && a.uniform1i(a.getUniformLocation(this.program, c), b[c]);
+            return this
+        };
+        d.prototype.drawRect = function(b, c, e, d) {
+            var f = a.getParameter(a.VIEWPORT);
+            c = void 0 !== c ? (c - f[1]) / f[3] : 0;
+            b = void 0 !== b ? (b - f[0]) / f[2] : 0;
+            e = void 0 !== e ? (e - f[0]) / f[2] : 1;
+            d = void 0 !== d ? (d - f[1]) / f[3] : 1;
+            null == a.vertexBuffer && (a.vertexBuffer = a.createBuffer());
+            a.bindBuffer(a.ARRAY_BUFFER, a.vertexBuffer);
+            a.bufferData(a.ARRAY_BUFFER, new Float32Array([b,
+                c, b, d, e, c, e, d
+            ]), a.STATIC_DRAW);
+            null == a.texCoordBuffer && (a.texCoordBuffer = a.createBuffer(), a.bindBuffer(a.ARRAY_BUFFER, a.texCoordBuffer), a.bufferData(a.ARRAY_BUFFER, new Float32Array([0, 0, 0, 1, 1, 0, 1, 1]), a.STATIC_DRAW));
+            null == this.vertexAttribute && (this.vertexAttribute = a.getAttribLocation(this.program, "vertex"), a.enableVertexAttribArray(this.vertexAttribute));
+            null == this.texCoordAttribute && (this.texCoordAttribute = a.getAttribLocation(this.program, "_texCoord"), a.enableVertexAttribArray(this.texCoordAttribute));
+            a.useProgram(this.program);
+            a.bindBuffer(a.ARRAY_BUFFER, a.vertexBuffer);
+            a.vertexAttribPointer(this.vertexAttribute, 2, a.FLOAT, !1, 0, 0);
+            a.bindBuffer(a.ARRAY_BUFFER, a.texCoordBuffer);
+            a.vertexAttribPointer(this.texCoordAttribute, 2, a.FLOAT, !1, 0, 0);
+            a.drawArrays(a.TRIANGLE_STRIP, 0, 4)
+        };
+        d.getDefaultShader = function() {
+            a.defaultShader = a.defaultShader || new d;
+            return a.defaultShader
+        };
+        return d
+    }();
+    z.prototype.interpolate = function(a) {
+        for (var d = 0, c = this.ya.length - 1; 1 < c - d;) {
+            var e = c + d >> 1;
+            this.xa[e] > a ? c = e : d = e
+        }
+        var e = this.xa[c] -
+            this.xa[d],
+            g = (this.xa[c] - a) / e;
+        a = (a - this.xa[d]) / e;
+        return g * this.ya[d] + a * this.ya[c] + ((g * g * g - g) * this.y2[d] + (a * a * a - a) * this.y2[c]) * e * e / 6
+    };
+    var r = function() {
+            function b(b, c, d, f) {
+                this.gl = a;
+                this.id = a.createTexture();
+                this.width = b;
+                this.height = c;
+                this.format = d;
+                this.type = f;
+                a.bindTexture(a.TEXTURE_2D, this.id);
+                a.texParameteri(a.TEXTURE_2D, a.TEXTURE_MAG_FILTER, a.LINEAR);
+                a.texParameteri(a.TEXTURE_2D, a.TEXTURE_MIN_FILTER, a.LINEAR);
+                a.texParameteri(a.TEXTURE_2D, a.TEXTURE_WRAP_S, a.CLAMP_TO_EDGE);
+                a.texParameteri(a.TEXTURE_2D,
+                    a.TEXTURE_WRAP_T, a.CLAMP_TO_EDGE);
+                b && c && a.texImage2D(a.TEXTURE_2D, 0, this.format, b, c, 0, this.format, this.type, null)
+            }
+
+            function d(a) {
+                null == c && (c = document.createElement("canvas"));
+                c.width = a.width;
+                c.height = a.height;
+                a = c.getContext("2d");
+                a.clearRect(0, 0, c.width, c.height);
+                return a
+            }
+            b.fromElement = function(c) {
+                var d = new b(0, 0, a.RGBA, a.UNSIGNED_BYTE);
+                d.loadContentsOf(c);
+                return d
+            };
+            b.prototype.loadContentsOf = function(b) {
+                this.width = b.width || b.videoWidth;
+                this.height = b.height || b.videoHeight;
+                a.bindTexture(a.TEXTURE_2D,
+                    this.id);
+                a.texImage2D(a.TEXTURE_2D, 0, this.format, this.format, this.type, b)
+            };
+            b.prototype.initFromBytes = function(b, c, d) {
+                this.width = b;
+                this.height = c;
+                this.format = a.RGBA;
+                this.type = a.UNSIGNED_BYTE;
+                a.bindTexture(a.TEXTURE_2D, this.id);
+                a.texImage2D(a.TEXTURE_2D, 0, a.RGBA, b, c, 0, a.RGBA, this.type, new Uint8Array(d))
+            };
+            b.prototype.initFromCanvas = function(b, c, d) {
+                this.width = b;
+                this.height = c;
+                this.format = a.RGB;
+                this.type = a.UNSIGNED_BYTE;
+                a.bindTexture(a.TEXTURE_2D, this.id);
+                // a.texImage2D(a.TEXTURE_2D, 0, a.RGBA, b, c, 0, a.RGBA, this.type, d);
+                a.texImage2D(a.TEXTURE_2D, 0, a.RGBA, a.RGBA, a.UNSIGNED_BYTE, d);
+            };
+            b.prototype.destroy = function() {
+                a.deleteTexture(this.id);
+                this.id = null
+            };
+            b.prototype.use = function(b) {
+                a.activeTexture(a.TEXTURE0 + (b || 0));
+                a.bindTexture(a.TEXTURE_2D, this.id)
+            };
+            b.prototype.unuse = function(b) {
+                a.activeTexture(a.TEXTURE0 +
+                    (b || 0));
+                a.bindTexture(a.TEXTURE_2D, null)
+            };
+            b.prototype.ensureFormat = function(b, c, d, f) {
+                if (1 == arguments.length) {
+                    var h = arguments[0];
+                    b = h.width;
+                    c = h.height;
+                    d = h.format;
+                    f = h.type
+                }
+                if (b != this.width || c != this.height || d != this.format || f != this.type) this.width = b, this.height = c, this.format = d, this.type = f, a.bindTexture(a.TEXTURE_2D, this.id), a.texImage2D(a.TEXTURE_2D, 0, this.format, b, c, 0, this.format, this.type, null)
+            };
+            b.prototype.drawTo = function(b) {
+                a.framebuffer = a.framebuffer || a.createFramebuffer();
+                a.bindFramebuffer(a.FRAMEBUFFER,
+                    a.framebuffer);
+                a.framebufferTexture2D(a.FRAMEBUFFER, a.COLOR_ATTACHMENT0, a.TEXTURE_2D, this.id, 0);
+                if (a.checkFramebufferStatus(a.FRAMEBUFFER) !== a.FRAMEBUFFER_COMPLETE) throw Error("incomplete framebuffer");
+                a.viewport(0, 0, this.width, this.height);
+                b();
+                a.bindFramebuffer(a.FRAMEBUFFER, null)
+            };
+            var c = null;
+            b.prototype.fillUsingCanvas = function(b) {
+                b(d(this));
+                this.format = a.RGBA;
+                this.type = a.UNSIGNED_BYTE;
+                a.bindTexture(a.TEXTURE_2D, this.id);
+                a.texImage2D(a.TEXTURE_2D, 0, a.RGBA, a.RGBA, a.UNSIGNED_BYTE, c);
+                return this
+            };
+            b.prototype.toImage = function(b) {
+                this.use();
+                h.getDefaultShader().drawRect();
+                var f = 4 * this.width * this.height,
+                    k = new Uint8Array(f),
+                    n = d(this),
+                    p = n.createImageData(this.width, this.height);
+                a.readPixels(0, 0, this.width, this.height, a.RGBA, a.UNSIGNED_BYTE, k);
+                for (var m = 0; m < f; m++) p.data[m] = k[m];
+                n.putImageData(p, 0, 0);
+                b.src = c.toDataURL()
+            };
+            b.prototype.swapWith = function(a) {
+                var b;
+                b = a.id;
+                a.id = this.id;
+                this.id = b;
+                b = a.width;
+                a.width = this.width;
+                this.width = b;
+                b = a.height;
+                a.height = this.height;
+                this.height = b;
+                b = a.format;
+                a.format =
+                    this.format;
+                this.format = b
+            };
+            return b
+        }(),
+        s = "float random(vec3 scale,float seed){return fract(sin(dot(gl_FragCoord.xyz+seed,scale))*43758.5453+seed);}";
+    return v
+}();
\ No newline at end of file
diff --git a/docs/vendor/particles.js b/docs/vendor/particles.js
new file mode 100644
index 00000000..240e8b82
--- /dev/null
+++ b/docs/vendor/particles.js
@@ -0,0 +1,1545 @@
+/* -----------------------------------------------
+/* Author : Vincent Garreau  - vincentgarreau.com
+/* MIT license: http://opensource.org/licenses/MIT
+/* Demo / Generator : vincentgarreau.com/particles.js
+/* GitHub : github.com/VincentGarreau/particles.js
+/* How to use? : Check the GitHub README
+/* v2.0.0
+/* ----------------------------------------------- */
+
+var pJS = function(tag_id, params){
+
+  var canvas_el = document.querySelector('#'+tag_id+' > .particles-js-canvas-el');
+
+  /* particles.js variables with default values */
+  this.pJS = {
+    canvas: {
+      el: canvas_el,
+      w: canvas_el.offsetWidth,
+      h: canvas_el.offsetHeight
+    },
+    particles: {
+      number: {
+        value: 400,
+        density: {
+          enable: true,
+          value_area: 800
+        }
+      },
+      color: {
+        value: '#fff'
+      },
+      shape: {
+        type: 'circle',
+        stroke: {
+          width: 0,
+          color: '#ff0000'
+        },
+        polygon: {
+          nb_sides: 5
+        },
+        image: {
+          src: '',
+          width: 100,
+          height: 100
+        }
+      },
+      opacity: {
+        value: 1,
+        random: false,
+        anim: {
+          enable: false,
+          speed: 2,
+          opacity_min: 0,
+          sync: false
+        }
+      },
+      size: {
+        value: 20,
+        random: false,
+        anim: {
+          enable: false,
+          speed: 20,
+          size_min: 0,
+          sync: false
+        }
+      },
+      line_linked: {
+        enable: true,
+        distance: 100,
+        color: '#fff',
+        opacity: 1,
+        width: 1
+      },
+      move: {
+        enable: true,
+        speed: 2,
+        direction: 'none',
+        random: false,
+        straight: false,
+        out_mode: 'out',
+        bounce: false,
+        attract: {
+          enable: false,
+          rotateX: 3000,
+          rotateY: 3000
+        }
+      },
+      array: []
+    },
+    interactivity: {
+      detect_on: 'canvas',
+      events: {
+        onhover: {
+          enable: true,
+          mode: 'grab'
+        },
+        onclick: {
+          enable: true,
+          mode: 'push'
+        },
+        resize: true
+      },
+      modes: {
+        grab:{
+          distance: 100,
+          line_linked:{
+            opacity: 1
+          }
+        },
+        bubble:{
+          distance: 200,
+          size: 80,
+          duration: 0.4
+        },
+        repulse:{
+          distance: 200,
+          duration: 0.4
+        },
+        push:{
+          particles_nb: 4
+        },
+        remove:{
+          particles_nb: 2
+        }
+      },
+      mouse:{}
+    },
+    retina_detect: false,
+    fn: {
+      interact: {},
+      modes: {},
+      vendors:{}
+    },
+    tmp: {}
+  };
+
+  var pJS = this.pJS;
+
+  /* params settings */
+  if(params){
+    Object.deepExtend(pJS, params);
+  }
+
+  pJS.tmp.obj = {
+    size_value: pJS.particles.size.value,
+    size_anim_speed: pJS.particles.size.anim.speed,
+    move_speed: pJS.particles.move.speed,
+    line_linked_distance: pJS.particles.line_linked.distance,
+    line_linked_width: pJS.particles.line_linked.width,
+    mode_grab_distance: pJS.interactivity.modes.grab.distance,
+    mode_bubble_distance: pJS.interactivity.modes.bubble.distance,
+    mode_bubble_size: pJS.interactivity.modes.bubble.size,
+    mode_repulse_distance: pJS.interactivity.modes.repulse.distance
+  };
+
+
+  pJS.fn.retinaInit = function(){
+
+    if(pJS.retina_detect && window.devicePixelRatio > 1){
+      pJS.canvas.pxratio = window.devicePixelRatio; 
+      pJS.tmp.retina = true;
+    } 
+    else{
+      pJS.canvas.pxratio = 1;
+      pJS.tmp.retina = false;
+    }
+
+    pJS.canvas.w = pJS.canvas.el.offsetWidth * pJS.canvas.pxratio;
+    pJS.canvas.h = pJS.canvas.el.offsetHeight * pJS.canvas.pxratio;
+
+    pJS.particles.size.value = pJS.tmp.obj.size_value * pJS.canvas.pxratio;
+    pJS.particles.size.anim.speed = pJS.tmp.obj.size_anim_speed * pJS.canvas.pxratio;
+    pJS.particles.move.speed = pJS.tmp.obj.move_speed * pJS.canvas.pxratio;
+    pJS.particles.line_linked.distance = pJS.tmp.obj.line_linked_distance * pJS.canvas.pxratio;
+    pJS.interactivity.modes.grab.distance = pJS.tmp.obj.mode_grab_distance * pJS.canvas.pxratio;
+    pJS.interactivity.modes.bubble.distance = pJS.tmp.obj.mode_bubble_distance * pJS.canvas.pxratio;
+    pJS.particles.line_linked.width = pJS.tmp.obj.line_linked_width * pJS.canvas.pxratio;
+    pJS.interactivity.modes.bubble.size = pJS.tmp.obj.mode_bubble_size * pJS.canvas.pxratio;
+    pJS.interactivity.modes.repulse.distance = pJS.tmp.obj.mode_repulse_distance * pJS.canvas.pxratio;
+
+  };
+
+
+
+  /* ---------- pJS functions - canvas ------------ */
+
+  pJS.fn.canvasInit = function(){
+    pJS.canvas.ctx = pJS.canvas.el.getContext('2d');
+  };
+
+  pJS.fn.canvasSize = function(){
+
+    pJS.canvas.el.width = pJS.canvas.w;
+    pJS.canvas.el.height = pJS.canvas.h;
+
+    if(pJS && pJS.interactivity.events.resize){
+
+      window.addEventListener('resize', function(){
+
+          pJS.canvas.w = pJS.canvas.el.offsetWidth;
+          pJS.canvas.h = pJS.canvas.el.offsetHeight;
+
+          /* resize canvas */
+          if(pJS.tmp.retina){
+            pJS.canvas.w *= pJS.canvas.pxratio;
+            pJS.canvas.h *= pJS.canvas.pxratio;
+          }
+
+          pJS.canvas.el.width = pJS.canvas.w;
+          pJS.canvas.el.height = pJS.canvas.h;
+
+          /* repaint canvas on anim disabled */
+          if(!pJS.particles.move.enable){
+            pJS.fn.particlesEmpty();
+            pJS.fn.particlesCreate();
+            pJS.fn.particlesDraw();
+            pJS.fn.vendors.densityAutoParticles();
+          }
+
+        /* density particles enabled */
+        pJS.fn.vendors.densityAutoParticles();
+
+      });
+
+    }
+
+  };
+
+
+  pJS.fn.canvasPaint = function(){
+    pJS.canvas.ctx.fillRect(0, 0, pJS.canvas.w, pJS.canvas.h);
+  };
+
+  pJS.fn.canvasClear = function(){
+    pJS.canvas.ctx.clearRect(0, 0, pJS.canvas.w, pJS.canvas.h);
+  };
+
+
+  /* --------- pJS functions - particles ----------- */
+
+  pJS.fn.particle = function(color, opacity, position){
+
+    /* size */
+    this.radius = (pJS.particles.size.random ? Math.random() : 1) * pJS.particles.size.value;
+    if(pJS.particles.size.anim.enable){
+      this.size_status = false;
+      this.vs = pJS.particles.size.anim.speed / 100;
+      if(!pJS.particles.size.anim.sync){
+        this.vs = this.vs * Math.random();
+      }
+    }
+
+    /* position */
+    this.x = position ? position.x : Math.random() * pJS.canvas.w;
+    this.y = position ? position.y : Math.random() * pJS.canvas.h;
+
+    /* check position  - into the canvas */
+    if(this.x > pJS.canvas.w - this.radius*2) this.x = this.x - this.radius;
+    else if(this.x < this.radius*2) this.x = this.x + this.radius;
+    if(this.y > pJS.canvas.h - this.radius*2) this.y = this.y - this.radius;
+    else if(this.y < this.radius*2) this.y = this.y + this.radius;
+
+    /* check position - avoid overlap */
+    if(pJS.particles.move.bounce){
+      pJS.fn.vendors.checkOverlap(this, position);
+    }
+
+    /* color */
+    this.color = {};
+    if(typeof(color.value) == 'object'){
+
+      if(color.value instanceof Array){
+        var color_selected = color.value[Math.floor(Math.random() * pJS.particles.color.value.length)];
+        this.color.rgb = hexToRgb(color_selected);
+      }else{
+        if(color.value.r != undefined && color.value.g != undefined && color.value.b != undefined){
+          this.color.rgb = {
+            r: color.value.r,
+            g: color.value.g,
+            b: color.value.b
+          }
+        }
+        if(color.value.h != undefined && color.value.s != undefined && color.value.l != undefined){
+          this.color.hsl = {
+            h: color.value.h,
+            s: color.value.s,
+            l: color.value.l
+          }
+        }
+      }
+
+    }
+    else if(color.value == 'random'){
+      this.color.rgb = {
+        r: (Math.floor(Math.random() * (255 - 0 + 1)) + 0),
+        g: (Math.floor(Math.random() * (255 - 0 + 1)) + 0),
+        b: (Math.floor(Math.random() * (255 - 0 + 1)) + 0)
+      }
+    }
+    else if(typeof(color.value) == 'string'){
+      this.color = color;
+      this.color.rgb = hexToRgb(this.color.value);
+    }
+
+    /* opacity */
+    this.opacity = (pJS.particles.opacity.random ? Math.random() : 1) * pJS.particles.opacity.value;
+    if(pJS.particles.opacity.anim.enable){
+      this.opacity_status = false;
+      this.vo = pJS.particles.opacity.anim.speed / 100;
+      if(!pJS.particles.opacity.anim.sync){
+        this.vo = this.vo * Math.random();
+      }
+    }
+
+    /* animation - velocity for speed */
+    var velbase = {}
+    switch(pJS.particles.move.direction){
+      case 'top':
+        velbase = { x:0, y:-1 };
+      break;
+      case 'top-right':
+        velbase = { x:0.5, y:-0.5 };
+      break;
+      case 'right':
+        velbase = { x:1, y:-0 };
+      break;
+      case 'bottom-right':
+        velbase = { x:0.5, y:0.5 };
+      break;
+      case 'bottom':
+        velbase = { x:0, y:1 };
+      break;
+      case 'bottom-left':
+        velbase = { x:-0.5, y:1 };
+      break;
+      case 'left':
+        velbase = { x:-1, y:0 };
+      break;
+      case 'top-left':
+        velbase = { x:-0.5, y:-0.5 };
+      break;
+      default:
+        velbase = { x:0, y:0 };
+      break;
+    }
+
+    if(pJS.particles.move.straight){
+      this.vx = velbase.x;
+      this.vy = velbase.y;
+      if(pJS.particles.move.random){
+        this.vx = this.vx * (Math.random());
+        this.vy = this.vy * (Math.random());
+      }
+    }else{
+      this.vx = velbase.x + Math.random()-0.5;
+      this.vy = velbase.y + Math.random()-0.5;
+    }
+
+    // var theta = 2.0 * Math.PI * Math.random();
+    // this.vx = Math.cos(theta);
+    // this.vy = Math.sin(theta);
+
+    this.vx_i = this.vx;
+    this.vy_i = this.vy;
+
+    
+
+    /* if shape is image */
+
+    var shape_type = pJS.particles.shape.type;
+    if(typeof(shape_type) == 'object'){
+      if(shape_type instanceof Array){
+        var shape_selected = shape_type[Math.floor(Math.random() * shape_type.length)];
+        this.shape = shape_selected;
+      }
+    }else{
+      this.shape = shape_type;
+    }
+
+    if(this.shape == 'image'){
+      var sh = pJS.particles.shape;
+      this.img = {
+        src: sh.image.src,
+        ratio: sh.image.width / sh.image.height
+      }
+      if(!this.img.ratio) this.img.ratio = 1;
+      if(pJS.tmp.img_type == 'svg' && pJS.tmp.source_svg != undefined){
+        pJS.fn.vendors.createSvgImg(this);
+        if(pJS.tmp.pushing){
+          this.img.loaded = false;
+        }
+      }
+    }
+
+    
+
+  };
+
+
+  pJS.fn.particle.prototype.draw = function() {
+
+    var p = this;
+
+    if(p.radius_bubble != undefined){
+      var radius = p.radius_bubble; 
+    }else{
+      var radius = p.radius;
+    }
+
+    if(p.opacity_bubble != undefined){
+      var opacity = p.opacity_bubble;
+    }else{
+      var opacity = p.opacity;
+    }
+
+    if(p.color.rgb){
+      var color_value = 'rgba('+p.color.rgb.r+','+p.color.rgb.g+','+p.color.rgb.b+','+opacity+')';
+    }else{
+      var color_value = 'hsla('+p.color.hsl.h+','+p.color.hsl.s+'%,'+p.color.hsl.l+'%,'+opacity+')';
+    }
+
+    pJS.canvas.ctx.fillStyle = color_value;
+    pJS.canvas.ctx.beginPath();
+
+    switch(p.shape){
+
+      case 'circle':
+        pJS.canvas.ctx.arc(p.x, p.y, radius, 0, Math.PI * 2, false);
+      break;
+
+      case 'edge':
+        pJS.canvas.ctx.rect(p.x-radius, p.y-radius, radius*2, radius*2);
+      break;
+
+      case 'triangle':
+        pJS.fn.vendors.drawShape(pJS.canvas.ctx, p.x-radius, p.y+radius / 1.66, radius*2, 3, 2);
+      break;
+
+      case 'polygon':
+        pJS.fn.vendors.drawShape(
+          pJS.canvas.ctx,
+          p.x - radius / (pJS.particles.shape.polygon.nb_sides/3.5), // startX
+          p.y - radius / (2.66/3.5), // startY
+          radius*2.66 / (pJS.particles.shape.polygon.nb_sides/3), // sideLength
+          pJS.particles.shape.polygon.nb_sides, // sideCountNumerator
+          1 // sideCountDenominator
+        );
+      break;
+
+      case 'star':
+        pJS.fn.vendors.drawShape(
+          pJS.canvas.ctx,
+          p.x - radius*2 / (pJS.particles.shape.polygon.nb_sides/4), // startX
+          p.y - radius / (2*2.66/3.5), // startY
+          radius*2*2.66 / (pJS.particles.shape.polygon.nb_sides/3), // sideLength
+          pJS.particles.shape.polygon.nb_sides, // sideCountNumerator
+          2 // sideCountDenominator
+        );
+      break;
+
+      case 'image':
+
+        function draw(){
+          pJS.canvas.ctx.drawImage(
+            img_obj,
+            p.x-radius,
+            p.y-radius,
+            radius*2,
+            radius*2 / p.img.ratio
+          );
+        }
+
+        if(pJS.tmp.img_type == 'svg'){
+          var img_obj = p.img.obj;
+        }else{
+          var img_obj = pJS.tmp.img_obj;
+        }
+
+        if(img_obj){
+          draw();
+        }
+
+      break;
+
+    }
+
+    pJS.canvas.ctx.closePath();
+
+    if(pJS.particles.shape.stroke.width > 0){
+      pJS.canvas.ctx.strokeStyle = pJS.particles.shape.stroke.color;
+      pJS.canvas.ctx.lineWidth = pJS.particles.shape.stroke.width;
+      pJS.canvas.ctx.stroke();
+    }
+    
+    pJS.canvas.ctx.fill();
+    
+  };
+
+
+  pJS.fn.particlesCreate = function(){
+    for(var i = 0; i < pJS.particles.number.value; i++) {
+      pJS.particles.array.push(new pJS.fn.particle(pJS.particles.color, pJS.particles.opacity.value));
+    }
+  };
+
+  pJS.fn.particlesUpdate = function(){
+
+    for(var i = 0; i < pJS.particles.array.length; i++){
+
+      /* the particle */
+      var p = pJS.particles.array[i];
+
+      // var d = ( dx = pJS.interactivity.mouse.click_pos_x - p.x ) * dx + ( dy = pJS.interactivity.mouse.click_pos_y - p.y ) * dy;
+      // var f = -BANG_SIZE / d;
+      // if ( d < BANG_SIZE ) {
+      //     var t = Math.atan2( dy, dx );
+      //     p.vx = f * Math.cos(t);
+      //     p.vy = f * Math.sin(t);
+      // }
+
+      /* move the particle */
+      if(pJS.particles.move.enable){
+        var ms = pJS.particles.move.speed/2;
+        p.x += p.vx * ms;
+        p.y += p.vy * ms;
+      }
+
+      /* change opacity status */
+      if(pJS.particles.opacity.anim.enable) {
+        if(p.opacity_status == true) {
+          if(p.opacity >= pJS.particles.opacity.value) p.opacity_status = false;
+          p.opacity += p.vo;
+        }else {
+          if(p.opacity <= pJS.particles.opacity.anim.opacity_min) p.opacity_status = true;
+          p.opacity -= p.vo;
+        }
+        if(p.opacity < 0) p.opacity = 0;
+      }
+
+      /* change size */
+      if(pJS.particles.size.anim.enable){
+        if(p.size_status == true){
+          if(p.radius >= pJS.particles.size.value) p.size_status = false;
+          p.radius += p.vs;
+        }else{
+          if(p.radius <= pJS.particles.size.anim.size_min) p.size_status = true;
+          p.radius -= p.vs;
+        }
+        if(p.radius < 0) p.radius = 0;
+      }
+
+      /* change particle position if it is out of canvas */
+      if(pJS.particles.move.out_mode == 'bounce'){
+        var new_pos = {
+          x_left: p.radius,
+          x_right:  pJS.canvas.w,
+          y_top: p.radius,
+          y_bottom: pJS.canvas.h
+        }
+      }else{
+        var new_pos = {
+          x_left: -p.radius,
+          x_right: pJS.canvas.w + p.radius,
+          y_top: -p.radius,
+          y_bottom: pJS.canvas.h + p.radius
+        }
+      }
+
+      if(p.x - p.radius > pJS.canvas.w){
+        p.x = new_pos.x_left;
+        p.y = Math.random() * pJS.canvas.h;
+      }
+      else if(p.x + p.radius < 0){
+        p.x = new_pos.x_right;
+        p.y = Math.random() * pJS.canvas.h;
+      }
+      if(p.y - p.radius > pJS.canvas.h){
+        p.y = new_pos.y_top;
+        p.x = Math.random() * pJS.canvas.w;
+      }
+      else if(p.y + p.radius < 0){
+        p.y = new_pos.y_bottom;
+        p.x = Math.random() * pJS.canvas.w;
+      }
+
+      /* out of canvas modes */
+      switch(pJS.particles.move.out_mode){
+        case 'bounce':
+          if (p.x + p.radius > pJS.canvas.w) p.vx = -p.vx;
+          else if (p.x - p.radius < 0) p.vx = -p.vx;
+          if (p.y + p.radius > pJS.canvas.h) p.vy = -p.vy;
+          else if (p.y - p.radius < 0) p.vy = -p.vy;
+        break;
+      }
+
+      /* events */
+      if(isInArray('grab', pJS.interactivity.events.onhover.mode)){
+        pJS.fn.modes.grabParticle(p);
+      }
+
+      if(isInArray('bubble', pJS.interactivity.events.onhover.mode) || isInArray('bubble', pJS.interactivity.events.onclick.mode)){
+        pJS.fn.modes.bubbleParticle(p);
+      }
+
+      if(isInArray('repulse', pJS.interactivity.events.onhover.mode) || isInArray('repulse', pJS.interactivity.events.onclick.mode)){
+        pJS.fn.modes.repulseParticle(p);
+      }
+
+      /* interaction auto between particles */
+      if(pJS.particles.line_linked.enable || pJS.particles.move.attract.enable){
+        for(var j = i + 1; j < pJS.particles.array.length; j++){
+          var p2 = pJS.particles.array[j];
+
+          /* link particles */
+          if(pJS.particles.line_linked.enable){
+            pJS.fn.interact.linkParticles(p,p2);
+          }
+
+          /* attract particles */
+          if(pJS.particles.move.attract.enable){
+            pJS.fn.interact.attractParticles(p,p2);
+          }
+
+          /* bounce particles */
+          if(pJS.particles.move.bounce){
+            pJS.fn.interact.bounceParticles(p,p2);
+          }
+
+        }
+      }
+
+
+    }
+
+  };
+
+  pJS.fn.particlesDraw = function(){
+
+    /* clear canvas */
+    pJS.canvas.ctx.clearRect(0, 0, pJS.canvas.w, pJS.canvas.h);
+
+    /* update each particles param */
+    pJS.fn.particlesUpdate();
+
+    /* draw each particle */
+    for(var i = 0; i < pJS.particles.array.length; i++){
+      var p = pJS.particles.array[i];
+      p.draw();
+    }
+
+  };
+
+  pJS.fn.particlesEmpty = function(){
+    pJS.particles.array = [];
+  };
+
+  pJS.fn.particlesRefresh = function(){
+
+    /* init all */
+    cancelRequestAnimFrame(pJS.fn.checkAnimFrame);
+    cancelRequestAnimFrame(pJS.fn.drawAnimFrame);
+    pJS.tmp.source_svg = undefined;
+    pJS.tmp.img_obj = undefined;
+    pJS.tmp.count_svg = 0;
+    pJS.fn.particlesEmpty();
+    pJS.fn.canvasClear();
+    
+    /* restart */
+    pJS.fn.vendors.start();
+
+  };
+
+
+  /* ---------- pJS functions - particles interaction ------------ */
+
+  pJS.fn.interact.linkParticles = function(p1, p2){
+
+    var dx = p1.x - p2.x,
+        dy = p1.y - p2.y,
+        dist = Math.sqrt(dx*dx + dy*dy);
+
+    /* draw a line between p1 and p2 if the distance between them is under the config distance */
+    if(dist <= pJS.particles.line_linked.distance){
+
+      var opacity_line = pJS.particles.line_linked.opacity - (dist / (1/pJS.particles.line_linked.opacity)) / pJS.particles.line_linked.distance;
+
+      if(opacity_line > 0){        
+        
+        /* style */
+        var color_line = pJS.particles.line_linked.color_rgb_line;
+        pJS.canvas.ctx.strokeStyle = 'rgba('+color_line.r+','+color_line.g+','+color_line.b+','+opacity_line+')';
+        pJS.canvas.ctx.lineWidth = pJS.particles.line_linked.width;
+        //pJS.canvas.ctx.lineCap = 'round'; /* performance issue */
+        
+        /* path */
+        pJS.canvas.ctx.beginPath();
+        pJS.canvas.ctx.moveTo(p1.x, p1.y);
+        pJS.canvas.ctx.lineTo(p2.x, p2.y);
+        pJS.canvas.ctx.stroke();
+        pJS.canvas.ctx.closePath();
+
+      }
+
+    }
+
+  };
+
+
+  pJS.fn.interact.attractParticles  = function(p1, p2){
+
+    /* condensed particles */
+    var dx = p1.x - p2.x,
+        dy = p1.y - p2.y,
+        dist = Math.sqrt(dx*dx + dy*dy);
+
+    if(dist <= pJS.particles.line_linked.distance){
+
+      var ax = dx/(pJS.particles.move.attract.rotateX*1000),
+          ay = dy/(pJS.particles.move.attract.rotateY*1000);
+
+      p1.vx -= ax;
+      p1.vy -= ay;
+
+      p2.vx += ax;
+      p2.vy += ay;
+
+    }
+    
+
+  }
+
+
+  pJS.fn.interact.bounceParticles = function(p1, p2){
+
+    var dx = p1.x - p2.x,
+        dy = p1.y - p2.y,
+        dist = Math.sqrt(dx*dx + dy*dy),
+        dist_p = p1.radius+p2.radius;
+
+    if(dist <= dist_p){
+      p1.vx = -p1.vx;
+      p1.vy = -p1.vy;
+
+      p2.vx = -p2.vx;
+      p2.vy = -p2.vy;
+    }
+
+  }
+
+
+  /* ---------- pJS functions - modes events ------------ */
+
+  pJS.fn.modes.pushParticles = function(nb, pos){
+
+    pJS.tmp.pushing = true;
+
+    for(var i = 0; i < nb; i++){
+      pJS.particles.array.push(
+        new pJS.fn.particle(
+          pJS.particles.color,
+          pJS.particles.opacity.value,
+          {
+            'x': pos ? pos.pos_x : Math.random() * pJS.canvas.w,
+            'y': pos ? pos.pos_y : Math.random() * pJS.canvas.h
+          }
+        )
+      )
+      if(i == nb-1){
+        if(!pJS.particles.move.enable){
+          pJS.fn.particlesDraw();
+        }
+        pJS.tmp.pushing = false;
+      }
+    }
+
+  };
+
+
+  pJS.fn.modes.removeParticles = function(nb){
+
+    pJS.particles.array.splice(0, nb);
+    if(!pJS.particles.move.enable){
+      pJS.fn.particlesDraw();
+    }
+
+  };
+
+
+  pJS.fn.modes.bubbleParticle = function(p){
+
+    /* on hover event */
+    if(pJS.interactivity.events.onhover.enable && isInArray('bubble', pJS.interactivity.events.onhover.mode)){
+
+      var dx_mouse = p.x - pJS.interactivity.mouse.pos_x,
+          dy_mouse = p.y - pJS.interactivity.mouse.pos_y,
+          dist_mouse = Math.sqrt(dx_mouse*dx_mouse + dy_mouse*dy_mouse),
+          ratio = 1 - dist_mouse / pJS.interactivity.modes.bubble.distance;
+
+      function init(){
+        p.opacity_bubble = p.opacity;
+        p.radius_bubble = p.radius;
+      }
+
+      /* mousemove - check ratio */
+      if(dist_mouse <= pJS.interactivity.modes.bubble.distance){
+
+        if(ratio >= 0 && pJS.interactivity.status == 'mousemove'){
+          
+          /* size */
+          if(pJS.interactivity.modes.bubble.size != pJS.particles.size.value){
+
+            if(pJS.interactivity.modes.bubble.size > pJS.particles.size.value){
+              var size = p.radius + (pJS.interactivity.modes.bubble.size*ratio);
+              if(size >= 0){
+                p.radius_bubble = size;
+              }
+            }else{
+              var dif = p.radius - pJS.interactivity.modes.bubble.size,
+                  size = p.radius - (dif*ratio);
+              if(size > 0){
+                p.radius_bubble = size;
+              }else{
+                p.radius_bubble = 0;
+              }
+            }
+
+          }
+
+          /* opacity */
+          if(pJS.interactivity.modes.bubble.opacity != pJS.particles.opacity.value){
+
+            if(pJS.interactivity.modes.bubble.opacity > pJS.particles.opacity.value){
+              var opacity = pJS.interactivity.modes.bubble.opacity*ratio;
+              if(opacity > p.opacity && opacity <= pJS.interactivity.modes.bubble.opacity){
+                p.opacity_bubble = opacity;
+              }
+            }else{
+              var opacity = p.opacity - (pJS.particles.opacity.value-pJS.interactivity.modes.bubble.opacity)*ratio;
+              if(opacity < p.opacity && opacity >= pJS.interactivity.modes.bubble.opacity){
+                p.opacity_bubble = opacity;
+              }
+            }
+
+          }
+
+        }
+
+      }else{
+        init();
+      }
+
+
+      /* mouseleave */
+      if(pJS.interactivity.status == 'mouseleave'){
+        init();
+      }
+    
+    }
+
+    /* on click event */
+    else if(pJS.interactivity.events.onclick.enable && isInArray('bubble', pJS.interactivity.events.onclick.mode)){
+
+
+      if(pJS.tmp.bubble_clicking){
+        var dx_mouse = p.x - pJS.interactivity.mouse.click_pos_x,
+            dy_mouse = p.y - pJS.interactivity.mouse.click_pos_y,
+            dist_mouse = Math.sqrt(dx_mouse*dx_mouse + dy_mouse*dy_mouse),
+            time_spent = (new Date().getTime() - pJS.interactivity.mouse.click_time)/1000;
+
+        if(time_spent > pJS.interactivity.modes.bubble.duration){
+          pJS.tmp.bubble_duration_end = true;
+        }
+
+        if(time_spent > pJS.interactivity.modes.bubble.duration*2){
+          pJS.tmp.bubble_clicking = false;
+          pJS.tmp.bubble_duration_end = false;
+        }
+      }
+
+
+      function process(bubble_param, particles_param, p_obj_bubble, p_obj, id){
+
+        if(bubble_param != particles_param){
+
+          if(!pJS.tmp.bubble_duration_end){
+            if(dist_mouse <= pJS.interactivity.modes.bubble.distance){
+              if(p_obj_bubble != undefined) var obj = p_obj_bubble;
+              else var obj = p_obj;
+              if(obj != bubble_param){
+                var value = p_obj - (time_spent * (p_obj - bubble_param) / pJS.interactivity.modes.bubble.duration);
+                if(id == 'size') p.radius_bubble = value;
+                if(id == 'opacity') p.opacity_bubble = value;
+              }
+            }else{
+              if(id == 'size') p.radius_bubble = undefined;
+              if(id == 'opacity') p.opacity_bubble = undefined;
+            }
+          }else{
+            if(p_obj_bubble != undefined){
+              var value_tmp = p_obj - (time_spent * (p_obj - bubble_param) / pJS.interactivity.modes.bubble.duration),
+                  dif = bubble_param - value_tmp;
+                  value = bubble_param + dif;
+              if(id == 'size') p.radius_bubble = value;
+              if(id == 'opacity') p.opacity_bubble = value;
+            }
+          }
+
+        }
+
+      }
+
+      if(pJS.tmp.bubble_clicking){
+        /* size */
+        process(pJS.interactivity.modes.bubble.size, pJS.particles.size.value, p.radius_bubble, p.radius, 'size');
+        /* opacity */
+        process(pJS.interactivity.modes.bubble.opacity, pJS.particles.opacity.value, p.opacity_bubble, p.opacity, 'opacity');
+      }
+
+    }
+
+  };
+
+
+  pJS.fn.modes.repulseParticle = function(p){
+
+    if(pJS.interactivity.events.onhover.enable && isInArray('repulse', pJS.interactivity.events.onhover.mode) && pJS.interactivity.status == 'mousemove') {
+
+      var dx_mouse = p.x - pJS.interactivity.mouse.pos_x,
+          dy_mouse = p.y - pJS.interactivity.mouse.pos_y,
+          dist_mouse = Math.sqrt(dx_mouse*dx_mouse + dy_mouse*dy_mouse);
+
+      var normVec = {x: dx_mouse/dist_mouse, y: dy_mouse/dist_mouse},
+          repulseRadius = pJS.interactivity.modes.repulse.distance,
+          velocity = 100,
+          repulseFactor = clamp((1/repulseRadius)*(-1*Math.pow(dist_mouse/repulseRadius,2)+1)*repulseRadius*velocity, 0, 50);
+      
+      var pos = {
+        x: p.x + normVec.x * repulseFactor,
+        y: p.y + normVec.y * repulseFactor
+      }
+
+      if(pJS.particles.move.out_mode == 'bounce'){
+        if(pos.x - p.radius > 0 && pos.x + p.radius < pJS.canvas.w) p.x = pos.x;
+        if(pos.y - p.radius > 0 && pos.y + p.radius < pJS.canvas.h) p.y = pos.y;
+      }else{
+        p.x = pos.x;
+        p.y = pos.y;
+      }
+    
+    }
+
+
+    else if(pJS.interactivity.events.onclick.enable && isInArray('repulse', pJS.interactivity.events.onclick.mode)) {
+
+      if(!pJS.tmp.repulse_finish){
+        pJS.tmp.repulse_count++;
+        if(pJS.tmp.repulse_count == pJS.particles.array.length){
+          pJS.tmp.repulse_finish = true;
+        }
+      }
+
+      if(pJS.tmp.repulse_clicking){
+
+        var repulseRadius = Math.pow(pJS.interactivity.modes.repulse.distance/6, 3);
+
+        var dx = pJS.interactivity.mouse.click_pos_x - p.x,
+            dy = pJS.interactivity.mouse.click_pos_y - p.y,
+            d = dx*dx + dy*dy;
+
+        var force = -repulseRadius / d * 1;
+
+        function process(){
+
+          var f = Math.atan2(dy,dx);
+          p.vx = force * Math.cos(f);
+          p.vy = force * Math.sin(f);
+
+          if(pJS.particles.move.out_mode == 'bounce'){
+            var pos = {
+              x: p.x + p.vx,
+              y: p.y + p.vy
+            }
+            if (pos.x + p.radius > pJS.canvas.w) p.vx = -p.vx;
+            else if (pos.x - p.radius < 0) p.vx = -p.vx;
+            if (pos.y + p.radius > pJS.canvas.h) p.vy = -p.vy;
+            else if (pos.y - p.radius < 0) p.vy = -p.vy;
+          }
+
+        }
+
+        // default
+        if(d <= repulseRadius){
+          process();
+        }
+
+        // bang - slow motion mode
+        // if(!pJS.tmp.repulse_finish){
+        //   if(d <= repulseRadius){
+        //     process();
+        //   }
+        // }else{
+        //   process();
+        // }
+        
+
+      }else{
+
+        if(pJS.tmp.repulse_clicking == false){
+
+          p.vx = p.vx_i;
+          p.vy = p.vy_i;
+        
+        }
+
+      }
+
+    }
+
+  }
+
+
+  pJS.fn.modes.grabParticle = function(p){
+
+    if(pJS.interactivity.events.onhover.enable && pJS.interactivity.status == 'mousemove'){
+
+      var dx_mouse = p.x - pJS.interactivity.mouse.pos_x,
+          dy_mouse = p.y - pJS.interactivity.mouse.pos_y,
+          dist_mouse = Math.sqrt(dx_mouse*dx_mouse + dy_mouse*dy_mouse);
+
+      /* draw a line between the cursor and the particle if the distance between them is under the config distance */
+      if(dist_mouse <= pJS.interactivity.modes.grab.distance){
+
+        var opacity_line = pJS.interactivity.modes.grab.line_linked.opacity - (dist_mouse / (1/pJS.interactivity.modes.grab.line_linked.opacity)) / pJS.interactivity.modes.grab.distance;
+
+        if(opacity_line > 0){
+
+          /* style */
+          var color_line = pJS.particles.line_linked.color_rgb_line;
+          pJS.canvas.ctx.strokeStyle = 'rgba('+color_line.r+','+color_line.g+','+color_line.b+','+opacity_line+')';
+          pJS.canvas.ctx.lineWidth = pJS.particles.line_linked.width;
+          //pJS.canvas.ctx.lineCap = 'round'; /* performance issue */
+          
+          /* path */
+          pJS.canvas.ctx.beginPath();
+          pJS.canvas.ctx.moveTo(p.x, p.y);
+          pJS.canvas.ctx.lineTo(pJS.interactivity.mouse.pos_x, pJS.interactivity.mouse.pos_y);
+          pJS.canvas.ctx.stroke();
+          pJS.canvas.ctx.closePath();
+
+        }
+
+      }
+
+    }
+
+  };
+
+
+
+  /* ---------- pJS functions - vendors ------------ */
+
+  pJS.fn.vendors.eventsListeners = function(){
+
+    /* events target element */
+    if(pJS.interactivity.detect_on == 'window'){
+      pJS.interactivity.el = window;
+    }else{
+      pJS.interactivity.el = pJS.canvas.el;
+    }
+
+
+    /* detect mouse pos - on hover / click event */
+    if(pJS.interactivity.events.onhover.enable || pJS.interactivity.events.onclick.enable){
+
+      /* el on mousemove */
+      pJS.interactivity.el.addEventListener('mousemove', function(e){
+
+        if(pJS.interactivity.el == window){
+          var pos_x = e.clientX,
+              pos_y = e.clientY;
+        }
+        else{
+          var pos_x = e.offsetX || e.clientX,
+              pos_y = e.offsetY || e.clientY;
+        }
+
+        pJS.interactivity.mouse.pos_x = pos_x;
+        pJS.interactivity.mouse.pos_y = pos_y;
+
+        if(pJS.tmp.retina){
+          pJS.interactivity.mouse.pos_x *= pJS.canvas.pxratio;
+          pJS.interactivity.mouse.pos_y *= pJS.canvas.pxratio;
+        }
+
+        pJS.interactivity.status = 'mousemove';
+
+      });
+
+      /* el on onmouseleave */
+      pJS.interactivity.el.addEventListener('mouseleave', function(e){
+
+        pJS.interactivity.mouse.pos_x = null;
+        pJS.interactivity.mouse.pos_y = null;
+        pJS.interactivity.status = 'mouseleave';
+
+      });
+
+    }
+
+    /* on click event */
+    if(pJS.interactivity.events.onclick.enable){
+
+      pJS.interactivity.el.addEventListener('click', function(){
+
+        pJS.interactivity.mouse.click_pos_x = pJS.interactivity.mouse.pos_x;
+        pJS.interactivity.mouse.click_pos_y = pJS.interactivity.mouse.pos_y;
+        pJS.interactivity.mouse.click_time = new Date().getTime();
+
+        if(pJS.interactivity.events.onclick.enable){
+
+          switch(pJS.interactivity.events.onclick.mode){
+
+            case 'push':
+              if(pJS.particles.move.enable){
+                pJS.fn.modes.pushParticles(pJS.interactivity.modes.push.particles_nb, pJS.interactivity.mouse);
+              }else{
+                if(pJS.interactivity.modes.push.particles_nb == 1){
+                  pJS.fn.modes.pushParticles(pJS.interactivity.modes.push.particles_nb, pJS.interactivity.mouse);
+                }
+                else if(pJS.interactivity.modes.push.particles_nb > 1){
+                  pJS.fn.modes.pushParticles(pJS.interactivity.modes.push.particles_nb);
+                }
+              }
+            break;
+
+            case 'remove':
+              pJS.fn.modes.removeParticles(pJS.interactivity.modes.remove.particles_nb);
+            break;
+
+            case 'bubble':
+              pJS.tmp.bubble_clicking = true;
+            break;
+
+            case 'repulse':
+              pJS.tmp.repulse_clicking = true;
+              pJS.tmp.repulse_count = 0;
+              pJS.tmp.repulse_finish = false;
+              setTimeout(function(){
+                pJS.tmp.repulse_clicking = false;
+              }, pJS.interactivity.modes.repulse.duration*1000)
+            break;
+
+          }
+
+        }
+
+      });
+        
+    }
+
+
+  };
+
+  pJS.fn.vendors.densityAutoParticles = function(){
+
+    if(pJS.particles.number.density.enable){
+
+      /* calc area */
+      var area = pJS.canvas.el.width * pJS.canvas.el.height / 1000;
+      if(pJS.tmp.retina){
+        area = area/(pJS.canvas.pxratio*2);
+      }
+
+      /* calc number of particles based on density area */
+      var nb_particles = area * pJS.particles.number.value / pJS.particles.number.density.value_area;
+
+      /* add or remove X particles */
+      var missing_particles = pJS.particles.array.length - nb_particles;
+      if(missing_particles < 0) pJS.fn.modes.pushParticles(Math.abs(missing_particles));
+      else pJS.fn.modes.removeParticles(missing_particles);
+
+    }
+
+  };
+
+
+  pJS.fn.vendors.checkOverlap = function(p1, position){
+    for(var i = 0; i < pJS.particles.array.length; i++){
+      var p2 = pJS.particles.array[i];
+
+      var dx = p1.x - p2.x,
+          dy = p1.y - p2.y,
+          dist = Math.sqrt(dx*dx + dy*dy);
+
+      if(dist <= p1.radius + p2.radius){
+        p1.x = position ? position.x : Math.random() * pJS.canvas.w;
+        p1.y = position ? position.y : Math.random() * pJS.canvas.h;
+        pJS.fn.vendors.checkOverlap(p1);
+      }
+    }
+  };
+
+
+  pJS.fn.vendors.createSvgImg = function(p){
+
+    /* set color to svg element */
+    var svgXml = pJS.tmp.source_svg,
+        rgbHex = /#([0-9A-F]{3,6})/gi,
+        coloredSvgXml = svgXml.replace(rgbHex, function (m, r, g, b) {
+          if(p.color.rgb){
+            var color_value = 'rgba('+p.color.rgb.r+','+p.color.rgb.g+','+p.color.rgb.b+','+p.opacity+')';
+          }else{
+            var color_value = 'hsla('+p.color.hsl.h+','+p.color.hsl.s+'%,'+p.color.hsl.l+'%,'+p.opacity+')';
+          }
+          return color_value;
+        });
+
+    /* prepare to create img with colored svg */
+    var svg = new Blob([coloredSvgXml], {type: 'image/svg+xml;charset=utf-8'}),
+        DOMURL = window.URL || window.webkitURL || window,
+        url = DOMURL.createObjectURL(svg);
+
+    /* create particle img obj */
+    var img = new Image();
+    img.addEventListener('load', function(){
+      p.img.obj = img;
+      p.img.loaded = true;
+      DOMURL.revokeObjectURL(url);
+      pJS.tmp.count_svg++;
+    });
+    img.src = url;
+
+  };
+
+
+  pJS.fn.vendors.destroypJS = function(){
+    cancelAnimationFrame(pJS.fn.drawAnimFrame);
+    canvas_el.remove();
+    pJSDom = null;
+  };
+
+
+  pJS.fn.vendors.drawShape = function(c, startX, startY, sideLength, sideCountNumerator, sideCountDenominator){
+
+    // By Programming Thomas - https://programmingthomas.wordpress.com/2013/04/03/n-sided-shapes/
+    var sideCount = sideCountNumerator * sideCountDenominator;
+    var decimalSides = sideCountNumerator / sideCountDenominator;
+    var interiorAngleDegrees = (180 * (decimalSides - 2)) / decimalSides;
+    var interiorAngle = Math.PI - Math.PI * interiorAngleDegrees / 180; // convert to radians
+    c.save();
+    c.beginPath();
+    c.translate(startX, startY);
+    c.moveTo(0,0);
+    for (var i = 0; i < sideCount; i++) {
+      c.lineTo(sideLength,0);
+      c.translate(sideLength,0);
+      c.rotate(interiorAngle);
+    }
+    //c.stroke();
+    c.fill();
+    c.restore();
+
+  };
+
+  pJS.fn.vendors.exportImg = function(){
+    window.open(pJS.canvas.el.toDataURL('image/png'), '_blank');
+  };
+
+
+  pJS.fn.vendors.loadImg = function(type){
+
+    pJS.tmp.img_error = undefined;
+
+    if(pJS.particles.shape.image.src != ''){
+
+      if(type == 'svg'){
+
+        var xhr = new XMLHttpRequest();
+        xhr.open('GET', pJS.particles.shape.image.src);
+        xhr.onreadystatechange = function (data) {
+          if(xhr.readyState == 4){
+            if(xhr.status == 200){
+              pJS.tmp.source_svg = data.currentTarget.response;
+              pJS.fn.vendors.checkBeforeDraw();
+            }else{
+              console.log('Error pJS - Image not found');
+              pJS.tmp.img_error = true;
+            }
+          }
+        }
+        xhr.send();
+
+      }else{
+
+        var img = new Image();
+        img.addEventListener('load', function(){
+          pJS.tmp.img_obj = img;
+          pJS.fn.vendors.checkBeforeDraw();
+        });
+        img.src = pJS.particles.shape.image.src;
+
+      }
+
+    }else{
+      console.log('Error pJS - No image.src');
+      pJS.tmp.img_error = true;
+    }
+
+  };
+
+
+  pJS.fn.vendors.draw = function(){
+
+    if(pJS.particles.shape.type == 'image'){
+
+      if(pJS.tmp.img_type == 'svg'){
+
+        if(pJS.tmp.count_svg >= pJS.particles.number.value){
+          pJS.fn.particlesDraw();
+          if(!pJS.particles.move.enable) cancelRequestAnimFrame(pJS.fn.drawAnimFrame);
+          else pJS.fn.drawAnimFrame = requestAnimFrame(pJS.fn.vendors.draw);
+        }else{
+          //console.log('still loading...');
+          if(!pJS.tmp.img_error) pJS.fn.drawAnimFrame = requestAnimFrame(pJS.fn.vendors.draw);
+        }
+
+      }else{
+
+        if(pJS.tmp.img_obj != undefined){
+          pJS.fn.particlesDraw();
+          if(!pJS.particles.move.enable) cancelRequestAnimFrame(pJS.fn.drawAnimFrame);
+          else pJS.fn.drawAnimFrame = requestAnimFrame(pJS.fn.vendors.draw);
+        }else{
+          if(!pJS.tmp.img_error) pJS.fn.drawAnimFrame = requestAnimFrame(pJS.fn.vendors.draw);
+        }
+
+      }
+
+    }else{
+      pJS.fn.particlesDraw();
+      if(!pJS.particles.move.enable) cancelRequestAnimFrame(pJS.fn.drawAnimFrame);
+      else pJS.fn.drawAnimFrame = requestAnimFrame(pJS.fn.vendors.draw);
+    }
+
+  };
+
+
+  pJS.fn.vendors.checkBeforeDraw = function(){
+
+    // if shape is image
+    if(pJS.particles.shape.type == 'image'){
+
+      if(pJS.tmp.img_type == 'svg' && pJS.tmp.source_svg == undefined){
+        pJS.tmp.checkAnimFrame = requestAnimFrame(check);
+      }else{
+        //console.log('images loaded! cancel check');
+        cancelRequestAnimFrame(pJS.tmp.checkAnimFrame);
+        if(!pJS.tmp.img_error){
+          pJS.fn.vendors.init();
+          pJS.fn.vendors.draw();
+        }
+        
+      }
+
+    }else{
+      pJS.fn.vendors.init();
+      pJS.fn.vendors.draw();
+    }
+
+  };
+
+
+  pJS.fn.vendors.init = function(){
+
+    /* init canvas + particles */
+    pJS.fn.retinaInit();
+    pJS.fn.canvasInit();
+    pJS.fn.canvasSize();
+    pJS.fn.canvasPaint();
+    pJS.fn.particlesCreate();
+    pJS.fn.vendors.densityAutoParticles();
+
+    /* particles.line_linked - convert hex colors to rgb */
+    pJS.particles.line_linked.color_rgb_line = hexToRgb(pJS.particles.line_linked.color);
+
+  };
+
+
+  pJS.fn.vendors.start = function(){
+
+    if(isInArray('image', pJS.particles.shape.type)){
+      pJS.tmp.img_type = pJS.particles.shape.image.src.substr(pJS.particles.shape.image.src.length - 3);
+      pJS.fn.vendors.loadImg(pJS.tmp.img_type);
+    }else{
+      pJS.fn.vendors.checkBeforeDraw();
+    }
+
+  };
+
+
+
+
+  /* ---------- pJS - start ------------ */
+
+
+  pJS.fn.vendors.eventsListeners();
+
+  pJS.fn.vendors.start();
+  
+
+
+};
+
+/* ---------- global functions - vendors ------------ */
+
+Object.deepExtend = function(destination, source) {
+  for (var property in source) {
+    if (source[property] && source[property].constructor &&
+     source[property].constructor === Object) {
+      destination[property] = destination[property] || {};
+      Object.deepExtend(destination[property], source[property]);
+    } else {
+      destination[property] = source[property];
+    }
+  }
+  return destination;
+};
+
+window.requestAnimFrame = (function(){
+  return  window.requestAnimationFrame ||
+    window.webkitRequestAnimationFrame ||
+    window.mozRequestAnimationFrame    ||
+    window.oRequestAnimationFrame      ||
+    window.msRequestAnimationFrame     ||
+    function(callback){
+      window.setTimeout(callback, 1000 / 60);
+    };
+})();
+
+window.cancelRequestAnimFrame = ( function() {
+  return window.cancelAnimationFrame         ||
+    window.webkitCancelRequestAnimationFrame ||
+    window.mozCancelRequestAnimationFrame    ||
+    window.oCancelRequestAnimationFrame      ||
+    window.msCancelRequestAnimationFrame     ||
+    clearTimeout
+} )();
+
+function hexToRgb(hex){
+  // By Tim Down - http://stackoverflow.com/a/5624139/3493650
+  // Expand shorthand form (e.g. "03F") to full form (e.g. "0033FF")
+  var shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
+  hex = hex.replace(shorthandRegex, function(m, r, g, b) {
+     return r + r + g + g + b + b;
+  });
+  var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+  return result ? {
+      r: parseInt(result[1], 16),
+      g: parseInt(result[2], 16),
+      b: parseInt(result[3], 16)
+  } : null;
+};
+
+function clamp(number, min, max) {
+  return Math.min(Math.max(number, min), max);
+};
+
+function isInArray(value, array) {
+  return array.indexOf(value) > -1;
+}
+
+
+/* ---------- particles.js functions - start ------------ */
+
+window.pJSDom = [];
+
+window.particlesJS = function(tag_id, params){
+  if (!document) {
+    return;
+  }
+  //console.log(params);
+
+  /* no string id? so it's object params, and set the id with default id */
+  if(typeof(tag_id) != 'string'){
+    params = tag_id;
+    tag_id = 'particles-js';
+  }
+
+  /* no id? set the id to default id */
+  if(!tag_id){
+    tag_id = 'particles-js';
+  }
+
+  /* pJS elements */
+  var pJS_tag = document.getElementById(tag_id),
+      pJS_canvas_class = 'particles-js-canvas-el',
+      exist_canvas = pJS_tag.getElementsByClassName(pJS_canvas_class);
+
+  /* remove canvas if exists into the pJS target tag */
+  if(exist_canvas.length){
+    while(exist_canvas.length > 0){
+      pJS_tag.removeChild(exist_canvas[0]);
+    }
+  }
+
+  /* create canvas element */
+  var canvas_el = document.createElement('canvas');
+  canvas_el.className = pJS_canvas_class;
+
+  /* set size canvas */
+  canvas_el.style.width = "100%";
+  canvas_el.style.height = "100%";
+
+  /* append canvas */
+  var canvas = document.getElementById(tag_id).appendChild(canvas_el);
+
+  /* launch particle.js */
+  if(canvas != null){
+    pJSDom.push(new pJS(tag_id, params));
+  }
+
+};
+
+window.particlesJS.load = function(tag_id, path_config_json, callback){
+
+  /* load json config */
+  var xhr = new XMLHttpRequest();
+  xhr.open('GET', path_config_json);
+  xhr.onreadystatechange = function (data) {
+    if(xhr.readyState == 4){
+      if(xhr.status == 200){
+        var params = JSON.parse(data.currentTarget.response);
+        window.particlesJS(tag_id, params);
+        if(callback) callback();
+      }else{
+        console.log('Error pJS - XMLHttpRequest status: '+xhr.status);
+        console.log('Error pJS - File config not found');
+      }
+    }
+  };
+  xhr.send();
+
+};
+
+module.exports = window.particlesJS;
diff --git a/docs/wrappers/html.js b/docs/wrappers/html.js
new file mode 100644
index 00000000..da86a154
--- /dev/null
+++ b/docs/wrappers/html.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import DocumentTitle from 'react-document-title';
+
+class HTML extends React.Component {
+  render() {
+    var page = this.props.page.data;
+    return (
+      <div>
+        <div dangerouslySetInnerHTML={{__html: page}}/>
+      </div>
+    );
+  }
+}
+
+module.exports = HTML;
diff --git a/docs/wrappers/md.js b/docs/wrappers/md.js
new file mode 100644
index 00000000..ddde3df8
--- /dev/null
+++ b/docs/wrappers/md.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import DocumentTitle from 'react-document-title';
+import { link } from 'gatsby-helpers';
+
+var DOCS_BASEURL = "https://github.com/graphql-python/graphene/edit/master/docs/pages/";
+
+class Markdown extends React.Component {
+  render() {
+    var post = this.props.page.data;
+    var pagePath = this.props.page.requirePath;
+    var documentUrl = `${DOCS_BASEURL}${pagePath}`;
+
+    return (
+      <DocumentTitle title={`${post.title?post.title+' - ':''}${this.props.config.siteTitle}`}>
+        <div className="markdown">
+          {post.title?<div className="title">
+            <h1>{post.title}</h1>
+          </div>:null}
+          <div className="wrapper" dangerouslySetInnerHTML={{__html: post.body}}/>
+          <a href={documentUrl} className="improve-document-link">Improve this document!</a>
+        </div>
+      </DocumentTitle>
+    );
+  }
+}
+
+module.exports = Markdown;

From 7340d80fa64d4aa815300322de5a9c5b25c394c3 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 25 Nov 2015 11:33:32 -0800
Subject: [PATCH 011/173] Changed type resolver function name to _resolve_type.
 Fixed #50

---
 graphene/contrib/django/tests/test_types.py  | 2 +-
 graphene/core/tests/test_query.py            | 5 ++++-
 graphene/core/types/objecttype.py            | 4 ++--
 graphene/core/types/tests/test_objecttype.py | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/graphene/contrib/django/tests/test_types.py b/graphene/contrib/django/tests/test_types.py
index 5d7f582e..4d709580 100644
--- a/graphene/contrib/django/tests/test_types.py
+++ b/graphene/contrib/django/tests/test_types.py
@@ -69,7 +69,7 @@ def test_node_replacedfield():
 
 
 def test_interface_resolve_type():
-    resolve_type = Character.resolve_type(schema, Human())
+    resolve_type = Character._resolve_type(schema, Human())
     assert isinstance(resolve_type, GraphQLObjectType)
 
 
diff --git a/graphene/core/tests/test_query.py b/graphene/core/tests/test_query.py
index b9e8ee84..5fbe2faa 100644
--- a/graphene/core/tests/test_query.py
+++ b/graphene/core/tests/test_query.py
@@ -13,7 +13,10 @@ class Character(Interface):
 
 
 class Pet(ObjectType):
-    type = String(resolver=lambda *_: 'Dog')
+    type = String()
+
+    def resolve_type(self, args, info):
+        return 'Dog'
 
 
 class Human(Character):
diff --git a/graphene/core/types/objecttype.py b/graphene/core/types/objecttype.py
index 14283af5..09f65ad0 100644
--- a/graphene/core/types/objecttype.py
+++ b/graphene/core/types/objecttype.py
@@ -182,7 +182,7 @@ class BaseObjectType(BaseType):
         signals.post_init.send(self.__class__, instance=self)
 
     @classmethod
-    def resolve_type(cls, schema, instance, *args):
+    def _resolve_type(cls, schema, instance, *args):
         return schema.T(instance.__class__)
 
     @classmethod
@@ -191,7 +191,7 @@ class BaseObjectType(BaseType):
             return GraphQLInterfaceType(
                 cls._meta.type_name,
                 description=cls._meta.description,
-                resolve_type=partial(cls.resolve_type, schema),
+                resolve_type=partial(cls._resolve_type, schema),
                 fields=partial(cls.get_fields, schema)
             )
         elif cls._meta.is_union:
diff --git a/graphene/core/types/tests/test_objecttype.py b/graphene/core/types/tests/test_objecttype.py
index add37bae..6bb157d6 100644
--- a/graphene/core/types/tests/test_objecttype.py
+++ b/graphene/core/types/tests/test_objecttype.py
@@ -75,7 +75,7 @@ def test_union_cannot_initialize():
 
 
 def test_interface_resolve_type():
-    resolve_type = Character.resolve_type(schema, Human(object()))
+    resolve_type = Character._resolve_type(schema, Human(object()))
     assert isinstance(resolve_type, GraphQLObjectType)
 
 

From 65c9cc7ce8fb6824d635b254cb205a0f0ff451ac Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 25 Nov 2015 15:25:03 -0800
Subject: [PATCH 012/173] Big improvements in docs pages

---
 .gitignore                                    |   4 +
 .travis.yml                                   |  15 +-
 docs/assets/edit.png                          | Bin 0 -> 372 bytes
 docs/assets/edit@2x.png                       | Bin 0 -> 688 bytes
 docs/config.toml                              |  18 +-
 docs/css/hljs.css                             |  70 +++++++
 docs/css/main.styl                            | 182 ++++++++++++++++--
 docs/gatsby.config.js                         |   3 +-
 docs/package.json                             |   2 +-
 docs/pages/_header.js                         |  11 +-
 docs/pages/_template.js                       |   6 +-
 docs/pages/community.md                       |   8 +
 docs/pages/docs/_template.js                  |  48 +++++
 docs/pages/docs/basic-types.md                |  52 +++++
 .../interface.md => docs/interfaces.md}       |  14 +-
 docs/pages/docs/mutations.md                  |  75 ++++++++
 .../objecttype.md => docs/objecttypes.md}     |  10 +-
 ...ngo_quickstart.md => quickstart-django.md} |   7 +-
 docs/pages/docs/quickstart.md                 |   9 +-
 docs/pages/guide/mutation.md                  |  67 -------
 docs/pages/index.md                           |   2 +-
 docs/wrappers/md.js                           |   8 +-
 22 files changed, 494 insertions(+), 117 deletions(-)
 create mode 100644 docs/assets/edit.png
 create mode 100644 docs/assets/edit@2x.png
 create mode 100644 docs/css/hljs.css
 create mode 100644 docs/pages/docs/_template.js
 create mode 100644 docs/pages/docs/basic-types.md
 rename docs/pages/{guide/interface.md => docs/interfaces.md} (76%)
 create mode 100644 docs/pages/docs/mutations.md
 rename docs/pages/{guide/objecttype.md => docs/objecttypes.md} (85%)
 rename docs/pages/docs/{django_quickstart.md => quickstart-django.md} (95%)
 delete mode 100644 docs/pages/guide/mutation.md

diff --git a/.gitignore b/.gitignore
index 57bee153..474bb31d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,7 @@ target/
 
 
 /tests/django.sqlite
+
+/graphene/index.json
+
+/graphene/meta.json
diff --git a/.travis.yml b/.travis.yml
index afc82b45..705ef0d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,22 +6,25 @@ python:
 - 3.4
 - 3.5
 - pypy
+node_js:
+- 4.1
 cache:
-  - pip
-  - directories:
+  directories:
     - .cache/pip/
-    - docs/node_modules
+    - $HOME/.cache/pip
+    - docs/node_modules/
+    - $HOME/docs/node_modules
 install:
-- pip install --download-cache .cache/pip/ pytest pytest-cov coveralls flake8 six
+- pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls flake8 six
   blinker pytest-django
-- pip install --download-cache .cache/pip/ -e .[django]
+- pip install --download-cache $HOME/.cache/pip/ -e .[django]
 - python setup.py develop
 script:
 - py.test --cov=graphene
 - flake8
 after_success:
 - coveralls
-- cd docs && npm run deploy
+- nvm install 4.1 && cd docs && npm run deploy
 
 env:
   matrix:
diff --git a/docs/assets/edit.png b/docs/assets/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..80646b2f41d00941f9ae328ec8dbee1ef7b41c09
GIT binary patch
literal 372
zcmV-)0gL{LP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006O%
z3;baP0003iNkl<ZI1!zaF;Bu!6op&SghUob(-1dD+!=9Y#8DTg`X6*QVPbLjKkyR@
z%rZ6%Bqqkq#5mD}`knT*ytXs~CpquFch9|t_sVtRI3B?@tV4+4IR@-~_zNfS(qTEI
zxk>#H{y<^kYBlD!#4!6M6F*$n{nnncN5V6FfGaqI4cp+F;swbHX!c3ITEc++8N85l
zhOSkRZxQw8O;%*$7qOWXSwh7CZCA6*bfXk?2KzKq)7kliJ)1r1mK6h%`m5&9M&a5B
zZK(N(3kIBT;0tWQHz*XE^>A|CL}4i#+!<j?Jcj|?ez5I#%MDIVt{i$Ko?xHZSeHfn
zTs8<0?@htyf6c114X!wAl;0%?T)#3Ksp6<Mfks(Z)L0&a=!C8@jE?A5&-f1|D7}<*
SUzA$_0000<MNUMnLSTZERG~Nk

literal 0
HcmV?d00001

diff --git a/docs/assets/edit@2x.png b/docs/assets/edit@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..faa874831d14c4bb45f7402a2f98589f97b660f5
GIT binary patch
literal 688
zcmV;h0#E&kP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP0007KNkl<ZSP8Y4y-OTX6vbV&h~i&hktPrXcUxHyt3W!tY#@S_jfEmaQUvjz
zNEfh85P~Eif=Ifc*oX)UZnCxsWXnx#G+BRVcHS^EyqS6Pu@}zX_i^t%XYQMsWk&k_
z{sedjeuFZ$K9XP*ZGl_x1MGli5Xwa4Wo<1e7#mPn<aaTG|ID|&PzGhMJds=k)L#HM
zAZ`-TR6rR^B&X<8(+tK_VBbQtQ`4de^!<DMacs>t{Z*^gzS=e@`I7Yy;1sM9cg5Nm
zW7S>(#yYkRESudTUgRKr<~`<%s)Zi~Ux2aON(E5WcEgG6A21>&8D9g5Y*i*e#r&c;
ztEm&SekbM_x4aHpLUSL1ih*$3EoHr>ZyssrXEZb}G!!|BAHldofhO_6)1mlM0&<ey
z!?(l}@jW8cYfSXV=?Fv)T-vVcgBvcw>`$~CvrGZRS3@ohF>*~)1yo5+tv9&@R80Pw
zdVOaB6_am>T;?QzxX0j+5*#e~h8rCDTDXRj0RLX8lXwwMwv4mLpT%=h-vb1{09)V@
z&+jEd=E0!^S<F1=pDcT3Y1#||A6LXYcnTOF`THGwLrM5?aNw^SmwM%fjNoOHV0>x^
zOd|dXI3ejdozRu)|Nb1vT&{c&Y58>(pwua_hlmCu{xW_AdO)w&w6+tHY%YHw;cSWc
zjEFj<ZTt-WXE-45I8O&mZ5_v^CS}Q0BdY^v3bI(+vQ}s*RRCA`woug^NkxtzNBQhf
zTL<R3xw12hMd(EqG23@RBw*MR9YJ^4Bq{Z~60n;RFzl^ez1yq$Jg1bi>4R8b<r5E|
W60M|(dft%$0000<MNUMnLSTYlDJ@3;

literal 0
HcmV?d00001

diff --git a/docs/config.toml b/docs/config.toml
index 08df109a..f53d3f17 100644
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -1 +1,17 @@
-siteTitle="Graphene"
+siteTitle = "Graphene"
+
+[docs.quickstart]
+	name = "Quickstart"
+	pages = [
+	  "/docs/quickstart/",
+	  "/docs/quickstart-django/",
+	]
+
+[docs.walkthrough]
+	name = "Walkthrough"
+	pages = [
+	  "/docs/interfaces/",
+	  "/docs/objecttypes/",
+	  "/docs/mutations/",
+	  "/docs/basic-types/",
+	]
diff --git a/docs/css/hljs.css b/docs/css/hljs.css
new file mode 100644
index 00000000..10019598
--- /dev/null
+++ b/docs/css/hljs.css
@@ -0,0 +1,70 @@
+/**
+ * GitHub Gist Theme
+ * Author : Louis Barranqueiro - https://github.com/LouisBarranqueiro
+ */
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
diff --git a/docs/css/main.styl b/docs/css/main.styl
index 71c00739..31049be9 100644
--- a/docs/css/main.styl
+++ b/docs/css/main.styl
@@ -1,6 +1,7 @@
 @import 'nib'
 @import 'jeet'
 
+@import 'hljs.css'
 @import 'https://fonts.googleapis.com/css?family=Raleway:400,500,600,200,100&.css'
 
 normalize-css()
@@ -15,6 +16,9 @@ $wrapper
 a, a:hover
   text-decoration none
 
+a
+  color rgb(42,93,173)
+
 html, body
   font-family "Helvetica Neue", Helvetica, Arial, sans-serif
   font-weight 300
@@ -85,7 +89,19 @@ html, body
     text-transform uppercase
     font-weight 600
     line-height 15px
-
+    position relative
+    &.active:before
+      content: ''
+      width 5px
+      height 5px
+      border-radius 100%
+      display block
+      position absolute
+      background white
+      left 50%
+      margin-left -3px
+      bottom -24px
+      
 .header-logo
   font-family 'Raleway'
   font-size 22px
@@ -168,45 +184,183 @@ html, body
   border-radius: 100px
   font-size 13px
   padding 17px 17px 17px 71px
-  width 226px
+  width 236px
   box-sizing border-box
   color white
   font-family 'Raleway'
   font-weight 500
+  transition all .2s ease-in-out
   &:before
     content: ''
     display block
     position absolute
-    left 0
-    top 0
+    left 20px
+    top 20px
     height 32px
     width 32px
-    image '../assets/starwars-icon.png'
+    image '~!file-loader!../assets/starwars-icon.png' 32px 32px
+
+  &:hover
+    transform translateY(-3px)
+    box-shadow 0px 4px 8px 0px rgba(0,0,0,0.32)
 
 .improve-document-link
-  @extend $wrapper
+  position fixed
+  right 0
+  bottom 70px
+  transform-origin 100% 100%
+  background: #999;
+  border: 1px solid #919191;
+  border-radius: 3px 3px 0 0;
+  border-bottom 0
+  padding 9px 12px 12px 34px
+  transform: rotate(270deg) translateX(100%) translateY(3px);
+  font-size: 11px;
+  font-weight: 500;
+  text-transform uppercase
+  color: #FFFFFF;
+  letter-spacing: 0.3px;
+  line-height: 11px;
+  transition all .2s ease-in-out
+  &:before
+    content: ''
+    display block
+    position absolute
+    left 10px
+    top 8px
+    height 16px
+    width 16px
+    image '~!file-loader!../assets/edit.png' 16px 16px
+  &:hover
+    transform: rotate(270deg) translateX(100%)
+    background #666
+    border-color #555
+  +below(600px)
+    display none
+
+$title
+  display block
+  font-family: 'Raleway';
+  font-weight 500
+  line-height 1.2em
+  padding-top .3em
+  margin-bottom .5em
+  padding-bottom .5em
+  color #4A4A4A
 
 .markdown
   .wrapper
     margin-top 60px
 
-    h1, h2, h3, h4, h5, h6
-      font-family: 'Raleway';
-      font-weight 600
-      color #4A4A4A
-    strong
-      font-weight 500
-  
+  h1, h2, h3, h4, h5, h6
+    @extend $title
+
+  h1
+    font-size 32px
+  h2
+    font-size 26px
+  h3
+    font-size 24px
+  h4
+    font-size 21px
+  h5
+    font-size 18px
+  h6
+    font-size 16px
+  strong
+    font-weight 500
+  pre
+    line-height 20px
+    background #FAFAFA
+    padding 20px
+    white-space: pre
+    display: block;
+    color: #333333;
+    overflow-x: auto;
+  p code, ul code
+    background #FAFAFA
+    padding 2px 4px
+    border-radius 2px
+    border 1px solid #CCC
+    color #000
+  code
+    font-size 14px
+    line-height 20px
+    overflow-x: auto;
   margin-bottom 40px
 
+.markdown h1:first-child
+  margin-top 0
+  padding-top 0
+
 .title
   background: #F9F9F9;
-  padding 30px 0
+  padding 54px 0
 
   h1
+    margin 0 auto
     @extend $wrapper
     font-family: 'Raleway';
     font-size: 42px;
     font-weight 200
     color: #585858;
     line-height: 49px;
+
+.docs
+  @extend $wrapper
+
+.docs-aside
+  col(1/4)
+  margin-top 60px
+  +below(600px)
+    padding 20px
+    width 100%
+    box-sizing content-box
+    margin 0 -20px
+    margin-bottom 30px
+    background #F9F9F9
+
+.docs-aside-group
+  display block
+  margin-bottom 40px
+  h3
+    font-family: 'Raleway';
+    font-weight 500
+    font-size 12px
+    text-transform uppercase
+    line-height 1.2em
+    margin-bottom 1em
+    color #AAA
+  a
+    display block
+    font-size 15px
+    font-weight 400
+    line-height 22px
+    height 28px
+    padding 3px 0
+    color #4A4A4A
+    &.active
+      font-weight 500
+      line-height 21px
+      color #E05B49
+
+  +below(600px)
+    display none
+
+.docs-aside-navselect
+  display none
+  width 100%
+  +below(600px)
+    display block
+
+.docs-content
+  col(3/4)
+  margin-top 60px
+  +below(600px)
+    margin-top 10px
+    col(1)
+
+  >h1
+    margin 0
+    @extend $title
+    font-size 32px
diff --git a/docs/gatsby.config.js b/docs/gatsby.config.js
index 80be7b41..8aa39cdf 100644
--- a/docs/gatsby.config.js
+++ b/docs/gatsby.config.js
@@ -1,12 +1,13 @@
 var nib = require("nib");
 var jeet = require("jeet");
+var rupture = require("rupture");
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
 
 module.exports = function(config, env) {
   var IS_STATIC = env === 'static';
   config.merge({
      stylus: {
-        use: [nib(), jeet()]
+        use: [nib(), jeet(), rupture()]
     }
   });
   if (IS_STATIC) {
diff --git a/docs/package.json b/docs/package.json
index 7ef2b3b9..2eeea26e 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -5,7 +5,7 @@
   "main": "n/a",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "npm install -g gatsby && npm install",
+    "build": "npm install -g gatsby && npm install && gatsby build",
     "deploy": "npm run build"
   },
   "keywords": [
diff --git a/docs/pages/_header.js b/docs/pages/_header.js
index 9d70ef03..845a081d 100644
--- a/docs/pages/_header.js
+++ b/docs/pages/_header.js
@@ -1,6 +1,13 @@
 var IN_BROWSER = typeof window != 'undefined';
 import React from 'react';
+var browser_supported;
 if (IN_BROWSER) {
+    var isSafari = navigator.vendor && navigator.vendor.indexOf('Apple') > -1 &&
+                   navigator.userAgent && !navigator.userAgent.match('CriOS');
+    var browser_supported = !isSafari;
+}
+console.log(browser_supported);
+if (IN_BROWSER && browser_supported) {
   var glfx = require('../vendor/glfx.optim')
   var particlesJS = require('../vendor/particles.js')
 }
@@ -23,12 +30,12 @@ class Header extends React.Component {
     this.mounted = false;
   }
   componentDidMount() {
-    if (!IN_BROWSER) return;
+    if (!(IN_BROWSER && browser_supported)) return;
     this.mounted = true;
     new particlesJS('header-background', {
       "particles": {
         "number": {
-          "value": 36,
+          "value": 40,
           "density": {
             "enable": true,
             "value_area": 800
diff --git a/docs/pages/_template.js b/docs/pages/_template.js
index e077d005..4d40b788 100644
--- a/docs/pages/_template.js
+++ b/docs/pages/_template.js
@@ -19,10 +19,10 @@ class Template extends React.Component {
                     Graphene
                 </Link>
                 <nav className="header-nav">
-                    <Link to="/docs/quickstart/">Get started</Link>
-                    <Link to="/">Playground</Link>
-                    <Link to="/">Docs</Link>
+                    <Link to="/try/">Try it out</Link>
+                    <Link to="/docs/quickstart/" className={path.indexOf('/docs')==0?"active":null}>Docs</Link>
                     <Link to="/community/">Community</Link>
+                    <a href="https://github.com/graphql-python/graphene/">Github</a>
                 </nav>
             </div>
             {isIndex?
diff --git a/docs/pages/community.md b/docs/pages/community.md
index 5ad38de1..c42f6b2b 100644
--- a/docs/pages/community.md
+++ b/docs/pages/community.md
@@ -17,9 +17,17 @@ If you think working with Graphene is fun, there are many ways you can contribut
 -   **GraphQL Relay**: [Source Code][1] - [PyPI package][2]
 -   **Graphene**: [Source Code][3] - [PyPI package][4]
 
+Django integration:
+-   **graphql-django-view**: [Source Code][5] - [PyPI package][6]
+-   **django-graphiql**: [Source Code][7] - [PyPI package][8]
+
   [Source Code]: https://github.com/graphql-python/graphql-core
   [PyPI package]: https://pypi.python.org/pypi/graphql-core
   [1]: https://github.com/graphql-python/graphql-relay
   [2]: https://pypi.python.org/pypi/graphql-relay
   [3]: https://github.com/graphql-python/graphene
   [4]: https://pypi.python.org/pypi/graphene
+  [5]: https://github.com/graphql-python/graphql-django-view
+  [6]: https://pypi.python.org/pypi/graphql-django-view
+  [7]: https://github.com/graphql-python/django-graphiql
+  [8]: https://pypi.python.org/pypi/django-graphiql
diff --git a/docs/pages/docs/_template.js b/docs/pages/docs/_template.js
new file mode 100644
index 00000000..c678e494
--- /dev/null
+++ b/docs/pages/docs/_template.js
@@ -0,0 +1,48 @@
+import React from 'react';
+import { RouteHandler, Link, State } from 'react-router';
+import _  from 'lodash';
+
+class Template extends React.Component {
+  goToPage(event) {
+    var page = event.target.value;
+    this.context.router.transitionTo(page);
+  }
+  render() {
+    var docs = this.props.config.docs;
+    var docs_index = _.indexBy(this.props.pages, 'path');
+    return (
+      <div className="docs">
+        <aside className="docs-aside">
+            {Object.keys(docs).map((key) => {
+                let group = docs[key];
+                return <div className="docs-aside-group" key={key}>
+                    <h3>{group.name}</h3>
+                    {group.pages.map((page) => {
+                        return <Link key={page} to={page}>{docs_index[page].data.title}</Link>
+                    })}
+                </div>;
+            })}
+            <select className="docs-aside-navselect" onChange={this.goToPage.bind(this)}>
+                {Object.keys(docs).map((key) => {
+                    let group = docs[key];
+                    return <optgroup key={key} label={group.name}>
+                        {group.pages.map((page) => {
+                            return <option key={page} value={page}>{docs_index[page].data.title}</option>
+                        })}
+                    </optgroup>;
+                })}
+            </select>
+        </aside>
+        <div className="docs-content">
+            <RouteHandler {...this.props} docs={true}/>
+        </div>
+      </div>
+    );
+  }
+}
+
+Template.contextTypes = {
+  router: React.PropTypes.func
+};
+
+module.exports = Template;
diff --git a/docs/pages/docs/basic-types.md b/docs/pages/docs/basic-types.md
new file mode 100644
index 00000000..7a067942
--- /dev/null
+++ b/docs/pages/docs/basic-types.md
@@ -0,0 +1,52 @@
+---
+title: Basic Types
+description: Walkthrough Basic Types
+---
+
+# Basic Types
+
+Graphene define the following base Types:
+- `graphene.String`
+- `graphene.Int`
+- `graphene.Float`
+- `graphene.Boolean`
+- `graphene.ID`
+
+Also, define:
+- `graphene.List`
+- `graphene.NonNull`
+
+## Mounting in ClassTypes
+
+This types if are mounted in a `ObjectType`, `Interface` or `Mutation`,
+ would act as `Field`s.
+So, the following examples will behave exactly the same:
+
+```python
+class Person(graphene.ObjectType):
+    name = graphene.String()
+```
+and
+
+```python
+class Person(graphene.ObjectType):
+    name = graphene.Field(graphene.String())
+```
+
+## Mounting in Fields
+
+If this types are mounted in a `Field`, would act as `Argument`s.
+So, the following examples will behave exactly the same:
+
+```python
+class Person(graphene.ObjectType):
+    say_hello = graphene.Field(graphene.String(),
+                               to=graphene.String())
+```
+and
+
+```python
+class Person(graphene.ObjectType):
+    say_hello = graphene.Field(graphene.String(),
+                               to=graphene.Argument(graphene.String()))
+```
diff --git a/docs/pages/guide/interface.md b/docs/pages/docs/interfaces.md
similarity index 76%
rename from docs/pages/guide/interface.md
rename to docs/pages/docs/interfaces.md
index 9f5ff2b9..43c2daf8 100644
--- a/docs/pages/guide/interface.md
+++ b/docs/pages/docs/interfaces.md
@@ -1,9 +1,13 @@
+---
+title: Interfaces
+description: Walkthrough Interfaces
+---
+
 # Interfaces
 
 An Interface contains the essential fields that will be shared among multiple ObjectTypes.
 
 The basics:
-
 - Each Interface is a Python class that inherits from graphene.Interface.
 - Each attribute of the Interface represents a GraphQL field.
 
@@ -16,19 +20,19 @@ import graphene
 
 # Character is an Interface
 class Character(graphene.Interface):
-	name = graphene.String()
+    name = graphene.String()
 
 # Human is an ObjectType, as inherits an interface
 class Human(Character):
-	born_in = graphene.String()
+    born_in = graphene.String()
 
 # Droid is an ObjectType, as inherits an interface
 class Droid(Character):
-	function = graphene.String()
+    function = graphene.String()
 
 ```
 
-**name** is a field in the `Character` interface that will be in both `Human` and `Droid` ObjectTypes (as those inherit from Character). Each ObjectType also define extra fields at the same time.
+**name** is a field in the `Character` interface that will be in both `Human` and `Droid` ObjectTypes (as those inherit from `Character`). Each ObjectType also define extra fields at the same time.
 
 The above types would have the following representation in a schema:
 
diff --git a/docs/pages/docs/mutations.md b/docs/pages/docs/mutations.md
new file mode 100644
index 00000000..7967f62c
--- /dev/null
+++ b/docs/pages/docs/mutations.md
@@ -0,0 +1,75 @@
+---
+title: Mutations
+description: Walkthrough Mutations
+---
+
+# Mutations
+
+A Mutation is a special ObjectType that define also an Input.
+
+## Quick example
+
+This example defines a Mutation:
+
+```python
+import graphene
+
+class CreatePerson(graphene.Mutation):
+    class Input:
+        name = graphene.String()
+
+    ok = graphene.String()
+    person = graphene.Field('Person')
+
+    @classmethod
+    def mutate(cls, args, info):
+        person = Person(name=args.get('name'))
+        ok = True
+        return CreatePerson(person=person, ok=ok)
+```
+
+**person** and **ok** are the output fields of the Mutation when is resolved.
+
+**Input** attributes are the arguments that the Mutation `CreatePerson` needs for resolving, in this case **name** will be the only argument for the mutation.
+
+**mutate** is the function that will be applied once the mutation is called.
+
+So, we can finish our schema like this:
+
+```python
+# ... the Mutation Class
+
+class Person(graphene.ObjectType):
+    name = graphene.String()
+
+class MyMutations(graphene.ObjectType):
+    create_person = graphene.Field(CreatePerson)
+
+schema = graphene.Schema(mutation=MyMutations)
+```
+
+## Executing the Mutation
+
+Then, if we query (`schema.execute(query_str)`) the following:
+```graphql
+mutation myFirstMutation {
+    createPerson(name:"Peter") {
+        person {
+            name
+        }
+        ok
+    }
+}
+```
+
+We should receive:
+
+```json
+{
+    "createPerson": {
+        "person" : {
+            name: "Peter"
+        },
+        "ok": true
+    }
+}
diff --git a/docs/pages/guide/objecttype.md b/docs/pages/docs/objecttypes.md
similarity index 85%
rename from docs/pages/guide/objecttype.md
rename to docs/pages/docs/objecttypes.md
index 191094ae..dbcab0f3 100644
--- a/docs/pages/guide/objecttype.md
+++ b/docs/pages/docs/objecttypes.md
@@ -1,10 +1,14 @@
+---
+title: ObjectTypes
+description: Walkthrough ObjectTypes
+---
+
 # ObjectTypes
 
 An ObjectType is the single, definitive source of information about your data. It contains the essential fields and behaviors of the data you’re querying.
 
 The basics:
-
-- Each ObjectType is a Python class that inherits graphene.ObjectType or inherits an implemented [interface](/docs/interface).
+- Each ObjectType is a Python class that inherits graphene.ObjectType or inherits an implemented [interfaces](/docs/interfaces/).
 - Each attribute of the ObjectType represents a GraphQL field.
 
 ## Quick example
@@ -20,7 +24,7 @@ class Person(graphene.ObjectType):
     full_name = graphene.String()
 
     def resolve_full_name(self, args, info):
-    	return '{} {}'.format(self.first_name, self.last_name)
+        return '{} {}'.format(self.first_name, self.last_name)
 ```
 
 **first_name** and **last_name** are fields of the ObjectType. Each field is specified as a class attribute, and each attribute maps to a GraphQL field.
diff --git a/docs/pages/docs/django_quickstart.md b/docs/pages/docs/quickstart-django.md
similarity index 95%
rename from docs/pages/docs/django_quickstart.md
rename to docs/pages/docs/quickstart-django.md
index e88fbcdf..542854e7 100644
--- a/docs/pages/docs/django_quickstart.md
+++ b/docs/pages/docs/quickstart-django.md
@@ -1,13 +1,10 @@
 ---
-title: Django Quickstart Guide
-active_tab: quickstart
+title: Guide to Django
 description: A Quick guide to Graphene in Django
 ---
 
-## Django Quickstart
-
 In our previous quickstart page we created a very simple schema.
-Now we will adapt the schema for our Django models.
+Now we will adapt the schema to map automatically some Django models.
 
 ## Project setup
 
diff --git a/docs/pages/docs/quickstart.md b/docs/pages/docs/quickstart.md
index f408a851..f2c56f03 100644
--- a/docs/pages/docs/quickstart.md
+++ b/docs/pages/docs/quickstart.md
@@ -1,10 +1,10 @@
 ---
-title: Quickstart Guide
-active_tab: quickstart
+title: Getting started
 description: A Quick guide to Graphene
 ---
 
-Graphene is a powerful framework for creating GraphQL schemas easily in Python.
+Let's build a basic GraphQL schema from scratch.
+
 
 ## Requirements
 
@@ -23,6 +23,7 @@ cd tutorial
 virtualenv env
 source env/bin/activate  # On Windows use `env\Scripts\activate`
 
+# Install Graphene
 pip install graphene
 ```
 
@@ -30,7 +31,7 @@ pip install graphene
 
 A GraphQL schema describes your data model, and provides a GraphQL server with an associated set of resolve methods that know how to fetch data.
 
-We are going to create a very simple schema, with a `Query` with only one field: `hello`. And when we query it should return 'World'.
+We are going to create a very simple schema, with a `Query` with only one field: `hello`. And when we query it should return `"World"`.
 
 
 ```python
diff --git a/docs/pages/guide/mutation.md b/docs/pages/guide/mutation.md
deleted file mode 100644
index 788cadfd..00000000
--- a/docs/pages/guide/mutation.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Mutations
-
-A Mutation is a special ObjectType that define also an Input.
-
-## Quick example
-
-This example model defines a Mutation:
-
-```python
-import graphene
-
-class CreatePerson(graphene.Mutation):
-	class Input:
-		name = graphene.String()
-
-    ok = graphene.String()
-    person = graphene.Field('Person')
-
-    @classmethod
-    def mutate(cls, args, info):
-    	person = Person(name=args.get('name'))
-    	ok = True
-    	return CreatePerson(person=person, ok=ok)
-```
-
-**person** and **ok** are the output fields of the Mutation when is resolved.
-**Input** attributes are the arguments that the Mutation needs for resolving. **mutate** is the function that will be applied once the mutation is called.
-
-So, we can finish our schema like this:
-
-```python
-# ... the Mutation Class
-
-class Person(graphene.ObjectType):
-	name = graphene.String()
-
-class MyMutations(graphene.ObjectType):
-	create_person = graphene.Field(CreatePerson)
-
-schema = graphene.Schema(mutation=MyMutations)
-```
-
-## Executing the Mutation
-
-Then, if we query (`schema.execute(query_str)`) the following:
-```graphql
-mutation myFirstMutation {
-	createPerson(name:"Peter") {
-		person {
-			name
-		}
-		ok
-	}
-}
-```
-
-We should receive:
-
-```json
-{
-	"createPerson": {
-		"person" : {
-			name: "Peter"
-		},
-		"ok": true
-	}
-}
diff --git a/docs/pages/index.md b/docs/pages/index.md
index 80444d40..359e512b 100644
--- a/docs/pages/index.md
+++ b/docs/pages/index.md
@@ -1,7 +1,7 @@
 ---
 path: /
 ---
-<a class="starwars-example" href="http://swapi.graphene-python.org/">Check our starwars API example!</a>
+<div><a class="starwars-example" href="http://swapi.graphene-python.org/">Check our Django Starwars API example!</a></div>
 
 ## About Graphene
 
diff --git a/docs/wrappers/md.js b/docs/wrappers/md.js
index ddde3df8..b34806c3 100644
--- a/docs/wrappers/md.js
+++ b/docs/wrappers/md.js
@@ -9,15 +9,15 @@ class Markdown extends React.Component {
     var post = this.props.page.data;
     var pagePath = this.props.page.requirePath;
     var documentUrl = `${DOCS_BASEURL}${pagePath}`;
-
+    var showTitle = post.title && !this.props.docs;
     return (
       <DocumentTitle title={`${post.title?post.title+' - ':''}${this.props.config.siteTitle}`}>
         <div className="markdown">
-          {post.title?<div className="title">
+          {showTitle?<div className="title">
             <h1>{post.title}</h1>
           </div>:null}
-          <div className="wrapper" dangerouslySetInnerHTML={{__html: post.body}}/>
-          <a href={documentUrl} className="improve-document-link">Improve this document!</a>
+          <div className={!this.props.docs?"wrapper":null} dangerouslySetInnerHTML={{__html: post.body}}/>
+          <a href={documentUrl} className="improve-document-link">Edit page</a>
         </div>
       </DocumentTitle>
     );

From 1345ea873a445b8dcc461fb8b5de4e9dada0e8f8 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 25 Nov 2015 17:53:52 -0800
Subject: [PATCH 013/173] Improved Travis for build website automatically

---
 .travis.yml       | 46 +++++++++++++++++++++++++++++++++-------------
 docs/package.json |  1 +
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 705ef0d3..0e3b1f10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,6 @@ python:
 - 3.4
 - 3.5
 - pypy
-node_js:
-- 4.1
 cache:
   directories:
     - .cache/pip/
@@ -15,17 +13,39 @@ cache:
     - docs/node_modules/
     - $HOME/docs/node_modules
 install:
-- pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls flake8 six
-  blinker pytest-django
-- pip install --download-cache $HOME/.cache/pip/ -e .[django]
-- python setup.py develop
+- |
+    if [ "$TEST_TYPE" = build ]; then
+        pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django
+        pip install --download-cache $HOME/.cache/pip/ -e .[django]
+        python setup.py develop
+    elif [ "$TEST_TYPE" = lint ]; then
+        pip install --download-cache $HOME/.cache/pip/ flake8
+    fi
 script:
-- py.test --cov=graphene
-- flake8
+- |
+    if [ "$TEST_TYPE" = build_website ]; then
+        echo "Building the web."
+        nvm install 4.1 && cd docs && npm run deploy
+        exit
+    elif [ "$TEST_TYPE" = lint ]; then
+        echo "Checking Python code lint."
+        flake8
+        exit
+    elif [ "$TEST_TYPE" = build ]; then
+        py.test --cov=graphene
+    fi
 after_success:
-- coveralls
-- nvm install 4.1 && cd docs && npm run deploy
-
+- |
+    if [ "$TEST_TYPE" = build ]; then
+        coveralls
+    fi
 env:
-  matrix:
-    secure: e0iu1FvUcGNcsKEDsGQiGTJZMJ8tJMAQ+c+KCuh7I11likoJbninI9FX85efMglG93Xu4GtND1rUwKWnANM94Cz5IrLrT9ga62Cg1sinbzD+JUOG9EobtmcYcLbfNvA1ybkZf4K0KvkYfH1XUxtL3v6jFI6lLjZ1vKa2M6i5t/38pjgUOOh9KlVGi+rqSp2TUsCyjZkMxE2Wwceen5N/B1yZJDn9yHPA+kiV2ScOMgZOuVMqQd0IAPcjhqTbNdaW2VjNQFtS8CQ8FOjJh9NepRAyA42oII7Aq65YzZbifzYL1eSPKKfUHHdc7Bs+vq1kGuaWz+XBqByZAQvw7OtpkecG+KrcO7XDV38y6z33vgCC5MPu9e0BZwITIvyuUOKmFA9vTAx/w963vBDSzHgskgqYtYswxzOoE55TS9tHsc5rgoSatEGW2VXyI8ytWpgkuluCNwT+/ZvNaQ33SCPTwN7mQGWx+DC+eyMBjI1sP9s4aYCaTggCSFNtwhRpQqqM/0HFa7hHDksK/zJhl4fhFUrbmyrJo6wm6Z7/s/WiSulk+zZkrLC9eBs1+XNtU7PzcmgfFmcsJnPGBmBF8WOa8WiX9hOn9DutBT4mLtlOod3YvU22U0Vwj2TjzhDvx8uyYCpDA03a/q9QjE4+klcI2Mw5UNhJsmTpCZQE06aHDKg=
+  - TEST_TYPE=build
+matrix:
+  fast_finish: true
+  include:
+    - python: "2.7"
+      env: TEST_TYPE=build_website
+      secure: e0iu1FvUcGNcsKEDsGQiGTJZMJ8tJMAQ+c+KCuh7I11likoJbninI9FX85efMglG93Xu4GtND1rUwKWnANM94Cz5IrLrT9ga62Cg1sinbzD+JUOG9EobtmcYcLbfNvA1ybkZf4K0KvkYfH1XUxtL3v6jFI6lLjZ1vKa2M6i5t/38pjgUOOh9KlVGi+rqSp2TUsCyjZkMxE2Wwceen5N/B1yZJDn9yHPA+kiV2ScOMgZOuVMqQd0IAPcjhqTbNdaW2VjNQFtS8CQ8FOjJh9NepRAyA42oII7Aq65YzZbifzYL1eSPKKfUHHdc7Bs+vq1kGuaWz+XBqByZAQvw7OtpkecG+KrcO7XDV38y6z33vgCC5MPu9e0BZwITIvyuUOKmFA9vTAx/w963vBDSzHgskgqYtYswxzOoE55TS9tHsc5rgoSatEGW2VXyI8ytWpgkuluCNwT+/ZvNaQ33SCPTwN7mQGWx+DC+eyMBjI1sP9s4aYCaTggCSFNtwhRpQqqM/0HFa7hHDksK/zJhl4fhFUrbmyrJo6wm6Z7/s/WiSulk+zZkrLC9eBs1+XNtU7PzcmgfFmcsJnPGBmBF8WOa8WiX9hOn9DutBT4mLtlOod3YvU22U0Vwj2TjzhDvx8uyYCpDA03a/q9QjE4+klcI2Mw5UNhJsmTpCZQE06aHDKg=
+    - python: "2.7"
+      env: TEST_TYPE=lint
diff --git a/docs/package.json b/docs/package.json
index 2eeea26e..79e04946 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -19,6 +19,7 @@
     "react": "^0.14.3",
     "react-document-title": "^2.0.1",
     "react-router": "^0.13.5",
+    "rupture": "^0.6.1",
     "stylus-loader": "^1.4.2",
     "webpack": "^1.12.9"
   }

From e55d230faf9d0dcf54df5f216794da84262b6222 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 25 Nov 2015 18:35:13 -0800
Subject: [PATCH 014/173] Improved travis deploy to build in a branch

---
 .travis.yml                                   |  79 +++++++++++-------
 docs/{assets => css/images}/edit.png          | Bin
 docs/{assets => css/images}/edit@2x.png       | Bin
 docs/{assets => css/images}/starwars-icon.png | Bin
 .../images}/starwars-icon@2x.png              | Bin
 docs/css/main.styl                            |   4 +-
 docs/gatsby.config.js                         |  26 ++++++
 docs/html.js                                  |   2 +-
 docs/package.json                             |   2 +
 docs/patched-react.js                         |  10 +++
 docs/static/CNAME                             |   1 +
 docs/static/favicon.png                       | Bin 0 -> 1451 bytes
 12 files changed, 91 insertions(+), 33 deletions(-)
 rename docs/{assets => css/images}/edit.png (100%)
 rename docs/{assets => css/images}/edit@2x.png (100%)
 rename docs/{assets => css/images}/starwars-icon.png (100%)
 rename docs/{assets => css/images}/starwars-icon@2x.png (100%)
 create mode 100644 docs/patched-react.js
 create mode 100644 docs/static/CNAME
 create mode 100644 docs/static/favicon.png

diff --git a/.travis.yml b/.travis.yml
index 0e3b1f10..c1827fdb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,44 +8,63 @@ python:
 - pypy
 cache:
   directories:
-    - .cache/pip/
-    - $HOME/.cache/pip
-    - docs/node_modules/
-    - $HOME/docs/node_modules
+  - .cache/pip/
+  - $HOME/.cache/pip
+  - docs/node_modules/
+  - $HOME/docs/node_modules
+  - $(npm config get prefix)/bin/gatsby
 install:
 - |
-    if [ "$TEST_TYPE" = build ]; then
-        pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django
-        pip install --download-cache $HOME/.cache/pip/ -e .[django]
-        python setup.py develop
-    elif [ "$TEST_TYPE" = lint ]; then
-        pip install --download-cache $HOME/.cache/pip/ flake8
-    fi
+  if [ "$TEST_TYPE" = build ]; then
+      pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django
+      pip install --download-cache $HOME/.cache/pip/ -e .[django]
+      python setup.py develop
+  elif [ "$TEST_TYPE" = lint ]; then
+      pip install --download-cache $HOME/.cache/pip/ flake8
+  fi
 script:
 - |
-    if [ "$TEST_TYPE" = build_website ]; then
-        echo "Building the web."
-        nvm install 4.1 && cd docs && npm run deploy
-        exit
-    elif [ "$TEST_TYPE" = lint ]; then
-        echo "Checking Python code lint."
-        flake8
-        exit
-    elif [ "$TEST_TYPE" = build ]; then
-        py.test --cov=graphene
-    fi
+  if [ "$TEST_TYPE" = build_website ]; then
+      echo "Building the web."
+      nvm install 4.0
+
+      GH_PAGES_DIR="$TRAVIS_BUILD_DIR"/docs/public
+      git config --global user.name "Travis CI"
+      git config --global user.email "travis@graphene-python.org"
+      git clone --branch gh-pages-seg --depth=50 \
+        https://graphql-python-bot@github.com/graphql-python/graphene.git \
+        $GH_PAGES_DIR
+      cd docs
+      npm run build
+      cd $GH_PAGES_DIR
+      git status
+      if ! git diff-index --quiet HEAD --; then
+        git add -A .
+        git commit -m "Rebuild website"
+        git push "https://${GITHUB_TOKEN}@github.com/graphql-python/graphene.git" gh-pages-seg
+      fi
+      exit
+  elif [ "$TEST_TYPE" = lint ]; then
+      echo "Checking Python code lint."
+      flake8
+      exit
+  elif [ "$TEST_TYPE" = build ]; then
+      py.test --cov=graphene
+  fi
 after_success:
 - |
-    if [ "$TEST_TYPE" = build ]; then
-        coveralls
-    fi
+  if [ "$TEST_TYPE" = build ]; then
+      coveralls
+  fi
 env:
+  matrix:
   - TEST_TYPE=build
+  global:
+    secure: SQC0eCWCWw8bZxbLE8vQn+UjJOp3Z1m779s9SMK3lCLwJxro/VCLBZ7hj4xsrq1MtcFO2U2Kqf068symw4Hr/0amYI3HFTCFiwXAC3PAKXeURca03eNO2heku+FtnQcOjBanExTsIBQRLDXMOaUkf3MIztpLJ4LHqMfUupKmw9YSB0v40jDbSN8khBnndFykmOnVVHznFp8USoN5F0CiPpnfEvHnJkaX76lNf7Kc9XNShBTTtJsnsHMhuYQeInt0vg9HSjoIYC38Tv2hmMj1myNdzyrHF+LgRjI6ceGi50ApAnGepXC/DNRhXROfECKez+LON/ZSqBGdJhUILqC8A4WmWmIjNcwitVFp3JGBqO7LULS0BI96EtSLe8rD1rkkdTbjivajkbykM1Q0Tnmg1adzGwLxRUbTq9tJQlTTkHBCuXIkpKb1mAtb/TY7A6BqfnPi2xTc/++qEawUG7ePhscdTj0IBrUfZsUNUYZqD8E8XbSWKIuS3SHE+cZ+s/kdAsm4q+FFAlpZKOYGxIkwvgyfu4/Plfol4b7X6iAP9J3r1Kv0DgBVFst5CXEwzZs19/g0CgokQbCXf1N+xeNnUELl6/fImaR3RKP22EaABoil4z8vzl4EqxqVoH1nfhE+WlpryXsuSaF/1R+WklR7aQ1FwoCk8V8HxM2zrj4tI8k=
 matrix:
   fast_finish: true
   include:
-    - python: "2.7"
-      env: TEST_TYPE=build_website
-      secure: e0iu1FvUcGNcsKEDsGQiGTJZMJ8tJMAQ+c+KCuh7I11likoJbninI9FX85efMglG93Xu4GtND1rUwKWnANM94Cz5IrLrT9ga62Cg1sinbzD+JUOG9EobtmcYcLbfNvA1ybkZf4K0KvkYfH1XUxtL3v6jFI6lLjZ1vKa2M6i5t/38pjgUOOh9KlVGi+rqSp2TUsCyjZkMxE2Wwceen5N/B1yZJDn9yHPA+kiV2ScOMgZOuVMqQd0IAPcjhqTbNdaW2VjNQFtS8CQ8FOjJh9NepRAyA42oII7Aq65YzZbifzYL1eSPKKfUHHdc7Bs+vq1kGuaWz+XBqByZAQvw7OtpkecG+KrcO7XDV38y6z33vgCC5MPu9e0BZwITIvyuUOKmFA9vTAx/w963vBDSzHgskgqYtYswxzOoE55TS9tHsc5rgoSatEGW2VXyI8ytWpgkuluCNwT+/ZvNaQ33SCPTwN7mQGWx+DC+eyMBjI1sP9s4aYCaTggCSFNtwhRpQqqM/0HFa7hHDksK/zJhl4fhFUrbmyrJo6wm6Z7/s/WiSulk+zZkrLC9eBs1+XNtU7PzcmgfFmcsJnPGBmBF8WOa8WiX9hOn9DutBT4mLtlOod3YvU22U0Vwj2TjzhDvx8uyYCpDA03a/q9QjE4+klcI2Mw5UNhJsmTpCZQE06aHDKg=
-    - python: "2.7"
-      env: TEST_TYPE=lint
+  - python: '2.7'
+    env: TEST_TYPE=build_website
+  - python: '2.7'
+    env: TEST_TYPE=lint
diff --git a/docs/assets/edit.png b/docs/css/images/edit.png
similarity index 100%
rename from docs/assets/edit.png
rename to docs/css/images/edit.png
diff --git a/docs/assets/edit@2x.png b/docs/css/images/edit@2x.png
similarity index 100%
rename from docs/assets/edit@2x.png
rename to docs/css/images/edit@2x.png
diff --git a/docs/assets/starwars-icon.png b/docs/css/images/starwars-icon.png
similarity index 100%
rename from docs/assets/starwars-icon.png
rename to docs/css/images/starwars-icon.png
diff --git a/docs/assets/starwars-icon@2x.png b/docs/css/images/starwars-icon@2x.png
similarity index 100%
rename from docs/assets/starwars-icon@2x.png
rename to docs/css/images/starwars-icon@2x.png
diff --git a/docs/css/main.styl b/docs/css/main.styl
index 31049be9..e982b922 100644
--- a/docs/css/main.styl
+++ b/docs/css/main.styl
@@ -198,7 +198,7 @@ html, body
     top 20px
     height 32px
     width 32px
-    image '~!file-loader!../assets/starwars-icon.png' 32px 32px
+    // image 'images/starwars-icon.png' 32px 32px
 
   &:hover
     transform translateY(-3px)
@@ -230,7 +230,7 @@ html, body
     top 8px
     height 16px
     width 16px
-    image '~!file-loader!../assets/edit.png' 16px 16px
+    // image 'images/edit.png' 16px 16px
   &:hover
     transform: rotate(270deg) translateX(100%)
     background #666
diff --git a/docs/gatsby.config.js b/docs/gatsby.config.js
index 8aa39cdf..bbfddb16 100644
--- a/docs/gatsby.config.js
+++ b/docs/gatsby.config.js
@@ -1,18 +1,38 @@
 var nib = require("nib");
 var jeet = require("jeet");
 var rupture = require("rupture");
+var path = require("path");
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
+var CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = function(config, env) {
   var IS_STATIC = env === 'static';
   config.merge({
      stylus: {
         use: [nib(), jeet(), rupture()]
+    },
+    resolveLoader: {
+      root: path.join(__dirname, "node_modules"),
+      modulesDirectories: ['./'],
+      alias: {
+        'copy': 'file-loader?name=[path][name].[ext]&context=./static',
+      }
+    },
+    resolve: {
+      root: path.join(__dirname, "node_modules"),
+      alias: {
+        'original-react': path.join(__dirname, "node_modules", "react"),
+        'react/lib': path.join(__dirname, "node_modules", "react", "lib"),
+        'react': path.join(__dirname, 'patched-react.js')
+      },
+      modulesDirectories: ['./']
     }
   });
   if (IS_STATIC) {
     config.plugin('extract-css', ExtractTextPlugin, ["app.css"]);
   }
+  config.plugin('static', CopyWebpackPlugin, [[{ from: '../static'}]]);
+
   config.loader('stylus', function(cfg) {
     cfg.test = /\.styl$/;
     if (IS_STATIC) {
@@ -23,5 +43,11 @@ module.exports = function(config, env) {
     }
     return cfg
   });
+  config.removeLoader('png');
+  config.loader('png', function(cfg) {
+    cfg.test = /\.png$/;
+    cfg.loader = 'file-loader'
+    return cfg
+  })
   return config;
 };
diff --git a/docs/html.js b/docs/html.js
index e93eda04..0b96a36d 100644
--- a/docs/html.js
+++ b/docs/html.js
@@ -11,7 +11,7 @@ export default class Html extends React.Component {
           <meta httpEquiv="X-UA-Compatible" content="IE=edge"/>
           <meta name='viewport' content='width=device-width, initial-scale=1.0 maximum-scale=1.0'/>
           <title>{title}</title>
-          <link rel="shortcut icon" href={this.props.favicon}/>
+          <link rel="shortcut icon" href="/favicon.png"/>
           <link href='https://fonts.googleapis.com/css?family=Raleway:400,600,200,100' rel='stylesheet' type='text/css' />
           <link href='/app.css' rel='stylesheet' type='text/css' />
         </head>
diff --git a/docs/package.json b/docs/package.json
index 79e04946..79172095 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -13,8 +13,10 @@
   ],
   "license": "MIT",
   "dependencies": {
+    "copy-webpack-plugin": "^0.2.0",
     "extract-text-webpack-plugin": "^0.9.1",
     "jeet": "^6.1.2",
+    "lodash": "^3.10.1",
     "nib": "^1.1.0",
     "react": "^0.14.3",
     "react-document-title": "^2.0.1",
diff --git a/docs/patched-react.js b/docs/patched-react.js
new file mode 100644
index 00000000..8b05d3e1
--- /dev/null
+++ b/docs/patched-react.js
@@ -0,0 +1,10 @@
+// React patched version for render in server side always with same ids
+if (typeof window === "undefined") {
+  var ServerReactRootIndex = require('react/lib/ServerReactRootIndex');
+  console.log(ServerReactRootIndex);
+  ServerReactRootIndex.createReactRootIndex = function(){
+      return "graphene";
+  };
+}
+
+module.exports = require('original-react');
diff --git a/docs/static/CNAME b/docs/static/CNAME
new file mode 100644
index 00000000..3e3b78e4
--- /dev/null
+++ b/docs/static/CNAME
@@ -0,0 +1 @@
+graphene-python.org
\ No newline at end of file
diff --git a/docs/static/favicon.png b/docs/static/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..aad799666d30ae5f25c53828c7e1982fed5a41a9
GIT binary patch
literal 1451
zcmV;c1yuTpP)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00004XF*Lt006O%
z3;baP000GINkl<ZSP89HYfM~46rMACd1zBxi<Mf_+N5-OsR^`=kAz720Cq`@wFMUa
zXJU*-gSHy|VGvB3s7b46n`n$_?2od5ttP_KXK3mVV^R|P02WA0G#Y426>STp?49E`
z7cR>_xZO*cWbe$J_ndR)oLLg{7~!glT<MWtFwv95Vo)jZc3x{o*E~cCa?5nStZY%{
zGUE~vt%>sTt;p@k#|w^}9E`$JTglYOqEs1KMoFx4jiXG%NUx4krM_})fMhOBCSH+p
zElbNWk_k%&>k0UZ3?Z8kw32u{v$$=NIvNj8Wq(Hl&TlV!Ff-HGLxNs{KsZ30XQe)u
zl3s@EH^QLb6!Wga;PIYR6vorcnS|%ouTNW?ll=yfs24;_Scnl){QlvV(ANz@C@rY9
zN_eW<gc&c?&E7Jgr^;7g7@|fnRG2CVrE7(hpCZ}3%p4)6{Wm9WHWvMGX4H-F*|ZJt
zUZBQTOOlG2srSa<@SzRe-IFv>UAYC0ZO17yGy^O$aazwb^KrgC`DX5s6XEIoyr=#^
z<xw1LdsG0Q{WTKWL<51!ZfGrzBCOT8skl17CDa}VpVzjp%J+=NkZ0nV6{{+V(|Y3(
z*pDrgaxL5Ak-159Xm5KZKIf7klfjaZ-5C_F^;fXqcau>n7Uv8_W}OtC(;#?26M=Y$
z6up&<!3}JnrZS(2_u~5c^ih$_zayz1iOS%E`7NC%WM1>J3lSA5*9a)TI5s|3;BD#X
zixRq9^=;pr)gSQhhw=+h=mR&J6+f3746T9uLs}YQU+--W>AEsi2~8pYwJH*et8T7Z
zPt}&y%HWB|nonQ0>c+b4*P*l?a+l&aic^1heem*reciM&Qes%>f=$$~_j=s15>AoD
ze#3#SD<!3W2k288GZ66q0;ySWb&jqZ03A>h6CdP%fBKrnI}OW#j0i46x)WI}PEy*J
zfLO{c4AB#MhVo7nt=(=y80!IKj3v<FqsuRnr7V$>|3sYq4y-dMLMgO2IwG!yuKjok
zU5{r%llm(jmdf5TK*>qeqtpjZ(3C*U>azq`3V;|7AbvBhapLs`LwnGIUq#f<BJd|o
zlXvE}91A+}%!P~1fw`y>;hYx?=|t4OyBd}U;QwXQQnLHEm0A_?uB6VvjMQ7HQE+pi
zO+vjj<;8|HP62Sg1!TTznqqT)Tj-)qv=H+^tsgl;bu+S<4<nQ>N)H)2d8U+WEYWgl
z(7qYM1z3aw{tYq8r}VtgU*q%X5ERAhAi*2sVRy5KyaXMVJQ77PfRns-XbB!FZN1O?
zXLYannb1>PUWmel2W;XXmSO4(RFryzCxpznXNrVxp-_$DLaqSgI6BxT*UW!De!A`F
z@k9}GLv&Y^85xbBcm)j#w~hZp81Az<koc#Xn>)&_d*8cb>pD+*+D^Q6nIhCWBL5!B
zGM2sv3*WH}WATR)YIk0+Q#T;T(N$V%JiOxG*N{sMAk?`v3f{&W16K|#TATf>lwv)4
zM$ZM+8PrwPvGC{+7#U(OEZ?EE!W&&GBI@iLqFZo#cemLv{Y=+Mh1c{x2+adAN;ZF`
zZcWrXbwx)5v{F67wZ2V~t$#(2T7rf8hJ-}z;B72ul7u>fIUBC7uozGsBOKXP&~oCE
zwRiZWWPs+kT>H=>lwZ+^U-a5)WONLgrrMp~+WBJ?<h)AR09(wUuVgtdU5w60X*NvH
zi0d$3KdbH6&upC2I;I&p5!$$Qoj;8r3}g1*o^g^Px5_oIYXiW;_+$93t$1c8Iykd-
zv9SMwxnL2(zbdC|S-O72(JEZiEAYri-e5<QD<RXw{{zb{=q5kR$I}1+002ovPDHLk
FV1oOlx{Ck+

literal 0
HcmV?d00001


From 2574ee2976a44ce36b65382bed1e96ddef2e879b Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 25 Nov 2015 21:00:13 -0800
Subject: [PATCH 015/173] Added before install to travis for stopping build if
 only docs changed

---
 .travis.yml           | 27 ++++++++++++++++++---------
 docs/package.json     |  3 ++-
 docs/pages/_header.js |  1 -
 docs/patched-react.js |  1 -
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c1827fdb..48fd46be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,19 +12,27 @@ cache:
   - $HOME/.cache/pip
   - docs/node_modules/
   - $HOME/docs/node_modules
-  - $(npm config get prefix)/bin/gatsby
+before_install:
+- |
+  if [ "$TEST_TYPE" != build_website ] && \
+    ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.md$)|(^(docs))/'
+  then
+    echo "Only docs were updated, stopping build process."
+    exit
+  fi
 install:
 - |
   if [ "$TEST_TYPE" = build ]; then
-      pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django
-      pip install --download-cache $HOME/.cache/pip/ -e .[django]
-      python setup.py develop
+    pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django
+    pip install --download-cache $HOME/.cache/pip/ -e .[django]
+    python setup.py develop
   elif [ "$TEST_TYPE" = lint ]; then
-      pip install --download-cache $HOME/.cache/pip/ flake8
+    pip install --download-cache $HOME/.cache/pip/ flake8
   fi
 script:
 - |
   if [ "$TEST_TYPE" = build_website ]; then
+    if [ "$TRAVIS_BRANCH" = "docs" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
       echo "Building the web."
       nvm install 4.0
 
@@ -44,12 +52,13 @@ script:
         git push "https://${GITHUB_TOKEN}@github.com/graphql-python/graphene.git" gh-pages-seg
       fi
       exit
+    fi
   elif [ "$TEST_TYPE" = lint ]; then
-      echo "Checking Python code lint."
-      flake8
-      exit
+    echo "Checking Python code lint."
+    flake8
+    exit
   elif [ "$TEST_TYPE" = build ]; then
-      py.test --cov=graphene
+    py.test --cov=graphene
   fi
 after_success:
 - |
diff --git a/docs/package.json b/docs/package.json
index 79172095..207603ea 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -5,7 +5,7 @@
   "main": "n/a",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "npm install -g gatsby && npm install && gatsby build",
+    "build": "npm install && ./node_modules/.bin/gatsby build",
     "deploy": "npm run build"
   },
   "keywords": [
@@ -15,6 +15,7 @@
   "dependencies": {
     "copy-webpack-plugin": "^0.2.0",
     "extract-text-webpack-plugin": "^0.9.1",
+    "gatsby": "^0.7.2",
     "jeet": "^6.1.2",
     "lodash": "^3.10.1",
     "nib": "^1.1.0",
diff --git a/docs/pages/_header.js b/docs/pages/_header.js
index 845a081d..7fca1af6 100644
--- a/docs/pages/_header.js
+++ b/docs/pages/_header.js
@@ -6,7 +6,6 @@ if (IN_BROWSER) {
                    navigator.userAgent && !navigator.userAgent.match('CriOS');
     var browser_supported = !isSafari;
 }
-console.log(browser_supported);
 if (IN_BROWSER && browser_supported) {
   var glfx = require('../vendor/glfx.optim')
   var particlesJS = require('../vendor/particles.js')
diff --git a/docs/patched-react.js b/docs/patched-react.js
index 8b05d3e1..d8253895 100644
--- a/docs/patched-react.js
+++ b/docs/patched-react.js
@@ -1,7 +1,6 @@
 // React patched version for render in server side always with same ids
 if (typeof window === "undefined") {
   var ServerReactRootIndex = require('react/lib/ServerReactRootIndex');
-  console.log(ServerReactRootIndex);
   ServerReactRootIndex.createReactRootIndex = function(){
       return "graphene";
   };

From 324aa9bd84d8a99a9c972e62718295e74af71322 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 25 Nov 2015 21:45:02 -0800
Subject: [PATCH 016/173] Improved styles and markup

---
 docs/css/main.styl             | 6 +++---
 docs/gatsby.config.js          | 2 +-
 docs/package.json              | 1 +
 docs/pages/docs/objecttypes.md | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/css/main.styl b/docs/css/main.styl
index e982b922..3bdd3bcd 100644
--- a/docs/css/main.styl
+++ b/docs/css/main.styl
@@ -94,7 +94,7 @@ html, body
       content: ''
       width 5px
       height 5px
-      border-radius 100%
+      border-radius 3px
       display block
       position absolute
       background white
@@ -198,7 +198,7 @@ html, body
     top 20px
     height 32px
     width 32px
-    // image 'images/starwars-icon.png' 32px 32px
+    image './images/starwars-icon.png' 32px 32px
 
   &:hover
     transform translateY(-3px)
@@ -230,7 +230,7 @@ html, body
     top 8px
     height 16px
     width 16px
-    // image 'images/edit.png' 16px 16px
+    image './images/edit.png' 16px 16px
   &:hover
     transform: rotate(270deg) translateX(100%)
     background #666
diff --git a/docs/gatsby.config.js b/docs/gatsby.config.js
index bbfddb16..da6afec6 100644
--- a/docs/gatsby.config.js
+++ b/docs/gatsby.config.js
@@ -46,7 +46,7 @@ module.exports = function(config, env) {
   config.removeLoader('png');
   config.loader('png', function(cfg) {
     cfg.test = /\.png$/;
-    cfg.loader = 'file-loader'
+    cfg.loader = 'url-loader'
     return cfg
   })
   return config;
diff --git a/docs/package.json b/docs/package.json
index 207603ea..0b20256e 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -24,6 +24,7 @@
     "react-router": "^0.13.5",
     "rupture": "^0.6.1",
     "stylus-loader": "^1.4.2",
+    "url-loader": "^0.5.7",
     "webpack": "^1.12.9"
   }
 }
diff --git a/docs/pages/docs/objecttypes.md b/docs/pages/docs/objecttypes.md
index dbcab0f3..897b50f0 100644
--- a/docs/pages/docs/objecttypes.md
+++ b/docs/pages/docs/objecttypes.md
@@ -8,7 +8,7 @@ description: Walkthrough ObjectTypes
 An ObjectType is the single, definitive source of information about your data. It contains the essential fields and behaviors of the data you’re querying.
 
 The basics:
-- Each ObjectType is a Python class that inherits graphene.ObjectType or inherits an implemented [interfaces](/docs/interfaces/).
+- Each ObjectType is a Python class that inherits graphene.ObjectType or inherits an implemented [Interface](/docs/interfaces/).
 - Each attribute of the ObjectType represents a GraphQL field.
 
 ## Quick example

From aebafbc3c3f58518a767f0a15eb8f25f7c0c0e8b Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 25 Nov 2015 22:02:36 -0800
Subject: [PATCH 017/173] Improved basic types page

---
 docs/pages/docs/basic-types.md | 54 +++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 8 deletions(-)

diff --git a/docs/pages/docs/basic-types.md b/docs/pages/docs/basic-types.md
index 7a067942..50e96e86 100644
--- a/docs/pages/docs/basic-types.md
+++ b/docs/pages/docs/basic-types.md
@@ -5,17 +5,59 @@ description: Walkthrough Basic Types
 
 # Basic Types
 
-Graphene define the following base Types:
+Graphene define the following base Scalar Types:
 - `graphene.String`
 - `graphene.Int`
 - `graphene.Float`
 - `graphene.Boolean`
 - `graphene.ID`
 
-Also, define:
+Also the following Types are available:
 - `graphene.List`
 - `graphene.NonNull`
 
+## Shorcuts
+
+There are some shorcuts for code easier.
+The following are equivalent
+
+```python
+# A list of strings
+string_list = graphene.List(graphene.String())
+string_list = graphene.String().List
+
+# A non-null string
+string_non_null = graphene.String().NonNull
+string_non_null = graphene.NonNull(graphene.String())
+```
+
+
+## Custom scalars
+
+You can also create a custom scalar for your schema.
+If you want to create a DateTime Scalar Type just type:
+
+```python
+import datetime
+from graphql.core.language import ast
+
+class DateTime(Scalar):
+    '''DateTime'''
+    @staticmethod
+    def serialize(dt):
+        return dt.isoformat()
+
+    @staticmethod
+    def parse_literal(node):
+        if isinstance(node, ast.StringValue):
+            return datetime.datetime.strptime(
+                node.value, "%Y-%m-%dT%H:%M:%S.%f")
+
+    @staticmethod
+    def parse_value(value):
+        return datetime.datetime.strptime(value, "%Y-%m-%dT%H:%M:%S.%f")
+```
+
 ## Mounting in ClassTypes
 
 This types if are mounted in a `ObjectType`, `Interface` or `Mutation`,
@@ -39,14 +81,10 @@ If this types are mounted in a `Field`, would act as `Argument`s.
 So, the following examples will behave exactly the same:
 
 ```python
-class Person(graphene.ObjectType):
-    say_hello = graphene.Field(graphene.String(),
-                               to=graphene.String())
+graphene.Field(graphene.String(), to=graphene.String())
 ```
 and
 
 ```python
-class Person(graphene.ObjectType):
-    say_hello = graphene.Field(graphene.String(),
-                               to=graphene.Argument(graphene.String()))
+graphene.Field(graphene.String(), to=graphene.Argument(graphene.String()))
 ```

From c4c3d0ef284c6eece719d25543fa83ecdcf5a244 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 25 Nov 2015 22:58:43 -0800
Subject: [PATCH 018/173] Improved documentation pages.

---
 .travis.yml                          |  2 +-
 docs/css/main.styl                   | 19 +++++++--
 docs/pages/community.md              |  7 +++-
 docs/pages/docs/_template.js         | 58 ++++++++++++++++------------
 docs/pages/docs/basic-types.md       | 12 ++----
 docs/pages/docs/interfaces.md        |  2 +-
 docs/pages/docs/objecttypes.md       |  2 +-
 docs/pages/docs/quickstart-django.md | 10 +++--
 docs/pages/docs/quickstart.md        | 11 +-----
 docs/pages/index.md                  |  8 +---
 docs/wrappers/md.js                  |  8 ++--
 11 files changed, 78 insertions(+), 61 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 48fd46be..d948d340 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ install:
 script:
 - |
   if [ "$TEST_TYPE" = build_website ]; then
-    if [ "$TRAVIS_BRANCH" = "docs" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
+    if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
       echo "Building the web."
       nvm install 4.0
 
diff --git a/docs/css/main.styl b/docs/css/main.styl
index 3bdd3bcd..fd7e3c43 100644
--- a/docs/css/main.styl
+++ b/docs/css/main.styl
@@ -19,6 +19,9 @@ a, a:hover
 a
   color rgb(42,93,173)
 
+p
+  margin-bottom 1em
+
 html, body
   font-family "Helvetica Neue", Helvetica, Arial, sans-serif
   font-weight 300
@@ -283,6 +286,10 @@ $title
     border-radius 2px
     border 1px solid #CCC
     color #000
+  p + p, p + ul
+    margin-top -.4em
+  p + ul
+    margin-top -.6em
   code
     font-size 14px
     line-height 20px
@@ -295,16 +302,16 @@ $title
 
 .title
   background: #F9F9F9;
-  padding 54px 0
+  padding 48px 0
 
   h1
     margin 0 auto
     @extend $wrapper
     font-family: 'Raleway';
-    font-size: 42px;
+    font-size: 40px;
     font-weight 200
     color: #585858;
-    line-height: 49px;
+    line-height: 50px;
 
 .docs
   @extend $wrapper
@@ -356,6 +363,7 @@ $title
 .docs-content
   col(3/4)
   margin-top 60px
+  margin-bottom 20px
   +below(600px)
     margin-top 10px
     col(1)
@@ -364,3 +372,8 @@ $title
     margin 0
     @extend $title
     font-size 32px
+    
+  .docs-next
+    float right
+    color #e05b49
+    font-weight 400
diff --git a/docs/pages/community.md b/docs/pages/community.md
index c42f6b2b..20d747a7 100644
--- a/docs/pages/community.md
+++ b/docs/pages/community.md
@@ -5,7 +5,7 @@ active_tab: community
 description: The biggest GraphQL Community in Python
 ---
 
-Graphene is constantly developing thanks to an active volunteer community, There are many different places where you discuss Graphene, share your experiences or ask for help. Your feedback and participation are very welcome!
+Graphene is constantly developing thanks to an active volunteer community, There are many different places where you discuss Graphene, share your experiences or ask for help. **Your feedback and participation are very welcome**!
 
 If you think working with Graphene is fun, there are many ways you can contribute to it. Please join us in the Slack community and help us shape the next generation API’s.
 
@@ -21,6 +21,11 @@ Django integration:
 -   **graphql-django-view**: [Source Code][5] - [PyPI package][6]
 -   **django-graphiql**: [Source Code][7] - [PyPI package][8]
 
+## Other related projects
+
+- [Flask GraphQL Demo](https://github.com/amitsaha/flask-graphql-demo) by [@echorand](https://twitter.com/echorand)
+
+
   [Source Code]: https://github.com/graphql-python/graphql-core
   [PyPI package]: https://pypi.python.org/pypi/graphql-core
   [1]: https://github.com/graphql-python/graphql-relay
diff --git a/docs/pages/docs/_template.js b/docs/pages/docs/_template.js
index c678e494..d25d0d3e 100644
--- a/docs/pages/docs/_template.js
+++ b/docs/pages/docs/_template.js
@@ -10,31 +10,41 @@ class Template extends React.Component {
   render() {
     var docs = this.props.config.docs;
     var docs_index = _.indexBy(this.props.pages, 'path');
-    return (
-      <div className="docs">
-        <aside className="docs-aside">
-            {Object.keys(docs).map((key) => {
-                let group = docs[key];
-                return <div className="docs-aside-group" key={key}>
-                    <h3>{group.name}</h3>
-                    {group.pages.map((page) => {
-                        return <Link key={page} to={page}>{docs_index[page].data.title}</Link>
-                    })}
-                </div>;
+    var pages = [];
+    var aside_links = Object.keys(docs).map((key) => {
+        let group = docs[key];
+        return <div className="docs-aside-group" key={key}>
+            <h3>{group.name}</h3>
+            {group.pages.map((page) => {
+                pages.push(page)
+                return <Link key={page} to={page}>{docs_index[page].data.title}</Link>
             })}
-            <select className="docs-aside-navselect" onChange={this.goToPage.bind(this)}>
-                {Object.keys(docs).map((key) => {
-                    let group = docs[key];
-                    return <optgroup key={key} label={group.name}>
-                        {group.pages.map((page) => {
-                            return <option key={page} value={page}>{docs_index[page].data.title}</option>
-                        })}
-                    </optgroup>;
-                })}
-            </select>
-        </aside>
-        <div className="docs-content">
-            <RouteHandler {...this.props} docs={true}/>
+        </div>;
+    });
+    var aside_options = Object.keys(docs).map((key) => {
+        let group = docs[key];
+        return <optgroup key={key} label={group.name}>
+            {group.pages.map((page) => {
+                return <option key={page} value={page}>{docs_index[page].data.title}</option>
+            })}
+        </optgroup>;
+    });
+    var next_page_index = pages.indexOf(this.props.page.path)+1;
+    var next_page = pages[next_page_index];
+    return (
+      <div>
+        <div className="title"><h1>Documentation</h1></div>
+        <div className="docs">
+          <aside className="docs-aside">
+              {aside_links}
+              <select className="docs-aside-navselect" onChange={this.goToPage.bind(this)}>
+                  {aside_options}
+              </select>
+          </aside>
+          <div className="docs-content">
+              <RouteHandler {...this.props} docs={true}/>
+              {next_page?<Link className="docs-next" to={next_page}>Next - {docs_index[next_page].data.title} →</Link>:null}
+          </div>
         </div>
       </div>
     );
diff --git a/docs/pages/docs/basic-types.md b/docs/pages/docs/basic-types.md
index 50e96e86..b1acb2f6 100644
--- a/docs/pages/docs/basic-types.md
+++ b/docs/pages/docs/basic-types.md
@@ -62,29 +62,23 @@ class DateTime(Scalar):
 
 This types if are mounted in a `ObjectType`, `Interface` or `Mutation`,
  would act as `Field`s.
-So, the following examples will behave exactly the same:
 
 ```python
 class Person(graphene.ObjectType):
     name = graphene.String()
-```
-and
 
-```python
+# Is equivalent to:
 class Person(graphene.ObjectType):
     name = graphene.Field(graphene.String())
 ```
 
 ## Mounting in Fields
 
-If this types are mounted in a `Field`, would act as `Argument`s.
-So, the following examples will behave exactly the same:
+If the types are mounted in a `Field`, would act as `Argument`s.
 
 ```python
 graphene.Field(graphene.String(), to=graphene.String())
-```
-and
 
-```python
+# Is equivalent to:
 graphene.Field(graphene.String(), to=graphene.Argument(graphene.String()))
 ```
diff --git a/docs/pages/docs/interfaces.md b/docs/pages/docs/interfaces.md
index 43c2daf8..b6e61743 100644
--- a/docs/pages/docs/interfaces.md
+++ b/docs/pages/docs/interfaces.md
@@ -8,7 +8,7 @@ description: Walkthrough Interfaces
 An Interface contains the essential fields that will be shared among multiple ObjectTypes.
 
 The basics:
-- Each Interface is a Python class that inherits from graphene.Interface.
+- Each Interface is a Python class that inherits from `graphene.Interface`.
 - Each attribute of the Interface represents a GraphQL field.
 
 ## Quick example
diff --git a/docs/pages/docs/objecttypes.md b/docs/pages/docs/objecttypes.md
index 897b50f0..b1c59663 100644
--- a/docs/pages/docs/objecttypes.md
+++ b/docs/pages/docs/objecttypes.md
@@ -8,7 +8,7 @@ description: Walkthrough ObjectTypes
 An ObjectType is the single, definitive source of information about your data. It contains the essential fields and behaviors of the data you’re querying.
 
 The basics:
-- Each ObjectType is a Python class that inherits graphene.ObjectType or inherits an implemented [Interface](/docs/interfaces/).
+- Each ObjectType is a Python class that inherits `graphene.ObjectType` or inherits an implemented [Interface](/docs/interfaces/).
 - Each attribute of the ObjectType represents a GraphQL field.
 
 ## Quick example
diff --git a/docs/pages/docs/quickstart-django.md b/docs/pages/docs/quickstart-django.md
index 542854e7..2b6020d0 100644
--- a/docs/pages/docs/quickstart-django.md
+++ b/docs/pages/docs/quickstart-django.md
@@ -1,10 +1,14 @@
 ---
-title: Guide to Django
+title: Django Tutorial
 description: A Quick guide to Graphene in Django
 ---
 
+# Django Tutorial
+
 In our previous quickstart page we created a very simple schema.
-Now we will adapt the schema to map automatically some Django models.
+
+Now we will adapt the schema to map automatically some Django models, 
+and expose this schema in a `/graphql` API endpoint.
 
 ## Project setup
 
@@ -54,7 +58,7 @@ from graphene.contrib.django import DjangoObjectType
 
 from django.contrib.auth.models import User, Group
 
-# Graphene will map automaticall the User model to UserType with
+# Graphene will map automatically the User model to UserType with
 # the specified fields
 class UserType(DjangoObjectType):
     class Meta:
diff --git a/docs/pages/docs/quickstart.md b/docs/pages/docs/quickstart.md
index f2c56f03..74d574d2 100644
--- a/docs/pages/docs/quickstart.md
+++ b/docs/pages/docs/quickstart.md
@@ -3,6 +3,8 @@ title: Getting started
 description: A Quick guide to Graphene
 ---
 
+# Getting started
+
 Let's build a basic GraphQL schema from scratch.
 
 
@@ -15,15 +17,6 @@ Let's build a basic GraphQL schema from scratch.
 ## Project setup
 
 ```bash
-# Create the project directory
-mkdir tutorial
-cd tutorial
-
-# Create a virtualenv to isolate our package dependencies locally
-virtualenv env
-source env/bin/activate  # On Windows use `env\Scripts\activate`
-
-# Install Graphene
 pip install graphene
 ```
 
diff --git a/docs/pages/index.md b/docs/pages/index.md
index 359e512b..880dc27c 100644
--- a/docs/pages/index.md
+++ b/docs/pages/index.md
@@ -3,12 +3,8 @@ path: /
 ---
 <div><a class="starwars-example" href="http://swapi.graphene-python.org/">Check our Django Starwars API example!</a></div>
 
-## About Graphene
+## Meet Graphene
 
 Graphene is a Python library for building GraphQL schemas/types fast and easily.
 
-**What is GraphQL?** A GraphQL query is a string interpreted by a server that returns data in a specified format.
-
-- **Easy to use:** Graphene helps you use GraphQL in Python without effort.
-- **Relay:** Graphene has builtin support for Relay
-- **Django:** Automatic *Django model* mapping to Graphene Types.
+**But, what is GraphQL?** A GraphQL query is a string interpreted by a server that returns data in a specified format. We believe *GraphQL* is the next big thing after peanut butter and *REST*.
diff --git a/docs/wrappers/md.js b/docs/wrappers/md.js
index b34806c3..67df0e37 100644
--- a/docs/wrappers/md.js
+++ b/docs/wrappers/md.js
@@ -12,12 +12,14 @@ class Markdown extends React.Component {
     var showTitle = post.title && !this.props.docs;
     return (
       <DocumentTitle title={`${post.title?post.title+' - ':''}${this.props.config.siteTitle}`}>
-        <div className="markdown">
+        <div>
           {showTitle?<div className="title">
             <h1>{post.title}</h1>
           </div>:null}
-          <div className={!this.props.docs?"wrapper":null} dangerouslySetInnerHTML={{__html: post.body}}/>
-          <a href={documentUrl} className="improve-document-link">Edit page</a>
+          <div className="markdown">
+            <div className={!this.props.docs?"wrapper":null} dangerouslySetInnerHTML={{__html: post.body}}/>
+            <a href={documentUrl} className="improve-document-link">Edit page</a>
+          </div>
         </div>
       </DocumentTitle>
     );

From 62d045301ae98239814499896cb5230e9fd2a427 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 26 Nov 2015 02:30:52 -0800
Subject: [PATCH 019/173] Added burger menu to the website

---
 docs/css/bm.css              | 41 ++++++++++++++++++++++++++++++++++++
 docs/css/main.styl           | 37 +++++++++++++++++++++++++++++++-
 docs/package.json            |  1 +
 docs/pages/_template.js      |  7 ++++++
 docs/pages/docs/_template.js |  2 +-
 5 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 docs/css/bm.css

diff --git a/docs/css/bm.css b/docs/css/bm.css
new file mode 100644
index 00000000..dad8480f
--- /dev/null
+++ b/docs/css/bm.css
@@ -0,0 +1,41 @@
+/* Position and sizing of burger button */
+.bm-burger-button {
+  position: absolute;
+  width: 24px;
+  height: 20px;
+  right: 36px;
+  top: 42px;
+}
+ 
+/* Color/shape of burger icon bars */
+.bm-burger-bars {
+  background: white;
+}
+ 
+/* Color of close button cross */
+.bm-cross {
+  background: #bdc3c7;
+  margin-top: -1px;
+  width: 1px!important;
+  height: 18px!important;
+}
+ 
+/* Background color of sidebar */
+.bm-menu {
+  background: #3c3c3c;
+  box-shadow: -1px 0 5px rgba(0,0,0,.15);
+}
+ 
+/* Morph shape necessary with bubble or elastic */
+.bm-morph-shape {
+  fill: white;
+}
+ 
+.bm-menu-wrap {
+  z-index: 10000!important;
+}
+/* General menu styles */
+.bm-menu {
+  padding: 2.5em 1.5em 0;
+  font-size: 1.15em;
+}
diff --git a/docs/css/main.styl b/docs/css/main.styl
index fd7e3c43..0fafdf5e 100644
--- a/docs/css/main.styl
+++ b/docs/css/main.styl
@@ -2,6 +2,7 @@
 @import 'jeet'
 
 @import 'hljs.css'
+@import 'bm.css'
 @import 'https://fonts.googleapis.com/css?family=Raleway:400,500,600,200,100&.css'
 
 normalize-css()
@@ -104,7 +105,36 @@ html, body
       left 50%
       margin-left -3px
       bottom -24px
-      
+
+  +below(600px)
+    display none
+
+.bm-burger-button, .bm-menu-wrap, .bm-overlay
+  display none
+  +below(600px)
+    display block
+
+.bm-burger-button
+  z-index 300!important
+
+.bm-overlay
+  z-index 1000!important
+
+.bm-item-list
+  a
+    font-family 'Raleway'
+    display block
+    font-size 15px
+    color #CCC
+    margin 6px 0
+    padding 10px 6px
+    text-transform uppercase
+    font-weight 500
+    line-height 20px
+    position relative
+    &:hover
+      color white
+
 .header-logo
   font-family 'Raleway'
   font-size 22px
@@ -254,6 +284,8 @@ $title
 .markdown
   .wrapper
     margin-top 60px
+    +below(600px)
+      margin-top 30px
 
   h1, h2, h3, h4, h5, h6
     @extend $title
@@ -313,6 +345,9 @@ $title
     color: #585858;
     line-height: 50px;
 
+  +below(600px)
+    padding 30px 0
+
 .docs
   @extend $wrapper
 
diff --git a/docs/package.json b/docs/package.json
index 0b20256e..efaa1c67 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -20,6 +20,7 @@
     "lodash": "^3.10.1",
     "nib": "^1.1.0",
     "react": "^0.14.3",
+    "react-burger-menu": "^1.4.2",
     "react-document-title": "^2.0.1",
     "react-router": "^0.13.5",
     "rupture": "^0.6.1",
diff --git a/docs/pages/_template.js b/docs/pages/_template.js
index 4d40b788..385239dd 100644
--- a/docs/pages/_template.js
+++ b/docs/pages/_template.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { RouteHandler, Link, State } from 'react-router';
 import Icon from 'assets/icon'
+import {stack as Menu} from 'react-burger-menu';
 
 import Header from './_header'
 import logo from '!raw!assets/logo.svg'
@@ -12,6 +13,12 @@ class Template extends React.Component {
     var isIndex = path == '/';
     return (
       <div>
+        <Menu width={200} right>
+            <span><Link to="/try/">Try it out</Link></span>
+            <span><Link to="/docs/quickstart/" className={path.indexOf('/docs')==0?"active":null}>Docs</Link></span>
+            <span><Link to="/community/">Community</Link></span>
+            <a href="https://github.com/graphql-python/graphene/">Github</a>
+        </Menu>
         <header className="header">
             <div className="header-wrapper">
                 <Link className="header-logo" to="/">
diff --git a/docs/pages/docs/_template.js b/docs/pages/docs/_template.js
index d25d0d3e..507b9a79 100644
--- a/docs/pages/docs/_template.js
+++ b/docs/pages/docs/_template.js
@@ -37,7 +37,7 @@ class Template extends React.Component {
         <div className="docs">
           <aside className="docs-aside">
               {aside_links}
-              <select className="docs-aside-navselect" onChange={this.goToPage.bind(this)}>
+              <select className="docs-aside-navselect" value={this.props.page.path} onChange={this.goToPage.bind(this)}>
                   {aside_options}
               </select>
           </aside>

From aed366a3c7a1cc285eea1754e7090ebb1e2d5adb Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 26 Nov 2015 02:36:15 -0800
Subject: [PATCH 020/173] Changed from gh-pages-seg to gh-pages in travis

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d948d340..c6e3e352 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ script:
       GH_PAGES_DIR="$TRAVIS_BUILD_DIR"/docs/public
       git config --global user.name "Travis CI"
       git config --global user.email "travis@graphene-python.org"
-      git clone --branch gh-pages-seg --depth=50 \
+      git clone --branch gh-pages --depth=50 \
         https://graphql-python-bot@github.com/graphql-python/graphene.git \
         $GH_PAGES_DIR
       cd docs
@@ -49,7 +49,7 @@ script:
       if ! git diff-index --quiet HEAD --; then
         git add -A .
         git commit -m "Rebuild website"
-        git push "https://${GITHUB_TOKEN}@github.com/graphql-python/graphene.git" gh-pages-seg
+        git push "https://${GITHUB_TOKEN}@github.com/graphql-python/graphene.git" gh-pages
       fi
       exit
     fi

From 944d361fd7fee284a1238370caa67b31c4a67ea8 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 26 Nov 2015 03:06:29 -0800
Subject: [PATCH 021/173] Improved docs

---
 docs/pages/docs/quickstart-django.md | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/docs/pages/docs/quickstart-django.md b/docs/pages/docs/quickstart-django.md
index 2b6020d0..db17b0e2 100644
--- a/docs/pages/docs/quickstart-django.md
+++ b/docs/pages/docs/quickstart-django.md
@@ -28,7 +28,6 @@ pip install django-graphiql
 
 # Set up a new project with a single application
 django-admin.py startproject tutorial .  # Note the trailing '.' character
-cd tutorial
 django-admin.py startapp quickstart
 ```
 
@@ -50,7 +49,7 @@ Once you've set up a database and initial user created and ready to go, open up
 
 ## Schema
 
-Right, we'd better write some types then. Open `tutorial/quickstart/schema.py` and get typing.
+Right, we'd better write some types then. Open `quickstart/schema.py` and get typing.
 
 ```python
 import graphene
@@ -58,6 +57,7 @@ from graphene.contrib.django import DjangoObjectType
 
 from django.contrib.auth.models import User, Group
 
+
 # Graphene will map automatically the User model to UserType with
 # the specified fields
 class UserType(DjangoObjectType):
@@ -68,14 +68,16 @@ class UserType(DjangoObjectType):
 
 class GroupType(DjangoObjectType):
     class Meta:
-        model = User
+        model = Group
         only_fields = ('name', )
 
 
 class Query(graphene.ObjectType):
     all_users = graphene.List(UserType)
-    get_user = graphene.Field(UserType
-                              id=graphene.String(required=True))
+    get_user = graphene.Field(UserType,
+                              id=graphene.String().NonNull)
+    get_group = graphene.Field(GroupType,
+                               id=graphene.String().NonNull)
 
     def resolve_all_users(self, args, info):
         return User.objects.all()
@@ -83,10 +85,24 @@ class Query(graphene.ObjectType):
     def resolve_get_user(self, args, info):
         return User.objects.get(id=args.get('id'))
 
+    def resolve_get_group(self, args, info):
+        return Group.objects.get(id=args.get('id'))
+
 schema = graphene.Schema(query=Query)
 ```
 
 
+## Adding GraphiQL
+
+For having the GraphiQL static assets we need to append `django_graphiql` in `INSTALLED_APPS` in `tutorial/settings.py`:
+
+```python
+INSTALLED_APPS = [
+    # The other installed apps
+    'django_graphiql',
+]
+```
+
 ## Creating GraphQL and GraphiQL views
 
 Okay, now let's wire up the GraphQL and GraphiQL urls. On to `tutorial/urls.py`...
@@ -96,7 +112,7 @@ Okay, now let's wire up the GraphQL and GraphiQL urls. On to `tutorial/urls.py`.
 from django.conf.urls import url, include
 from django.views.decorators.csrf import csrf_exempt
 from graphene.contrib.django.views import GraphQLView
-from tutorial.quickstart.schema import schema
+from quickstart.schema import schema
 
 
 # Wire up our GraphQL schema in /graphql.

From 059f25c44cda7a8afe33179262ba1ab0a2d4a32c Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 26 Nov 2015 23:50:37 -0800
Subject: [PATCH 022/173] First version docs playground

---
 docs/css/graphiql.css        | 1070 ++++++++++++++++++++++++++++++++++
 docs/css/main.styl           |   11 +-
 docs/css/playground.styl     |   38 ++
 docs/gatsby.config.js        |   23 +-
 docs/package.json            |    3 +
 docs/pages/_empty.js         |    9 +
 docs/pages/_template.js      |    4 +-
 docs/pages/docs/_template.js |    2 +-
 docs/pages/playground.js     |    1 +
 docs/playground/page.js      |   67 +++
 docs/playground/schema.js    |   59 ++
 docs/playground/wrapper.js   |   22 +
 docs/wrappers/md.js          |    2 +-
 13 files changed, 1301 insertions(+), 10 deletions(-)
 create mode 100644 docs/css/graphiql.css
 create mode 100644 docs/css/playground.styl
 create mode 100644 docs/pages/_empty.js
 create mode 100644 docs/pages/playground.js
 create mode 100644 docs/playground/page.js
 create mode 100644 docs/playground/schema.js
 create mode 100644 docs/playground/wrapper.js

diff --git a/docs/css/graphiql.css b/docs/css/graphiql.css
new file mode 100644
index 00000000..c8af1081
--- /dev/null
+++ b/docs/css/graphiql.css
@@ -0,0 +1,1070 @@
+#graphiql-container {
+  color: #141823;
+  width: 100%;
+  display: -webkit-flex;
+  display:         flex;
+  -webkit-flex-direction: row;
+          flex-direction: row;
+  height: 100%;
+  font-family: system, -apple-system, 'San Francisco', '.SFNSDisplay-Regular', 'Segoe UI', Segoe, 'Segoe WP', 'Helvetica Neue', helvetica, 'Lucida Grande', arial, sans-serif;
+  font-size: 14px;
+}
+
+#graphiql-container .editorWrap {
+  display: -webkit-flex;
+  display:         flex;
+  -webkit-flex-direction: column;
+          flex-direction: column;
+  -webkit-flex: 1;
+          flex: 1;
+}
+
+#graphiql-container .title {
+  display: none;
+  font-size: 18px;
+}
+
+#graphiql-container .title em {
+  font-family: georgia;
+  font-size: 19px;
+}
+
+#graphiql-container .topBarWrap {
+  display: -webkit-flex;
+  display:         flex;
+  -webkit-flex-direction: row;
+          flex-direction: row;
+  background: #F9F9F9;
+  height: 48px;
+}
+
+#graphiql-container .topBar {
+  border-bottom: solid 1px #d0d0d0;
+  cursor: default;
+  -webkit-user-select: none;
+          user-select: none;
+  display: -webkit-flex;
+  display:         flex;
+  -webkit-flex-direction: row;
+          flex-direction: row;
+  -webkit-flex: 1;
+          flex: 1;
+  -webkit-align-items: center;
+          align-items: center;
+}
+
+#graphiql-container .docExplorerShow {
+  background: #F9F9F9;
+  border: none;
+  border-bottom: solid 1px #d0d0d0;
+  border-left: solid 1px rgba(0, 0, 0, 0.2);
+  color: #3B5998;
+  cursor: pointer;
+  font-size: 14px;
+  outline: 0;
+  padding: 2px 20px 0 18px;
+}
+
+#graphiql-container .docExplorerShow:before {
+  border-left: 2px solid #3B5998;
+  border-top: 2px solid #3B5998;
+  content: '';
+  display: inline-block;
+  height: 9px;
+  margin: 0 3px -1px 0;
+  position: relative;
+  width: 9px;
+  -webkit-transform: rotate(-45deg);
+          transform: rotate(-45deg);
+}
+
+#graphiql-container .editorBar {
+  display: -webkit-flex;
+  display:         flex;
+  -webkit-flex-direction: row;
+          flex-direction: row;
+  -webkit-flex: 1;
+          flex: 1;
+}
+
+#graphiql-container .queryWrap {
+  display: -webkit-flex;
+  display:         flex;
+  -webkit-flex-direction: column;
+          flex-direction: column;
+  -webkit-flex: 1;
+          flex: 1;
+}
+
+#graphiql-container .resultWrap {
+  display: -webkit-flex;
+  display:         flex;
+  -webkit-flex-direction: column;
+          flex-direction: column;
+  -webkit-flex: 1;
+          flex: 1;
+  border-left: solid 1px #e0e0e0;
+}
+
+#graphiql-container .docExplorerWrap {
+  box-shadow: 0 0 8px rgba(0, 0, 0, 0.15);
+  z-index: 3;
+  position: relative;
+  background: white;
+}
+
+#graphiql-container .docExplorerResizer {
+  cursor: col-resize;
+  height: 100%;
+  left: -5px;
+  position: absolute;
+  top: 0;
+  width: 10px;
+  z-index: 10;
+}
+
+#graphiql-container .docExplorerHide {
+  cursor: pointer;
+  font-size: 18px;
+  margin: -7px -8px -6px 0;
+  padding: 18px 16px 15px 12px;
+}
+
+#graphiql-container .query-editor {
+  -webkit-flex: 1;
+          flex: 1;
+  position: relative;
+}
+
+#graphiql-container .variable-editor {
+  height: 30px;
+  display: -webkit-flex;
+  display:         flex;
+  -webkit-flex-direction: column;
+          flex-direction: column;
+  position: relative;
+}
+
+#graphiql-container .variable-editor-title {
+  background: #eeeeee;
+  border-bottom: solid 1px #d6d6d6;
+  border-top: solid 1px #e0e0e0;
+  color: #777;
+  font-variant: small-caps;
+  font-weight: bold;
+  letter-spacing: 1px;
+  line-height: 14px;
+  padding: 6px 0 8px 43px;
+  text-transform: lowercase;
+  -webkit-user-select: none;
+          user-select: none;
+}
+
+#graphiql-container .codemirrorWrap {
+  -webkit-flex: 1;
+          flex: 1;
+  position: relative;
+}
+
+#graphiql-container .result-window {
+  -webkit-flex: 1;
+          flex: 1;
+  position: relative;
+}
+
+#graphiql-container .footer {
+  background: #f6f7f8;
+  border-left: solid 1px #e0e0e0;
+  border-top: solid 1px #e0e0e0;
+  margin-left: 12px;
+  position: relative;
+}
+
+#graphiql-container .footer:before {
+  background: #eeeeee;
+  bottom: 0;
+  content: " ";
+  left: -13px;
+  position: absolute;
+  top: -1px;
+  width: 12px;
+}
+
+#graphiql-container .result-window .CodeMirror {
+  background: #f6f7f8;
+}
+
+#graphiql-container .result-window .CodeMirror-gutters {
+  background-color: #eeeeee;
+  border-color: #e0e0e0;
+  cursor: col-resize;
+}
+
+#graphiql-container .result-window .CodeMirror-foldgutter,
+#graphiql-container .result-window .CodeMirror-foldgutter-open:after,
+#graphiql-container .result-window .CodeMirror-foldgutter-folded:after {
+  padding-left: 3px;
+}
+
+#graphiql-container .execute-button {
+  background: white;
+  border: solid 1px #999;
+  border-radius: 17px;
+  box-shadow: 0 1px 0 #fff;
+  cursor: pointer;
+  fill: #444;
+  height: 34px;
+  margin: 0 14px 0 14px;
+  padding: 0;
+  width: 34px;
+}
+
+#graphiql-container .execute-button:active {
+  background: #EEE;
+  box-shadow:
+    inset 0 0 2px rgba(0, 0, 0, 0.2),
+    inset 0 0 6px rgba(0, 0, 0, 0.1);
+}
+
+#graphiql-container .execute-button:focus {
+  outline: 0;
+}
+
+#graphiql-container .CodeMirror-scroll {
+  -webkit-overflow-scrolling: touch;
+}
+
+#graphiql-container .CodeMirror {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  width: 100%;
+  font-size: 13px;
+  font-family: 'Consolas', 'Inconsolata', 'Droid Sans Mono', 'Monaco', monospace;
+  color: #141823;
+}
+
+#graphiql-container .CodeMirror-lines {
+  padding: 20px 0;
+}
+
+.CodeMirror-hint-information .content {
+  -webkit-box-orient: vertical;
+  color: #141823;
+  display: -webkit-box;
+  font-family: system, -apple-system, 'San Francisco', '.SFNSDisplay-Regular', 'Segoe UI', Segoe, 'Segoe WP', 'Helvetica Neue', helvetica, 'Lucida Grande', arial, sans-serif;
+  font-size: 13px;
+  -webkit-line-clamp: 3;
+  line-height: 16px;
+  max-height: 48px;
+  overflow: hidden;
+  text-overflow: -o-ellipsis-lastline;
+}
+
+.CodeMirror-hint-information .content p:first-child {
+  margin-top: 0;
+}
+
+.CodeMirror-hint-information .content p:last-child {
+  margin-bottom: 0;
+}
+
+.CodeMirror-hint-information .infoType {
+  color: #30a;
+  margin-right: 0.5em;
+  display: inline;
+  cursor: pointer;
+}
+
+.autoInsertedLeaf.cm-property {
+  padding: 2px 4px 1px;
+  margin: -2px -4px -1px;
+  border-radius: 2px;
+  border-bottom: solid 2px rgba(255, 255, 255, 0);
+  -webkit-animation-duration: 6s;
+     -moz-animation-duration: 6s;
+          animation-duration: 6s;
+  -webkit-animation-name: insertionFade;
+     -moz-animation-name: insertionFade;
+          animation-name: insertionFade;
+}
+
+@-moz-keyframes insertionFade {
+  from, to {
+    background: rgba(255, 255, 255, 0);
+    border-color: rgba(255, 255, 255, 0);
+  }
+
+  15%, 85% {
+    background: #fbffc9;
+    border-color: #f0f3c0;
+  }
+}
+
+@-webkit-keyframes insertionFade {
+  from, to {
+    background: rgba(255, 255, 255, 0);
+    border-color: rgba(255, 255, 255, 0);
+  }
+
+  15%, 85% {
+    background: #fbffc9;
+    border-color: #f0f3c0;
+  }
+}
+
+@keyframes insertionFade {
+  from, to {
+    background: rgba(255, 255, 255, 0);
+    border-color: rgba(255, 255, 255, 0);
+  }
+
+  15%, 85% {
+    background: #fbffc9;
+    border-color: #f0f3c0;
+  }
+}
+
+div.CodeMirror-lint-tooltip {
+  background-color: white;
+  color: #141823;
+  border: 0;
+  border-radius: 2px;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.45);
+   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.45);
+        box-shadow: 0 1px 3px rgba(0, 0, 0, 0.45);
+  font-family: system, -apple-system, 'San Francisco', '.SFNSDisplay-Regular', 'Segoe UI', Segoe, 'Segoe WP', 'Helvetica Neue', helvetica, 'Lucida Grande', arial, sans-serif;
+  font-size: 13px;
+  line-height: 16px;
+  padding: 6px 10px;
+  opacity: 0;
+  transition: opacity 0.15s;
+  -moz-transition: opacity 0.15s;
+  -webkit-transition: opacity 0.15s;
+  -o-transition: opacity 0.15s;
+  -ms-transition: opacity 0.15s;
+}
+
+div.CodeMirror-lint-message-error, div.CodeMirror-lint-message-warning {
+  padding-left: 23px;
+}
+
+/* COLORS */
+
+#graphiql-container .CodeMirror-foldmarker {
+  border-radius: 4px;
+  background: #08f;
+  background: -webkit-linear-gradient(#43A8FF, #0F83E8);
+  background:         linear-gradient(#43A8FF, #0F83E8);
+
+  color: white;
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+      box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+  font-family: arial;
+  line-height: 0;
+  padding: 0px 4px 1px;
+  font-size: 12px;
+  margin: 0 3px;
+  text-shadow: 0 -1px rgba(0, 0, 0, 0.1);
+}
+
+#graphiql-container div.CodeMirror span.CodeMirror-matchingbracket {
+  color: #555;
+  text-decoration: underline;
+}
+
+#graphiql-container div.CodeMirror span.CodeMirror-nonmatchingbracket {
+  color: #f00;
+}
+
+/* Comment */
+.cm-comment {
+  color: #999;
+}
+
+/* Punctuation */
+.cm-punctuation {
+  color: #555;
+}
+
+/* Keyword */
+.cm-keyword {
+  color: #B11A04;
+}
+
+/* OperationName, FragmentName */
+.cm-def {
+  color: #D2054E;
+}
+
+/* FieldName */
+.cm-property {
+  color: #1F61A0;
+}
+
+/* FieldAlias */
+.cm-qualifier {
+  color: #1C92A9;
+}
+
+/* ArgumentName and ObjectFieldName */
+.cm-attribute {
+  color: #8B2BB9;
+}
+
+/* Number */
+.cm-number {
+  color: #2882F9;
+}
+
+/* String */
+.cm-string {
+  color: #D64292;
+}
+
+/* Boolean */
+.cm-builtin {
+  color: #D47509;
+}
+
+/* EnumValue */
+.cm-string-2 {
+  color: #0B7FC7;
+}
+
+/* Variable */
+.cm-variable {
+  color: #397D13;
+}
+
+/* Directive */
+.cm-meta {
+  color: #B33086;
+}
+
+/* Type */
+.cm-atom {
+  color: #CA9800;
+}
+/* BASICS */
+
+.CodeMirror {
+  /* Set height, width, borders, and global font properties here */
+  font-family: monospace;
+  height: 300px;
+  color: black;
+}
+
+/* PADDING */
+
+.CodeMirror-lines {
+  padding: 4px 0; /* Vertical padding around content */
+}
+.CodeMirror pre {
+  padding: 0 4px; /* Horizontal padding of content */
+}
+
+.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+  background-color: white; /* The little square between H and V scrollbars */
+}
+
+/* GUTTER */
+
+.CodeMirror-gutters {
+  border-right: 1px solid #ddd;
+  background-color: #f7f7f7;
+  white-space: nowrap;
+}
+.CodeMirror-linenumbers {}
+.CodeMirror-linenumber {
+  padding: 0 3px 0 5px;
+  min-width: 20px;
+  text-align: right;
+  color: #999;
+  white-space: nowrap;
+}
+
+.CodeMirror-guttermarker { color: black; }
+.CodeMirror-guttermarker-subtle { color: #999; }
+
+/* CURSOR */
+
+.CodeMirror div.CodeMirror-cursor {
+  border-left: 1px solid black;
+}
+/* Shown when moving in bi-directional text */
+.CodeMirror div.CodeMirror-secondarycursor {
+  border-left: 1px solid silver;
+}
+.CodeMirror.cm-fat-cursor div.CodeMirror-cursor {
+  width: auto;
+  border: 0;
+  background: #7e7;
+}
+.CodeMirror.cm-fat-cursor div.CodeMirror-cursors {
+  z-index: 1;
+}
+
+.cm-animate-fat-cursor {
+  width: auto;
+  border: 0;
+  -webkit-animation: blink 1.06s steps(1) infinite;
+  -moz-animation: blink 1.06s steps(1) infinite;
+  animation: blink 1.06s steps(1) infinite;
+}
+@-moz-keyframes blink {
+  0% { background: #7e7; }
+  50% { background: none; }
+  100% { background: #7e7; }
+}
+@-webkit-keyframes blink {
+  0% { background: #7e7; }
+  50% { background: none; }
+  100% { background: #7e7; }
+}
+@keyframes blink {
+  0% { background: #7e7; }
+  50% { background: none; }
+  100% { background: #7e7; }
+}
+
+/* Can style cursor different in overwrite (non-insert) mode */
+div.CodeMirror-overwrite div.CodeMirror-cursor {}
+
+.cm-tab { display: inline-block; text-decoration: inherit; }
+
+.CodeMirror-ruler {
+  border-left: 1px solid #ccc;
+  position: absolute;
+}
+
+/* DEFAULT THEME */
+
+.cm-s-default .cm-keyword {color: #708;}
+.cm-s-default .cm-atom {color: #219;}
+.cm-s-default .cm-number {color: #164;}
+.cm-s-default .cm-def {color: #00f;}
+.cm-s-default .cm-variable,
+.cm-s-default .cm-punctuation,
+.cm-s-default .cm-property,
+.cm-s-default .cm-operator {}
+.cm-s-default .cm-variable-2 {color: #05a;}
+.cm-s-default .cm-variable-3 {color: #085;}
+.cm-s-default .cm-comment {color: #a50;}
+.cm-s-default .cm-string {color: #a11;}
+.cm-s-default .cm-string-2 {color: #f50;}
+.cm-s-default .cm-meta {color: #555;}
+.cm-s-default .cm-qualifier {color: #555;}
+.cm-s-default .cm-builtin {color: #30a;}
+.cm-s-default .cm-bracket {color: #997;}
+.cm-s-default .cm-tag {color: #170;}
+.cm-s-default .cm-attribute {color: #00c;}
+.cm-s-default .cm-header {color: blue;}
+.cm-s-default .cm-quote {color: #090;}
+.cm-s-default .cm-hr {color: #999;}
+.cm-s-default .cm-link {color: #00c;}
+
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
+
+.cm-s-default .cm-error {color: #f00;}
+.cm-invalidchar {color: #f00;}
+
+.CodeMirror-composing { border-bottom: 2px solid; }
+
+/* Default styles for common addons */
+
+div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
+.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
+.CodeMirror-activeline-background {background: #e8f2ff;}
+
+/* STOP */
+
+/* The rest of this file contains styles related to the mechanics of
+   the editor. You probably shouldn't touch them. */
+
+.CodeMirror {
+  position: relative;
+  overflow: hidden;
+  background: white;
+}
+
+.CodeMirror-scroll {
+  overflow: scroll !important; /* Things will break if this is overridden */
+  /* 30px is the magic margin used to hide the element's real scrollbars */
+  /* See overflow: hidden in .CodeMirror */
+  margin-bottom: -30px; margin-right: -30px;
+  padding-bottom: 30px;
+  height: 100%;
+  outline: none; /* Prevent dragging from highlighting the element */
+  position: relative;
+}
+.CodeMirror-sizer {
+  position: relative;
+  border-right: 30px solid transparent;
+}
+
+/* The fake, visible scrollbars. Used to force redraw during scrolling
+   before actuall scrolling happens, thus preventing shaking and
+   flickering artifacts. */
+.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+  position: absolute;
+  z-index: 6;
+  display: none;
+}
+.CodeMirror-vscrollbar {
+  right: 0; top: 0;
+  overflow-x: hidden;
+  overflow-y: scroll;
+}
+.CodeMirror-hscrollbar {
+  bottom: 0; left: 0;
+  overflow-y: hidden;
+  overflow-x: scroll;
+}
+.CodeMirror-scrollbar-filler {
+  right: 0; bottom: 0;
+}
+.CodeMirror-gutter-filler {
+  left: 0; bottom: 0;
+}
+
+.CodeMirror-gutters {
+  position: absolute; left: 0; top: 0;
+  z-index: 3;
+}
+.CodeMirror-gutter {
+  white-space: normal;
+  height: 100%;
+  display: inline-block;
+  margin-bottom: -30px;
+  /* Hack to make IE7 behave */
+  *zoom:1;
+  *display:inline;
+}
+.CodeMirror-gutter-wrapper {
+  position: absolute;
+  z-index: 4;
+  height: 100%;
+}
+.CodeMirror-gutter-elt {
+  position: absolute;
+  cursor: default;
+  z-index: 4;
+}
+.CodeMirror-gutter-wrapper {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}
+
+.CodeMirror-lines {
+  cursor: text;
+  min-height: 1px; /* prevents collapsing before first draw */
+}
+.CodeMirror pre {
+  /* Reset some styles that the rest of the page might have set */
+  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
+  border-width: 0;
+  background: transparent;
+  font-family: inherit;
+  font-size: inherit;
+  margin: 0;
+  white-space: pre;
+  word-wrap: normal;
+  line-height: inherit;
+  color: inherit;
+  z-index: 2;
+  position: relative;
+  overflow: visible;
+  -webkit-tap-highlight-color: transparent;
+}
+.CodeMirror-wrap pre {
+  word-wrap: break-word;
+  white-space: pre-wrap;
+  word-break: normal;
+}
+
+.CodeMirror-linebackground {
+  position: absolute;
+  left: 0; right: 0; top: 0; bottom: 0;
+  z-index: 0;
+}
+
+.CodeMirror-linewidget {
+  position: relative;
+  z-index: 2;
+  overflow: auto;
+}
+
+.CodeMirror-widget {}
+
+.CodeMirror-code {
+  outline: none;
+}
+
+/* Force content-box sizing for the elements where we expect it */
+.CodeMirror-scroll,
+.CodeMirror-sizer,
+.CodeMirror-gutter,
+.CodeMirror-gutters,
+.CodeMirror-linenumber {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+
+.CodeMirror-measure {
+  position: absolute;
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  visibility: hidden;
+}
+.CodeMirror-measure pre { position: static; }
+
+.CodeMirror div.CodeMirror-cursor {
+  position: absolute;
+  border-right: none;
+  width: 0;
+}
+
+div.CodeMirror-cursors {
+  visibility: hidden;
+  position: relative;
+  z-index: 3;
+}
+.CodeMirror-focused div.CodeMirror-cursors {
+  visibility: visible;
+}
+
+.CodeMirror-selected { background: #d9d9d9; }
+.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
+.CodeMirror-crosshair { cursor: crosshair; }
+.CodeMirror ::selection { background: #d7d4f0; }
+.CodeMirror ::-moz-selection { background: #d7d4f0; }
+
+.cm-searching {
+  background: #ffa;
+  background: rgba(255, 255, 0, .4);
+}
+
+/* IE7 hack to prevent it from returning funny offsetTops on the spans */
+.CodeMirror span { *vertical-align: text-bottom; }
+
+/* Used to force a border model for a node */
+.cm-force-border { padding-right: .1px; }
+
+@media print {
+  /* Hide the cursor when printing */
+  .CodeMirror div.CodeMirror-cursors {
+    visibility: hidden;
+  }
+}
+
+/* See issue #2901 */
+.cm-tab-wrap-hack:after { content: ''; }
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext { background: none; }
+#graphiql-container .doc-explorer {
+  background: white;
+}
+
+#graphiql-container .doc-explorer-title-bar {
+  cursor: default;
+  display: -webkit-flex;
+  display: flex;
+  height: 34px;
+  line-height: 14px;
+  padding: 8px 8px 5px;
+  position: relative;
+  -webkit-user-select: none;
+          user-select: none;
+}
+
+#graphiql-container .doc-explorer-title {
+  padding: 10px 0 10px 10px;
+  font-weight: bold;
+  text-align: center;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow-x: hidden;
+  -webkit-flex: 1;
+          flex: 1;
+}
+
+#graphiql-container .doc-explorer-back {
+  color: #3B5998;
+  cursor: pointer;
+  margin: -7px 0 -6px -8px;
+  overflow-x: hidden;
+  padding: 17px 12px 16px 16px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+#graphiql-container .doc-explorer-back:before {
+  border-left: 2px solid #3B5998;
+  border-top: 2px solid #3B5998;
+  content: '';
+  display: inline-block;
+  height: 9px;
+  margin: 0 3px -1px 0;
+  position: relative;
+  width: 9px;
+  -webkit-transform: rotate(-45deg);
+          transform: rotate(-45deg);
+}
+
+#graphiql-container .doc-explorer-rhs {
+  position: relative;
+}
+
+#graphiql-container .doc-explorer-contents {
+  background-color: #ffffff;
+  border-top: 1px solid #d6d6d6;
+  bottom: 0;
+  left: 0;
+  min-width: 300px;
+  overflow-y: auto;
+  padding: 20px 15px;
+  position: absolute;
+  right: 0;
+  top: 47px;
+}
+
+#graphiql-container .doc-type-description p:first-child ,
+#graphiql-container .doc-type-description blockquote:first-child {
+  margin-top: 0;
+}
+
+#graphiql-container .doc-explorer-contents a {
+  cursor: pointer;
+  text-decoration: none;
+}
+
+#graphiql-container .doc-explorer-contents a:hover {
+  text-decoration: underline;
+}
+
+#graphiql-container .doc-value-description {
+  padding: 4px 0 8px 12px;
+}
+
+#graphiql-container .doc-category {
+  margin: 20px 0;
+}
+
+#graphiql-container .doc-category-title {
+  border-bottom: 1px solid #e0e0e0;
+  color: #777;
+  cursor: default;
+  font-size: 14px;
+  font-variant: small-caps;
+  font-weight: bold;
+  letter-spacing: 1px;
+  margin: 0 -15px 10px 0;
+  padding: 10px 0;
+  -webkit-user-select: none;
+          user-select: none;
+}
+
+#graphiql-container .doc-category-item {
+  margin: 12px 0;
+  color: #555;
+}
+
+#graphiql-container .keyword {
+  color: #B11A04;
+}
+
+#graphiql-container .type-name {
+  color: #CA9800;
+}
+
+#graphiql-container .field-name {
+  color: #1F61A0;
+}
+
+#graphiql-container .value-name {
+  color: #0B7FC7;
+}
+
+#graphiql-container .arg-name {
+  color: #8B2BB9;
+}
+
+#graphiql-container .arg:after {
+  content: ', ';
+}
+
+#graphiql-container .arg:last-child:after {
+  content: '';
+}
+.CodeMirror-foldmarker {
+  color: blue;
+  text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
+  font-family: arial;
+  line-height: .3;
+  cursor: pointer;
+}
+.CodeMirror-foldgutter {
+  width: .7em;
+}
+.CodeMirror-foldgutter-open,
+.CodeMirror-foldgutter-folded {
+  cursor: pointer;
+}
+.CodeMirror-foldgutter-open:after {
+  content: "\25BE";
+}
+.CodeMirror-foldgutter-folded:after {
+  content: "\25B8";
+}
+/* The lint marker gutter */
+.CodeMirror-lint-markers {
+  width: 16px;
+}
+
+.CodeMirror-lint-tooltip {
+  background-color: infobackground;
+  border: 1px solid black;
+  border-radius: 4px 4px 4px 4px;
+  color: infotext;
+  font-family: monospace;
+  font-size: 10pt;
+  overflow: hidden;
+  padding: 2px 5px;
+  position: fixed;
+  white-space: pre;
+  white-space: pre-wrap;
+  z-index: 100;
+  max-width: 600px;
+  opacity: 0;
+  transition: opacity .4s;
+  -moz-transition: opacity .4s;
+  -webkit-transition: opacity .4s;
+  -o-transition: opacity .4s;
+  -ms-transition: opacity .4s;
+}
+
+.CodeMirror-lint-mark-error, .CodeMirror-lint-mark-warning {
+  background-position: left bottom;
+  background-repeat: repeat-x;
+}
+
+.CodeMirror-lint-mark-error {
+  background-image:
+  url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==")
+  ;
+}
+
+.CodeMirror-lint-mark-warning {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=");
+}
+
+.CodeMirror-lint-marker-error, .CodeMirror-lint-marker-warning {
+  background-position: center center;
+  background-repeat: no-repeat;
+  cursor: pointer;
+  display: inline-block;
+  height: 16px;
+  width: 16px;
+  vertical-align: middle;
+  position: relative;
+}
+
+.CodeMirror-lint-message-error, .CodeMirror-lint-message-warning {
+  padding-left: 18px;
+  background-position: top left;
+  background-repeat: no-repeat;
+}
+
+.CodeMirror-lint-marker-error, .CodeMirror-lint-message-error {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=");
+}
+
+.CodeMirror-lint-marker-warning, .CodeMirror-lint-message-warning {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEX/uwDvrwD/uwD/uwD/uwD/uwD/uwD/uwD/uwD6twD/uwAAAADurwD2tQD7uAD+ugAAAAD/uwDhmeTRAAAADHRSTlMJ8mN1EYcbmiixgACm7WbuAAAAVklEQVR42n3PUQqAIBBFUU1LLc3u/jdbOJoW1P08DA9Gba8+YWJ6gNJoNYIBzAA2chBth5kLmG9YUoG0NHAUwFXwO9LuBQL1giCQb8gC9Oro2vp5rncCIY8L8uEx5ZkAAAAASUVORK5CYII=");
+}
+
+.CodeMirror-lint-marker-multiple {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAMAAADzjKfhAAAACVBMVEUAAAAAAAC/v7914kyHAAAAAXRSTlMAQObYZgAAACNJREFUeNo1ioEJAAAIwmz/H90iFFSGJgFMe3gaLZ0od+9/AQZ0ADosbYraAAAAAElFTkSuQmCC");
+  background-repeat: no-repeat;
+  background-position: right bottom;
+  width: 100%; height: 100%;
+}
+.CodeMirror-hints {
+  background: white;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.45);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.45);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.45);
+  font-family: 'Consolas', 'Inconsolata', 'Droid Sans Mono', 'Monaco', monospace;
+  font-size: 13px;
+  list-style: none;
+  margin: 0;
+  margin-left: -6px;
+  max-height: 14.5em;
+  overflow-y: auto;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  z-index: 10;
+}
+
+.CodeMirror-hints-wrapper {
+  background: white;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.45);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.45);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.45);
+  margin-left: -6px;
+  position: absolute;
+  z-index: 10;
+}
+
+.CodeMirror-hints-wrapper .CodeMirror-hints {
+  -webkit-box-shadow: none;
+   -moz-box-shadow: none;
+        box-shadow: none;
+  position: relative;
+  margin-left: 0;
+  z-index: 0;
+}
+
+.CodeMirror-hint {
+  border-top: solid 1px #f7f7f7;
+  color: #141823;
+  cursor: pointer;
+  margin: 0;
+  max-width: 300px;
+  overflow: hidden;
+  padding: 2px 6px;
+  white-space: pre;
+}
+
+li.CodeMirror-hint-active {
+  background-color: #08f;
+  border-top-color: white;
+  color: white;
+}
+
+.CodeMirror-hint-information {
+  border-top: solid 1px #c0c0c0;
+  max-width: 300px;
+  padding: 4px 6px;
+  position: relative;
+  z-index: 1;
+}
+
+.CodeMirror-hint-information:first-child {
+  border-bottom: solid 1px #c0c0c0;
+  border-top: none;
+  margin-bottom: -1px;
+}
diff --git a/docs/css/main.styl b/docs/css/main.styl
index 0fafdf5e..b1481f11 100644
--- a/docs/css/main.styl
+++ b/docs/css/main.styl
@@ -1,12 +1,14 @@
 @import 'nib'
 @import 'jeet'
 
-@import 'hljs.css'
-@import 'bm.css'
 @import 'https://fonts.googleapis.com/css?family=Raleway:400,500,600,200,100&.css'
 
+global-reset()
 normalize-css()
 
+@import 'hljs.css'
+@import 'bm.css'
+
 $wrapper
   center(960px, pad:20px)
 
@@ -29,6 +31,9 @@ html, body
   font-size 16px
   color #606060
   line-height 1.5
+  height 100%
+  margin 0
+  width 100%
 
 .header
   clearfix()
@@ -332,7 +337,7 @@ $title
   margin-top 0
   padding-top 0
 
-.title
+.page-title
   background: #F9F9F9;
   padding 48px 0
 
diff --git a/docs/css/playground.styl b/docs/css/playground.styl
new file mode 100644
index 00000000..7342bd5a
--- /dev/null
+++ b/docs/css/playground.styl
@@ -0,0 +1,38 @@
+@import 'graphiql.css'
+
+.playground
+  position absolute
+  top 106px
+  left 0
+  right 0
+  bottom 0
+  display flex
+  flex-direction row
+  min-width 960px
+
+.playground-schema
+  min-width 400px
+  width 36%
+  border-right 1px solid #E0E0E0
+  box-shadow 0 0 8px rgba(0, 0, 0, 0.15)
+  position relative
+  z-index 100
+  .CodeMirror
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: 100%;
+    font-size: 13px;
+    font-family: 'Consolas', 'Inconsolata', 'Droid Sans Mono', 'Monaco', monospace;
+    color: #141823;
+
+  .cm-def
+    &.called-function
+      background rgba(219, 89, 76, .2)
+      border-radius 1px
+      box-shadow 0 0 0 3px rgba(219, 89, 76, .2)
+
+.playground-graphiql
+  flex 1
+  height 100%
diff --git a/docs/gatsby.config.js b/docs/gatsby.config.js
index da6afec6..7b9c7f27 100644
--- a/docs/gatsby.config.js
+++ b/docs/gatsby.config.js
@@ -3,13 +3,24 @@ var jeet = require("jeet");
 var rupture = require("rupture");
 var path = require("path");
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
+var webpack = require("webpack");
 var CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = function(config, env) {
   var IS_STATIC = env === 'static';
+  var entry = config._config.entry.slice();
+  // var output = config._config.output;
+  // output.filename = "[name].js";
+  config._config.entry = {
+    bundle: entry,
+  };
   config.merge({
-     stylus: {
-        use: [nib(), jeet(), rupture()]
+    stylus: {
+      use: [nib(), jeet(), rupture()]
+    },
+    output: {
+      filename: "[name].js",
+      publicPath: "/",
     },
     resolveLoader: {
       root: path.join(__dirname, "node_modules"),
@@ -23,7 +34,9 @@ module.exports = function(config, env) {
       alias: {
         'original-react': path.join(__dirname, "node_modules", "react"),
         'react/lib': path.join(__dirname, "node_modules", "react", "lib"),
-        'react': path.join(__dirname, 'patched-react.js')
+        'react': path.join(__dirname, 'patched-react.js'),
+        'playground-page': (env != "static")?'../playground/page':'../pages/_empty',
+        'playground-wrapper': (env == "develop")?'../playground/page':'../playground/wrapper',
       },
       modulesDirectories: ['./']
     }
@@ -32,6 +45,10 @@ module.exports = function(config, env) {
     config.plugin('extract-css', ExtractTextPlugin, ["app.css"]);
   }
   config.plugin('static', CopyWebpackPlugin, [[{ from: '../static'}]]);
+  config.plugin('define-env', webpack.DefinePlugin, [{"ENV": JSON.stringify(env)}]);
+  // if (env != "static") {
+  //   config.plugin('commons', webpack.optimize.CommonsChunkPlugin, ["commons.js"]);
+  // }
 
   config.loader('stylus', function(cfg) {
     cfg.test = /\.styl$/;
diff --git a/docs/package.json b/docs/package.json
index efaa1c67..185d6160 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -16,6 +16,9 @@
     "copy-webpack-plugin": "^0.2.0",
     "extract-text-webpack-plugin": "^0.9.1",
     "gatsby": "^0.7.2",
+    "graphiql": "^0.4.2",
+    "graphql": "^0.4.13",
+    "codemirror": "5.9.0",
     "jeet": "^6.1.2",
     "lodash": "^3.10.1",
     "nib": "^1.1.0",
diff --git a/docs/pages/_empty.js b/docs/pages/_empty.js
new file mode 100644
index 00000000..5932606e
--- /dev/null
+++ b/docs/pages/_empty.js
@@ -0,0 +1,9 @@
+import React from 'react';
+
+class Empty extends React.Component {
+    render() {
+      return <div />;
+    }
+}
+
+module.exports = Empty;
diff --git a/docs/pages/_template.js b/docs/pages/_template.js
index 385239dd..18f32948 100644
--- a/docs/pages/_template.js
+++ b/docs/pages/_template.js
@@ -14,7 +14,7 @@ class Template extends React.Component {
     return (
       <div>
         <Menu width={200} right>
-            <span><Link to="/try/">Try it out</Link></span>
+            <span><Link to="/playground/">Try it out</Link></span>
             <span><Link to="/docs/quickstart/" className={path.indexOf('/docs')==0?"active":null}>Docs</Link></span>
             <span><Link to="/community/">Community</Link></span>
             <a href="https://github.com/graphql-python/graphene/">Github</a>
@@ -26,7 +26,7 @@ class Template extends React.Component {
                     Graphene
                 </Link>
                 <nav className="header-nav">
-                    <Link to="/try/">Try it out</Link>
+                    <Link to="/playground/">Try it out</Link>
                     <Link to="/docs/quickstart/" className={path.indexOf('/docs')==0?"active":null}>Docs</Link>
                     <Link to="/community/">Community</Link>
                     <a href="https://github.com/graphql-python/graphene/">Github</a>
diff --git a/docs/pages/docs/_template.js b/docs/pages/docs/_template.js
index 507b9a79..cf692ff8 100644
--- a/docs/pages/docs/_template.js
+++ b/docs/pages/docs/_template.js
@@ -33,7 +33,7 @@ class Template extends React.Component {
     var next_page = pages[next_page_index];
     return (
       <div>
-        <div className="title"><h1>Documentation</h1></div>
+        <div className="page-title"><h1>Documentation</h1></div>
         <div className="docs">
           <aside className="docs-aside">
               {aside_links}
diff --git a/docs/pages/playground.js b/docs/pages/playground.js
new file mode 100644
index 00000000..40e1b799
--- /dev/null
+++ b/docs/pages/playground.js
@@ -0,0 +1 @@
+module.exports = require('playground-wrapper');
diff --git a/docs/playground/page.js b/docs/playground/page.js
new file mode 100644
index 00000000..098b7e18
--- /dev/null
+++ b/docs/playground/page.js
@@ -0,0 +1,67 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { RouteHandler, Link, State } from 'react-router';
+import CodeMirror from 'codemirror';
+import { graphql } from 'graphql';
+import GraphiQL from 'graphiql';
+import schema from './schema';
+
+import 'codemirror/mode/python/python';
+import '../css/playground.styl';
+
+var baseCode = `import graphene
+
+class Query(graphene.ObjectType):
+    hello = graphene.String()
+    ping = graphene.String(to=graphene.String())
+
+    def resolve_hello(self, args, info):
+        return 'World'
+
+    def resolve_ping(self, args, info):
+        return 'Pinging {}'.format(args.get('to'))
+
+schema = graphene.Schema(query=Query)
+`;
+
+// function graphQLFetcher(graphQLParams) {
+//   return fetch('http://swapi.graphene-python.org/graphql', {
+//     method: 'post',
+//     headers: { 'Content-Type': 'application/json' },
+//     body: JSON.stringify(graphQLParams),
+//   }).then(response => response.json());
+// }
+function graphQLFetcher(graphQLParams) {
+  return graphql(schema, graphQLParams.query);
+}
+// var schema = null;
+
+class Playground extends React.Component {
+  componentDidMount() {
+    this.editor = CodeMirror(ReactDOM.findDOMNode(this.refs.schemaCode), {
+      value: baseCode,
+      mode:  "python",
+      lineNumbers: true,
+      tabSize: 4,
+    });
+    this.markLine(6)
+  }
+  markLine(lineNo) {
+    var mark = this.editor.markText({line: lineNo, ch: 0}, {line: lineNo, ch: 30}, {className: "called-function"});
+    setTimeout(() => {
+        mark.clear();
+    }, 2000);
+  }
+  render() {
+    return (
+      <div className="playground">
+        <div className="playground-schema" ref="schemaCode"/>
+        <div className="playground-graphiql">
+            <GraphiQL ref="graphiql" fetcher={graphQLFetcher} schema={schema} />
+        </div>
+      </div>
+    );
+  }
+}
+
+module.exports = Playground;
diff --git a/docs/playground/schema.js b/docs/playground/schema.js
new file mode 100644
index 00000000..cfe68ebd
--- /dev/null
+++ b/docs/playground/schema.js
@@ -0,0 +1,59 @@
+/**
+ * Copyright 2013-2015, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+import {
+  GraphQLObjectType,
+  GraphQLSchema,
+  GraphQLString,
+} from 'graphql';
+
+
+var GREETINGS = {
+  hello: 'Hello worlasdfasdfasssdfasdfasdasdd',
+};
+
+/**
+ * Objects.
+ * Build up a portrait of your data universe
+ * using the object type. Here, we define a
+ * type of object that has a 'hello' field
+ * that is of the string type.
+ */
+var GreetingsType = new GraphQLObjectType({
+  name: 'Greetings',
+  fields: () => ({
+    hello: {type: GraphQLString},
+  }),
+});
+
+/**
+ * The schema.
+ * Here we export a schema that offers one root
+ * field named 'greetings', and a method to
+ * resolve its data.
+ *
+ * To learn more about writing GraphQL schemas for Relay, visit:
+ *   https://github.com/graphql/graphql-relay-js
+ */
+export default new GraphQLSchema({
+  query: new GraphQLObjectType({
+    name: 'Query',
+    fields: () => ({
+      greetings: {
+        type: GreetingsType,
+        // Here we define a resolver that returns
+        // the data defined above. Were this schema
+        // executing on the server side, you could
+        // write a resolve method that fetches
+        // live data from a database.
+        resolve: () => GREETINGS,
+      },
+    }),
+  }),
+});
diff --git a/docs/playground/wrapper.js b/docs/playground/wrapper.js
new file mode 100644
index 00000000..6b2a7a40
--- /dev/null
+++ b/docs/playground/wrapper.js
@@ -0,0 +1,22 @@
+// require.ensure([], function(require) {
+//   require.include('../playground/page');
+// });  
+var React = require('react');
+class App extends React.Component {
+  constructor() {
+    super();
+    this.state = { currentComponent: null };
+  }
+  componentDidMount() {
+    require(["playground-page"], (Playground) =>{
+      this.setState({
+        currentComponent: Playground
+      });
+    });
+  }
+  render() {
+    var Current = this.state.currentComponent;
+    return Current?<Current />:null;
+  }
+}
+module.exports = App;
diff --git a/docs/wrappers/md.js b/docs/wrappers/md.js
index 67df0e37..96095bf2 100644
--- a/docs/wrappers/md.js
+++ b/docs/wrappers/md.js
@@ -13,7 +13,7 @@ class Markdown extends React.Component {
     return (
       <DocumentTitle title={`${post.title?post.title+' - ':''}${this.props.config.siteTitle}`}>
         <div>
-          {showTitle?<div className="title">
+          {showTitle?<div className="page-title">
             <h1>{post.title}</h1>
           </div>:null}
           <div className="markdown">

From 93b8a59985da754a0c4b1423fac3d5168227f3b6 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 27 Nov 2015 15:11:49 +0000
Subject: [PATCH 023/173] Expanding on the django quickstart to make it a
 little more verbose

---
 docs/pages/docs/quickstart-django.md | 29 ++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/docs/pages/docs/quickstart-django.md b/docs/pages/docs/quickstart-django.md
index 2b6020d0..cd24565a 100644
--- a/docs/pages/docs/quickstart-django.md
+++ b/docs/pages/docs/quickstart-django.md
@@ -7,7 +7,7 @@ description: A Quick guide to Graphene in Django
 
 In our previous quickstart page we created a very simple schema.
 
-Now we will adapt the schema to map automatically some Django models, 
+Now we will adapt the schema to automatically map some Django models,
 and expose this schema in a `/graphql` API endpoint.
 
 ## Project setup
@@ -50,7 +50,16 @@ Once you've set up a database and initial user created and ready to go, open up
 
 ## Schema
 
-Right, we'd better write some types then. Open `tutorial/quickstart/schema.py` and get typing.
+GraphQL presents your objects to the world as a graph structure rather than a more
+heiricarcal structure to which you may be acustomed. In order to create this
+representation, Graphene needs to know about each *type* of object which will appear in
+the graph. Below we define these as the `UserType` and `GroupType` classes.
+
+This graph also has a 'root' through which all access begins. This is the `Query` class below.
+In this example, we provide the ability to list all users via `all_users`, and the
+ability to obtain a single user via `get_user`.
+
+Open `tutorial/quickstart/schema.py` and type the following:
 
 ```python
 import graphene
@@ -58,8 +67,8 @@ from graphene.contrib.django import DjangoObjectType
 
 from django.contrib.auth.models import User, Group
 
-# Graphene will map automatically the User model to UserType with
-# the specified fields
+# Graphene will automatically map the User model's fields onto the UserType.
+# This is configured in the UserType's Meta class
 class UserType(DjangoObjectType):
     class Meta:
         model = User
@@ -68,13 +77,13 @@ class UserType(DjangoObjectType):
 
 class GroupType(DjangoObjectType):
     class Meta:
-        model = User
+        model = Group
         only_fields = ('name', )
 
 
 class Query(graphene.ObjectType):
     all_users = graphene.List(UserType)
-    get_user = graphene.Field(UserType
+    get_user = graphene.Field(UserType,
                               id=graphene.String(required=True))
 
     def resolve_all_users(self, args, info):
@@ -89,8 +98,12 @@ schema = graphene.Schema(query=Query)
 
 ## Creating GraphQL and GraphiQL views
 
-Okay, now let's wire up the GraphQL and GraphiQL urls. On to `tutorial/urls.py`...
+Unlike a RESTful API, there is only a single URL from which a GraphQL is accessed.
+Requests to this URL are handled by Graphene's `GraphQLView` view.
 
+Additionally, and interface for navigating this API will be very useful. Graphene
+includes the [graphiql](https://github.com/graphql/graphiql) in-browser IDE
+which assits and exploring and querying your new API. We'll add a URL for this too.
 
 ```python
 from django.conf.urls import url, include
@@ -99,7 +112,7 @@ from graphene.contrib.django.views import GraphQLView
 from tutorial.quickstart.schema import schema
 
 
-# Wire up our GraphQL schema in /graphql.
+# Wire up our GraphQL schema to /graphql.
 # Additionally, we include GraphiQL view for querying easily our schema.
 urlpatterns = [
     url(r'^graphql', csrf_exempt(GraphQLView.as_view(schema=schema))),

From 42db605fbddb61394f1c9cc656735c5925e8a603 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 27 Nov 2015 23:48:48 -0800
Subject: [PATCH 024/173] First fully working version of the playground editor

---
 .gitignore                                    |   7 +-
 docs/css/graphiql.css                         |  53 +-
 docs/css/main.styl                            |   1 -
 docs/css/playground.styl                      | 131 ++-
 docs/gatsby.config.js                         |  10 +-
 docs/html.js                                  |   2 +-
 docs/package.json                             |   3 +-
 docs/playground/graphene-js/.gitignore        |   1 +
 .../playground/graphene-js/FunctionPromise.js | 107 ++
 docs/playground/graphene-js/build.sh          |  32 +
 docs/playground/graphene-js/pypyjs.js         | 983 ++++++++++++++++++
 docs/playground/page.js                       | 160 ++-
 docs/playground/schema.js                     |  48 +-
 docs/static/graphene.appcache                 |   7 +
 14 files changed, 1449 insertions(+), 96 deletions(-)
 create mode 100644 docs/playground/graphene-js/.gitignore
 create mode 100644 docs/playground/graphene-js/FunctionPromise.js
 create mode 100755 docs/playground/graphene-js/build.sh
 create mode 100644 docs/playground/graphene-js/pypyjs.js
 create mode 100644 docs/static/graphene.appcache

diff --git a/.gitignore b/.gitignore
index 474bb31d..06f9dab5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,5 +63,10 @@ target/
 /tests/django.sqlite
 
 /graphene/index.json
-
 /graphene/meta.json
+
+/meta.json
+/index.json
+
+/docs/playground/graphene-js/pypyjs-release-nojit/
+/docs/static/playground/lib
diff --git a/docs/css/graphiql.css b/docs/css/graphiql.css
index c8af1081..5cc95b66 100644
--- a/docs/css/graphiql.css
+++ b/docs/css/graphiql.css
@@ -54,7 +54,7 @@
 }
 
 #graphiql-container .docExplorerShow {
-  background: #F9F9F9;
+  background: transparent;
   border: none;
   border-bottom: solid 1px #d0d0d0;
   border-left: solid 1px rgba(0, 0, 0, 0.2);
@@ -207,10 +207,9 @@
 }
 
 #graphiql-container .execute-button {
-  background: white;
-  border: solid 1px #999;
+  background: transparent;
+  border: solid 1px #777;
   border-radius: 17px;
-  box-shadow: 0 1px 0 #fff;
   cursor: pointer;
   fill: #444;
   height: 34px;
@@ -218,12 +217,22 @@
   padding: 0;
   width: 34px;
 }
+#graphiql-container .execute-button path {
+  fill: #777;
+}
+#graphiql-container .execute-button:hover {
+  border-color: #333;
+}
+#graphiql-container .execute-button:hover path {
+  fill: #333;
+}
 
 #graphiql-container .execute-button:active {
-  background: #EEE;
-  box-shadow:
-    inset 0 0 2px rgba(0, 0, 0, 0.2),
-    inset 0 0 6px rgba(0, 0, 0, 0.1);
+  background: white;
+  border-color: #db594c;
+}
+#graphiql-container .execute-button:active path {
+  fill: #db594c;
 }
 
 #graphiql-container .execute-button:focus {
@@ -380,72 +389,72 @@ div.CodeMirror-lint-message-error, div.CodeMirror-lint-message-warning {
 }
 
 /* Comment */
-.cm-comment {
+#graphiql-container .cm-comment {
   color: #999;
 }
 
 /* Punctuation */
-.cm-punctuation {
+#graphiql-container .cm-punctuation {
   color: #555;
 }
 
 /* Keyword */
-.cm-keyword {
+#graphiql-container .cm-keyword {
   color: #B11A04;
 }
 
 /* OperationName, FragmentName */
-.cm-def {
+#graphiql-container .cm-def {
   color: #D2054E;
 }
 
 /* FieldName */
-.cm-property {
+#graphiql-container .cm-property {
   color: #1F61A0;
 }
 
 /* FieldAlias */
-.cm-qualifier {
+#graphiql-container .cm-qualifier {
   color: #1C92A9;
 }
 
 /* ArgumentName and ObjectFieldName */
-.cm-attribute {
+#graphiql-container .cm-attribute {
   color: #8B2BB9;
 }
 
 /* Number */
-.cm-number {
+#graphiql-container .cm-number {
   color: #2882F9;
 }
 
 /* String */
-.cm-string {
+#graphiql-container .cm-string {
   color: #D64292;
 }
 
 /* Boolean */
-.cm-builtin {
+#graphiql-container .cm-builtin {
   color: #D47509;
 }
 
 /* EnumValue */
-.cm-string-2 {
+#graphiql-container .cm-string-2 {
   color: #0B7FC7;
 }
 
 /* Variable */
-.cm-variable {
+#graphiql-container .cm-variable {
   color: #397D13;
 }
 
 /* Directive */
-.cm-meta {
+#graphiql-container .cm-meta {
   color: #B33086;
 }
 
 /* Type */
-.cm-atom {
+#graphiql-container .cm-atom {
   color: #CA9800;
 }
 /* BASICS */
diff --git a/docs/css/main.styl b/docs/css/main.styl
index b1481f11..f66a9988 100644
--- a/docs/css/main.styl
+++ b/docs/css/main.styl
@@ -3,7 +3,6 @@
 
 @import 'https://fonts.googleapis.com/css?family=Raleway:400,500,600,200,100&.css'
 
-global-reset()
 normalize-css()
 
 @import 'hljs.css'
diff --git a/docs/css/playground.styl b/docs/css/playground.styl
index 7342bd5a..c993d77d 100644
--- a/docs/css/playground.styl
+++ b/docs/css/playground.styl
@@ -9,30 +9,135 @@
   display flex
   flex-direction row
   min-width 960px
+  .loading
+    position absolute
+    display block
+    left 0
+    right 0
+    bottom 0
+    top 0
+    z-index 10000
+    background rgba(255,255,255,.6)
 
 .playground-schema
   min-width 400px
   width 36%
   border-right 1px solid #E0E0E0
-  box-shadow 0 0 8px rgba(0, 0, 0, 0.15)
+  // box-shadow 0 0 8px rgba(0, 0, 0, 0.15)
   position relative
   z-index 100
-  .CodeMirror
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100%;
-    width: 100%;
-    font-size: 13px;
-    font-family: 'Consolas', 'Inconsolata', 'Droid Sans Mono', 'Monaco', monospace;
-    color: #141823;
+  display flex
+  flex-direction: column
 
   .cm-def
-    &.called-function
-      background rgba(219, 89, 76, .2)
+    transition all .3s ease-in-out
+    background transparent
+
+  .activeline
+    .cm-def
+      $color = #D7D3F1
+      // $color = rgba(219, 89, 76, .2)
+      background $color
       border-radius 1px
-      box-shadow 0 0 0 3px rgba(219, 89, 76, .2)
+      box-shadow 0 0 0 2px $color
+
+.playground-schema-editor
+  flex 1
+  position relative
+  .CodeMirror
+    font-size: 13px;
+    position absolute
+    height 100%
+    width 100%
+    top 0
+    left 0
+    right 0
+    bottom 0
+    font-family: 'Consolas', 'Inconsolata', 'Droid Sans Mono', 'Monaco', monospace;
+    color: #141823;
+  .CodeMirror-lines
+    padding 20px 0
+
+.playground-schema-header
+  // height 48px
+  // font-family 'Raleway', sans-serif
+  // font-weight 300
+  // line-height 48px
+  // padding 0 10px
+  // border-bottom solid 1px #d0d0d0
+  height: 48px;
+  font-family: 'Raleway', sans-serif;
+  color: #999;
+  font-weight: 600;
+  font-size: 12px;
+  text-transform: uppercase;
+  line-height: 52px;
+  padding: 0 12px;
+  border-bottom: solid 1px #d0d0d0;
+  background: #F9F9F9;
 
 .playground-graphiql
   flex 1
   height 100%
+
+
+.cm-s-graphene
+    
+/* Comment */
+.cm-s-graphene .cm-comment
+  color: #999;
+
+/* Punctuation */
+.cm-s-graphene .cm-punctuation
+  color: #555;
+
+/* Keyword */
+.cm-s-graphene .cm-keyword
+  // color: #B11A04;
+  // color #D2054E
+  color #a71d5d
+
+/* OperationName, FragmentName */
+.cm-s-graphene .cm-def
+  // color: #D2054E;
+  color: #1F61A0;
+
+/* FieldName */
+.cm-s-graphene .cm-property
+  color: #333;
+
+/* FieldAlias */
+.cm-s-graphene .cm-qualifier
+  color: #1C92A9;
+
+/* ArgumentName and ObjectFieldName */
+.cm-s-graphene .cm-attribute
+  color: #8B2BB9;
+
+/* Number */
+.cm-s-graphene .cm-number
+  color: #2882F9;
+
+/* String */
+.cm-s-graphene .cm-string
+  color: #D64292;
+
+/* Boolean */
+.cm-s-graphene .cm-builtin
+  color: #D47509;
+
+/* EnumValue */
+.cm-s-graphene .cm-string-2
+  color: #0B7FC7;
+
+/* Variable */
+.cm-s-graphene .cm-variable
+  color: #333;
+
+/* Directive */
+.cm-s-graphene .cm-meta
+  color: #B33086;
+
+/* Type */
+.cm-s-graphene .cm-atom
+  color: #CA9800;
diff --git a/docs/gatsby.config.js b/docs/gatsby.config.js
index 7b9c7f27..32ed0052 100644
--- a/docs/gatsby.config.js
+++ b/docs/gatsby.config.js
@@ -9,6 +9,7 @@ var CopyWebpackPlugin = require('copy-webpack-plugin');
 module.exports = function(config, env) {
   var IS_STATIC = env === 'static';
   var entry = config._config.entry.slice();
+  var publicPath = config._config.output.publicPath;
   // var output = config._config.output;
   // output.filename = "[name].js";
   config._config.entry = {
@@ -25,9 +26,6 @@ module.exports = function(config, env) {
     resolveLoader: {
       root: path.join(__dirname, "node_modules"),
       modulesDirectories: ['./'],
-      alias: {
-        'copy': 'file-loader?name=[path][name].[ext]&context=./static',
-      }
     },
     resolve: {
       root: path.join(__dirname, "node_modules"),
@@ -35,6 +33,7 @@ module.exports = function(config, env) {
         'original-react': path.join(__dirname, "node_modules", "react"),
         'react/lib': path.join(__dirname, "node_modules", "react", "lib"),
         'react': path.join(__dirname, 'patched-react.js'),
+        'pypyjs': '../playground/graphene-js/pypyjs',
         'playground-page': (env != "static")?'../playground/page':'../pages/_empty',
         'playground-wrapper': (env == "develop")?'../playground/page':'../playground/wrapper',
       },
@@ -45,7 +44,10 @@ module.exports = function(config, env) {
     config.plugin('extract-css', ExtractTextPlugin, ["app.css"]);
   }
   config.plugin('static', CopyWebpackPlugin, [[{ from: '../static'}]]);
-  config.plugin('define-env', webpack.DefinePlugin, [{"ENV": JSON.stringify(env)}]);
+  config.plugin('define-env', webpack.DefinePlugin, [{
+    "ENV": JSON.stringify(env),
+    "PUBLIC_PATH": JSON.stringify(publicPath),
+  }]);
   // if (env != "static") {
   //   config.plugin('commons', webpack.optimize.CommonsChunkPlugin, ["commons.js"]);
   // }
diff --git a/docs/html.js b/docs/html.js
index 0b96a36d..18c59088 100644
--- a/docs/html.js
+++ b/docs/html.js
@@ -5,7 +5,7 @@ export default class Html extends React.Component {
   render() {
     var title = this.props.title || DocumentTitle.rewind();
     return (
-      <html lang={this.props.lang}>
+      <html lang={this.props.lang} manifest="/graphene.appcache">
         <head>
           <meta charSet="utf-8"/>
           <meta httpEquiv="X-UA-Compatible" content="IE=edge"/>
diff --git a/docs/package.json b/docs/package.json
index 185d6160..854a0cf8 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -13,12 +13,13 @@
   ],
   "license": "MIT",
   "dependencies": {
+    "codemirror": "5.9.0",
     "copy-webpack-plugin": "^0.2.0",
+    "es6-promise": "^3.0.2",
     "extract-text-webpack-plugin": "^0.9.1",
     "gatsby": "^0.7.2",
     "graphiql": "^0.4.2",
     "graphql": "^0.4.13",
-    "codemirror": "5.9.0",
     "jeet": "^6.1.2",
     "lodash": "^3.10.1",
     "nib": "^1.1.0",
diff --git a/docs/playground/graphene-js/.gitignore b/docs/playground/graphene-js/.gitignore
new file mode 100644
index 00000000..5406e0a9
--- /dev/null
+++ b/docs/playground/graphene-js/.gitignore
@@ -0,0 +1 @@
+pypy-release-nojit
diff --git a/docs/playground/graphene-js/FunctionPromise.js b/docs/playground/graphene-js/FunctionPromise.js
new file mode 100644
index 00000000..58ed07c5
--- /dev/null
+++ b/docs/playground/graphene-js/FunctionPromise.js
@@ -0,0 +1,107 @@
+//
+// FunctionPromise: possibly-asynchronous function constructor.
+//
+// This is a prototype polyfill for a FunctionPromise object as described in:
+//
+//    https://bugzilla.mozilla.org/show_bug.cgi?id=854627
+//
+// Where possible it will arrange for the function body to be parsed/compiled
+// off of the main thread, with the function object returned asynchronously
+// via a promise.  The fallback implementation processes just falls back to
+// the standard synchronous Function() constructor.
+// 
+// It doesn't (yet) have the following features from the linked proposal:
+//
+//    * ability to copy to different workers
+//    * ability to store in IndexedDB
+// 
+function FunctionPromise(/* [args1[, args2[, ...argN]],], functionBody) */) {
+
+  var useFallback =
+    typeof window === "undefined" ||
+    window.FunctionPromise !== FunctionPromise ||
+    typeof document === "undefined" ||
+    typeof document.createElement === "undefined" ||
+    typeof document.head === "undefined" ||
+    typeof document.head.appendChild === "undefined" ||
+    typeof Blob === "undefined" ||
+    typeof URL === "undefined" ||
+    typeof URL.createObjectURL === "undefined";
+
+  var args = Array.prototype.slice.call(arguments);
+
+  // For the fallback case, we just use the normal Function constructor.
+
+  if (useFallback) {
+    try {
+      var fn = Function.apply(null, args);
+      return Promise.resolve(fn);
+    } catch (err) {
+      return Promise.reject(err);
+    }
+  }
+
+  // If we have all the necessary pieces, we can do this asynchronously
+  // by writing a <script> tag into the DOM.
+
+  var funcid = FunctionPromise._nextid++;
+
+  return new Promise(function(resolve, reject) {
+    try {
+      var funcSrc = [];
+      funcSrc.push("window.FunctionPromise._results[" + funcid + "]=");
+      funcSrc.push("function(");
+      if (args.length > 1) {
+        funcSrc.push(args[0]);
+        for (var i = 1; i < args.length - 1; i++) {
+          funcSrc.push(",");
+          funcSrc.push(args[i]);
+        }
+      }
+      funcSrc.push("){");
+      funcSrc.push(args[args.length - 1]);
+      funcSrc.push("}");
+      var dataUrl = URL.createObjectURL(new Blob(funcSrc));
+      var scriptTag = document.createElement("script");
+      var cleanup = function() {
+        URL.revokeObjectURL(dataUrl);
+        scriptTag.remove();
+        delete window.FunctionPromise._results[funcid];
+      }
+      scriptTag.onerror = function() {
+        reject(new Error("unknown error loading FunctionPromise"))
+        cleanup();
+      }
+      scriptTag.onload = function() {
+        if (window.FunctionPromise._results[funcid]) {
+          resolve(window.FunctionPromise._results[funcid]);
+        } else {
+          // No function, something must have gone wrong.
+          // Likely a syntax error in the function body string.
+          // Fall back to Function() constructor to surface it.
+          try {
+            Function.apply(null, args);
+            reject(new Error("unknown error fulfilling FunctionPromise"));
+          } catch (err) {
+            reject(err);
+          }
+        }
+        cleanup();
+      }
+      scriptTag.src = dataUrl;
+      document.head.appendChild(scriptTag);
+    } catch (err) {
+      reject(err);
+    }
+  });
+}
+
+FunctionPromise._nextid = 0;
+FunctionPromise._results = {};
+
+if (typeof module !== "undefined" && typeof module.exports !== "undefined") {
+  if (typeof Promise === "undefined") {
+    Promise = require('es6-promise').Promise;
+  }
+  module.exports = FunctionPromise;
+}
diff --git a/docs/playground/graphene-js/build.sh b/docs/playground/graphene-js/build.sh
new file mode 100755
index 00000000..c2ecc4f7
--- /dev/null
+++ b/docs/playground/graphene-js/build.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+if [ ! -d pypyjs-release-nojit ] ; then
+	git clone git@github.com:pypyjs/pypyjs-release-nojit.git
+fi
+
+GRAPHENE_DIR="$(python -c "import os; import graphene; print os.path.dirname(graphene.__file__)")"
+GRAPHQL_DIR="$(python -c "import os; import graphql; print os.path.dirname(graphql.__file__)")"
+GRAPHQL_RELAY_DIR="$(python -c "import os; import graphql_relay; print os.path.dirname(graphql_relay.__file__)")"
+SIX_DIR="$(python -c "import os; import six; print six.__file__.rstrip('c')")"
+
+cd pypyjs-release-nojit
+
+eval python tools/module_bundler.py add ./lib/modules "$GRAPHENE_DIR"
+eval python tools/module_bundler.py add ./lib/modules "$GRAPHQL_DIR"
+eval python tools/module_bundler.py add ./lib/modules "$GRAPHQL_RELAY_DIR"
+eval python tools/module_bundler.py add ./lib/modules "$SIX_DIR"
+
+python ./tools/module_bundler.py preload ./lib/modules graphene
+python ./tools/module_bundler.py preload ./lib/modules graphql
+python ./tools/module_bundler.py preload ./lib/modules graphql_relay
+python ./tools/module_bundler.py preload ./lib/modules six
+
+python ./tools/module_bundler.py remove ./lib/modules unittest
+
+lib_dirname=`perl -e 'use Cwd "abs_path";print abs_path(shift)' lib/`
+
+if [ -d ../../../static/playground/lib ] ; then
+	rm ../../../static/playground/lib
+fi
+
+exec ln -s "$lib_dirname/" ../../../static/playground
diff --git a/docs/playground/graphene-js/pypyjs.js b/docs/playground/graphene-js/pypyjs.js
new file mode 100644
index 00000000..510abdcf
--- /dev/null
+++ b/docs/playground/graphene-js/pypyjs.js
@@ -0,0 +1,983 @@
+//
+//  pypyjs:  an experimental in-browser python environment.
+//
+
+(function() {
+
+// Expose the main pypyjs function at global scope for this file,
+// as well as in any module exports or 'window' object we can find.
+if (this) {
+  this.pypyjs = pypyjs;
+}
+if (typeof window !== "undefined") {
+  window.pypyjs = pypyjs;
+}
+if (typeof module !== "undefined") {
+  if (typeof module.exports !== "undefined") {
+    module.exports = pypyjs;
+  }
+}
+
+
+// Generic debugging printf.
+var debug = function(){};
+if (typeof console !== "undefined") {
+  debug = console.log.bind(console);
+} else if (typeof print !== "undefined" && typeof window === "undefined") {
+  debug = print;
+}
+
+
+// Find the directory containing this very file.
+// It can be quite difficult depending on execution environment...
+if (typeof __dirname === "undefined" || true) {
+  var __dirname = "./";
+  // A little hackery to find the URL of this very file.
+  // Throw an error, then parse the stack trace looking for filenames.
+  var errlines = (new Error()).stack.split("\n");
+  for (var i = 0; i < errlines.length; i++) {
+    var match = /(at Anonymous function \(|at |@)(.+\/)pypyjs.js/.exec(errlines[i]);
+    if (match) {
+      __dirname = match[2];
+      break;
+    }
+  }
+}
+if (__dirname.charAt(__dirname.length - 1) !== "/") {
+  __dirname += "/";
+}
+
+
+if (typeof Promise === "undefined") {
+  var Promise = require('es6-promise').Promise;
+}
+
+
+// Ensure we have reference to a 'FunctionPromise' constructor.
+var FunctionPromise = require("./FunctionPromise.js");
+
+if (typeof FunctionPromise === "undefined") {
+  throw "FunctionPromise object not found";
+}
+
+// Some extra goodies for nodejs.
+if (typeof process !== 'undefined') {
+  if (Object.prototype.toString.call(process) === '[object process]') {
+    var fs = require("fs");
+    var path = require("path");
+  }
+}
+
+// Create functions for handling default stdio streams.
+// These will be shared by all VM instances by default.
+//
+// We default stdout and stderr to process outputs if available,
+// printing/logging functions otherwise, and /dev/null if nothing
+// else is available.  Unfortunately there's no good way to read
+// synchronously from stdin in javascript, so that's always /dev/null.
+
+var devNull = {
+  stdin: function() { return null; },
+  stdout: function() { },
+  stderr: function() { }
+}
+
+var stdio = {
+  stdin: null,
+  stdout: null,
+  stderr: null
+}
+
+stdio.stdin = devNull.stdin;
+
+if (typeof process !== "undefined") {
+  if (typeof process.stdout !== "undefined") {
+    stdio.stdout = function(x) { process.stdout.write(x); }
+  }
+  if (typeof process.stderr !== "undefined") {
+    stdio.stderr = function(x) { process.stderr.write(x); }
+  }
+}
+
+var _print, _printErr;
+if (typeof window === "undefined") {
+  // print, printErr from v8, spidermonkey
+  if (typeof print !== "undefined") {
+    _print = print;
+  }
+  if (typeof printErr !== "undefined") {
+    _printErr = printErr;
+  }
+}
+if (typeof console !== "undefined") {
+  if (typeof _print === "undefined") {
+    _print = console.log.bind(console);
+  }
+  if (typeof _printErr === "undefined") {
+    _printErr = console.error.bind(console);
+  }
+}
+
+if (stdio.stdout == null && typeof _print !== "undefined") {
+  // print()/console.log() will add a newline, so we buffer until we
+  // receive one and then let it add it for us.
+  stdio.stdout = (function() {
+    var buffer = [];
+    return function(data) {
+      for (var i = 0; i < data.length; i++) {
+        var x = data.charAt(i);
+        if (x !== "\n") {
+          buffer.push(x);
+        } else {
+          _print(buffer.join(""));
+          buffer.splice(undefined, buffer.length);
+        }
+      }
+    }
+  })();
+}
+
+if (stdio.stderr == null && typeof _printErr !== "undefined") {
+  // printErr()/console.error() will add a newline, so we buffer until we
+  // receive one and then let it add it for us.
+  stdio.stderr = (function() {
+    var buffer = [];
+    return function(data) {
+      for (var i = 0; i < data.length; i++) {
+        var x = data.charAt(i);
+        if (x !== "\n") {
+          buffer.push(x);
+        } else {
+          _printErr(buffer.join(""));
+          buffer.splice(undefined, buffer.length);
+        }
+      }
+    }
+  })();
+}
+
+if (stdio.stdout === null) {
+  stdio.stdout = devNull.stdout;
+}
+
+if (stdio.stderr === null) {
+  stdio.stderr = devNull.stderr;
+}
+
+function pypyjs(opts) {
+
+  opts = opts || {};
+  this.rootURL = opts.rootURL;
+  this.totalMemory = opts.totalMemory || 128 * 1024 * 1024;
+  this.autoLoadModules = opts.autoLoadModules || true;
+  this._pendingModules = {};
+  this._loadedModules = {};
+  this._allModules = {};
+
+  // Allow opts to override default IO streams.
+  this.stdin = opts.stdin || stdio.stdin;
+  this.stdout = opts.stdout || stdio.stdout;
+  this.stderr = opts.stderr || stdio.stderr;
+
+  // Default to finding files relative to this very file.
+  if (!this.rootURL && !pypyjs.rootURL) {
+    pypyjs.rootURL = __dirname;
+  }
+  if (this.rootURL && this.rootURL.charAt(this.rootURL.length - 1) !== "/") {
+    this.rootURL += "/";
+  } 
+
+  // If we haven't already done so, fetch and load the code for the VM.
+  // We do this once and cache the result for re-use, so that we don't
+  // have to pay asmjs compilation overhead each time we create the VM.
+
+  if (! pypyjs._vmBuilderPromise) {
+    pypyjs._vmBuilderPromise = this.fetch("pypyjs.vm.js").then((function(xhr) {
+      // Parse the compiled code, hopefully asynchronously.
+      // Unfortunately our use of Function constructor here doesn't
+      // play very well with nodejs, where things like 'module' and
+      // 'require' are not in the global scope.  We have to pass them
+      // in explicitly as arguments.
+      var funcBody = [
+        // This is the compiled code for the VM.
+        xhr.responseText,
+        '\n',
+        // Ensure that some functions are available on the Module,
+        // for linking with jitted code.
+        'if (!Module._jitInvoke && typeof _jitInvoke !== "undefined") {',
+        '  Module._jitInvoke = _jitInvoke;',
+        '}',
+        // Keep some functions that are not exported by default, but
+        // which appear in this scope when evaluating the above.
+        "Module._emjs_make_handle = _emjs_make_handle;",
+        "Module._emjs_free = _emjs_free;",
+        // Call dependenciesFulfilled if it won't be done automatically.
+        "dependenciesFulfilled=function() { inDependenciesFulfilled(FS); };",
+        "if(!memoryInitializer||(!ENVIRONMENT_IS_WEB&&!ENVIRONMENT_IS_WORKER))dependenciesFulfilled();",
+      ].join("");
+      return FunctionPromise("Module", "inDependenciesFulfilled", "require",
+                             "module", "__filename", "__dirname", funcBody)
+    }).bind(this));
+  }
+
+  // Create a new instance of the compiled VM, bound to local state
+  // and a local Module object.
+
+  this._ready = new Promise((function(resolve, reject) {
+
+    // Initialize the Module object.
+    // We make it available on this object so that we can use
+    // its methods to execute code in the VM.
+    var Module = {};
+    this._module = Module;
+    Module.TOTAL_MEMORY = this.totalMemory;
+
+    // We will set up the filesystem manually when we're ready.
+    Module.noFSInit = true;
+    Module.thisProgram = "/lib/pypyjs/pypyjs.js";
+    Module.filePackagePrefixURL = this.rootURL || pypyjs.rootURL;
+    Module.memoryInitializerPrefixURL = this.rootURL || pypyjs.rootURL;
+    Module.locateFile = function(name) {
+      return (this.rootURL || pypyjs.rootURL) + name;
+    }
+
+    // Don't start or stop the program, just set it up.
+    // We'll call the API functions ourself.
+    Module.noInitialRun = true;
+    Module.noExitRuntime = true;
+
+    // Route stdin to an overridable method on the object.
+    var stdin = (function stdin() {
+      return this.stdin();
+    }).bind(this);
+ 
+    // Route stdout to an overridable method on the object.
+    // We buffer the output for efficiency.
+    var stdout_buffer = []
+    var stdout = (function stdout(x) {
+      var c = String.fromCharCode(x);
+      stdout_buffer.push(c);
+      if (c === "\n" || stdout_buffer.length >= 128) {
+        this.stdout(stdout_buffer.join(""));
+        stdout_buffer = [];
+      }
+    }).bind(this);
+
+    // Route stderr to an overridable method on the object.
+    // We do not buffer stderr.
+    var stderr = (function stderr(x) {
+      var c = String.fromCharCode(x);
+      this.stderr(c);
+    }).bind(this);
+
+    // This is where execution will continue after loading
+    // the memory initialization data, if any.
+    var initializedResolve, initializedReject;
+    var initializedP = new Promise(function(resolve, reject) {
+      initializedResolve = resolve;
+      initializedReject = reject;
+    });
+    var FS;
+    var dependenciesFulfilled = function(fs) {
+      FS = fs;
+      // Initialize the filesystem state.
+      try {
+        FS.init(stdin, stdout, stderr);
+        Module.FS_createPath("/", "lib/pypyjs/lib_pypy", true, false);
+        Module.FS_createPath("/", "lib/pypyjs/lib-python/2.7", true, false);
+        initializedResolve();
+      } catch (err) {
+        initializedReject(err);
+      }
+    }
+ 
+    // Begin fetching the metadata for available python modules.
+    // With luck these can download while we jank around compiling
+    // all of that javascript.
+    // XXX TODO: also load memory initializer this way.
+    var moduleDataP = this.fetch("modules/index.json");
+
+    pypyjs._vmBuilderPromise.then((function(vmBuilder) {
+      var args = [
+        Module,
+        dependenciesFulfilled,
+        typeof undefined,
+        typeof undefined,
+        typeof undefined,
+        typeof __dirname
+      ];
+      // This links the async-compiled module into our Module object.
+      vmBuilder.apply(null, args);
+      return initializedP;
+    }).bind(this)).then((function() {
+      // Continue with processing the downloaded module metadata.
+      return moduleDataP.then((function(xhr) {
+        // Store the module index, and load any preload modules.
+        var modIndex = JSON.parse(xhr.responseText);
+        this._allModules = modIndex.modules;
+        if (modIndex.preload) {
+          for (var name in modIndex.preload) {
+            this._writeModuleFile(name, modIndex.preload[name]);
+          }
+        }
+        // It's finally safe to launch the VM.
+        Module.run();
+        Module._rpython_startup_code();
+        var pypy_home = Module.intArrayFromString("/lib/pypyjs/pypyjs.js");
+        pypy_home = Module.allocate(pypy_home, 'i8', Module.ALLOC_NORMAL);
+        Module._pypy_setup_home(pypy_home, 0);
+        Module._free(pypy_home);
+        var initCode = [
+          "import js",
+          "import sys; sys.platform = 'js'",
+          "import traceback",
+          "top_level_scope = {'__name__': '__main__'}"
+        ];
+        initCode.forEach(function(codeStr) {
+          var code = Module.intArrayFromString(codeStr);
+          var code = Module.allocate(code, 'i8', Module.ALLOC_NORMAL);
+          if (!code) {
+            throw new pypyjs.Error('Failed to allocate memory');
+          }
+          var res = Module._pypy_execute_source(code);
+          if (res < 0) {
+            throw new pypyjs.Error('Failed to execute python code');
+          }
+          Module._free(code);
+        });
+      }).bind(this))
+    }).bind(this))
+    .then(resolve, reject);
+  }).bind(this));
+
+};
+
+
+// A simple file-fetching wrapper around XMLHttpRequest,
+// that treats paths as relative to the pypyjs.js root url.
+//
+pypyjs.prototype.fetch = function (relpath, responseType) {
+  if (typeof window === "undefined") {
+    var localStorage = false;
+  }
+  else {
+    var localStorage = window.localStorage;
+  }
+  var use_cache = pypyjs.cacheKey && localStorage && relpath != "pypyjs.vm.js";
+  if (use_cache) {
+    var item = localStorage.getItem(pypyjs.cacheKey+':'+relpath);
+    if (item) {
+      return new Promise((function(resolve, reject) {
+        resolve({ responseText: item });
+      }))
+    }
+  }
+  // For the web, use XMLHttpRequest.
+  if (typeof XMLHttpRequest !== "undefined") {
+    return new Promise((function(resolve, reject) {
+      var xhr = new XMLHttpRequest();
+      xhr.onload = function() {
+        if (xhr.status >= 400) {
+          reject(xhr)
+        } else {
+          if (use_cache && xhr.responseText) {
+            localStorage.setItem(pypyjs.cacheKey+':'+relpath, xhr.responseText);
+          }
+          resolve(xhr);
+        }
+      };
+      var rootURL = this.rootURL || pypyjs.rootURL;
+      xhr.open('GET', rootURL + relpath, true);
+      xhr.responseType = responseType || "text";
+      xhr.send(null);
+    }).bind(this));
+  }
+  // For nodejs, use fs.readFile.
+  if (typeof fs !== "undefined" && typeof fs.readFile !== "undefined") {
+    return new Promise((function(resolve, reject) {
+      var rootURL = this.rootURL || pypyjs.rootURL;
+      fs.readFile(path.join(rootURL, relpath), function(err, data) {
+        if (err) return reject(err);
+        resolve({ responseText: data.toString() });
+      });
+    }).bind(this));
+  }
+  // For spidermonkey, use snarf (which has a binary read mode).
+  if (typeof snarf !== "undefined") {
+    return new Promise((function(resolve, reject) {
+      var rootURL = this.rootURL || pypyjs.rootURL;
+      var data = snarf(rootURL + relpath);
+      resolve({ responseText: data });
+    }).bind(this));
+  }
+  // For d8, use read() and readbuffer().
+  if (typeof read !== "undefined" && typeof readbuffer !== "undefined") {
+    return new Promise((function(resolve, reject) {
+      var rootURL = this.rootURL || pypyjs.rootURL;
+      var data = read(rootURL + relpath);
+      resolve({ responseText: data });
+    }).bind(this));
+  }
+  return new Promise(function(resolve, reject) {
+    reject("unable to fetch files");
+  });
+};
+
+if (typeof localStorage !== "undefined") {
+  var localStorage = false;
+}
+
+// pypyjs.prototype.fetch = function fetch(relpath, responseType) {
+//   // For the web, use XMLHttpRequest.
+//   var use_cache = pypyjs.cacheKey && localStorage;
+//   if (use_cache) {
+//     if (var item = localStorage.getItem(pypyjs.cacheKey+'-'+relpath)) {
+//       resolve({ responseText: item });
+//     }
+//   }
+//   if (typeof XMLHttpRequest !== "undefined") {
+//     return new Promise((function(resolve, reject) {
+//       var xhr = new XMLHttpRequest();
+//       xhr.onload = function() {
+//         if (xhr.status >= 400) {
+//           reject(xhr)
+//         } else {
+//           console.log(xhr.responseText);
+//           if (use_cache && xhr.responseText) {
+//             localStorage.setItem(pypyjs.cacheKey+'-'+relpath, xhr.responseText);
+//           }
+//           resolve(xhr);
+//         }
+//       };
+//       var rootURL = this.rootURL || pypyjs.rootURL;
+//       xhr.open('GET', rootURL + relpath, true);
+//       xhr.responseType = responseType || "text";
+//       xhr.send(null);
+//     }).bind(this));
+//   }
+//   // For nodejs, use fs.readFile.
+//   if (typeof fs !== "undefined" && typeof fs.readFile !== "undefined") {
+//     return new Promise((function(resolve, reject) {
+//       var rootURL = this.rootURL || pypyjs.rootURL;
+//       fs.readFile(path.join(rootURL, relpath), function(err, data) {
+//         if (err) return reject(err);
+//         resolve({ responseText: data.toString() });
+//       });
+//     }).bind(this));
+//   }
+//   // For spidermonkey, use snarf (which has a binary read mode).
+//   if (typeof snarf !== "undefined") {
+//     return new Promise((function(resolve, reject) {
+//       var rootURL = this.rootURL || pypyjs.rootURL;
+//       var data = snarf(rootURL + relpath);
+//       resolve({ responseText: data });
+//     }).bind(this));
+//   }
+//   // For d8, use read() and readbuffer().
+//   if (typeof read !== "undefined" && typeof readbuffer !== "undefined") {
+//     return new Promise((function(resolve, reject) {
+//       var rootURL = this.rootURL || pypyjs.rootURL;
+//       var data = read(rootURL + relpath);
+//       resolve({ responseText: data });
+//     }).bind(this));
+//   }
+//   return new Promise(function(resolve, reject) {
+//     reject("unable to fetch files");
+//   });
+// };
+
+
+// Method to execute python source directly in the VM.
+//
+// This is the basic way to push code into the pypyjs VM.
+// Calling code should not use it directly; rather we use it
+// as a primitive to build up a nicer execution API.
+//
+pypyjs.prototype._execute_source = function _execute_source(code) {
+  var Module = this._module;
+  code = "try:\n" +
+         "  " + code + "\n" +
+         "except Exception:\n" +
+         "  typ, val, tb = sys.exc_info()\n" +
+         "  err_name = getattr(typ, '__name__', str(typ))\n" +
+         "  err_msg = str(val)\n" +
+         "  err_trace = traceback.format_exception(typ, val, tb)\n" +
+         "  err_trace = ''.join(err_trace)\n" +
+         "  js.globals['pypyjs']._lastErrorName = err_name\n" +
+         "  js.globals['pypyjs']._lastErrorMessage = err_msg\n" +
+         "  js.globals['pypyjs']._lastErrorTrace = err_trace\n";
+  var code_chars = Module.intArrayFromString(code);
+  var code_ptr = Module.allocate(code_chars, 'i8', Module.ALLOC_NORMAL);
+  if (!code_ptr) {
+    return Promise.reject(new pypyjs.Error("Failed to allocate memory"));
+  }
+  var res = Module._pypy_execute_source(code_ptr);
+  Module._free(code_ptr);
+  // XXX TODO: races/re-entrancy on _lastError?
+  if (pypyjs._lastErrorName) {
+    var err = new pypyjs.Error(
+      pypyjs._lastErrorName,
+      pypyjs._lastErrorMessage,
+      pypyjs._lastErrorTrace
+    );
+    pypyjs._lastErrorName = null;
+    pypyjs._lastErrorMessage = null;
+    pypyjs._lastErrorTrace = null;
+    return Promise.reject(err);
+  }
+  if (res < 0) {
+    return Promise.reject(new pypyjs.Error("Error executing python code"));
+  }
+  return Promise.resolve(null);
+}
+
+
+function _escape(value) {
+  return value.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+}
+
+
+// Method to determine when the interpreter is ready.
+//
+// This method returns a promise that will resolve once the interpreter
+// is ready for use.
+//
+pypyjs.prototype.ready = function ready() {
+  return this._ready;
+}
+
+
+// Method to execute some python code.
+//
+// This passes the given python code to the VM for execution.
+// It's fairly directly analogous to the "exec" statement in python.
+// It is not possible to directly access the result of the code, if any.
+// Rather you should store it into a variable and then use the get() method.
+//
+pypyjs.prototype.exec = function exec(code) {
+  return this._ready.then((function() {
+    var p = Promise.resolve();
+    // Find any "import" statements in the code,
+    // and ensure the modules are ready for loading.
+    if (this.autoLoadModules) {
+      p = p.then((function() {
+        return this.findImportedNames(code);
+      }).bind(this))
+      .then((function(imports) {
+        return this.loadModuleData.apply(this, imports);
+      }).bind(this))
+    }
+    // Now we can execute the code in custom top-level scope.
+    code = 'exec \'\'\'' + _escape(code) + '\'\'\' in top_level_scope';
+    p = p.then((function() {
+      return this._execute_source(code);
+    }).bind(this));
+    return p;
+  }).bind(this));
+}
+
+
+// Method to evaluate an expression.
+//
+// This method evaluates an expression and returns its value (assuming the
+// value can be translated into javascript).  It's fairly directly analogous
+// to the "eval" function in python.
+//
+// For backwards-compatibility reasons, it will also evaluate statements.
+// This behaviour is deprecated and will be removed in a future release.
+//
+pypyjs.prototype.eval = function (expr) {
+  return this._ready.then((function() {
+    // First try to execute it as an expression.
+    code = "r = eval('" + _escape(expr) + "', top_level_scope)";
+    return this._execute_source(code);
+  }).bind(this)).then(
+    (function() {
+      // If that succeeded, return the result.
+      return this.get("r", true)
+    }).bind(this),
+    (function(err) {
+      if (err && err.name && err.name !== "SyntaxError") {
+        throw err;
+      }
+      // If that failed, try again via exec().
+      if (typeof console !== "undefined") {
+        console.warn("Calling pypyjs.eval() with statements is deprecated.");
+        console.warn("Use eval() for expressions, exec() for statements.");
+      }
+      return this.exec(expr);
+    }).bind(this)
+  )
+}
+
+// Method to evaluate some python code from a file..
+//
+// This fetches the named file and passes it to the VM for execution.
+//
+pypyjs.prototype.execfile = function execfile(filename) {
+  return this.fetch(filename).then((function(xhr) {
+    var code = xhr.responseText;
+    return this.exec(code);
+  }).bind(this));
+}
+
+
+// Method to read a python variable.
+//
+// This tries to convert the value in the named python variable into an
+// equivalent javascript value and returns it.  It will fail if the variable
+// does not exist or contains a value that cannot be converted.
+//
+pypyjs._resultsID = 0;
+pypyjs._resultsMap = {};
+pypyjs.prototype.get = function get(name, _fromGlobals) {
+  var resid = ""+(pypyjs._resultsID++);
+  // We can read from global scope for internal use; don't do this from calling code!
+  if (_fromGlobals) {
+    var namespace = "globals()";
+  } else {
+    var namespace = "top_level_scope";
+  }
+  return this._ready.then((function() {
+    var code = namespace + ".get('" + _escape(name) + "', js.undefined)";
+    code = "js.convert(" + code + ")"
+    code = "js.globals['pypyjs']._resultsMap['" + resid + "'] = " + code;
+    return this._execute_source(code);
+  }).bind(this)).then((function() {
+    var res = pypyjs._resultsMap[resid];
+    delete pypyjs._resultsMap[resid];
+    return res;
+  }).bind(this));
+}
+
+
+// Method to set a python variable to a javascript value.
+//
+// This generates a handle to the given object, and arranges for the named
+// python variable to reference it via that handle.
+//
+pypyjs.prototype.set = function set(name, value) {
+  return this._ready.then((function() {
+    var Module = this._module;
+    var h = Module._emjs_make_handle(value);
+    name = _escape(name);
+    var code = "top_level_scope['" + name + "'] = js.Value(" + h + ")";
+    return this._execute_source(code);
+  }).bind(this));
+}
+
+
+// Method to run an interactive REPL.
+//
+// This method takes takes callback function implementing the user
+// input prompt, and runs a REPL loop using it.  The prompt function
+// may either return the input as a string, or a promise resolving to
+// the input as a string.  If not specified, we read from stdin (which
+// works fine in e.g. nodejs, but is almost certainly not what you want
+// in the browser, because it's blocking).
+//
+pypyjs.prototype.repl = function repl(prmpt) {
+  if (!prmpt) {
+    // If there's a custom stdin, or we're not in nodejs, then we should
+    // default to prompting on stdin/stdout.  For nodejs, we can build
+    // an async prompt atop process.stdin.
+    var buffer = "";
+    if (this.stdin !== devNull.stdin || typeof process === "undefined") {
+      prmpt = (function(ps1) {
+        var input;
+        this.stdout(ps1);
+        var c = this.stdin();
+        while (c) {
+          var idx = c.indexOf("\n");
+          if (idx >= 0) {
+            var input = buffer + c.substr(0, idx + 1);
+            buffer = c.substr(idx + 1);
+            return input;
+          }
+          buffer += c;
+          c = this.stdin();
+        }
+        input = buffer;
+        buffer = "";
+        return input;
+      }).bind(this);
+    } else {
+      prmpt = (function(ps1) {
+        return new Promise((function(resolve, reject) {
+          this.stdout(ps1);
+          var slurp = function() {
+            process.stdin.once("readable", function() {
+              var chunk = process.stdin.read();
+              if (chunk === null) {
+                slurp();
+              } else {
+                chunk = chunk.toString();
+                var idx = chunk.indexOf("\n");
+                if (idx < 0) {
+                  buffer += chunk;
+                  slurp();
+                } else {
+                  resolve(buffer + chunk.substr(0, idx + 1));
+                  buffer = chunk.substr(idx + 1);
+                }
+              }
+            });
+          }
+          slurp();
+        }).bind(this));
+      }).bind(this);
+    }
+  }
+  // Set up an InteractiveConsole instance,
+  // then loop forever via recursive promises.
+  return this._ready.then((function() {
+    return this.loadModuleData("code");
+  }).bind(this)).then((function() {
+    return this._execute_source("import code");
+  }).bind(this)).then((function() {
+    return this._execute_source("c = code.InteractiveConsole(top_level_scope)");
+  }).bind(this)).then((function() {
+    return this._repl_loop(prmpt, ">>> ");
+  }).bind(this));
+}
+
+
+pypyjs.prototype._repl_loop = function _repl_loop(prmpt, ps1) {
+  return Promise.resolve().then((function() {
+    // Prompt for input, which may happen via async promise.
+    return prmpt.call(this, ps1);
+  }).bind(this)).then((function(input) {
+    // Push it into the InteractiveConsole, a line at a time.
+    var p = Promise.resolve();
+    input.split("\n").forEach((function(line) {
+      // Find any "import" statements in the code,
+      // and ensure the modules are ready for loading.
+      if (this.autoLoadModules) {
+        p = p.then((function() {
+          return this.findImportedNames(line);
+        }).bind(this))
+        .then((function(imports) {
+          return this.loadModuleData.apply(this, imports);
+        }).bind(this))
+      }
+      var code = 'r = c.push(\'' + _escape(line) + '\')';
+      p = p.then((function() {
+        return this._execute_source(code);
+      }).bind(this));
+    }).bind(this));
+    return p;
+  }).bind(this)).then((function() {
+    // Check the result from the final push.
+    return this.get("r", true)
+  }).bind(this)).then((function(r) {
+    // If r == 1, we're in a multi-line definition.
+    // Adjust the prompt accordingly.
+    if (r) {
+      return this._repl_loop(prmpt, "... ");
+    } else {
+      return this._repl_loop(prmpt, ">>> ");
+    }
+  }).bind(this));
+}
+
+
+// Method to look for "import" statements in a code string.
+// Returns a promise that will resolve to a list of imported module names.
+//
+// XXX TODO: this is far from complete and should not be done with a regex.
+// Perhaps we can call into python's "ast" module for this parsing?
+//
+var importStatementRE = /(from\s+([a-zA-Z0-9_\.]+)\s+)?import\s+\(?\s*([a-zA-Z0-9_\.\*]+(\s+as\s+[a-zA-Z0-9_]+)?[ \t]*,?[ \t]*)+[ \t]*\)?/g
+pypyjs.prototype.findImportedNames = function findImportedNames(code) {
+  var match = null;
+  var imports = [];
+  importStatementRE.lastIndex = 0;
+  while ((match = importStatementRE.exec(code)) !== null) {
+    var relmod = match[2];
+    if (relmod) {
+      relmod = relmod + ".";
+    } else {
+      relmod = "";
+    }
+    var submods = match[0].split("import")[1];
+    while (submods && /[\s(]/.test(submods.charAt(0))) {
+      submods = submods.substr(1);
+    }
+    while (submods && /[\s)]/.test(submods.charAt(submods.length - 1))) {
+      submods = submods.substr(0, submods.length - 1);
+    }
+    submods = submods.split(/\s*,\s*/);
+    for (var i = 0; i < submods.length; i++) {
+      var submod = submods[i];
+      submod = submod.split(/\s*as\s*/)[0];
+      imports.push(relmod + submod);
+    }
+  }
+  return Promise.resolve(imports);
+}
+
+
+// Method to load the contents of a python module, along with
+// any dependencies.  This populates the relevant paths within
+// the VMs simulated filesystem so that is can find and import
+// the specified module.
+//
+pypyjs.prototype.loadModuleData = function loadModuleData(/* names */) {
+  // Each argument is a name that we want to import.
+  // We must find the longest prefix that is an available module
+  // and load it along with all its dependencies.
+  var modules = Array.prototype.slice.call(arguments);
+  return this._ready.then((function() {
+    var toLoad = {};
+    NEXTNAME: for (var i = 0; i < modules.length; i++) {
+      var name = modules[i];
+      // Find the nearest containing module for the given name.
+      // Note that it may not match a module at all, in which case we ignore it.
+      while (true) {
+        if (this._allModules[name]) {
+          break;
+        }
+        name = name.substr(0, name.lastIndexOf("."));
+        if (!name) continue NEXTNAME;
+      }
+      this._findModuleDeps(name, toLoad);
+    } 
+    // Now ensure that each module gets loaded.
+    // XXX TODO: we could load these concurrently.
+    var p = Promise.resolve();
+    for (var name in toLoad) {
+      p = p.then(this._makeLoadModuleData(name));
+    }
+    return p;
+  }).bind(this));
+}
+
+
+pypyjs.prototype._findModuleDeps = function _findModuleDeps(name, seen) {
+  if (!seen) seen = {};
+  var deps = [];
+  // If we don't know about this module, ignore it.
+  if (!this._allModules[name]) {
+    return seen;
+  }
+  // Depend on any explicitly-named imports.
+  var imports = this._allModules[name].imports;
+  if (imports) {
+    for (var i = 0; i < imports.length; i++) {
+      deps.push(imports[i]);
+    }
+  }
+  // Depend on the __init__.py for packages.
+  if (this._allModules[name].dir) {
+    deps.push(name + ".__init__");
+  }
+  // Include the parent package, if any.
+  var idx = name.lastIndexOf(".");
+  if (idx !== -1) {
+    deps.push(name.substr(0, idx));
+  }
+  // Recurse for any previously-unseen dependencies.
+  seen[name] = true;
+  for (var i = 0; i < deps.length; i++) {
+    if (!seen[deps[i]]) {
+      this._findModuleDeps(deps[i], seen);
+    }
+  }
+  return seen;
+}
+
+
+pypyjs.prototype._makeLoadModuleData = function _makeLoadModuleData(name) {
+  return (function() {
+    // If we've already loaded this module, we're done.
+    if (this._loadedModules[name]) {
+      return Promise.resolve();
+    }
+    // If we're already in the process of loading it, use the existing promise.
+    if (this._pendingModules[name]) {
+      return this._pendingModules[name];
+    }
+    // If it's a package directory, there's not actually anything to do.
+    if (this._allModules[name].dir) {
+      return Promise.resolve();
+    }
+    // We need to fetch the module file and write it out.
+    var modfile = this._allModules[name].file;
+    var p = this.fetch("modules/" + modfile)
+    .then((function(xhr) {
+      var contents = xhr.responseText;
+      this._writeModuleFile(name, contents)
+      delete this._pendingModules[name];
+    }).bind(this))
+    this._pendingModules[name] = p;
+    return p;
+  }).bind(this);
+}
+
+
+pypyjs.prototype._writeModuleFile = function _writeModuleFile(name, data) {
+  var Module = this._module;
+  var file = this._allModules[name].file;
+  // Create the containing directory first.
+  var dir = file.split("/").slice(0, -1).join("/")
+  try {
+    Module.FS_createPath("/lib/pypyjs/lib_pypy", dir, true, false);
+  } catch (e) { }
+  // Now we can safely create the file.
+  var fullpath = "/lib/pypyjs/lib_pypy/" + file;
+  Module.FS_createDataFile(fullpath, "", data, true, false, true);
+  this._loadedModules[name] = true;
+}
+
+
+// An error class for reporting python exceptions back to calling code.
+// XXX TODO: this could be a lot more user-friendly than a opaque error...
+
+pypyjs.Error = function pypyjsError(name, message, trace) {
+  if (name && typeof message === "undefined") {
+    message = name;
+    name = "";
+  }
+  this.name = name || "pypyjs.Error";
+  this.message = message || "pypyjs Unknown Error";
+  this.trace = trace || "";
+}
+pypyjs.Error.prototype = new Error();
+pypyjs.Error.prototype.constructor = pypyjs.Error;
+
+
+
+// XXX TODO: expose the filesystem for manipulation by calling code.
+
+
+// Add convenience methods directly on the 'pypyjs' function, that
+// will invoke corresponding methods on a default VM instance.
+// This makes it look like 'pypyjs' is a singleton VM instance.
+
+pypyjs._defaultVM = null;
+pypyjs.stdin = stdio.stdin
+pypyjs.stdout = stdio.stdout
+pypyjs.stderr = stdio.stderr
+
+var PUBLIC_NAMES = ['ready', 'exec', 'eval', 'execfile', 'get', 'set',
+                    'repl', 'loadModuleData'];
+
+PUBLIC_NAMES.forEach(function(name) {
+  pypyjs[name] = function() {
+    if (!pypyjs._defaultVM) {
+      pypyjs._defaultVM = new pypyjs({
+        stdin: function(){ return pypyjs.stdin.apply(this, arguments); },
+        stdout: function(){ return pypyjs.stdout.apply(this, arguments); },
+        stderr: function(){ return pypyjs.stderr.apply(this, arguments); },
+      });
+    }
+    return pypyjs._defaultVM[name].apply(pypyjs._defaultVM, arguments)
+  }
+})
+
+
+// For nodejs, run a repl when invoked directly from the command-line.
+
+return pypyjs;
+
+})();
diff --git a/docs/playground/page.js b/docs/playground/page.js
index 098b7e18..9e130fb8 100644
--- a/docs/playground/page.js
+++ b/docs/playground/page.js
@@ -5,10 +5,18 @@ import CodeMirror from 'codemirror';
 import { graphql } from 'graphql';
 import GraphiQL from 'graphiql';
 import schema from './schema';
+import pypyjs_vm from 'pypyjs';
 
 import 'codemirror/mode/python/python';
 import '../css/playground.styl';
 
+if (typeof PUBLIC_PATH === "undefined") {
+  var PUBLIC_PATH = '';
+}
+
+pypyjs_vm.rootURL = `${PUBLIC_PATH}/playground/lib/`;
+pypyjs_vm.cacheKey = 'graphene';
+
 var baseCode = `import graphene
 
 class Query(graphene.ObjectType):
@@ -36,28 +44,166 @@ function graphQLFetcher(graphQLParams) {
 }
 // var schema = null;
 
+function syntaxError() {
+  var marker = document.createElement("div");
+  marker.style.color = "#822";
+  marker.innerHTML = "●";
+  return marker;
+}
+
+var default_interpreter;
 class Playground extends React.Component {
+  constructor() {
+    super();
+    this.state = {pypyjs: false, stdout: '', response:''};
+  }
+  stdout() {
+    console.log('stdout', arguments);
+  }
   componentDidMount() {
+    if (default_interpreter) {
+      this.pypy_interpreter = default_interpreter;
+      this.pypy_interpreter.stdout = this.stdout.bind(this);
+    }
+    else {
+      this.pypy_interpreter = new pypyjs_vm({
+        stdin: function(){},
+        stdout: this.stdout.bind(this),
+        stderr: function(){},
+        rootURL: `${PUBLIC_PATH}/playground/lib/`
+      });
+      default_interpreter = this.pypy_interpreter;
+    }
+
+    this.pypyjs = this.pypy_interpreter.ready().then(() => {
+      return this.pypy_interpreter.exec("import graphene");
+    }).then(() => {
+      this.createSchema(baseCode);
+    }).then(() => {
+      this.setState({pypyjs: true, response:'"Execute the query for see the results"'});
+    });
+
+    window.markLine = (lineNo) => {
+      this.markLine(lineNo);
+    }
+
     this.editor = CodeMirror(ReactDOM.findDOMNode(this.refs.schemaCode), {
       value: baseCode,
       mode:  "python",
-      lineNumbers: true,
+      theme: "graphene",
+      // lineNumbers: true,
       tabSize: 4,
+      indentUnit: 4,
+      gutters: ["CodeMirror-linenumbers", "breakpoints"]
+    });
+    this.editor.on("change", this.onEditorChange.bind(this));
+  }
+  onEditorChange() {
+    if (this.changeTimeout) {
+      clearTimeout(this.changeTimeout);
+    }
+    this.changeTimeout = setTimeout(() =>
+      this.updateSchema()
+    , 300);
+  }
+  updateSchema() {
+    this.createSchema(this.editor.getValue());
+  }
+  createSchema(code) {
+    this.validSchema = null;
+    this.pypyjs.then(() => {
+      return this.pypy_interpreter.exec(`
+schema = None
+${code}
+assert schema, 'You have to define a schema'
+`)
+    }, (err) => {
+      this.validSchema = false;
+      // this.editor.setGutterMarker(5, "breakpoints", syntaxError());
+      console.log('ERROR', err);
+    }).then(() => {
+      if (this.validSchema === null) {
+        this.validSchema = true;
+      }
+    }).then(this.updateGraphiQL.bind(this));
+  }
+  updateGraphiQL() {
+    if (this.validSchema) {
+      this.refs.graphiql.state.schema = null;
+      this.refs.graphiql.componentDidMount();
+      this.refs.graphiql.forceUpdate();
+      this.refs.graphiql.refs.docExplorer.forceUpdate();
+    }
+  }
+  fetcher (graphQLParams) {
+    if (!this.validSchema) {
+      return graphQLFetcher(arguments);
+    }
+    return this.execute(graphQLParams.query);
+  }
+  execute(query) {
+    // console.log('execute', query);
+    return this.pypyjs.then(() => {
+      var x = `
+import js
+import json
+from collections import OrderedDict
+from graphql.core.execution.executor import Executor
+from graphql.core.execution.middlewares.sync import SynchronousExecutionMiddleware
+from graphql.core.error import GraphQLError, format_error
+
+def get_wrapped(f):
+    if hasattr(f, 'func_closure') and f.func_closure:
+        return get_wrapped(f.func_closure[0].cell_contents)
+    return f
+
+class TrackResolver(SynchronousExecutionMiddleware):
+    @staticmethod
+    def run_resolve_fn(resolver, original_resolver):
+        if resolver.func.__module__ == '__main__':
+            line = get_wrapped(resolver.func).resolver.func_code.co_firstlineno
+            js.globals.markLine(line-3)
+        return SynchronousExecutionMiddleware.run_resolve_fn(resolver, original_resolver)
+
+executor = Executor([TrackResolver()], map_type=OrderedDict)
+
+result = executor.execute(schema.schema, '''${query}''')
+result_dict = {};
+if result.errors:
+  result_dict['errors'] = [format_error(e) for e in result.errors]
+if result.data:
+  result_dict['data'] = result.data
+result_json = json.dumps(result_dict)
+`;
+      return this.pypy_interpreter.exec(x)
+    }
+    ).then(() =>
+      this.pypy_interpreter.get(`result_json`)
+    ).then((data) => {
+      var json_data = JSON.parse(data);
+      return json_data;
     });
-    this.markLine(6)
   }
   markLine(lineNo) {
-    var mark = this.editor.markText({line: lineNo, ch: 0}, {line: lineNo, ch: 30}, {className: "called-function"});
+    console.log(lineNo);
+    var hlLine = this.editor.addLineClass(lineNo, "text", "activeline");
+    // var mark = this.editor.markText({line: lineNo, ch: 0}, {line: lineNo, ch: 10}, {className: "called-function"});
     setTimeout(() => {
-        mark.clear();
-    }, 2000);
+        this.editor.removeLineClass(lineNo, "text", "activeline");
+    }, 1200);
   }
   render() {
     return (
       <div className="playground">
-        <div className="playground-schema" ref="schemaCode"/>
+        {!this.state.pypyjs?<div className="loading" />:null}
+        <div className="playground-schema">
+          <header className="playground-schema-header">
+            Schema
+          </header>
+          <div className="playground-schema-editor" ref="schemaCode" />
+        </div>
         <div className="playground-graphiql">
-            <GraphiQL ref="graphiql" fetcher={graphQLFetcher} schema={schema} />
+            <GraphiQL ref="graphiql" fetcher={this.fetcher.bind(this)} response={this.state.response} />
         </div>
       </div>
     );
diff --git a/docs/playground/schema.js b/docs/playground/schema.js
index cfe68ebd..8aa20170 100644
--- a/docs/playground/schema.js
+++ b/docs/playground/schema.js
@@ -1,59 +1,15 @@
-/**
- * Copyright 2013-2015, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
 import {
   GraphQLObjectType,
-  GraphQLSchema,
   GraphQLString,
+  GraphQLSchema,
 } from 'graphql';
 
 
-var GREETINGS = {
-  hello: 'Hello worlasdfasdfasssdfasdfasdasdd',
-};
-
-/**
- * Objects.
- * Build up a portrait of your data universe
- * using the object type. Here, we define a
- * type of object that has a 'hello' field
- * that is of the string type.
- */
-var GreetingsType = new GraphQLObjectType({
-  name: 'Greetings',
-  fields: () => ({
-    hello: {type: GraphQLString},
-  }),
-});
-
-/**
- * The schema.
- * Here we export a schema that offers one root
- * field named 'greetings', and a method to
- * resolve its data.
- *
- * To learn more about writing GraphQL schemas for Relay, visit:
- *   https://github.com/graphql/graphql-relay-js
- */
 export default new GraphQLSchema({
   query: new GraphQLObjectType({
     name: 'Query',
     fields: () => ({
-      greetings: {
-        type: GreetingsType,
-        // Here we define a resolver that returns
-        // the data defined above. Were this schema
-        // executing on the server side, you could
-        // write a resolve method that fetches
-        // live data from a database.
-        resolve: () => GREETINGS,
-      },
+      __emptyField: {type: GraphQLString},
     }),
   }),
 });
diff --git a/docs/static/graphene.appcache b/docs/static/graphene.appcache
new file mode 100644
index 00000000..c5ec2e45
--- /dev/null
+++ b/docs/static/graphene.appcache
@@ -0,0 +1,7 @@
+CACHE MANIFEST
+# 2015-11-27 v1.0.0
+/playground/lib/pypyjs.vm.js
+/playground/lib/pypyjs.vm.js.zmem
+
+NETWORK:
+*

From bf5746b88bf195959f10447416d94d176199451f Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 28 Nov 2015 00:19:54 -0800
Subject: [PATCH 025/173] Improved views for mobile

---
 docs/css/main.styl           | 8 ++++++++
 docs/pages/docs/_template.js | 1 +
 docs/pages/index.md          | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/css/main.styl b/docs/css/main.styl
index 0fafdf5e..65244342 100644
--- a/docs/css/main.styl
+++ b/docs/css/main.styl
@@ -207,6 +207,10 @@ html, body
   opacity 0
   position absolute
 
+.starwars-example-wrapper
+  +below(600px)
+    margin-bottom 30px
+
 .starwars-example
   background: #3C3C3C
   display inline-block
@@ -237,6 +241,9 @@ html, body
     transform translateY(-3px)
     box-shadow 0px 4px 8px 0px rgba(0,0,0,0.32)
 
+  +below(600px)
+    top -70px
+
 .improve-document-link
   position fixed
   right 0
@@ -390,6 +397,7 @@ $title
     display none
 
 .docs-aside-navselect
+  margin-top -18px
   display none
   width 100%
   +below(600px)
diff --git a/docs/pages/docs/_template.js b/docs/pages/docs/_template.js
index 507b9a79..856a9c20 100644
--- a/docs/pages/docs/_template.js
+++ b/docs/pages/docs/_template.js
@@ -4,6 +4,7 @@ import _  from 'lodash';
 
 class Template extends React.Component {
   goToPage(event) {
+    event.target.blur();
     var page = event.target.value;
     this.context.router.transitionTo(page);
   }
diff --git a/docs/pages/index.md b/docs/pages/index.md
index 880dc27c..778e5225 100644
--- a/docs/pages/index.md
+++ b/docs/pages/index.md
@@ -1,7 +1,7 @@
 ---
 path: /
 ---
-<div><a class="starwars-example" href="http://swapi.graphene-python.org/">Check our Django Starwars API example!</a></div>
+<div class="starwars-example-wrapper"><a class="starwars-example" href="http://swapi.graphene-python.org/">Check our Django Starwars API example!</a></div>
 
 ## Meet Graphene
 

From 235193cb46cd8543e28eeb4342d1fdb9b91d9e51 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 28 Nov 2015 00:38:22 -0800
Subject: [PATCH 026/173] Improved build process

---
 .gitignore                           | 2 ++
 .travis.yml                          | 5 +++--
 docs/playground/graphene-js/build.sh | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 06f9dab5..e6447ce7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,5 @@ target/
 
 /docs/playground/graphene-js/pypyjs-release-nojit/
 /docs/static/playground/lib
+
+/docs/static/playground
diff --git a/.travis.yml b/.travis.yml
index c6e3e352..955d8d7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ install:
 script:
 - |
   if [ "$TEST_TYPE" = build_website ]; then
-    if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
+    if [ "$TRAVIS_BRANCH" = "docs-playground" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
       echo "Building the web."
       nvm install 4.0
 
@@ -43,7 +43,8 @@ script:
         https://graphql-python-bot@github.com/graphql-python/graphene.git \
         $GH_PAGES_DIR
       cd docs
-      npm run build
+      ./playground/graphene-js/build.sh
+      npm run deploy
       cd $GH_PAGES_DIR
       git status
       if ! git diff-index --quiet HEAD --; then
diff --git a/docs/playground/graphene-js/build.sh b/docs/playground/graphene-js/build.sh
index c2ecc4f7..9fd549e0 100755
--- a/docs/playground/graphene-js/build.sh
+++ b/docs/playground/graphene-js/build.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+cd "$(dirname "$0")"
+
 if [ ! -d pypyjs-release-nojit ] ; then
 	git clone git@github.com:pypyjs/pypyjs-release-nojit.git
 fi

From 45c52cdb704c34d4a8f5d6f97d66fb9215e6a000 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 28 Nov 2015 01:56:36 -0800
Subject: [PATCH 027/173] Fixed travis build

---
 .travis.yml                          |   8 ++++++--
 docs/css/playground.styl             |   1 +
 docs/playground/graphene-js/build.sh |   6 ++++--
 docs/static/favicon.png              | Bin 1451 -> 1367 bytes
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 955d8d7d..159407e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,9 @@ install:
     pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django
     pip install --download-cache $HOME/.cache/pip/ -e .[django]
     python setup.py develop
+  elif [ "$TEST_TYPE" = build_website ]; then
+    pip install --download-cache $HOME/.cache/pip/ -e .
+    python setup.py develop
   elif [ "$TEST_TYPE" = lint ]; then
     pip install --download-cache $HOME/.cache/pip/ flake8
   fi
@@ -39,7 +42,7 @@ script:
       GH_PAGES_DIR="$TRAVIS_BUILD_DIR"/docs/public
       git config --global user.name "Travis CI"
       git config --global user.email "travis@graphene-python.org"
-      git clone --branch gh-pages --depth=50 \
+      git clone --branch gh-pages-seg --depth=50 \
         https://graphql-python-bot@github.com/graphql-python/graphene.git \
         $GH_PAGES_DIR
       cd docs
@@ -47,10 +50,11 @@ script:
       npm run deploy
       cd $GH_PAGES_DIR
       git status
+      git add --intent-to-add .
       if ! git diff-index --quiet HEAD --; then
         git add -A .
         git commit -m "Rebuild website"
-        git push "https://${GITHUB_TOKEN}@github.com/graphql-python/graphene.git" gh-pages
+        git push "https://${GITHUB_TOKEN}@github.com/graphql-python/graphene.git" gh-pages-seg
       fi
       exit
     fi
diff --git a/docs/css/playground.styl b/docs/css/playground.styl
index c993d77d..f758b157 100644
--- a/docs/css/playground.styl
+++ b/docs/css/playground.styl
@@ -66,6 +66,7 @@
   // padding 0 10px
   // border-bottom solid 1px #d0d0d0
   height: 48px;
+  box-sizing border-box
   font-family: 'Raleway', sans-serif;
   color: #999;
   font-weight: 600;
diff --git a/docs/playground/graphene-js/build.sh b/docs/playground/graphene-js/build.sh
index 9fd549e0..d797cf6b 100755
--- a/docs/playground/graphene-js/build.sh
+++ b/docs/playground/graphene-js/build.sh
@@ -3,7 +3,7 @@
 cd "$(dirname "$0")"
 
 if [ ! -d pypyjs-release-nojit ] ; then
-	git clone git@github.com:pypyjs/pypyjs-release-nojit.git
+	git clone https://github.com/pypyjs/pypyjs-release-nojit.git
 fi
 
 GRAPHENE_DIR="$(python -c "import os; import graphene; print os.path.dirname(graphene.__file__)")"
@@ -31,4 +31,6 @@ if [ -d ../../../static/playground/lib ] ; then
 	rm ../../../static/playground/lib
 fi
 
-exec ln -s "$lib_dirname/" ../../../static/playground
+mkdir -p ../../../static/playground
+
+exec ln -s "$lib_dirname/" ../../../static/playground/lib
diff --git a/docs/static/favicon.png b/docs/static/favicon.png
index aad799666d30ae5f25c53828c7e1982fed5a41a9..cd3051aa5b30ae8204f90ee2d0125339b326fd25 100644
GIT binary patch
delta 1346
zcmV-I1-<&K3)c#e7YZN<1^@s6b9#F8ks%X*4oO5oR9Fe6S8GgMMHHTydv{sTf;C1k
zZQ9h>vUDR*N=+>NK?NzhtF0|rc8Mk$;|~%Ov1nu4L<)(os3aJF_=>-@fwCzy)$Ia;
znlv?ykwmClc8QIN@d42`XnAz$of*&EI(P3bQ0`qO+02~xH*?OJJBv}4V<P0=jS)M4
zND!H3^D`g0&tABmjVqjuQKHfN1SYr-VXWJ8#4lZ$;k$g%Xwt4fV%I?EV+9|U!F3wp
z2e;(oN3-!|8^C0P|9+0JCo>ovg_6m$LaSDkgid^a)jE7f!Ewa-Va$;eP9SB<(a*E<
z(_f_+)>o?nXh(>Ig1)CA-WwR<B9762_mr^~g|WLaQ5rZxQ*)GcRemu#Z#`^E)3l9S
z%&~)Y_a@Y#tBqkq6M_0YSXH_}vXgW4J3{<eanHHWfrhyDMl9fQ60K-mN&m=Iv!wwb
z7TEWIswk(SuuI{X|ABx%L8Vtgs0D_2XY!i%R@u<doY~mwIuZ1>iW7vi<pA=3;rWHR
zz>YKD&Io%W1*)Qc2uh{8Q;Z8>UBx-;*XYd`J>lVBtp>}~yByqC0lwaqT?0F=&2{B<
zfL@ExHM#&JUYTjk8R}e1aN$oy$}SmP`Uen3ECT?v)(=uapE;VRoK2+hY!Z_pzn^3L
z$`UiqM<vflfkw4vhoX)kj5dLPaF#Ouj3+#JO)A=%<4yIY7%81#Qwt~iFXuP{Y48F~
zpteSmv*d*IXB44eBtqUG#-!(_Mh|$x181d@)%j9WO`#Lzyaw(1EEF%)8~<dM^0ta_
z^shw7e;$f^OYy058_oWV6EHIghO1_kA-cvv)aT*Eau{1YNwBjTc6Stic6ul0d_cqW
zWl#5D%;W~LftZQbm&*dkRLZ1df!a+DRS|j27cxQ|%>YEej!{ZqD(M{<%(PjFP6GfC
z;i7|&4bi8SY>=uro&qgBxUM9=iX5H)kw*543v5NhWdueSEF)Wy1@N?`LLR$aaM;_j
zX-x;fR?oc%%#!Rg@b-6q3IxBwF#8}yudsqNWlGWkNGT^v6s1Va+xrIpMA||*6k7-U
z-sFqg4tMv!xLL>QI;{q*8VSAP@YnEhLhWL`mSLQL_}&xDpA*iY4clS?@AkDgHrvJ<
z{d=KE%Yavy2>IH31F6T00RZRS^*%IGoo<Lxg+n3HZ>p<ZW=Gk7tS=w(Z6*YL3BC)U
za~#kxC(4PhRr)djz^(PTWa=|q$%Tcv<!QVu2;$^5P<nZ0Qz)_hl1>4@;=z$V6olVi
zODYn9M>fEYo6^1N)Nhh!0KgQt!u4%DIG_zi!Fac-;IVkf_ujbQzg`-xHh&j*I5!dW
zw;|P)fX=Ih{Qn_;ZJ=wWxJKJ0Z2;KT8yTiax)pBg28L+a*6v6p=h{xV<1Ro^zL1lT
zCILvZxqze-(~RRm@00ha>nAZm9T4~mL#$?7Ph<n5Y!Bn~z;(Llc83QN(&o1PE|uaz
ze*muMcVIW0VF%;jv}J1Q#>M-Javy^rISa{!h|A$BA@F{G1cwg+Z<-_aYIjfc({{MG
zq@U$xO8|tS=m-dS1pbO0)r$(=jkhWrgz$LzpO=J6?}EQ-uUq}AW*LA)KX%Bw(dESb
zP#?y#O32`3COOsW-Ql5Mq^_0Or~xa=LZ_@RDk?a#L?5Gzc7qEawgCtuOwk$GaoQJ=
zF%%XuyTf)Z3S@wZptp_?as(a%PR97h?o-i|Qf6oV4}!(I1X=s2tN;K207*qoM6N<$
Ef@~U+YybcN

delta 1431
zcmV;I1!(%$3abl{7YZZ@1^@s6=<7J*ks%X*Vo5|nR9FeES8GgMMHHShdwFP6TZ@%i
z)7qqTd8rAsjgN##`T%xGjkN_9{byo~MuWB*{b3MHny5*uXq#w^Y3z@(fUPFN(r0Mu
z4`Wgi`v4Y5Of(v3OBHPkrR<&KHy19;KDgaWnPl(GocEk_=A2m)^BCc(id^ZDUog>s
zlf+_BDe-n*Ye&~SL<w@sbiS-?QRXt^5)rM5^75_7?a9Xrj+`8f!ctqw)X1V#8Cgb2
zta6Q`Ov6a8j#8z*a&3TQE=?w0k#a3d%Q2D(O9tx+_=*f6n-H{;cs#SXZIU_~4^L%(
zM+44pFMBXE)7V3TUV=b4K%8f#K9`bzUWV&8!l2(2^RB|+@t#x^#?#E1gy+_;Pg|Um
z{RWY!7eq@~h!Il!{^6F;*9}4_EvU6hc&gik886h$-ZG%4%2!|*qDC-Om?{XRYlW1b
zBH6sm93iItHz#g37X5H$)Q#}jv<>iHpvG5Al8TwB_r~Dxp$*;LlQd9Wxdo1YZO17y
zGy^O$aazwb^KrgC`DX5s6XEIoyr=#^<xw1LdsG0Q{WTKWL<51!ZfGrzBCOT8skl17
zCDa}VpVzjp%J+=NkZ0nV6{{+V(|Y3(*pDrgaxL5Ak-159Xm5KZKIf7klfjaZ-5C_F
z^;fXqcau>n7Uv8_W}OtC(;#?%Kofy@h!nk*jKK|Tpr$gPiTC3A`t(te%)cY4ABoD~
zgZV9;CuCmpu?rCuDc1-nzc@BNR^V;v=!+7%TlH<<oYf!j?}zdWQ0N0UniW5n8w{<1
z{6ktAVqfoV4(YlwRS8WY|FtR-i>q#~T2IxM)ym+B$C^)Hw(7>Z?AM`xv>tMo;x~#@
ze|UZH@_v2Yv@%j+Sm=UH)UWq?+_4f)k;Q()fvqbgrGE$LQyMc6@c#m-S#WiZt{VUy
zP!kg$<bQwqn#MZ~%YcjsE<?H#Su9Rc+LwS>$}J4h6MBa7P86-(ZbBIA0c4CN(BY%Y
zFOsD!k&^#Joc#{0GbloTDYQ2_BCdw6{dfsok7q)Y`YRrm%HA?S$w}0s)CW$`lt9hu
zvjkWQfEW)TelxCd;`IhYd(eVkMbytC@Fz`^cjmSn3p(-4g^SIBxu_E1oEHq~MAW~#
z8kPs(|7FusvirA{S{3oGq|U*N)LW@haC4zeLcKNR#fCIa0dT*61!TTznqqT)Tj-)q
zv=H+^tsgl;bu+S<4<nQ>N)H)2d8U+WEYWgl(7qYM1z3aw{tYq8r}VtgU*q%X5ERAh
zAi*2sVRy5KyaXMVJQ77PfRns-XbB!FZN1O?XLYannb1>PUWmel2W;XXmSO4(RFryz
zCxpznXNrVxp-_!~;zF(f<2X9lC)dn>K7P9G=kY`lb3=4jlo=U~pm+rh3b&2_Lm2L}
zIgt3LnwvYyt$W|QW9vFkdfHCBb(td6IwJob$}*O|2Mgb^3}f+!5^8r|uv0f6$I(?<
zYCOE+-q(;z4ItFHH45Iw8v|DkELxlWtdwFsdPdI$)fv=(Rn@WZ=nxngVlOP;p|!#r
zT`D5#>>Hw6aC>*R*)aV~*GYxf^gam912IZAf2D3s)H`)WM+3A{J;JrVO_HsDMUPs7
zh5CksMD5^hENGI1I)XVHuCA~cP#q&2*;UYT;*zy@_@rcj=C@q?&?1yy(THF4+G=EU
z44S6eo!{Dj`C}C1yh_;sTg;%ZWH~QgjLt`CHcZcm>o8tFtL@j%Y@E|NrWrXA+PHO{
zKaC&^WA@&jagrgo$~CWR1Hi-hWB9GDcxEO#IJ0)Ku>XR&U=hN<DyM5%x_-pbDqPbm
l@W@BrU`LZHA=AYF1IsPwCO^!_(*OVf07*qoM6N;tV1oX4ye0qu


From 9a767aa5dacb3faa2fdb3a68727aaf31051d5910 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 28 Nov 2015 03:34:49 -0800
Subject: [PATCH 028/173] Improved Playground. Added document title.

---
 docs/pages/playground.js   | 14 +++++++++++++-
 docs/playground/wrapper.js | 11 +++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/docs/pages/playground.js b/docs/pages/playground.js
index 40e1b799..fbbe0520 100644
--- a/docs/pages/playground.js
+++ b/docs/pages/playground.js
@@ -1 +1,13 @@
-module.exports = require('playground-wrapper');
+import React from 'react';
+import DocumentTitle from 'react-document-title';
+import PlaygroundWrapper from 'playground-wrapper';
+
+class Playground extends React.Component {
+  render() {
+    return <DocumentTitle title="Playground - Graphene">
+      <PlaygroundWrapper />
+    </DocumentTitle>;
+  }
+}
+
+module.exports = Playground;
diff --git a/docs/playground/wrapper.js b/docs/playground/wrapper.js
index 6b2a7a40..0efa09be 100644
--- a/docs/playground/wrapper.js
+++ b/docs/playground/wrapper.js
@@ -1,8 +1,6 @@
-// require.ensure([], function(require) {
-//   require.include('../playground/page');
-// });  
-var React = require('react');
-class App extends React.Component {
+import React from 'react';
+
+class PlaygroundWrapper extends React.Component {
   constructor() {
     super();
     this.state = { currentComponent: null };
@@ -19,4 +17,5 @@ class App extends React.Component {
     return Current?<Current />:null;
   }
 }
-module.exports = App;
+
+module.exports = PlaygroundWrapper;

From 60fba63c4500664c9cd49b39ba6b9f319a8ba13c Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 28 Nov 2015 03:54:20 -0800
Subject: [PATCH 029/173] Added lambda active resolver

---
 docs/css/playground.styl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/css/playground.styl b/docs/css/playground.styl
index f758b157..21f134f2 100644
--- a/docs/css/playground.styl
+++ b/docs/css/playground.styl
@@ -30,11 +30,14 @@
   flex-direction: column
 
   .cm-def
+  .cm-variable + .cm-keyword // lambda
+
     transition all .3s ease-in-out
     background transparent
 
   .activeline
     .cm-def
+    .cm-variable + .cm-keyword // lambda
       $color = #D7D3F1
       // $color = rgba(219, 89, 76, .2)
       background $color

From f3d7eedafd07d8cb04b2583e93ea2989c3f926f3 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 28 Nov 2015 13:05:34 -0800
Subject: [PATCH 030/173] Improved error handling

---
 docs/playground/page.js | 57 +++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/docs/playground/page.js b/docs/playground/page.js
index 9e130fb8..21a292b4 100644
--- a/docs/playground/page.js
+++ b/docs/playground/page.js
@@ -76,7 +76,29 @@ class Playground extends React.Component {
     }
 
     this.pypyjs = this.pypy_interpreter.ready().then(() => {
-      return this.pypy_interpreter.exec("import graphene");
+      return this.pypy_interpreter.exec(`
+import graphene
+import js
+from collections import OrderedDict
+from graphql.core.execution.executor import Executor
+from graphql.core.execution.middlewares.sync import SynchronousExecutionMiddleware
+from graphql.core.error import GraphQLError, format_error
+
+def get_wrapped(f):
+    if hasattr(f, 'func_closure') and f.func_closure:
+        return get_wrapped(f.func_closure[0].cell_contents)
+    return f
+
+class TrackResolver(SynchronousExecutionMiddleware):
+    @staticmethod
+    def run_resolve_fn(resolver, original_resolver):
+        if resolver.func.__module__ == '__main__':
+            line = get_wrapped(resolver.func).resolver.func_code.co_firstlineno
+            js.globals.markLine(line-3)
+        return SynchronousExecutionMiddleware.run_resolve_fn(resolver, original_resolver)
+
+__graphene_executor = Executor([TrackResolver()], map_type=OrderedDict)
+`);
     }).then(() => {
       this.createSchema(baseCode);
     }).then(() => {
@@ -110,6 +132,7 @@ class Playground extends React.Component {
     this.createSchema(this.editor.getValue());
   }
   createSchema(code) {
+    console.log('createSchema');
     this.validSchema = null;
     this.pypyjs.then(() => {
       return this.pypy_interpreter.exec(`
@@ -117,14 +140,13 @@ schema = None
 ${code}
 assert schema, 'You have to define a schema'
 `)
+    }).then(() => {
+      console.log('NO ERRORS');
+      this.validSchema = true;
     }, (err) => {
+      console.log('ERROR', err);
       this.validSchema = false;
       // this.editor.setGutterMarker(5, "breakpoints", syntaxError());
-      console.log('ERROR', err);
-    }).then(() => {
-      if (this.validSchema === null) {
-        this.validSchema = true;
-      }
     }).then(this.updateGraphiQL.bind(this));
   }
   updateGraphiQL() {
@@ -145,29 +167,8 @@ assert schema, 'You have to define a schema'
     // console.log('execute', query);
     return this.pypyjs.then(() => {
       var x = `
-import js
 import json
-from collections import OrderedDict
-from graphql.core.execution.executor import Executor
-from graphql.core.execution.middlewares.sync import SynchronousExecutionMiddleware
-from graphql.core.error import GraphQLError, format_error
-
-def get_wrapped(f):
-    if hasattr(f, 'func_closure') and f.func_closure:
-        return get_wrapped(f.func_closure[0].cell_contents)
-    return f
-
-class TrackResolver(SynchronousExecutionMiddleware):
-    @staticmethod
-    def run_resolve_fn(resolver, original_resolver):
-        if resolver.func.__module__ == '__main__':
-            line = get_wrapped(resolver.func).resolver.func_code.co_firstlineno
-            js.globals.markLine(line-3)
-        return SynchronousExecutionMiddleware.run_resolve_fn(resolver, original_resolver)
-
-executor = Executor([TrackResolver()], map_type=OrderedDict)
-
-result = executor.execute(schema.schema, '''${query}''')
+result = __graphene_executor.execute(schema.schema, '''${query}''')
 result_dict = {};
 if result.errors:
   result_dict['errors'] = [format_error(e) for e in result.errors]

From 3c308b90fa597e99fa6bcab31a44799d00f1e6c6 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 28 Nov 2015 14:32:16 -0800
Subject: [PATCH 031/173] Added Python lint checker to the editor

---
 docs/css/playground.styl |  6 ++---
 docs/playground/page.js  | 50 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/docs/css/playground.styl b/docs/css/playground.styl
index 21f134f2..3532b070 100644
--- a/docs/css/playground.styl
+++ b/docs/css/playground.styl
@@ -31,9 +31,9 @@
 
   .cm-def
   .cm-variable + .cm-keyword // lambda
-
-    transition all .3s ease-in-out
-    background transparent
+    &:not(.CodeMirror-lint-mark-error)
+      transition all .3s ease-in-out
+      background transparent
 
   .activeline
     .cm-def
diff --git a/docs/playground/page.js b/docs/playground/page.js
index 21a292b4..c5f732c2 100644
--- a/docs/playground/page.js
+++ b/docs/playground/page.js
@@ -8,6 +8,7 @@ import schema from './schema';
 import pypyjs_vm from 'pypyjs';
 
 import 'codemirror/mode/python/python';
+import 'codemirror/addon/lint/lint';
 import '../css/playground.styl';
 
 if (typeof PUBLIC_PATH === "undefined") {
@@ -32,6 +33,23 @@ class Query(graphene.ObjectType):
 schema = graphene.Schema(query=Query)
 `;
 
+CodeMirror.registerHelper('lint', 'python', function (text, options, editor) {
+  return (options.errors || []).map((error) => {
+    var tokens = editor.getLineTokens(error.line - 1);
+    tokens = tokens.filter((token, pos) => {
+      return !!token.type || token.string.trim().length > 0;
+    });
+    if (!tokens) return [];
+    return {
+      message: `${error.name}: ${error.message}`,
+      severity: 'error',
+      type: 'syntax',
+      from: CodeMirror.Pos(error.line - 1, tokens[0].start),
+      to: CodeMirror.Pos(error.line - 1, tokens[tokens.length-1].end),
+    };
+  });
+});
+
 // function graphQLFetcher(graphQLParams) {
 //   return fetch('http://swapi.graphene-python.org/graphql', {
 //     method: 'post',
@@ -113,10 +131,13 @@ __graphene_executor = Executor([TrackResolver()], map_type=OrderedDict)
       value: baseCode,
       mode:  "python",
       theme: "graphene",
-      // lineNumbers: true,
+      lineNumbers: true,
       tabSize: 4,
       indentUnit: 4,
-      gutters: ["CodeMirror-linenumbers", "breakpoints"]
+      gutters: ["CodeMirror-linenumbers", "breakpoints"],
+      lint: {
+        errors: [],
+      },
     });
     this.editor.on("change", this.onEditorChange.bind(this));
   }
@@ -132,6 +153,7 @@ __graphene_executor = Executor([TrackResolver()], map_type=OrderedDict)
     this.createSchema(this.editor.getValue());
   }
   createSchema(code) {
+    if (this.previousCode == code) return;
     console.log('createSchema');
     this.validSchema = null;
     this.pypyjs.then(() => {
@@ -142,12 +164,16 @@ assert schema, 'You have to define a schema'
 `)
     }).then(() => {
       console.log('NO ERRORS');
+      this.removeErrors();
       this.validSchema = true;
     }, (err) => {
-      console.log('ERROR', err);
+      this.editor.options.lint.errors = [];
+      console.log('ERRORS', err);
+      this.logError(err);
       this.validSchema = false;
       // this.editor.setGutterMarker(5, "breakpoints", syntaxError());
     }).then(this.updateGraphiQL.bind(this));
+    this.previousCode = code;
   }
   updateGraphiQL() {
     if (this.validSchema) {
@@ -157,6 +183,24 @@ assert schema, 'You have to define a schema'
       this.refs.graphiql.refs.docExplorer.forceUpdate();
     }
   }
+  logError(error) {
+    var lines = error.trace.split('\n');
+    var file_errors = lines.map((errorLine) => {
+      return errorLine.match(/File "<string>", line (\d+)/);
+    }).filter((x) => !! x);
+    if (!file_errors.length) return;
+    var line = parseInt(file_errors[file_errors.length-1][1]);
+    error.line = line-2;
+    if (error.name == "ImportError" && error.message == "No module named django") {
+      error.message = "Django is not supported yet in Playground editor";
+    }
+    this.editor.options.lint.errors.push(error);
+    CodeMirror.signal(this.editor, 'change', this.editor);
+  }
+  removeErrors() {
+    this.editor.options.lint.errors = [];
+    CodeMirror.signal(this.editor, 'change', this.editor);
+  }
   fetcher (graphQLParams) {
     if (!this.validSchema) {
       return graphQLFetcher(arguments);

From 18b66bd8a2119a0c63762fb37725502efa9ccc97 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 29 Nov 2015 22:33:09 -0800
Subject: [PATCH 032/173] Improved graphene playground with router query params

---
 docs/package.json                        |   2 +-
 docs/playground/GraphenePlayground.js    | 234 ++++++++++++++
 docs/playground/examples/hello.graphql   |   4 +
 docs/playground/examples/hello.schema.py |  13 +
 docs/playground/graphene-js/pypyjs.js    |   7 -
 docs/playground/page.js                  | 376 ++++++++---------------
 6 files changed, 386 insertions(+), 250 deletions(-)
 create mode 100644 docs/playground/GraphenePlayground.js
 create mode 100644 docs/playground/examples/hello.graphql
 create mode 100644 docs/playground/examples/hello.schema.py

diff --git a/docs/package.json b/docs/package.json
index 854a0cf8..33820334 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -17,7 +17,7 @@
     "copy-webpack-plugin": "^0.2.0",
     "es6-promise": "^3.0.2",
     "extract-text-webpack-plugin": "^0.9.1",
-    "gatsby": "^0.7.2",
+    "gatsby": "^0.7.3",
     "graphiql": "^0.4.2",
     "graphql": "^0.4.13",
     "jeet": "^6.1.2",
diff --git a/docs/playground/GraphenePlayground.js b/docs/playground/GraphenePlayground.js
new file mode 100644
index 00000000..106cd58d
--- /dev/null
+++ b/docs/playground/GraphenePlayground.js
@@ -0,0 +1,234 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { RouteHandler, Link, State } from 'react-router';
+import CodeMirror from 'codemirror';
+import { graphql } from 'graphql';
+import GraphiQL from 'graphiql';
+import schema from './schema';
+import pypyjs_vm from 'pypyjs';
+
+import 'codemirror/mode/python/python';
+import 'codemirror/addon/lint/lint';
+import '../css/playground.styl';
+
+if (typeof PUBLIC_PATH === "undefined") {
+  var PUBLIC_PATH = '';
+}
+
+pypyjs_vm.rootURL = `${PUBLIC_PATH}/playground/lib/`;
+pypyjs_vm.cacheKey = 'graphene';
+
+CodeMirror.registerHelper('lint', 'python', function (text, options, editor) {
+  return (options.errors || []).map((error) => {
+    var tokens = editor.getLineTokens(error.line - 1);
+    tokens = tokens.filter((token, pos) => {
+      return !!token.type || token.string.trim().length > 0;
+    });
+    if (!tokens) return [];
+    return {
+      message: `${error.name}: ${error.message}`,
+      severity: 'error',
+      type: 'syntax',
+      from: CodeMirror.Pos(error.line - 1, tokens[0].start),
+      to: CodeMirror.Pos(error.line - 1, tokens[tokens.length-1].end),
+    };
+  });
+});
+
+function graphQLFetcher(graphQLParams) {
+  return graphql(schema, graphQLParams.query);
+}
+
+var default_interpreter;
+class Playground extends React.Component {
+  constructor() {
+    super();
+    this.state = {pypyjs: false, stdout: '', response:''};
+  }
+  stdout() {
+    console.log('stdout', arguments);
+  }
+  componentDidMount() {
+    if (default_interpreter) {
+      this.pypy_interpreter = default_interpreter;
+      this.pypy_interpreter.stdout = this.stdout.bind(this);
+    }
+    else {
+      this.pypy_interpreter = new pypyjs_vm({
+        stdin: function(){},
+        stdout: this.stdout.bind(this),
+        stderr: function(){},
+        rootURL: `${PUBLIC_PATH}/playground/lib/`
+      });
+      default_interpreter = this.pypy_interpreter;
+    }
+
+    this.pypyjs = this.pypy_interpreter.ready().then(() => {
+      return this.pypy_interpreter.exec(`
+import graphene
+import js
+from collections import OrderedDict
+from graphql.core.execution.executor import Executor
+from graphql.core.execution.middlewares.sync import SynchronousExecutionMiddleware
+from graphql.core.error import GraphQLError, format_error
+
+def get_wrapped(f):
+    if hasattr(f, 'func_closure') and f.func_closure:
+        return get_wrapped(f.func_closure[0].cell_contents)
+    return f
+
+class TrackResolver(SynchronousExecutionMiddleware):
+    @staticmethod
+    def run_resolve_fn(resolver, original_resolver):
+        if resolver.func.__module__ == '__main__':
+            line = get_wrapped(resolver.func).resolver.func_code.co_firstlineno
+            js.globals.markLine(line-3)
+        return SynchronousExecutionMiddleware.run_resolve_fn(resolver, original_resolver)
+
+__graphene_executor = Executor([TrackResolver()], map_type=OrderedDict)
+`);
+    }).then(() => {
+      this.createSchema(this.props.initialSchema);
+    }).then(() => {
+      this.setState({pypyjs: true, response:'"Execute the query for see the results"'});
+    });
+
+    window.markLine = (lineNo) => {
+      this.markLine(lineNo);
+    }
+
+    this.editor = CodeMirror(ReactDOM.findDOMNode(this.refs.schemaCode), {
+      value: this.props.initialSchema,
+      mode:  "python",
+      theme: "graphene",
+      lineNumbers: true,
+      tabSize: 4,
+      indentUnit: 4,
+      gutters: ["CodeMirror-linenumbers", "breakpoints"],
+      lint: {
+        errors: [],
+      },
+    });
+    this.editor.on("change", this.onEditorChange.bind(this));
+  }
+  onEditorChange() {
+    if (this.changeTimeout) {
+      clearTimeout(this.changeTimeout);
+    }
+    if (this.props.onEditSchema) {
+      var value = this.editor.getValue();
+      if (value != this.props.initialSchema) {
+        this.props.onEditSchema(value)
+      }
+    }
+
+    this.changeTimeout = setTimeout(() =>
+      this.updateSchema()
+    , 300);
+  }
+  updateSchema() {
+    this.createSchema(this.editor.getValue());
+  }
+  createSchema(code) {
+    if (this.previousCode == code) return;
+    console.log('createSchema');
+    this.validSchema = null;
+    this.pypyjs.then(() => {
+      return this.pypy_interpreter.exec(`
+schema = None
+${code}
+assert schema, 'You have to define a schema'
+`)
+    }).then(() => {
+      console.log('NO ERRORS');
+      this.removeErrors();
+      this.validSchema = true;
+    }, (err) => {
+      this.editor.options.lint.errors = [];
+      console.log('ERRORS', err);
+      this.logError(err);
+      this.validSchema = false;
+    }).then(this.updateGraphiQL.bind(this));
+    this.previousCode = code;
+  }
+  updateGraphiQL() {
+    if (this.validSchema) {
+      this.refs.graphiql.state.schema = null;
+      this.refs.graphiql.componentDidMount();
+      this.refs.graphiql.forceUpdate();
+      this.refs.graphiql.refs.docExplorer.forceUpdate();
+    }
+  }
+  logError(error) {
+    var lines = error.trace.split('\n');
+    var file_errors = lines.map((errorLine) => {
+      return errorLine.match(/File "<string>", line (\d+)/);
+    }).filter((x) => !! x);
+    if (!file_errors.length) return;
+    var line = parseInt(file_errors[file_errors.length-1][1]);
+    error.line = line-2;
+    if (error.name == "ImportError" && error.message == "No module named django") {
+      error.message = "Django is not supported yet in Playground editor";
+    }
+    this.editor.options.lint.errors.push(error);
+    CodeMirror.signal(this.editor, 'change', this.editor);
+  }
+  removeErrors() {
+    this.editor.options.lint.errors = [];
+    CodeMirror.signal(this.editor, 'change', this.editor);
+  }
+  fetcher (graphQLParams) {
+    if (!this.validSchema) {
+      return graphQLFetcher(arguments);
+    }
+    return this.execute(graphQLParams.query);
+  }
+  execute(query) {
+    // console.log('execute', query);
+    return this.pypyjs.then(() => {
+      var x = `
+import json
+result = __graphene_executor.execute(schema.schema, '''${query}''')
+result_dict = {};
+if result.errors:
+  result_dict['errors'] = [format_error(e) for e in result.errors]
+if result.data:
+  result_dict['data'] = result.data
+result_json = json.dumps(result_dict)
+`;
+      return this.pypy_interpreter.exec(x)
+    }
+    ).then(() =>
+      this.pypy_interpreter.get(`result_json`)
+    ).then((data) => {
+      var json_data = JSON.parse(data);
+      return json_data;
+    });
+  }
+  markLine(lineNo) {
+    console.log(lineNo);
+    var hlLine = this.editor.addLineClass(lineNo, "text", "activeline");
+    // var mark = this.editor.markText({line: lineNo, ch: 0}, {line: lineNo, ch: 10}, {className: "called-function"});
+    setTimeout(() => {
+        this.editor.removeLineClass(lineNo, "text", "activeline");
+    }, 1200);
+  }
+  render() {
+    return (
+      <div className="playground">
+        {!this.state.pypyjs?<div className="loading" />:null}
+        <div className="playground-schema">
+          <header className="playground-schema-header">
+            Schema
+          </header>
+          <div className="playground-schema-editor" ref="schemaCode" />
+        </div>
+        <div className="playground-graphiql">
+            <GraphiQL ref="graphiql" fetcher={this.fetcher.bind(this)} response={this.state.response} onEditQuery={this.props.onEditQuery} query={this.props.initialQuery}/>
+        </div>
+      </div>
+    );
+  }
+}
+
+module.exports = Playground;
diff --git a/docs/playground/examples/hello.graphql b/docs/playground/examples/hello.graphql
new file mode 100644
index 00000000..f8d0ad68
--- /dev/null
+++ b/docs/playground/examples/hello.graphql
@@ -0,0 +1,4 @@
+query {
+  hello
+  ping(to:"Peter")
+}
diff --git a/docs/playground/examples/hello.schema.py b/docs/playground/examples/hello.schema.py
new file mode 100644
index 00000000..b2ce1cfb
--- /dev/null
+++ b/docs/playground/examples/hello.schema.py
@@ -0,0 +1,13 @@
+import graphene
+
+class Query(graphene.ObjectType):
+    hello = graphene.String()
+    ping = graphene.String(to=graphene.String())
+
+    def resolve_hello(self, args, info):
+        return 'World'
+
+    def resolve_ping(self, args, info):
+        return 'Pinging {}'.format(args.get('to'))
+
+schema = graphene.Schema(query=Query)
diff --git a/docs/playground/graphene-js/pypyjs.js b/docs/playground/graphene-js/pypyjs.js
index 510abdcf..ac030a44 100644
--- a/docs/playground/graphene-js/pypyjs.js
+++ b/docs/playground/graphene-js/pypyjs.js
@@ -60,13 +60,6 @@ if (typeof FunctionPromise === "undefined") {
   throw "FunctionPromise object not found";
 }
 
-// Some extra goodies for nodejs.
-if (typeof process !== 'undefined') {
-  if (Object.prototype.toString.call(process) === '[object process]') {
-    var fs = require("fs");
-    var path = require("path");
-  }
-}
 
 // Create functions for handling default stdio streams.
 // These will be shared by all VM instances by default.
diff --git a/docs/playground/page.js b/docs/playground/page.js
index c5f732c2..59dae266 100644
--- a/docs/playground/page.js
+++ b/docs/playground/page.js
@@ -1,258 +1,150 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
-import { RouteHandler, Link, State } from 'react-router';
-import CodeMirror from 'codemirror';
-import { graphql } from 'graphql';
-import GraphiQL from 'graphiql';
-import schema from './schema';
-import pypyjs_vm from 'pypyjs';
+import GraphenePlayground from './GraphenePlayground';
 
-import 'codemirror/mode/python/python';
-import 'codemirror/addon/lint/lint';
-import '../css/playground.styl';
+import _ from 'lodash';
 
-if (typeof PUBLIC_PATH === "undefined") {
-  var PUBLIC_PATH = '';
+const DEFAULT_CACHE_KEY = 'default';
+
+function filterObject(object, callback, context) {
+  if (!object) {
+    return null;
+  }
+  var result = {};
+  for (var name in object) {
+    if (hasOwnProperty.call(object, name) &&
+        callback.call(context, object[name], name, object)) {
+      result[name] = object[name];
+    }
+  }
+  return result;
 }
 
-pypyjs_vm.rootURL = `${PUBLIC_PATH}/playground/lib/`;
-pypyjs_vm.cacheKey = 'graphene';
-
-var baseCode = `import graphene
-
-class Query(graphene.ObjectType):
-    hello = graphene.String()
-    ping = graphene.String(to=graphene.String())
-
-    def resolve_hello(self, args, info):
-        return 'World'
-
-    def resolve_ping(self, args, info):
-        return 'Pinging {}'.format(args.get('to'))
-
-schema = graphene.Schema(query=Query)
-`;
-
-CodeMirror.registerHelper('lint', 'python', function (text, options, editor) {
-  return (options.errors || []).map((error) => {
-    var tokens = editor.getLineTokens(error.line - 1);
-    tokens = tokens.filter((token, pos) => {
-      return !!token.type || token.string.trim().length > 0;
-    });
-    if (!tokens) return [];
-    return {
-      message: `${error.name}: ${error.message}`,
-      severity: 'error',
-      type: 'syntax',
-      from: CodeMirror.Pos(error.line - 1, tokens[0].start),
-      to: CodeMirror.Pos(error.line - 1, tokens[tokens.length-1].end),
-    };
-  });
-});
-
-// function graphQLFetcher(graphQLParams) {
-//   return fetch('http://swapi.graphene-python.org/graphql', {
-//     method: 'post',
-//     headers: { 'Content-Type': 'application/json' },
-//     body: JSON.stringify(graphQLParams),
-//   }).then(response => response.json());
-// }
-function graphQLFetcher(graphQLParams) {
-  return graphql(schema, graphQLParams.query);
-}
-// var schema = null;
-
-function syntaxError() {
-  var marker = document.createElement("div");
-  marker.style.color = "#822";
-  marker.innerHTML = "●";
-  return marker;
-}
-
-var default_interpreter;
 class Playground extends React.Component {
-  constructor() {
-    super();
-    this.state = {pypyjs: false, stdout: '', response:''};
-  }
-  stdout() {
-    console.log('stdout', arguments);
-  }
-  componentDidMount() {
-    if (default_interpreter) {
-      this.pypy_interpreter = default_interpreter;
-      this.pypy_interpreter.stdout = this.stdout.bind(this);
-    }
-    else {
-      this.pypy_interpreter = new pypyjs_vm({
-        stdin: function(){},
-        stdout: this.stdout.bind(this),
-        stderr: function(){},
-        rootURL: `${PUBLIC_PATH}/playground/lib/`
-      });
-      default_interpreter = this.pypy_interpreter;
-    }
+  componentWillMount() {
+    var sourceWasInjected = false;
+    var queryParams = this.context.router.getCurrentQuery();
 
-    this.pypyjs = this.pypy_interpreter.ready().then(() => {
-      return this.pypy_interpreter.exec(`
-import graphene
-import js
-from collections import OrderedDict
-from graphql.core.execution.executor import Executor
-from graphql.core.execution.middlewares.sync import SynchronousExecutionMiddleware
-from graphql.core.error import GraphQLError, format_error
+    var {
+      cacheKey,
+      noCache,
+    } = queryParams;
+    noCache = (noCache !== undefined) && (noCache !== 'false');
+    if (noCache) {
+      cacheKey = undefined;
+    } else if (!cacheKey) {
+      cacheKey = DEFAULT_CACHE_KEY;
+    }
+    this.schemaCacheKey = `rp-${cacheKey}-schema`;
+    this.queryCacheKey = `rp-${cacheKey}-query`;
+    this.cacheKey = cacheKey;
 
-def get_wrapped(f):
-    if hasattr(f, 'func_closure') and f.func_closure:
-        return get_wrapped(f.func_closure[0].cell_contents)
-    return f
-
-class TrackResolver(SynchronousExecutionMiddleware):
-    @staticmethod
-    def run_resolve_fn(resolver, original_resolver):
-        if resolver.func.__module__ == '__main__':
-            line = get_wrapped(resolver.func).resolver.func_code.co_firstlineno
-            js.globals.markLine(line-3)
-        return SynchronousExecutionMiddleware.run_resolve_fn(resolver, original_resolver)
-
-__graphene_executor = Executor([TrackResolver()], map_type=OrderedDict)
-`);
-    }).then(() => {
-      this.createSchema(baseCode);
-    }).then(() => {
-      this.setState({pypyjs: true, response:'"Execute the query for see the results"'});
-    });
-
-    window.markLine = (lineNo) => {
-      this.markLine(lineNo);
+    var initialSchema;
+    var initialQuery;
+    var storedSchema = localStorage.getItem(this.schemaCacheKey);
+    var storedQuery = localStorage.getItem(this.queryCacheKey);
+    if (noCache) {
+      // Use case #1
+      // We use the noCache param to force a playground to have certain contents.
+      // eg. static example apps
+      initialSchema = queryParams.schema || '';
+      initialQuery = queryParams.query || '';
+      sourceWasInjected = true;
+      queryParams = {};
+    } else if (cacheKey === DEFAULT_CACHE_KEY) {
+      // Use case #2
+      // The user loaded the playground without a custom cache key.
+      //   Allow code injection via the URL
+      //   OR load code from localStorage
+      //   OR prime the playground with some default 'hello world' code
+      if (queryParams.schema != null) {
+        initialSchema = queryParams.schema;
+        sourceWasInjected = queryParams.schema !== storedSchema;
+      } else if (storedSchema != null) {
+        initialSchema = storedSchema;
+      } else {
+        initialSchema = require('!raw!./examples/hello.schema.py');
+      }
+      if (queryParams.query != null) {
+        initialQuery = queryParams.query;
+        sourceWasInjected = queryParams.query !== storedQuery;
+      } else if (storedQuery != null) {
+        initialQuery = storedQuery;
+      } else {
+        initialQuery = require('!raw!./examples/hello.graphql');
+      }
+      queryParams = filterObject({
+        schema: queryParams.schema,
+        query: queryParams.query,
+      }, v => v !== undefined);
+    } else if (cacheKey) {
+      // Use case #3
+      // Custom cache keys are useful in cases where you want to embed a playground
+      // that features both custom boilerplate code AND saves the developer's
+      // progress, without overwriting the default code cache. eg. a tutorial.
+      if (storedSchema != null) {
+        initialSchema = storedSchema;
+      } else {
+        initialSchema = queryParams[`schema_${cacheKey}`];
+        if (initialSchema != null) {
+          sourceWasInjected = true;
+        }
+      }
+      if (storedQuery != null) {
+        initialQuery = storedQuery;
+      } else {
+        initialQuery = queryParams[`query_${cacheKey}`];
+        if (initialQuery != null) {
+          sourceWasInjected = true;
+        }
+      }
+      queryParams = {};
     }
-
-    this.editor = CodeMirror(ReactDOM.findDOMNode(this.refs.schemaCode), {
-      value: baseCode,
-      mode:  "python",
-      theme: "graphene",
-      lineNumbers: true,
-      tabSize: 4,
-      indentUnit: 4,
-      gutters: ["CodeMirror-linenumbers", "breakpoints"],
-      lint: {
-        errors: [],
-      },
-    });
-    this.editor.on("change", this.onEditorChange.bind(this));
+    this.changeParams(queryParams);
+    this.state = {initialSchema, initialQuery, sourceWasInjected};
+    this.queryParams = queryParams;
   }
-  onEditorChange() {
-    if (this.changeTimeout) {
-      clearTimeout(this.changeTimeout);
-    }
-    this.changeTimeout = setTimeout(() =>
-      this.updateSchema()
-    , 300);
+  shouldComponentUpdate() {
+    return false;
   }
-  updateSchema() {
-    this.createSchema(this.editor.getValue());
-  }
-  createSchema(code) {
-    if (this.previousCode == code) return;
-    console.log('createSchema');
-    this.validSchema = null;
-    this.pypyjs.then(() => {
-      return this.pypy_interpreter.exec(`
-schema = None
-${code}
-assert schema, 'You have to define a schema'
-`)
-    }).then(() => {
-      console.log('NO ERRORS');
-      this.removeErrors();
-      this.validSchema = true;
-    }, (err) => {
-      this.editor.options.lint.errors = [];
-      console.log('ERRORS', err);
-      this.logError(err);
-      this.validSchema = false;
-      // this.editor.setGutterMarker(5, "breakpoints", syntaxError());
-    }).then(this.updateGraphiQL.bind(this));
-    this.previousCode = code;
-  }
-  updateGraphiQL() {
-    if (this.validSchema) {
-      this.refs.graphiql.state.schema = null;
-      this.refs.graphiql.componentDidMount();
-      this.refs.graphiql.forceUpdate();
-      this.refs.graphiql.refs.docExplorer.forceUpdate();
-    }
-  }
-  logError(error) {
-    var lines = error.trace.split('\n');
-    var file_errors = lines.map((errorLine) => {
-      return errorLine.match(/File "<string>", line (\d+)/);
-    }).filter((x) => !! x);
-    if (!file_errors.length) return;
-    var line = parseInt(file_errors[file_errors.length-1][1]);
-    error.line = line-2;
-    if (error.name == "ImportError" && error.message == "No module named django") {
-      error.message = "Django is not supported yet in Playground editor";
-    }
-    this.editor.options.lint.errors.push(error);
-    CodeMirror.signal(this.editor, 'change', this.editor);
-  }
-  removeErrors() {
-    this.editor.options.lint.errors = [];
-    CodeMirror.signal(this.editor, 'change', this.editor);
-  }
-  fetcher (graphQLParams) {
-    if (!this.validSchema) {
-      return graphQLFetcher(arguments);
-    }
-    return this.execute(graphQLParams.query);
-  }
-  execute(query) {
-    // console.log('execute', query);
-    return this.pypyjs.then(() => {
-      var x = `
-import json
-result = __graphene_executor.execute(schema.schema, '''${query}''')
-result_dict = {};
-if result.errors:
-  result_dict['errors'] = [format_error(e) for e in result.errors]
-if result.data:
-  result_dict['data'] = result.data
-result_json = json.dumps(result_dict)
-`;
-      return this.pypy_interpreter.exec(x)
-    }
-    ).then(() =>
-      this.pypy_interpreter.get(`result_json`)
-    ).then((data) => {
-      var json_data = JSON.parse(data);
-      return json_data;
-    });
-  }
-  markLine(lineNo) {
-    console.log(lineNo);
-    var hlLine = this.editor.addLineClass(lineNo, "text", "activeline");
-    // var mark = this.editor.markText({line: lineNo, ch: 0}, {line: lineNo, ch: 10}, {className: "called-function"});
-    setTimeout(() => {
-        this.editor.removeLineClass(lineNo, "text", "activeline");
-    }, 1200);
+  changeParams(queryParams) {
+    var router = this.context.router;
+    var routeName = router.getCurrentPathname();
+    var params = router.getCurrentParams();
+    queryParams = _.mapValues(queryParams, encodeURIComponent);
+    router.replaceWith(routeName, params, queryParams);
   }
   render() {
-    return (
-      <div className="playground">
-        {!this.state.pypyjs?<div className="loading" />:null}
-        <div className="playground-schema">
-          <header className="playground-schema-header">
-            Schema
-          </header>
-          <div className="playground-schema-editor" ref="schemaCode" />
-        </div>
-        <div className="playground-graphiql">
-            <GraphiQL ref="graphiql" fetcher={this.fetcher.bind(this)} response={this.state.response} />
-        </div>
-      </div>
-    );
+    return (<GraphenePlayground
+      initialSchema={this.state.initialSchema}
+      initialQuery={this.state.initialQuery}
+      onEditSchema={(source) => {
+        localStorage.setItem(this.schemaCacheKey, source);
+        if (this.cacheKey === DEFAULT_CACHE_KEY) {
+          this.queryParams.schema = source;
+          if (!this.queryParams.query) {
+            this.queryParams.query = this.state.initialQuery;
+          }
+          this.changeParams(this.queryParams);
+        }
+      }}
+      onEditQuery={(source) => {
+        localStorage.setItem(this.queryCacheKey, source);
+        if (this.cacheKey === DEFAULT_CACHE_KEY) {
+          this.queryParams.query = source;
+          if (!this.queryParams.schema) {
+            this.queryParams.schema = this.state.initialSchema;
+          }
+          this.changeParams(this.queryParams);
+        }
+      }}
+    />);
+
   }
-}
+};
+
+
+Playground.contextTypes = {
+  router: React.PropTypes.func
+};
 
 module.exports = Playground;

From a556ab89f4ef293ad29f6834514131b9599e287c Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 29 Nov 2015 23:03:14 -0800
Subject: [PATCH 033/173] Exclude flake8 syntax in docs. Added tea_store
 example

---
 docs/playground/examples/tea_store.graphql   |  8 +++++
 docs/playground/examples/tea_store.schema.py | 38 ++++++++++++++++++++
 setup.cfg                                    |  2 +-
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 docs/playground/examples/tea_store.graphql
 create mode 100644 docs/playground/examples/tea_store.schema.py

diff --git a/docs/playground/examples/tea_store.graphql b/docs/playground/examples/tea_store.graphql
new file mode 100644
index 00000000..8cafaae0
--- /dev/null
+++ b/docs/playground/examples/tea_store.graphql
@@ -0,0 +1,8 @@
+query {
+  store {
+    teas(orderBy:"name") {
+      name
+      steepingTime
+    }
+  }
+}
diff --git a/docs/playground/examples/tea_store.schema.py b/docs/playground/examples/tea_store.schema.py
new file mode 100644
index 00000000..60caafcf
--- /dev/null
+++ b/docs/playground/examples/tea_store.schema.py
@@ -0,0 +1,38 @@
+import graphene
+
+class Tea(graphene.ObjectType):
+    name = graphene.String()
+    steeping_time = graphene.Int()
+
+TEAS = [
+    Tea(name='Earl Grey Blue Star', steeping_time=5),
+    Tea(name='Milk Oolong', steeping_time=3),
+    Tea(name='Gunpowder Golden Temple', steeping_time=3),
+    Tea(name='Assam Hatimara', steeping_time=5),
+    Tea(name='Bancha', steeping_time=2),
+    Tea(name='Ceylon New Vithanakande', steeping_time=5),
+    Tea(name='Golden Tip Yunnan', steeping_time=5),
+    Tea(name='Jasmine Phoenix Pearls', steeping_time=3),
+    Tea(name='Kenya Milima', steeping_time=5),
+    Tea(name='Pu Erh First Grade', steeping_time=4),
+    Tea(name='Sencha Makoto', steeping_time=3),
+]
+
+class Store(graphene.ObjectType):
+    teas = graphene.List(Tea, order_by=graphene.String())
+
+    def resolve_teas(self, args, info):
+        order_by = args.get("order_by")
+        if order_by == "steepingTime":
+            return sorted(self.teas, key=lambda tea: tea.steeping_time)
+        elif order_by == "name":
+            return sorted(self.teas, key=lambda tea: tea.name)
+        return self.teas
+
+class Query(graphene.ObjectType):
+    store = graphene.Field(Store)
+
+    def resolve_store(self, args, info):
+        return Store(teas=TEAS) 
+
+schema = graphene.Schema(query=Query)
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 21db934b..d9e6b06f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [flake8]
-exclude = setup.py
+exclude = setup.py,docs/*
 max-line-length = 120
 
 [coverage:run]

From c589d73d07473f3857b63e40811270e3c5ef828b Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 29 Nov 2015 23:18:09 -0800
Subject: [PATCH 034/173] Fixed active link

---
 docs/pages/_template.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/pages/_template.js b/docs/pages/_template.js
index 18f32948..4cc9d23b 100644
--- a/docs/pages/_template.js
+++ b/docs/pages/_template.js
@@ -14,7 +14,7 @@ class Template extends React.Component {
     return (
       <div>
         <Menu width={200} right>
-            <span><Link to="/playground/">Try it out</Link></span>
+            <span><Link to="/playground/" className={path.indexOf('/playground')==0?"active":null}>Try it out</Link></span>
             <span><Link to="/docs/quickstart/" className={path.indexOf('/docs')==0?"active":null}>Docs</Link></span>
             <span><Link to="/community/">Community</Link></span>
             <a href="https://github.com/graphql-python/graphene/">Github</a>
@@ -26,7 +26,7 @@ class Template extends React.Component {
                     Graphene
                 </Link>
                 <nav className="header-nav">
-                    <Link to="/playground/">Try it out</Link>
+                    <Link to="/playground/" className={path.indexOf('/playground')==0?"active":null}>Try it out</Link>
                     <Link to="/docs/quickstart/" className={path.indexOf('/docs')==0?"active":null}>Docs</Link>
                     <Link to="/community/">Community</Link>
                     <a href="https://github.com/graphql-python/graphene/">Github</a>

From a924b348a3d522028c9f2075af932723488bc74d Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 29 Nov 2015 23:57:09 -0800
Subject: [PATCH 035/173] Added Relay basic documentation

---
 docs/config.toml         |  1 +
 docs/pages/docs/relay.md | 63 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 docs/pages/docs/relay.md

diff --git a/docs/config.toml b/docs/config.toml
index f53d3f17..441ef8fd 100644
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -14,4 +14,5 @@ siteTitle = "Graphene"
 	  "/docs/objecttypes/",
 	  "/docs/mutations/",
 	  "/docs/basic-types/",
+	  "/docs/relay/",
 	]
diff --git a/docs/pages/docs/relay.md b/docs/pages/docs/relay.md
new file mode 100644
index 00000000..43a21acc
--- /dev/null
+++ b/docs/pages/docs/relay.md
@@ -0,0 +1,63 @@
+---
+title: Relay
+description: A Relay implementation in Graphene
+---
+
+# Relay
+
+Graphene have complete support of [Relay](https://facebook.github.io/relay/docs/graphql-relay-specification.html), and it offers some utils for working if from Python easy.
+
+## Nodes
+
+A `Node` is an Interface provided by `graphene.relay` that contains a single field `id` (which is a `ID!`). Any object that inherits from it have to implement a `get_node` method for retrieving a `Node` by an *id*.
+
+Example usage (taken from the [Starwars Relay example](https://github.com/graphql-python/graphene/blob/master/examples/starwars_relay/schema.py)):
+
+```python
+class Ship(relay.Node):
+    '''A ship in the Star Wars saga'''
+    name = graphene.String(description='The name of the ship.')
+
+    @classmethod
+    def get_node(cls, id, info):
+        return get_ship(id)
+```
+
+The `id` returned by the `Ship` type when you query it will be a scalar which contains the enough info for the server for knowing it's type and it's id.
+
+For example, the instance `Ship(id=1)` will return `U2hpcDox` as the id when you query it (which is the base64 encoding of `Ship:1`), and which could be useful later if we want to query a node by its id.
+
+
+## Connection
+
+A connection is a vitaminized version of a List that provides ways of slicing and paginating through it. The way you create Connection fields in `graphene` is using `relay.ConnectionField`.
+
+You can create connection fields in any ObjectType, but the connection **must** be linked to an object which inherits from `Node` (in this case, a `Ship`).
+
+```python
+class Faction(graphene.ObjectType):
+    name = graphene.String()
+    ships = relay.ConnectionField(Ship)
+
+    def resolve_ships(self, args, info):
+        return []
+```
+
+## Node Root field
+
+As is required in the [Relay specification](https://facebook.github.io/relay/graphql/objectidentification.htm#sec-Node-root-field), the server must implement a root field called `node` that returns a `Node` Interface.
+
+For this reason, `graphene` provides the field `relay.NodeField`, which links to any type in the Schema which inherits from `Node`. Example usage:
+
+```python
+class Query(graphene.ObjectType):
+    node = relay.NodeField()
+```
+
+
+## Useful links
+
+* [Getting started with Relay](https://facebook.github.io/relay/docs/graphql-relay-specification.html)
+* [Relay Global Identification Specification](https://facebook.github.io/relay/graphql/objectidentification.htm)
+* [Relay Cursor Connection Specification](https://facebook.github.io/relay/graphql/connections.htm)
+* [Relay input Object Mutation](https://facebook.github.io/relay/graphql/mutations.htm)

From e407993e1f130c6dd678e194f5d51b9913e845fe Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Mon, 30 Nov 2015 00:12:21 -0800
Subject: [PATCH 036/173] Use the real branch names.

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 159407e4..ac80f4b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,14 +35,14 @@ install:
 script:
 - |
   if [ "$TEST_TYPE" = build_website ]; then
-    if [ "$TRAVIS_BRANCH" = "docs-playground" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
+    if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
       echo "Building the web."
       nvm install 4.0
 
       GH_PAGES_DIR="$TRAVIS_BUILD_DIR"/docs/public
       git config --global user.name "Travis CI"
       git config --global user.email "travis@graphene-python.org"
-      git clone --branch gh-pages-seg --depth=50 \
+      git clone --branch gh-pages --depth=50 \
         https://graphql-python-bot@github.com/graphql-python/graphene.git \
         $GH_PAGES_DIR
       cd docs
@@ -54,7 +54,7 @@ script:
       if ! git diff-index --quiet HEAD --; then
         git add -A .
         git commit -m "Rebuild website"
-        git push "https://${GITHUB_TOKEN}@github.com/graphql-python/graphene.git" gh-pages-seg
+        git push "https://${GITHUB_TOKEN}@github.com/graphql-python/graphene.git" gh-pages
       fi
       exit
     fi

From 5a953e9a57674736a6db6018b4e5f5ab608ccb5a Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Mon, 30 Nov 2015 00:25:18 -0800
Subject: [PATCH 037/173] Updated READMEs

---
 README.md      |  3 ++-
 README.rst     |  7 +++++--
 docs/README.md | 31 +++++++++++++++++++++++++++++--
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 115d4a14..e36ac257 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # ![Graphene Logo](http://graphene-python.org/favicon.png) [Graphene](http://graphene-python.org) [![Build Status](https://travis-ci.org/graphql-python/graphene.svg?branch=master)](https://travis-ci.org/graphql-python/graphene) [![PyPI version](https://badge.fury.io/py/graphene.svg)](https://badge.fury.io/py/graphene) [![Coverage Status](https://coveralls.io/repos/graphql-python/graphene/badge.svg?branch=master&service=github)](https://coveralls.io/github/graphql-python/graphene?branch=master)
 
 
-Graphene is a Python library for building GraphQL schemas/types fast and easily.
+[Graphene](http://graphene-python.org) is a Python library for building GraphQL schemas/types fast and easily.
 
 - **Easy to use:** Graphene helps you use GraphQL in Python without effort.
 - **Relay:** Graphene has builtin support for Relay
@@ -10,6 +10,7 @@ Graphene is a Python library for building GraphQL schemas/types fast and easily.
 
 *What is supported in this Python version?* **Everything**: Interfaces, ObjectTypes, Scalars, Unions and Relay (Nodes, Connections), in addition to queries, mutations and subscriptions.
 
+**NEW**!: [Try graphene online](http://graphene-python.org/playground/)
 
 ## Installation
 
diff --git a/README.rst b/README.rst
index ea5e2635..1d427010 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,8 @@
 |Graphene Logo| `Graphene <http://graphene-python.org>`__ |Build Status| |PyPI version| |Coverage Status|
 =========================================================================================================
 
-Graphene is a Python library for building GraphQL schemas/types fast and
-easily.
+`Graphene <http://graphene-python.org>`__ is a Python library for
+building GraphQL schemas/types fast and easily.
 
 -  **Easy to use:** Graphene helps you use GraphQL in Python without
    effort.
@@ -16,6 +16,9 @@ easily.
 ObjectTypes, Scalars, Unions and Relay (Nodes, Connections), in addition
 to queries, mutations and subscriptions.
 
+**NEW**!: `Try graphene
+online <http://graphene-python.org/playground/>`__
+
 Installation
 ------------
 
diff --git a/docs/README.md b/docs/README.md
index 2a8f240f..7ecaea8e 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,5 +1,6 @@
 # Graphene Docs
-Docs for Graphene
+
+Graphene docs are powered by [gatsby](https://github.com/gatsbyjs/gatsby).
 
 
 ## Installation
@@ -13,4 +14,30 @@ And then
 
 ```bash
 gatsby develop
-```
\ No newline at end of file
+```
+
+## Playground
+
+If you want to have the playground running too, just execute
+
+```
+./playground/graphene-js/build.sh
+```
+
+This command will clone the [pypyjs-release-nojit](https://github.com/pypyjs/pypyjs-release-nojit) repo, update it with the latest graphene, graphql-core and graphql-relay code, and make it available for the `/playground` view in the docs.
+
+
+## Build
+
+For building the docs into the `public` dir, just run:
+
+```bash
+npm run build
+```
+
+
+## Automation
+
+Thanks to [Travis](https://github.com/graphql-python/graphene/blob/master/.travis.yml#L39-L58), we automated the way documentation is updated in the `gh-pages` branch.
+
+Each time we modify the docs in the `master` branch the travis job runs and updates the `gh-pages` branch with the latest code, so [Graphene's website](http://graphene-python.org) have always the latest docs.

From 23073eb400ac17fdaf44217644b4070ca5fb0a8b Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Mon, 30 Nov 2015 00:38:13 -0800
Subject: [PATCH 038/173] Fixed playground css compatibility in old browsers

---
 docs/css/playground.styl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/css/playground.styl b/docs/css/playground.styl
index 3532b070..f496d57a 100644
--- a/docs/css/playground.styl
+++ b/docs/css/playground.styl
@@ -1,3 +1,4 @@
+@import 'nib'
 @import 'graphiql.css'
 
 .playground

From dbea5766737390d772b61362e41f472f4e5a307f Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Mon, 30 Nov 2015 00:52:52 -0800
Subject: [PATCH 039/173] Add graphene.relay autoload lib

---
 docs/playground/graphene-js/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/playground/graphene-js/build.sh b/docs/playground/graphene-js/build.sh
index d797cf6b..bd707251 100755
--- a/docs/playground/graphene-js/build.sh
+++ b/docs/playground/graphene-js/build.sh
@@ -19,6 +19,7 @@ eval python tools/module_bundler.py add ./lib/modules "$GRAPHQL_RELAY_DIR"
 eval python tools/module_bundler.py add ./lib/modules "$SIX_DIR"
 
 python ./tools/module_bundler.py preload ./lib/modules graphene
+python ./tools/module_bundler.py preload ./lib/modules graphene.relay
 python ./tools/module_bundler.py preload ./lib/modules graphql
 python ./tools/module_bundler.py preload ./lib/modules graphql_relay
 python ./tools/module_bundler.py preload ./lib/modules six

From 221889cb7bf037be3a6716d74fad68a2d9851577 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Mon, 30 Nov 2015 02:15:55 -0800
Subject: [PATCH 040/173] Removed app cache. Added google analytics.

---
 docs/app.js                   |  8 ++++++++
 docs/config.toml              |  1 +
 docs/html.js                  | 12 +++++++++++-
 docs/static/graphene.appcache |  7 -------
 4 files changed, 20 insertions(+), 8 deletions(-)
 delete mode 100644 docs/static/graphene.appcache

diff --git a/docs/app.js b/docs/app.js
index 148e5fd5..593ec9fe 100644
--- a/docs/app.js
+++ b/docs/app.js
@@ -9,3 +9,11 @@ exports.loadContext = function(callback) {
   }
   return callback(context);
 };
+
+exports.onRouteChange = function(state) {
+  if (typeof window !== "undefined" && window.ga) {
+    window.ga('send', 'pageview', {
+      page: state.pathname
+    });
+  }
+}
diff --git a/docs/config.toml b/docs/config.toml
index 441ef8fd..569605d9 100644
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -1,4 +1,5 @@
 siteTitle = "Graphene"
+ga = "UA-12613282-7"
 
 [docs.quickstart]
 	name = "Quickstart"
diff --git a/docs/html.js b/docs/html.js
index 18c59088..f126f69e 100644
--- a/docs/html.js
+++ b/docs/html.js
@@ -5,7 +5,7 @@ export default class Html extends React.Component {
   render() {
     var title = this.props.title || DocumentTitle.rewind();
     return (
-      <html lang={this.props.lang} manifest="/graphene.appcache">
+      <html lang={this.props.lang}>
         <head>
           <meta charSet="utf-8"/>
           <meta httpEquiv="X-UA-Compatible" content="IE=edge"/>
@@ -18,6 +18,16 @@ export default class Html extends React.Component {
         <body>
           <div id="react-mount" dangerouslySetInnerHTML={{__html: this.props.body}} />
           <script src="/bundle.js"/>
+          {this.props.config.ga?<script dangerouslySetInnerHTML={{__html: `
+            (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+            })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+            ga('create', '${this.props.config.ga}', 'auto');
+            ga('send', 'pageview');
+            `}}
+          />:null}
         </body>
       </html>
     );
diff --git a/docs/static/graphene.appcache b/docs/static/graphene.appcache
deleted file mode 100644
index c5ec2e45..00000000
--- a/docs/static/graphene.appcache
+++ /dev/null
@@ -1,7 +0,0 @@
-CACHE MANIFEST
-# 2015-11-27 v1.0.0
-/playground/lib/pypyjs.vm.js
-/playground/lib/pypyjs.vm.js.zmem
-
-NETWORK:
-*

From 1dc8b73bd0f174cc682154c0c59f2684562f253b Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Mon, 30 Nov 2015 02:31:17 -0800
Subject: [PATCH 041/173] Added starwars relay example

---
 .../examples/starwars_relay.graphql           |  20 +++
 .../examples/starwars_relay.schema.py         | 148 ++++++++++++++++++
 2 files changed, 168 insertions(+)
 create mode 100644 docs/playground/examples/starwars_relay.graphql
 create mode 100644 docs/playground/examples/starwars_relay.schema.py

diff --git a/docs/playground/examples/starwars_relay.graphql b/docs/playground/examples/starwars_relay.graphql
new file mode 100644
index 00000000..429d396a
--- /dev/null
+++ b/docs/playground/examples/starwars_relay.graphql
@@ -0,0 +1,20 @@
+query {
+  empire {
+    id
+    name
+    ships(first:2) {
+      edges {
+        node {
+          id
+          name
+        }
+      }
+    }
+  }
+  node(id:"U2hpcDo4") {
+    id
+    ... on Ship {
+      name
+    }
+  }
+}
diff --git a/docs/playground/examples/starwars_relay.schema.py b/docs/playground/examples/starwars_relay.schema.py
new file mode 100644
index 00000000..8e7f8fcc
--- /dev/null
+++ b/docs/playground/examples/starwars_relay.schema.py
@@ -0,0 +1,148 @@
+import graphene
+from graphene import relay, resolve_only_args
+
+class Ship(relay.Node):
+    '''A ship in the Star Wars saga'''
+    name = graphene.String(description='The name of the ship.')
+
+    @classmethod
+    def get_node(cls, id, info):
+        return get_ship(id)
+
+class Faction(relay.Node):
+    '''A faction in the Star Wars saga'''
+    name = graphene.String(description='The name of the faction.')
+    ships = relay.ConnectionField(
+        Ship, description='The ships used by the faction.')
+
+    @resolve_only_args
+    def resolve_ships(self, **args):
+        # Transform the instance ship_ids into real instances
+        return [get_ship(ship_id) for ship_id in self.ships]
+
+    @classmethod
+    def get_node(cls, id, info):
+        return get_faction(id)
+
+class IntroduceShip(relay.ClientIDMutation):
+    class Input:
+        ship_name = graphene.String(required=True)
+        faction_id = graphene.String(required=True)
+
+    ship = graphene.Field(Ship)
+    faction = graphene.Field(Faction)
+
+    @classmethod
+    def mutate_and_get_payload(cls, input, info):
+        ship_name = input.get('ship_name')
+        faction_id = input.get('faction_id')
+        ship = create_ship(ship_name, faction_id)
+        faction = get_faction(faction_id)
+        return IntroduceShip(ship=ship, faction=faction)
+
+
+class Query(graphene.ObjectType):
+    rebels = graphene.Field(Faction)
+    empire = graphene.Field(Faction)
+    node = relay.NodeField()
+
+    @resolve_only_args
+    def resolve_rebels(self):
+        return get_rebels()
+
+    @resolve_only_args
+    def resolve_empire(self):
+        return get_empire()
+
+
+class Mutation(graphene.ObjectType):
+    introduce_ship = graphene.Field(IntroduceShip)
+
+schema = graphene.Schema(name='Starwars Relay Schema')
+schema.query = Query
+schema.mutation = Mutation
+
+xwing = Ship(
+    id='1',
+    name='X-Wing',
+)
+ywing = Ship(
+    id='2',
+    name='Y-Wing',
+)
+awing = Ship(
+    id='3',
+    name='A-Wing',
+)
+
+# Yeah, technically it's Corellian. But it flew in the service of the rebels,
+# so for the purposes of this demo it's a rebel ship.
+falcon = Ship(
+    id='4',
+    name='Millenium Falcon',
+)
+homeOne = Ship(
+    id='5',
+    name='Home One',
+)
+tieFighter = Ship(
+    id='6',
+    name='TIE Fighter',
+)
+tieInterceptor = Ship(
+    id='7',
+    name='TIE Interceptor',
+)
+executor = Ship(
+    id='8',
+    name='Executor',
+)
+rebels = Faction(
+    id='1',
+    name='Alliance to Restore the Republic',
+    ships=['1', '2', '3', '4', '5']
+)
+empire = Faction(
+    id='2',
+    name='Galactic Empire',
+    ships=['6', '7', '8']
+)
+data = {
+    'Faction': {
+        '1': rebels,
+        '2': empire
+    },
+    'Ship': {
+        '1': xwing,
+        '2': ywing,
+        '3': awing,
+        '4': falcon,
+        '5': homeOne,
+        '6': tieFighter,
+        '7': tieInterceptor,
+        '8': executor
+    }
+}
+
+def create_ship(ship_name, faction_id):
+    from .schema import Ship
+    next_ship = len(data['Ship'].keys()) + 1
+    new_ship = Ship(
+        id=str(next_ship),
+        name=ship_name
+    )
+    data['Ship'][new_ship.id] = new_ship
+    data['Faction'][faction_id].ships.append(new_ship.id)
+    return new_ship
+
+def get_ship(_id):
+    return data['Ship'][_id]
+
+def get_faction(_id):
+    return data['Faction'][_id]
+
+def get_rebels():
+    return get_faction('1')
+
+def get_empire():
+    return get_faction('2')

From 4f72bf19711c66715c49c603e19762ff7531d57f Mon Sep 17 00:00:00 2001
From: Kyle Mathews <mathews.kyle@gmail.com>
Date: Mon, 30 Nov 2015 14:25:47 -0800
Subject: [PATCH 042/173] Copy improvements

---
 docs/pages/docs/relay.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pages/docs/relay.md b/docs/pages/docs/relay.md
index 43a21acc..ba22b6bb 100644
--- a/docs/pages/docs/relay.md
+++ b/docs/pages/docs/relay.md
@@ -5,7 +5,7 @@ description: A Relay implementation in Graphene
 
 # Relay
 
-Graphene have complete support of [Relay](https://facebook.github.io/relay/docs/graphql-relay-specification.html), and it offers some utils for working if from Python easy.
+Graphene has complete support for [Relay](https://facebook.github.io/relay/docs/graphql-relay-specification.html) and offers some utils to make integration from Python easy.
 
 ## Nodes
 

From cf328ed715487231c17790d99fd8ed66096d4e1f Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Mon, 30 Nov 2015 20:42:23 -0800
Subject: [PATCH 043/173] Fixed typo in community page

---
 docs/pages/community.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pages/community.md b/docs/pages/community.md
index 20d747a7..1d43a51c 100644
--- a/docs/pages/community.md
+++ b/docs/pages/community.md
@@ -5,7 +5,7 @@ active_tab: community
 description: The biggest GraphQL Community in Python
 ---
 
-Graphene is constantly developing thanks to an active volunteer community, There are many different places where you discuss Graphene, share your experiences or ask for help. **Your feedback and participation are very welcome**!
+Graphene is constantly developing thanks to an active volunteer community. There are many different places where you discuss Graphene, share your experiences or ask for help. **Your feedback and participation are very welcome**!
 
 If you think working with Graphene is fun, there are many ways you can contribute to it. Please join us in the Slack community and help us shape the next generation API’s.
 

From 7530aeb202debb401cb501f8056d3fa5e58d535d Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Mon, 30 Nov 2015 22:06:54 -0800
Subject: [PATCH 044/173] Added flask community example by @msoedov

---
 docs/pages/community.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/pages/community.md b/docs/pages/community.md
index 1d43a51c..8cdf0f50 100644
--- a/docs/pages/community.md
+++ b/docs/pages/community.md
@@ -24,6 +24,7 @@ Django integration:
 ## Other related projects
 
 - [Flask GraphQL Demo](https://github.com/amitsaha/flask-graphql-demo) by [@echorand](https://twitter.com/echorand)
+- [Example GraphQL application](https://github.com/msoedov/flask-graphql-example) by [@msoedov](https://twitter.com/msoedov) with Flask, pypy/python3 and MongoDB (using Docker containers)
 
 
   [Source Code]: https://github.com/graphql-python/graphql-core

From c6170671c0b05049a59efa0675f285430ec6aa34 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Mon, 30 Nov 2015 22:41:44 -0800
Subject: [PATCH 045/173] Fixed typo. Thanks @ pauliwang!

---
 docs/pages/docs/quickstart-django.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/pages/docs/quickstart-django.md b/docs/pages/docs/quickstart-django.md
index 5367a0b7..7ae15113 100644
--- a/docs/pages/docs/quickstart-django.md
+++ b/docs/pages/docs/quickstart-django.md
@@ -116,9 +116,9 @@ INSTALLED_APPS = [
 Unlike a RESTful API, there is only a single URL from which a GraphQL is accessed.
 Requests to this URL are handled by Graphene's `GraphQLView` view.
 
-Additionally, and interface for navigating this API will be very useful. Graphene
+Additionally, an interface for navigating this API will be very useful. Graphene
 includes the [graphiql](https://github.com/graphql/graphiql) in-browser IDE
-which assits and exploring and querying your new API. We'll add a URL for this too.
+which assists in exploring and querying your new API. We’ll add a URL for this too.
 
 ```python
 from django.conf.urls import url, include

From 9a198c8c86d2fba5251c25b7cc48515d75c98102 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Mon, 30 Nov 2015 23:08:18 -0800
Subject: [PATCH 046/173] Added abstract ObjectType definition. Fixed #55

---
 graphene/core/options.py                     |  3 +-
 graphene/core/types/objecttype.py            | 28 +++++++++---
 graphene/core/types/tests/test_objecttype.py | 46 +++++++++++++++++++-
 3 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/graphene/core/options.py b/graphene/core/options.py
index 0e175dd0..4f1bf4e4 100644
--- a/graphene/core/options.py
+++ b/graphene/core/options.py
@@ -3,7 +3,7 @@ from collections import OrderedDict
 from ..utils import cached_property
 
 DEFAULT_NAMES = ('description', 'name', 'is_interface', 'is_mutation',
-                 'type_name', 'interfaces')
+                 'type_name', 'interfaces', 'abstract')
 
 
 class Options(object):
@@ -14,6 +14,7 @@ class Options(object):
         self.is_interface = False
         self.is_mutation = False
         self.is_union = False
+        self.abstract = False
         self.interfaces = []
         self.parents = []
         self.types = []
diff --git a/graphene/core/types/objecttype.py b/graphene/core/types/objecttype.py
index 09f65ad0..a9ac43f1 100644
--- a/graphene/core/types/objecttype.py
+++ b/graphene/core/types/objecttype.py
@@ -16,6 +16,13 @@ from .base import BaseType
 from .definitions import List, NonNull
 
 
+def is_objecttype(cls):
+    if not issubclass(cls, BaseObjectType):
+        return False
+    _meta = getattr(cls, '_meta', None)
+    return not(_meta and (_meta.abstract or _meta.is_interface))
+
+
 class ObjectTypeMeta(type):
     options_cls = Options
 
@@ -39,19 +46,19 @@ class ObjectTypeMeta(type):
             '__doc__': doc
         })
         attr_meta = attrs.pop('Meta', None)
+        abstract = getattr(attr_meta, 'abstract', False)
         if not attr_meta:
-            meta = None
-            # meta = getattr(new_class, 'Meta', None)
+            meta = getattr(new_class, 'Meta', None)
         else:
             meta = attr_meta
 
-        getattr(new_class, '_meta', None)
+        base_meta = getattr(new_class, '_meta', None)
 
         new_class.add_to_class('_meta', new_class.options_cls(meta))
 
         new_class._meta.is_interface = new_class.is_interface(parents)
-        new_class._meta.is_mutation = new_class.is_mutation(parents)
-        union_types = [p for p in parents if issubclass(p, BaseObjectType)]
+        new_class._meta.is_mutation = new_class.is_mutation(parents) or (base_meta and base_meta.is_mutation)
+        union_types = list(filter(is_objecttype, parents))
 
         new_class._meta.is_union = len(union_types) > 1
         new_class._meta.types = union_types
@@ -66,6 +73,10 @@ class ObjectTypeMeta(type):
         for obj_name, obj in attrs.items():
             new_class.add_to_class(obj_name, obj)
 
+        if abstract:
+            new_class._prepare()
+            return new_class
+
         if new_class._meta.is_mutation:
             assert hasattr(
                 new_class, 'mutate'), "All mutations must implement mutate method"
@@ -138,8 +149,10 @@ class BaseObjectType(BaseType):
     def __new__(cls, *args, **kwargs):
         if cls._meta.is_interface:
             raise Exception("An interface cannot be initialized")
-        if cls._meta.is_union:
+        elif cls._meta.is_union:
             raise Exception("An union cannot be initialized")
+        elif cls._meta.abstract:
+            raise Exception("An abstract ObjectType cannot be initialized")
         return super(BaseObjectType, cls).__new__(cls)
 
     def __init__(self, *args, **kwargs):
@@ -187,6 +200,9 @@ class BaseObjectType(BaseType):
 
     @classmethod
     def internal_type(cls, schema):
+        if cls._meta.abstract:
+            raise Exception("Abstract ObjectTypes don't have a specific type.")
+
         if cls._meta.is_interface:
             return GraphQLInterfaceType(
                 cls._meta.type_name,
diff --git a/graphene/core/types/tests/test_objecttype.py b/graphene/core/types/tests/test_objecttype.py
index 6bb157d6..dd0ad477 100644
--- a/graphene/core/types/tests/test_objecttype.py
+++ b/graphene/core/types/tests/test_objecttype.py
@@ -5,7 +5,7 @@ from graphql.core.type import (GraphQLInterfaceType, GraphQLObjectType,
 from py.test import raises
 
 from graphene.core.schema import Schema
-from graphene.core.types import Int, Interface, String
+from graphene.core.types import Int, Interface, ObjectType, String
 
 
 class Character(Interface):
@@ -148,3 +148,47 @@ def test_type_has_list():
         name = String()
 
     assert Droid.List.of_type == Droid
+
+
+def test_abstracttype():
+    class MyObject1(ObjectType):
+        class Meta:
+            abstract = True
+        name1 = String()
+
+    class MyObject2(ObjectType):
+        class Meta:
+            abstract = True
+        name2 = String()
+
+    class MyObject(MyObject1, MyObject2):
+        pass
+
+    object_type = schema.T(MyObject)
+
+    assert MyObject._meta.fields_map.keys() == ['name1', 'name2']
+    assert MyObject._meta.fields_map['name1'].object_type == MyObject
+    assert MyObject._meta.fields_map['name2'].object_type == MyObject
+    assert isinstance(object_type, GraphQLObjectType)
+
+
+def test_abstracttype_initialize():
+    class MyAbstractObjectType(ObjectType):
+        class Meta:
+            abstract = True
+
+    with raises(Exception) as excinfo:
+        MyAbstractObjectType()
+
+    assert 'An abstract ObjectType cannot be initialized' == str(excinfo.value)
+
+
+def test_abstracttype_type():
+    class MyAbstractObjectType(ObjectType):
+        class Meta:
+            abstract = True
+
+    with raises(Exception) as excinfo:
+        schema.T(MyAbstractObjectType)
+
+    assert 'Abstract ObjectTypes don\'t have a specific type.' == str(excinfo.value)

From 5686008660634bbb9e1d057d18ed9babb3b6fcbf Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Tue, 1 Dec 2015 21:16:53 -0800
Subject: [PATCH 047/173] Removed unused empty class

---
 graphene/core/types/field.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py
index 53187391..db52086a 100644
--- a/graphene/core/types/field.py
+++ b/graphene/core/types/field.py
@@ -11,10 +11,6 @@ from .base import LazyType, MountType, OrderedType
 from .definitions import NonNull
 
 
-class Empty(object):
-    pass
-
-
 class Field(OrderedType):
 
     def __init__(

From e78936c424ede80c9fe31d93c82bacff059db35c Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 2 Dec 2015 01:33:41 -0800
Subject: [PATCH 048/173] Fixed tests

---
 graphene/core/types/tests/test_objecttype.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene/core/types/tests/test_objecttype.py b/graphene/core/types/tests/test_objecttype.py
index dd0ad477..51b84f61 100644
--- a/graphene/core/types/tests/test_objecttype.py
+++ b/graphene/core/types/tests/test_objecttype.py
@@ -166,7 +166,7 @@ def test_abstracttype():
 
     object_type = schema.T(MyObject)
 
-    assert MyObject._meta.fields_map.keys() == ['name1', 'name2']
+    assert list(MyObject._meta.fields_map.keys()) == ['name1', 'name2']
     assert MyObject._meta.fields_map['name1'].object_type == MyObject
     assert MyObject._meta.fields_map['name2'].object_type == MyObject
     assert isinstance(object_type, GraphQLObjectType)

From 3363f588fee79a333ee9fc8820d4b7e17e4de803 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 2 Dec 2015 20:06:15 -0800
Subject: [PATCH 049/173] First working version class types

---
 graphene/core/classtypes/__init__.py          |   0
 graphene/core/classtypes/base.py              | 109 ++++++++++++++++++
 graphene/core/classtypes/inputobjecttype.py   |  24 ++++
 graphene/core/classtypes/interface.py         |  54 +++++++++
 graphene/core/classtypes/mutation.py          |  30 +++++
 graphene/core/classtypes/objecttype.py        |  99 ++++++++++++++++
 graphene/core/classtypes/options.py           |  47 ++++++++
 graphene/core/classtypes/scalar.py            |  21 ++++
 graphene/core/classtypes/tests/__init__.py    |   0
 graphene/core/classtypes/tests/test_base.py   |  40 +++++++
 .../classtypes/tests/test_inputobjecttype.py  |  21 ++++
 .../core/classtypes/tests/test_interface.py   |  85 ++++++++++++++
 .../core/classtypes/tests/test_mutation.py    |  27 +++++
 .../core/classtypes/tests/test_objecttype.py  |  89 ++++++++++++++
 graphene/core/classtypes/tests/test_scalar.py |  32 +++++
 .../core/classtypes/tests/test_uniontype.py   |  27 +++++
 graphene/core/classtypes/uniontype.py         |  39 +++++++
 graphene/core/schema.py                       |   3 +-
 graphene/core/types/base.py                   |   7 +-
 graphene/core/types/field.py                  |   6 +-
 20 files changed, 755 insertions(+), 5 deletions(-)
 create mode 100644 graphene/core/classtypes/__init__.py
 create mode 100644 graphene/core/classtypes/base.py
 create mode 100644 graphene/core/classtypes/inputobjecttype.py
 create mode 100644 graphene/core/classtypes/interface.py
 create mode 100644 graphene/core/classtypes/mutation.py
 create mode 100644 graphene/core/classtypes/objecttype.py
 create mode 100644 graphene/core/classtypes/options.py
 create mode 100644 graphene/core/classtypes/scalar.py
 create mode 100644 graphene/core/classtypes/tests/__init__.py
 create mode 100644 graphene/core/classtypes/tests/test_base.py
 create mode 100644 graphene/core/classtypes/tests/test_inputobjecttype.py
 create mode 100644 graphene/core/classtypes/tests/test_interface.py
 create mode 100644 graphene/core/classtypes/tests/test_mutation.py
 create mode 100644 graphene/core/classtypes/tests/test_objecttype.py
 create mode 100644 graphene/core/classtypes/tests/test_scalar.py
 create mode 100644 graphene/core/classtypes/tests/test_uniontype.py
 create mode 100644 graphene/core/classtypes/uniontype.py

diff --git a/graphene/core/classtypes/__init__.py b/graphene/core/classtypes/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/graphene/core/classtypes/base.py b/graphene/core/classtypes/base.py
new file mode 100644
index 00000000..a662ec96
--- /dev/null
+++ b/graphene/core/classtypes/base.py
@@ -0,0 +1,109 @@
+from collections import OrderedDict
+import inspect
+import six
+
+from ..exceptions import SkipField
+from .options import Options
+
+
+class ClassTypeMeta(type):
+    options_class = Options
+
+    def __new__(mcs, name, bases, attrs):
+        super_new = super(ClassTypeMeta, mcs).__new__
+
+        module = attrs.pop('__module__', None)
+        doc = attrs.pop('__doc__', None)
+        new_class = super_new(mcs, name, bases, {
+            '__module__': module,
+            '__doc__': doc
+        })
+        attr_meta = attrs.pop('Meta', None)
+        if not attr_meta:
+            meta = getattr(new_class, 'Meta', None)
+        else:
+            meta = attr_meta
+
+        new_class.add_to_class('_meta', new_class.get_options(meta))
+
+        return mcs.construct(new_class, bases, attrs)
+
+    def get_options(cls, meta):
+        return cls.options_class(meta)
+
+    def add_to_class(cls, name, value):
+        # We should call the contribute_to_class method only if it's bound
+        if not inspect.isclass(value) and hasattr(
+                value, 'contribute_to_class'):
+            value.contribute_to_class(cls, name)
+        else:
+            setattr(cls, name, value)
+
+    def construct(cls, bases, attrs):
+        # Add all attributes to the class.
+        for obj_name, obj in attrs.items():
+            cls.add_to_class(obj_name, obj)
+        return cls
+
+
+class ClassType(six.with_metaclass(ClassTypeMeta)):
+    @classmethod
+    def internal_type(cls, schema):
+        raise NotImplementedError("Function internal_type not implemented in type {}".format(cls))
+
+
+class FieldsOptions(Options):
+    def __init__(self, *args, **kwargs):
+        super(FieldsOptions, self).__init__(*args, **kwargs)
+        self.local_fields = []
+
+    def add_field(self, field):
+        self.local_fields.append(field)
+
+    @property
+    def fields(self):
+        return sorted(self.local_fields)
+
+    @property
+    def fields_map(self):
+        return OrderedDict([(f.attname, f) for f in self.fields])
+
+
+class FieldsClassTypeMeta(ClassTypeMeta):
+    options_class = FieldsOptions
+
+
+class FieldsClassType(six.with_metaclass(FieldsClassTypeMeta, ClassType)):
+    @classmethod
+    def fields_internal_types(cls, schema):
+        fields = []
+        for field in cls._meta.fields:
+            try:
+                fields.append((field.name, schema.T(field)))
+            except SkipField:
+                continue
+
+        return OrderedDict(fields)
+
+# class NamedClassType(ClassType):
+#     pass
+
+
+# class UnionType(NamedClassType):
+#     class Meta:
+#         abstract = True
+
+
+# class ObjectType(NamedClassType):
+#     class Meta:
+#         abstract = True
+
+
+# class InputObjectType(NamedClassType):
+#     class Meta:
+#         abstract = True
+
+
+# class Mutation(ObjectType):
+#     class Meta:
+#         abstract = True
diff --git a/graphene/core/classtypes/inputobjecttype.py b/graphene/core/classtypes/inputobjecttype.py
new file mode 100644
index 00000000..393173e8
--- /dev/null
+++ b/graphene/core/classtypes/inputobjecttype.py
@@ -0,0 +1,24 @@
+from functools import partial
+
+from graphql.core.type import GraphQLInputObjectType
+
+from .base import FieldsClassType
+
+
+class InputObjectType(FieldsClassType):
+    class Meta:
+        abstract = True
+
+    def __init__(self, *args, **kwargs):
+        raise Exception("An InputObjectType cannot be initialized")
+
+    @classmethod
+    def internal_type(cls, schema):
+        if cls._meta.abstract:
+            raise Exception("Abstract InputObjectTypes don't have a specific type.")
+
+        return GraphQLInputObjectType(
+            cls._meta.type_name,
+            description=cls._meta.description,
+            fields=partial(cls.fields_internal_types, schema),
+        )
diff --git a/graphene/core/classtypes/interface.py b/graphene/core/classtypes/interface.py
new file mode 100644
index 00000000..f689c709
--- /dev/null
+++ b/graphene/core/classtypes/interface.py
@@ -0,0 +1,54 @@
+import six
+from functools import partial
+
+from graphql.core.type import GraphQLInterfaceType
+
+from .base import FieldsClassTypeMeta
+from .objecttype import ObjectType, ObjectTypeMeta
+
+
+class InterfaceMeta(ObjectTypeMeta):
+    def construct(cls, bases, attrs):
+        if cls._meta.abstract or Interface in bases:
+            # Return Interface type
+            cls = FieldsClassTypeMeta.construct(cls, bases, attrs)
+            setattr(cls._meta, 'interface', True)
+            return cls
+        else:
+            # Return ObjectType class with all the inherited interfaces
+            cls = super(InterfaceMeta, cls).construct(bases, attrs)
+            for interface in bases:
+                is_interface = issubclass(interface, Interface) and getattr(interface._meta, 'interface', False)
+                if not is_interface:
+                    continue
+                cls._meta.interfaces.append(interface)
+            return cls
+
+
+class Interface(six.with_metaclass(InterfaceMeta, ObjectType)):
+    class Meta:
+        abstract = True
+
+    def __init__(self, *args, **kwargs):
+        if self._meta.interface:
+            raise Exception("An interface cannot be initialized")
+        return super(Interface, self).__init__(*args, **kwargs)
+
+    @classmethod
+    def _resolve_type(cls, schema, instance, *args):
+        return schema.T(instance.__class__)
+
+    @classmethod
+    def internal_type(cls, schema):
+        if cls._meta.abstract:
+            raise Exception("Abstract Interfaces don't have a specific type.")
+
+        if not cls._meta.interface:
+            return super(Interface, cls).internal_type(schema)
+
+        return GraphQLInterfaceType(
+            cls._meta.type_name,
+            description=cls._meta.description,
+            resolve_type=partial(cls._resolve_type, schema),
+            fields=partial(cls.fields_internal_types, schema)
+        )
diff --git a/graphene/core/classtypes/mutation.py b/graphene/core/classtypes/mutation.py
new file mode 100644
index 00000000..90aa5cf8
--- /dev/null
+++ b/graphene/core/classtypes/mutation.py
@@ -0,0 +1,30 @@
+import six
+
+from ..types.argument import ArgumentsGroup
+from .objecttype import ObjectType, ObjectTypeMeta
+
+
+class MutationMeta(ObjectTypeMeta):
+    def construct(cls, bases, attrs):
+        input_class = attrs.pop('Input', None)
+        if input_class:
+            items = dict(vars(input_class))
+            items.pop('__dict__', None)
+            items.pop('__doc__', None)
+            items.pop('__module__', None)
+            items.pop('__weakref__', None)
+            cls.add_to_class('arguments', cls.construct_arguments(items))
+        cls = super(MutationMeta, cls).construct(bases, attrs)
+        return cls
+
+    def construct_arguments(cls, items):
+        return ArgumentsGroup(**items)
+
+
+class Mutation(six.with_metaclass(MutationMeta, ObjectType)):
+    class Meta:
+        abstract = True
+
+    @classmethod
+    def get_arguments(cls):
+        return cls.arguments
diff --git a/graphene/core/classtypes/objecttype.py b/graphene/core/classtypes/objecttype.py
new file mode 100644
index 00000000..93d2286e
--- /dev/null
+++ b/graphene/core/classtypes/objecttype.py
@@ -0,0 +1,99 @@
+import six
+from functools import partial
+
+from graphql.core.type import GraphQLObjectType
+
+from graphene import signals
+from .base import FieldsOptions, FieldsClassType, FieldsClassTypeMeta
+from .uniontype import UnionType
+
+
+def is_objecttype(cls):
+    if not issubclass(cls, ObjectType):
+        return False
+    return not cls._meta.interface
+
+
+class ObjectTypeOptions(FieldsOptions):
+    def __init__(self, *args, **kwargs):
+        super(ObjectTypeOptions, self).__init__(*args, **kwargs)
+        self.interface = False
+        self.interfaces = []
+
+
+class ObjectTypeMeta(FieldsClassTypeMeta):
+    def construct(cls, bases, attrs):
+        cls = super(ObjectTypeMeta, cls).construct(bases, attrs)
+        if not cls._meta.abstract:
+            union_types = list(filter(is_objecttype, bases))
+            if len(union_types) > 1:
+                meta_attrs = dict(cls._meta.original_attrs, types=union_types)
+                Meta = type('Meta', (object, ), meta_attrs)
+                attrs['Meta'] = Meta
+                attrs['__module__'] = cls.__module__
+                attrs['__doc__'] = cls.__doc__
+                return type(cls.__name__, (UnionType, ), attrs)
+        return cls
+
+    options_class = ObjectTypeOptions
+
+
+class ObjectType(six.with_metaclass(ObjectTypeMeta, FieldsClassType)):
+    class Meta:
+        abstract = True
+
+    def __init__(self, *args, **kwargs):
+        signals.pre_init.send(self.__class__, args=args, kwargs=kwargs)
+        self._root = kwargs.pop('_root', None)
+        args_len = len(args)
+        fields = self._meta.fields
+        if args_len > len(fields):
+            # Daft, but matches old exception sans the err msg.
+            raise IndexError("Number of args exceeds number of fields")
+        fields_iter = iter(fields)
+
+        if not kwargs:
+            for val, field in zip(args, fields_iter):
+                setattr(self, field.attname, val)
+        else:
+            for val, field in zip(args, fields_iter):
+                setattr(self, field.attname, val)
+                kwargs.pop(field.attname, None)
+
+        for field in fields_iter:
+            try:
+                val = kwargs.pop(field.attname)
+                setattr(self, field.attname, val)
+            except KeyError:
+                pass
+
+        if kwargs:
+            for prop in list(kwargs):
+                try:
+                    if isinstance(getattr(self.__class__, prop), property):
+                        setattr(self, prop, kwargs.pop(prop))
+                except AttributeError:
+                    pass
+            if kwargs:
+                raise TypeError(
+                    "'%s' is an invalid keyword argument for this function" %
+                    list(kwargs)[0])
+
+        signals.post_init.send(self.__class__, instance=self)
+
+    @classmethod
+    def internal_type(cls, schema):
+        if cls._meta.abstract:
+            raise Exception("Abstract ObjectTypes don't have a specific type.")
+
+        return GraphQLObjectType(
+            cls._meta.type_name,
+            description=cls._meta.description,
+            interfaces=[schema.T(i) for i in cls._meta.interfaces],
+            fields=partial(cls.fields_internal_types, schema),
+            is_type_of=getattr(cls, 'is_type_of', None)
+        )
+
+    @classmethod
+    def wrap(cls, instance, args, info):
+        return cls(_root=instance)
diff --git a/graphene/core/classtypes/options.py b/graphene/core/classtypes/options.py
new file mode 100644
index 00000000..7a965a2c
--- /dev/null
+++ b/graphene/core/classtypes/options.py
@@ -0,0 +1,47 @@
+class Options(object):
+    def __init__(self, meta=None, **defaults):
+        self.meta = meta
+        self.abstract = False
+        for name, value in defaults.items():
+            setattr(self, name, value)
+        self.valid_attrs = list(defaults.keys()) + ['type_name', 'description', 'abstract']
+
+    def contribute_to_class(self, cls, name):
+        cls._meta = self
+        self.parent = cls
+        # First, construct the default values for these options.
+        self.object_name = cls.__name__
+        self.type_name = self.object_name
+
+        self.description = cls.__doc__
+        # Store the original user-defined values for each option,
+        # for use when serializing the model definition
+        self.original_attrs = {}
+
+        # Next, apply any overridden values from 'class Meta'.
+        if self.meta:
+            meta_attrs = self.meta.__dict__.copy()
+            for name in self.meta.__dict__:
+                # Ignore any private attributes that Django doesn't care about.
+                # NOTE: We can't modify a dictionary's contents while looping
+                # over it, so we loop over the *original* dictionary instead.
+                if name.startswith('_'):
+                    del meta_attrs[name]
+            for attr_name in self.valid_attrs:
+                if attr_name in meta_attrs:
+                    setattr(self, attr_name, meta_attrs.pop(attr_name))
+                    self.original_attrs[attr_name] = getattr(self, attr_name)
+                elif hasattr(self.meta, attr_name):
+                    setattr(self, attr_name, getattr(self.meta, attr_name))
+                    self.original_attrs[attr_name] = getattr(self, attr_name)
+
+            del self.valid_attrs
+
+            # Any leftover attributes must be invalid.
+            if meta_attrs != {}:
+                raise TypeError(
+                    "'class Meta' got invalid attribute(s): %s" %
+                    ','.join(
+                        meta_attrs.keys()))
+
+        del self.meta
diff --git a/graphene/core/classtypes/scalar.py b/graphene/core/classtypes/scalar.py
new file mode 100644
index 00000000..fe4087e8
--- /dev/null
+++ b/graphene/core/classtypes/scalar.py
@@ -0,0 +1,21 @@
+from graphql.core.type import GraphQLScalarType
+
+from .base import ClassType
+from ..types.base import MountedType
+
+
+class Scalar(ClassType, MountedType):
+
+    @classmethod
+    def internal_type(cls, schema):
+        serialize = getattr(cls, 'serialize')
+        parse_literal = getattr(cls, 'parse_literal')
+        parse_value = getattr(cls, 'parse_value')
+
+        return GraphQLScalarType(
+            name=cls._meta.type_name,
+            description=cls._meta.description,
+            serialize=serialize,
+            parse_value=parse_value,
+            parse_literal=parse_literal
+        )
diff --git a/graphene/core/classtypes/tests/__init__.py b/graphene/core/classtypes/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/graphene/core/classtypes/tests/test_base.py b/graphene/core/classtypes/tests/test_base.py
new file mode 100644
index 00000000..2830b9bb
--- /dev/null
+++ b/graphene/core/classtypes/tests/test_base.py
@@ -0,0 +1,40 @@
+from ..base import ClassType, FieldsClassType
+from ...types import Field, String
+from ...schema import Schema
+
+
+def test_classtype_basic():
+    class Character(ClassType):
+        '''Character description'''
+        pass
+    assert Character._meta.type_name == 'Character'
+    assert Character._meta.description == 'Character description'
+
+
+def test_classtype_advanced():
+    class Character(ClassType):
+        class Meta:
+            type_name = 'OtherCharacter'
+            description = 'OtherCharacter description'
+    assert Character._meta.type_name == 'OtherCharacter'
+    assert Character._meta.description == 'OtherCharacter description'
+
+
+def test_fieldsclasstype():
+    f = Field(String())
+
+    class Character(FieldsClassType):
+        field_name = f
+
+    assert Character._meta.fields == [f]
+
+
+def test_fieldsclasstype_fieldtype():
+    f = Field(String())
+
+    class Character(FieldsClassType):
+        field_name = f
+
+    schema = Schema(query=Character)
+    assert Character.fields_internal_types(schema)['fieldName'] == schema.T(f)
+    assert Character._meta.fields_map['field_name'] == f
diff --git a/graphene/core/classtypes/tests/test_inputobjecttype.py b/graphene/core/classtypes/tests/test_inputobjecttype.py
new file mode 100644
index 00000000..67306bc3
--- /dev/null
+++ b/graphene/core/classtypes/tests/test_inputobjecttype.py
@@ -0,0 +1,21 @@
+from py.test import raises
+
+from graphql.core.type import GraphQLInputObjectType
+
+from graphene.core.schema import Schema
+from graphene.core.types import String
+from ..inputobjecttype import InputObjectType
+
+
+def test_inputobjecttype():
+    class InputCharacter(InputObjectType):
+        '''InputCharacter description'''
+        name = String()
+
+    schema = Schema()
+
+    object_type = schema.T(InputCharacter)
+    assert isinstance(object_type, GraphQLInputObjectType)
+    assert InputCharacter._meta.type_name == 'InputCharacter'
+    assert object_type.description == 'InputCharacter description'
+    assert list(object_type.get_fields().keys()) == ['name']
diff --git a/graphene/core/classtypes/tests/test_interface.py b/graphene/core/classtypes/tests/test_interface.py
new file mode 100644
index 00000000..43e9e503
--- /dev/null
+++ b/graphene/core/classtypes/tests/test_interface.py
@@ -0,0 +1,85 @@
+from py.test import raises
+
+from graphql.core.type import GraphQLInterfaceType, GraphQLObjectType
+
+from graphene.core.schema import Schema
+from graphene.core.types import String
+from ..interface import Interface
+from ..objecttype import ObjectType
+
+
+def test_interface():
+    class Character(Interface):
+        '''Character description'''
+        name = String()
+
+    schema = Schema()
+
+    object_type = schema.T(Character)
+    assert issubclass(Character, Interface)
+    assert isinstance(object_type, GraphQLInterfaceType)
+    assert Character._meta.interface
+    assert Character._meta.type_name == 'Character'
+    assert object_type.description == 'Character description'
+    assert list(object_type.get_fields().keys()) == ['name']
+
+
+def test_interface_cannot_initialize():
+    class Character(Interface):
+        pass
+
+    with raises(Exception) as excinfo:
+        Character()
+    assert 'An interface cannot be initialized' == str(excinfo.value)
+
+
+def test_interface_inheritance_abstract():
+    class Character(Interface):
+        pass
+
+    class ShouldBeInterface(Character):
+        class Meta:
+            abstract = True
+
+    class ShouldBeObjectType(ShouldBeInterface):
+        pass
+
+    assert ShouldBeInterface._meta.interface
+    assert not ShouldBeObjectType._meta.interface
+    assert issubclass(ShouldBeObjectType, ObjectType)
+
+
+def test_interface_inheritance():
+    class Character(Interface):
+        pass
+
+    class GeneralInterface(Interface):
+        pass
+
+    class ShouldBeObjectType(GeneralInterface, Character):
+        pass
+
+    schema = Schema()
+
+    assert Character._meta.interface
+    assert not ShouldBeObjectType._meta.interface
+    assert issubclass(ShouldBeObjectType, ObjectType)
+    assert Character in ShouldBeObjectType._meta.interfaces
+    assert GeneralInterface in ShouldBeObjectType._meta.interfaces
+    assert isinstance(schema.T(Character), GraphQLInterfaceType)
+    assert isinstance(schema.T(ShouldBeObjectType), GraphQLObjectType)
+
+
+def test_interface_inheritance_non_objects():
+    class ComonClass(object):
+        common_attr = True
+
+    class Character(ComonClass, Interface):
+        pass
+
+    class ShouldBeObjectType(Character):
+        pass
+
+    assert Character._meta.interface
+    assert Character.common_attr
+    assert ShouldBeObjectType.common_attr
diff --git a/graphene/core/classtypes/tests/test_mutation.py b/graphene/core/classtypes/tests/test_mutation.py
new file mode 100644
index 00000000..ded164ea
--- /dev/null
+++ b/graphene/core/classtypes/tests/test_mutation.py
@@ -0,0 +1,27 @@
+from py.test import raises
+
+from graphql.core.type import GraphQLObjectType
+
+from graphene.core.schema import Schema
+from graphene.core.types import String
+from ..mutation import Mutation
+from ...types.argument import ArgumentsGroup
+
+
+def test_mutation():
+    class MyMutation(Mutation):
+        '''MyMutation description'''
+        class Input:
+            arg_name = String()
+        name = String()
+
+    schema = Schema()
+
+    object_type = schema.T(MyMutation)
+    assert MyMutation._meta.type_name == 'MyMutation'
+    assert isinstance(object_type, GraphQLObjectType)
+    assert object_type.description == 'MyMutation description'
+    assert list(object_type.get_fields().keys()) == ['name']
+    assert MyMutation._meta.fields_map['name'].object_type == MyMutation
+    assert isinstance(MyMutation.arguments, ArgumentsGroup)
+    assert 'argName' in MyMutation.arguments
diff --git a/graphene/core/classtypes/tests/test_objecttype.py b/graphene/core/classtypes/tests/test_objecttype.py
new file mode 100644
index 00000000..95134bef
--- /dev/null
+++ b/graphene/core/classtypes/tests/test_objecttype.py
@@ -0,0 +1,89 @@
+from py.test import raises
+
+from graphql.core.type import GraphQLObjectType
+
+from graphene.core.schema import Schema
+from graphene.core.types import Int, String
+from ..objecttype import ObjectType
+from ..uniontype import UnionType
+
+
+def test_object_type():
+    class Human(ObjectType):
+        '''Human description'''
+        name = String()
+        friends = String()
+
+    schema = Schema()
+
+    object_type = schema.T(Human)
+    assert Human._meta.type_name == 'Human'
+    assert isinstance(object_type, GraphQLObjectType)
+    assert object_type.description == 'Human description'
+    assert list(object_type.get_fields().keys()) == ['name', 'friends']
+    assert Human._meta.fields_map['name'].object_type == Human
+
+
+def test_object_type_container():
+    class Human(ObjectType):
+        name = String()
+        friends = String()
+
+    h = Human(name='My name')
+    assert h.name == 'My name'
+
+
+def test_object_type_set_properties():
+    class Human(ObjectType):
+        name = String()
+        friends = String()
+
+        @property
+        def readonly_prop(self):
+            return 'readonly'
+
+        @property
+        def write_prop(self):
+            return self._write_prop
+
+        @write_prop.setter
+        def write_prop(self, value):
+            self._write_prop = value
+
+    h = Human(readonly_prop='custom', write_prop='custom')
+    assert h.readonly_prop == 'readonly'
+    assert h.write_prop == 'custom'
+
+
+def test_object_type_container_invalid_kwarg():
+    class Human(ObjectType):
+        name = String()
+
+    with raises(TypeError):
+        Human(invalid='My name')
+
+
+def test_object_type_container_too_many_args():
+    class Human(ObjectType):
+        name = String()
+
+    with raises(IndexError):
+        Human('Peter', 'No friends :(', None)
+
+
+def test_object_type_union():
+    class Human(ObjectType):
+        name = String()
+
+    class Pet(ObjectType):
+        name = String()
+
+    class Thing(Human, Pet):
+        '''Thing union description'''
+        my_attr = True
+
+    assert issubclass(Thing, UnionType)
+    assert Thing._meta.types == [Human, Pet]
+    assert Thing._meta.type_name == 'Thing'
+    assert Thing._meta.description == 'Thing union description'
+    assert Thing.my_attr
diff --git a/graphene/core/classtypes/tests/test_scalar.py b/graphene/core/classtypes/tests/test_scalar.py
new file mode 100644
index 00000000..a6e37881
--- /dev/null
+++ b/graphene/core/classtypes/tests/test_scalar.py
@@ -0,0 +1,32 @@
+from graphql.core.type import GraphQLScalarType
+
+from ...schema import Schema
+from ..scalar import Scalar
+
+
+def test_custom_scalar():
+    import datetime
+    from graphql.core.language import ast
+
+    class DateTimeScalar(Scalar):
+        '''DateTimeScalar Documentation'''
+        @staticmethod
+        def serialize(dt):
+            return dt.isoformat()
+
+        @staticmethod
+        def parse_literal(node):
+            if isinstance(node, ast.StringValue):
+                return datetime.datetime.strptime(
+                    node.value, "%Y-%m-%dT%H:%M:%S.%f")
+
+        @staticmethod
+        def parse_value(value):
+            return datetime.datetime.strptime(value, "%Y-%m-%dT%H:%M:%S.%f")
+
+    schema = Schema()
+
+    scalar_type = schema.T(DateTimeScalar)
+    assert isinstance(scalar_type, GraphQLScalarType)
+    assert scalar_type.name == 'DateTimeScalar'
+    assert scalar_type.description == 'DateTimeScalar Documentation'
diff --git a/graphene/core/classtypes/tests/test_uniontype.py b/graphene/core/classtypes/tests/test_uniontype.py
new file mode 100644
index 00000000..d19615fa
--- /dev/null
+++ b/graphene/core/classtypes/tests/test_uniontype.py
@@ -0,0 +1,27 @@
+from graphql.core.type import GraphQLUnionType
+
+from graphene.core.schema import Schema
+from graphene.core.types import String
+from ..objecttype import ObjectType
+from ..uniontype import UnionType
+
+
+def test_uniontype():
+    class Human(ObjectType):
+        name = String()
+
+    class Pet(ObjectType):
+        name = String()
+
+    class Thing(UnionType):
+        '''Thing union description'''
+        class Meta:
+            types = [Human, Pet]
+
+    schema = Schema()
+
+    object_type = schema.T(Thing)
+    assert isinstance(object_type, GraphQLUnionType)
+    assert Thing._meta.type_name == 'Thing'
+    assert object_type.description == 'Thing union description'
+    assert object_type.get_possible_types() == [schema.T(Human), schema.T(Pet)]
diff --git a/graphene/core/classtypes/uniontype.py b/graphene/core/classtypes/uniontype.py
new file mode 100644
index 00000000..c1fb86e3
--- /dev/null
+++ b/graphene/core/classtypes/uniontype.py
@@ -0,0 +1,39 @@
+import six
+
+from graphql.core.type import GraphQLUnionType
+
+from .base import FieldsOptions, FieldsClassType, FieldsClassTypeMeta
+
+
+class UnionTypeOptions(FieldsOptions):
+    def __init__(self, *args, **kwargs):
+        super(UnionTypeOptions, self).__init__(*args, **kwargs)
+        self.types = []
+
+
+class UnionTypeMeta(FieldsClassTypeMeta):
+    options_class = UnionTypeOptions
+
+    def get_options(cls, meta):
+        return cls.options_class(meta, types=[])
+
+
+class UnionType(six.with_metaclass(UnionTypeMeta, FieldsClassType)):
+    class Meta:
+        abstract = True
+
+    @classmethod
+    def _resolve_type(cls, schema, instance, *args):
+        return schema.T(instance.__class__)
+
+    @classmethod
+    def internal_type(cls, schema):
+        if cls._meta.abstract:
+            raise Exception("Abstract ObjectTypes don't have a specific type.")
+
+        return GraphQLUnionType(
+            cls._meta.type_name,
+            types=map(schema.T, cls._meta.types),
+            resolve_type=cls._resolve_type,
+            description=cls._meta.description,
+        )
diff --git a/graphene/core/schema.py b/graphene/core/schema.py
index eef79678..ec9d1bf5 100644
--- a/graphene/core/schema.py
+++ b/graphene/core/schema.py
@@ -12,6 +12,7 @@ from graphene import signals
 
 from .types.base import BaseType
 from .types.objecttype import BaseObjectType
+from .classtypes.base import ClassType
 
 
 class GraphQLSchema(_GraphQLSchema):
@@ -42,7 +43,7 @@ class Schema(object):
         if not object_type:
             return
         if inspect.isclass(object_type) and issubclass(
-                object_type, BaseType) or isinstance(
+                object_type, (BaseType, ClassType)) or isinstance(
                 object_type, BaseType):
             if object_type not in self._types:
                 internal_type = object_type.internal_type(self)
diff --git a/graphene/core/types/base.py b/graphene/core/types/base.py
index fe261790..2b9a4e01 100644
--- a/graphene/core/types/base.py
+++ b/graphene/core/types/base.py
@@ -2,6 +2,9 @@ from functools import total_ordering
 
 import six
 
+from ..classtypes.base import FieldsClassType
+from ..classtypes.inputobjecttype import InputObjectType as NewInputObjectType
+
 
 class BaseType(object):
 
@@ -105,10 +108,10 @@ class FieldType(MirroredType):
 
     def contribute_to_class(self, cls, name):
         from ..types import BaseObjectType, InputObjectType
-        if issubclass(cls, InputObjectType):
+        if issubclass(cls, (InputObjectType, NewInputObjectType)):
             inputfield = self.as_inputfield()
             return inputfield.contribute_to_class(cls, name)
-        elif issubclass(cls, BaseObjectType):
+        elif issubclass(cls, (BaseObjectType, FieldsClassType)):
             field = self.as_field()
             return field.contribute_to_class(cls, name)
 
diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py
index db52086a..489516e1 100644
--- a/graphene/core/types/field.py
+++ b/graphene/core/types/field.py
@@ -5,6 +5,8 @@ import six
 from graphql.core.type import GraphQLField, GraphQLInputObjectField
 
 from ...utils import to_camel_case
+from ..classtypes.base import FieldsClassType
+from ..classtypes.inputobjecttype import InputObjectType as NewInputObjectType
 from ..types import BaseObjectType, InputObjectType
 from .argument import ArgumentsGroup, snake_case_args
 from .base import LazyType, MountType, OrderedType
@@ -32,7 +34,7 @@ class Field(OrderedType):
 
     def contribute_to_class(self, cls, attname):
         assert issubclass(
-            cls, BaseObjectType), 'Field {} cannot be mounted in {}'.format(
+            cls, (BaseObjectType, FieldsClassType)), 'Field {} cannot be mounted in {}'.format(
             self, cls)
         if not self.name:
             self.name = to_camel_case(attname)
@@ -126,7 +128,7 @@ class InputField(OrderedType):
 
     def contribute_to_class(self, cls, attname):
         assert issubclass(
-            cls, InputObjectType), 'InputField {} cannot be mounted in {}'.format(
+            cls, (InputObjectType, NewInputObjectType)), 'InputField {} cannot be mounted in {}'.format(
             self, cls)
         if not self.name:
             self.name = to_camel_case(attname)

From afc5e2720bb21bfc5ac365565b3c9d9a22345f7e Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 2 Dec 2015 20:28:53 -0800
Subject: [PATCH 050/173] Added NonNull, List definitions to ClassTypes

---
 graphene/core/classtypes/base.py            | 12 ++++++++++++
 graphene/core/classtypes/tests/test_base.py | 16 +++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/graphene/core/classtypes/base.py b/graphene/core/classtypes/base.py
index a662ec96..5e338ebe 100644
--- a/graphene/core/classtypes/base.py
+++ b/graphene/core/classtypes/base.py
@@ -43,10 +43,19 @@ class ClassTypeMeta(type):
         # Add all attributes to the class.
         for obj_name, obj in attrs.items():
             cls.add_to_class(obj_name, obj)
+
+        if not cls._meta.abstract:
+            from ..types import List, NonNull
+            setattr(cls, 'NonNull', NonNull(cls))
+            setattr(cls, 'List', List(cls))
+
         return cls
 
 
 class ClassType(six.with_metaclass(ClassTypeMeta)):
+    class Meta:
+        abstract = True
+
     @classmethod
     def internal_type(cls, schema):
         raise NotImplementedError("Function internal_type not implemented in type {}".format(cls))
@@ -74,6 +83,9 @@ class FieldsClassTypeMeta(ClassTypeMeta):
 
 
 class FieldsClassType(six.with_metaclass(FieldsClassTypeMeta, ClassType)):
+    class Meta:
+        abstract = True
+
     @classmethod
     def fields_internal_types(cls, schema):
         fields = []
diff --git a/graphene/core/classtypes/tests/test_base.py b/graphene/core/classtypes/tests/test_base.py
index 2830b9bb..2564a606 100644
--- a/graphene/core/classtypes/tests/test_base.py
+++ b/graphene/core/classtypes/tests/test_base.py
@@ -1,5 +1,5 @@
 from ..base import ClassType, FieldsClassType
-from ...types import Field, String
+from ...types import Field, String, List, NonNull
 from ...schema import Schema
 
 
@@ -20,6 +20,20 @@ def test_classtype_advanced():
     assert Character._meta.description == 'OtherCharacter description'
 
 
+def test_classtype_definition_list():
+    class Character(ClassType):
+        '''Character description'''
+        pass
+    assert isinstance(Character.List, List)
+
+
+def test_classtype_definition_nonnull():
+    class Character(ClassType):
+        '''Character description'''
+        pass
+    assert isinstance(Character.NonNull, NonNull)
+
+
 def test_fieldsclasstype():
     f = Field(String())
 

From 398f7da24cbfd92a1800606ad61fc76159920df2 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 2 Dec 2015 20:39:20 -0800
Subject: [PATCH 051/173] Added FieldsClassType inheritance

---
 graphene/core/classtypes/base.py              | 56 +++++++++++--------
 graphene/core/classtypes/objecttype.py        |  2 +-
 graphene/core/classtypes/tests/test_base.py   | 15 +++++
 .../core/classtypes/tests/test_interface.py   |  4 +-
 4 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/graphene/core/classtypes/base.py b/graphene/core/classtypes/base.py
index 5e338ebe..c6d4dc58 100644
--- a/graphene/core/classtypes/base.py
+++ b/graphene/core/classtypes/base.py
@@ -1,6 +1,7 @@
 from collections import OrderedDict
 import inspect
 import six
+import copy
 
 from ..exceptions import SkipField
 from .options import Options
@@ -81,6 +82,38 @@ class FieldsOptions(Options):
 class FieldsClassTypeMeta(ClassTypeMeta):
     options_class = FieldsOptions
 
+    def extend_fields(cls, bases):
+        new_fields = cls._meta.local_fields
+        field_names = {f.name: f for f in new_fields}
+
+        for base in bases:
+            if not issubclass(base, FieldsClassType):
+                continue
+
+            parent_fields = base._meta.local_fields
+            for field in parent_fields:
+                if field.name in field_names and field.type.__class__ != field_names[
+                        field.name].type.__class__:
+                    raise Exception(
+                        'Local field %r in class %r (%r) clashes '
+                        'with field with similar name from '
+                        'Interface %s (%r)' % (
+                            field.name,
+                            cls.__name__,
+                            field.__class__,
+                            base.__name__,
+                            field_names[field.name].__class__)
+                    )
+                new_field = copy.copy(field)
+                cls.add_to_class(field.attname, new_field)
+
+
+    def construct(cls, bases, attrs):
+        cls = super(FieldsClassTypeMeta, cls).construct(bases, attrs)
+        if not cls._meta.abstract:
+            cls.extend_fields(bases)
+        return cls
+
 
 class FieldsClassType(six.with_metaclass(FieldsClassTypeMeta, ClassType)):
     class Meta:
@@ -96,26 +129,3 @@ class FieldsClassType(six.with_metaclass(FieldsClassTypeMeta, ClassType)):
                 continue
 
         return OrderedDict(fields)
-
-# class NamedClassType(ClassType):
-#     pass
-
-
-# class UnionType(NamedClassType):
-#     class Meta:
-#         abstract = True
-
-
-# class ObjectType(NamedClassType):
-#     class Meta:
-#         abstract = True
-
-
-# class InputObjectType(NamedClassType):
-#     class Meta:
-#         abstract = True
-
-
-# class Mutation(ObjectType):
-#     class Meta:
-#         abstract = True
diff --git a/graphene/core/classtypes/objecttype.py b/graphene/core/classtypes/objecttype.py
index 93d2286e..13e93cb3 100644
--- a/graphene/core/classtypes/objecttype.py
+++ b/graphene/core/classtypes/objecttype.py
@@ -89,7 +89,7 @@ class ObjectType(six.with_metaclass(ObjectTypeMeta, FieldsClassType)):
         return GraphQLObjectType(
             cls._meta.type_name,
             description=cls._meta.description,
-            interfaces=[schema.T(i) for i in cls._meta.interfaces],
+            interfaces=map(schema.T, cls._meta.interfaces),
             fields=partial(cls.fields_internal_types, schema),
             is_type_of=getattr(cls, 'is_type_of', None)
         )
diff --git a/graphene/core/classtypes/tests/test_base.py b/graphene/core/classtypes/tests/test_base.py
index 2564a606..546cd943 100644
--- a/graphene/core/classtypes/tests/test_base.py
+++ b/graphene/core/classtypes/tests/test_base.py
@@ -25,6 +25,7 @@ def test_classtype_definition_list():
         '''Character description'''
         pass
     assert isinstance(Character.List, List)
+    assert Character.List.of_type == Character
 
 
 def test_classtype_definition_nonnull():
@@ -32,6 +33,7 @@ def test_classtype_definition_nonnull():
         '''Character description'''
         pass
     assert isinstance(Character.NonNull, NonNull)
+    assert Character.NonNull.of_type == Character
 
 
 def test_fieldsclasstype():
@@ -52,3 +54,16 @@ def test_fieldsclasstype_fieldtype():
     schema = Schema(query=Character)
     assert Character.fields_internal_types(schema)['fieldName'] == schema.T(f)
     assert Character._meta.fields_map['field_name'] == f
+
+
+def test_fieldsclasstype_inheritfields():
+    name_field = Field(String())
+    last_name_field = Field(String())
+
+    class Fields1(FieldsClassType):
+        name = name_field
+
+    class Fields2(Fields1):
+        last_name = last_name_field
+
+    assert list(Fields2._meta.fields_map.keys()) == ['name', 'last_name']
diff --git a/graphene/core/classtypes/tests/test_interface.py b/graphene/core/classtypes/tests/test_interface.py
index 43e9e503..3a07f172 100644
--- a/graphene/core/classtypes/tests/test_interface.py
+++ b/graphene/core/classtypes/tests/test_interface.py
@@ -71,10 +71,10 @@ def test_interface_inheritance():
 
 
 def test_interface_inheritance_non_objects():
-    class ComonClass(object):
+    class CommonClass(object):
         common_attr = True
 
-    class Character(ComonClass, Interface):
+    class Character(CommonClass, Interface):
         pass
 
     class ShouldBeObjectType(Character):

From 8abcaff02b34c61d006a87ac5b27ff9cc93e67cd Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 2 Dec 2015 21:11:24 -0800
Subject: [PATCH 052/173] Improved classtypes core support

---
 graphene/__init__.py                         |   7 +-
 graphene/core/classtypes/__init__.py         |  16 ++
 graphene/core/options.py                     |  72 -----
 graphene/core/schema.py                      |   5 +-
 graphene/core/types/__init__.py              |   6 +-
 graphene/core/types/base.py                  |  10 +-
 graphene/core/types/field.py                 |  10 +-
 graphene/core/types/objecttype.py            | 283 +------------------
 graphene/core/types/tests/test_objecttype.py | 194 -------------
 9 files changed, 38 insertions(+), 565 deletions(-)
 delete mode 100644 graphene/core/options.py
 delete mode 100644 graphene/core/types/tests/test_objecttype.py

diff --git a/graphene/__init__.py b/graphene/__init__.py
index 520b2f75..88d3a365 100644
--- a/graphene/__init__.py
+++ b/graphene/__init__.py
@@ -8,11 +8,15 @@ from graphene.core.schema import (
     Schema
 )
 
-from graphene.core.types import (
+from graphene.core.classtypes import (
     ObjectType,
     InputObjectType,
     Interface,
     Mutation,
+    Scalar
+)
+
+from graphene.core.types import (
     BaseType,
     LazyType,
     Argument,
@@ -59,6 +63,7 @@ __all__ = [
     'InputObjectType',
     'Interface',
     'Mutation',
+    'Scalar',
     'Field',
     'InputField',
     'StringField',
diff --git a/graphene/core/classtypes/__init__.py b/graphene/core/classtypes/__init__.py
index e69de29b..488ccbb2 100644
--- a/graphene/core/classtypes/__init__.py
+++ b/graphene/core/classtypes/__init__.py
@@ -0,0 +1,16 @@
+from .inputobjecttype import InputObjectType
+from .interface import Interface
+from .mutation import Mutation
+from .objecttype import ObjectType
+from .options import Options
+from .scalar import Scalar
+from .uniontype import UnionType
+
+__all__ = [
+    'InputObjectType',
+    'Interface',
+    'Mutation',
+    'ObjectType',
+    'Options',
+    'Scalar',
+    'UnionType']
diff --git a/graphene/core/options.py b/graphene/core/options.py
deleted file mode 100644
index 4f1bf4e4..00000000
--- a/graphene/core/options.py
+++ /dev/null
@@ -1,72 +0,0 @@
-from collections import OrderedDict
-
-from ..utils import cached_property
-
-DEFAULT_NAMES = ('description', 'name', 'is_interface', 'is_mutation',
-                 'type_name', 'interfaces', 'abstract')
-
-
-class Options(object):
-
-    def __init__(self, meta=None):
-        self.meta = meta
-        self.local_fields = []
-        self.is_interface = False
-        self.is_mutation = False
-        self.is_union = False
-        self.abstract = False
-        self.interfaces = []
-        self.parents = []
-        self.types = []
-        self.valid_attrs = DEFAULT_NAMES
-
-    def contribute_to_class(self, cls, name):
-        cls._meta = self
-        self.parent = cls
-        # First, construct the default values for these options.
-        self.object_name = cls.__name__
-        self.type_name = self.object_name
-
-        self.description = cls.__doc__
-        # Store the original user-defined values for each option,
-        # for use when serializing the model definition
-        self.original_attrs = {}
-
-        # Next, apply any overridden values from 'class Meta'.
-        if self.meta:
-            meta_attrs = self.meta.__dict__.copy()
-            for name in self.meta.__dict__:
-                # Ignore any private attributes that Django doesn't care about.
-                # NOTE: We can't modify a dictionary's contents while looping
-                # over it, so we loop over the *original* dictionary instead.
-                if name.startswith('_'):
-                    del meta_attrs[name]
-            for attr_name in self.valid_attrs:
-                if attr_name in meta_attrs:
-                    setattr(self, attr_name, meta_attrs.pop(attr_name))
-                    self.original_attrs[attr_name] = getattr(self, attr_name)
-                elif hasattr(self.meta, attr_name):
-                    setattr(self, attr_name, getattr(self.meta, attr_name))
-                    self.original_attrs[attr_name] = getattr(self, attr_name)
-
-            del self.valid_attrs
-
-            # Any leftover attributes must be invalid.
-            if meta_attrs != {}:
-                raise TypeError(
-                    "'class Meta' got invalid attribute(s): %s" %
-                    ','.join(
-                        meta_attrs.keys()))
-
-        del self.meta
-
-    def add_field(self, field):
-        self.local_fields.append(field)
-
-    @cached_property
-    def fields(self):
-        return sorted(self.local_fields)
-
-    @cached_property
-    def fields_map(self):
-        return OrderedDict([(f.attname, f) for f in self.fields])
diff --git a/graphene/core/schema.py b/graphene/core/schema.py
index ec9d1bf5..48c9cf1e 100644
--- a/graphene/core/schema.py
+++ b/graphene/core/schema.py
@@ -11,7 +11,6 @@ from graphql.core.utils.schema_printer import print_schema
 from graphene import signals
 
 from .types.base import BaseType
-from .types.objecttype import BaseObjectType
 from .classtypes.base import ClassType
 
 
@@ -49,7 +48,7 @@ class Schema(object):
                 internal_type = object_type.internal_type(self)
                 self._types[object_type] = internal_type
                 is_objecttype = inspect.isclass(
-                    object_type) and issubclass(object_type, BaseObjectType)
+                    object_type) and issubclass(object_type, ClassType)
                 if is_objecttype:
                     self.register(object_type)
             return self._types[object_type]
@@ -91,7 +90,7 @@ class Schema(object):
         if name:
             objecttype = self._types_names.get(name, None)
             if objecttype and inspect.isclass(
-                    objecttype) and issubclass(objecttype, BaseObjectType):
+                    objecttype) and issubclass(objecttype, ClassType):
                 return objecttype
 
     def __str__(self):
diff --git a/graphene/core/types/__init__.py b/graphene/core/types/__init__.py
index 5bd49f2f..9260476c 100644
--- a/graphene/core/types/__init__.py
+++ b/graphene/core/types/__init__.py
@@ -1,7 +1,9 @@
 from .base import BaseType, LazyType, OrderedType
 from .argument import Argument, ArgumentsGroup, to_arguments
 from .definitions import List, NonNull
-from .objecttype import ObjectTypeMeta, BaseObjectType, Interface, ObjectType, Mutation, InputObjectType
+# Compatibility import
+from .objecttype import Interface, ObjectType, Mutation, InputObjectType
+
 from .scalars import String, ID, Boolean, Int, Float, Scalar
 from .field import Field, InputField
 
@@ -17,8 +19,6 @@ __all__ = [
     'Field',
     'InputField',
     'Interface',
-    'BaseObjectType',
-    'ObjectTypeMeta',
     'ObjectType',
     'Mutation',
     'InputObjectType',
diff --git a/graphene/core/types/base.py b/graphene/core/types/base.py
index 2b9a4e01..2b4078e4 100644
--- a/graphene/core/types/base.py
+++ b/graphene/core/types/base.py
@@ -2,9 +2,6 @@ from functools import total_ordering
 
 import six
 
-from ..classtypes.base import FieldsClassType
-from ..classtypes.inputobjecttype import InputObjectType as NewInputObjectType
-
 
 class BaseType(object):
 
@@ -107,11 +104,12 @@ class ArgumentType(MirroredType):
 class FieldType(MirroredType):
 
     def contribute_to_class(self, cls, name):
-        from ..types import BaseObjectType, InputObjectType
-        if issubclass(cls, (InputObjectType, NewInputObjectType)):
+        from ..classtypes.base import FieldsClassType
+        from ..classtypes.inputobjecttype import InputObjectType
+        if issubclass(cls, (InputObjectType)):
             inputfield = self.as_inputfield()
             return inputfield.contribute_to_class(cls, name)
-        elif issubclass(cls, (BaseObjectType, FieldsClassType)):
+        elif issubclass(cls, (FieldsClassType)):
             field = self.as_field()
             return field.contribute_to_class(cls, name)
 
diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py
index 489516e1..5a429b64 100644
--- a/graphene/core/types/field.py
+++ b/graphene/core/types/field.py
@@ -6,8 +6,8 @@ from graphql.core.type import GraphQLField, GraphQLInputObjectField
 
 from ...utils import to_camel_case
 from ..classtypes.base import FieldsClassType
-from ..classtypes.inputobjecttype import InputObjectType as NewInputObjectType
-from ..types import BaseObjectType, InputObjectType
+from ..classtypes.mutation import Mutation
+from ..classtypes.inputobjecttype import InputObjectType
 from .argument import ArgumentsGroup, snake_case_args
 from .base import LazyType, MountType, OrderedType
 from .definitions import NonNull
@@ -34,7 +34,7 @@ class Field(OrderedType):
 
     def contribute_to_class(self, cls, attname):
         assert issubclass(
-            cls, (BaseObjectType, FieldsClassType)), 'Field {} cannot be mounted in {}'.format(
+            cls, (FieldsClassType)), 'Field {} cannot be mounted in {}'.format(
             self, cls)
         if not self.name:
             self.name = to_camel_case(attname)
@@ -71,7 +71,7 @@ class Field(OrderedType):
             description = resolver.__doc__
         type = schema.T(self.get_type(schema))
         type_objecttype = schema.objecttype(type)
-        if type_objecttype and type_objecttype._meta.is_mutation:
+        if type_objecttype and issubclass(type_objecttype, Mutation):
             assert len(arguments) == 0
             arguments = type_objecttype.get_arguments()
             resolver = getattr(type_objecttype, 'mutate')
@@ -128,7 +128,7 @@ class InputField(OrderedType):
 
     def contribute_to_class(self, cls, attname):
         assert issubclass(
-            cls, (InputObjectType, NewInputObjectType)), 'InputField {} cannot be mounted in {}'.format(
+            cls, (InputObjectType)), 'InputField {} cannot be mounted in {}'.format(
             self, cls)
         if not self.name:
             self.name = to_camel_case(attname)
diff --git a/graphene/core/types/objecttype.py b/graphene/core/types/objecttype.py
index a9ac43f1..140b291e 100644
--- a/graphene/core/types/objecttype.py
+++ b/graphene/core/types/objecttype.py
@@ -1,282 +1,3 @@
-import copy
-import inspect
-from collections import OrderedDict
-from functools import partial
+from ..classtypes import ObjectType, Interface, Mutation, InputObjectType
 
-import six
-from graphql.core.type import (GraphQLInputObjectType, GraphQLInterfaceType,
-                               GraphQLObjectType, GraphQLUnionType)
-
-from graphene import signals
-
-from ..exceptions import SkipField
-from ..options import Options
-from .argument import ArgumentsGroup
-from .base import BaseType
-from .definitions import List, NonNull
-
-
-def is_objecttype(cls):
-    if not issubclass(cls, BaseObjectType):
-        return False
-    _meta = getattr(cls, '_meta', None)
-    return not(_meta and (_meta.abstract or _meta.is_interface))
-
-
-class ObjectTypeMeta(type):
-    options_cls = Options
-
-    def is_interface(cls, parents):
-        return Interface in parents
-
-    def is_mutation(cls, parents):
-        return issubclass(cls, Mutation)
-
-    def __new__(cls, name, bases, attrs):
-        super_new = super(ObjectTypeMeta, cls).__new__
-        parents = [b for b in bases if isinstance(b, cls)]
-        if not parents:
-            # If this isn't a subclass of Model, don't do anything special.
-            return super_new(cls, name, bases, attrs)
-
-        module = attrs.pop('__module__', None)
-        doc = attrs.pop('__doc__', None)
-        new_class = super_new(cls, name, bases, {
-            '__module__': module,
-            '__doc__': doc
-        })
-        attr_meta = attrs.pop('Meta', None)
-        abstract = getattr(attr_meta, 'abstract', False)
-        if not attr_meta:
-            meta = getattr(new_class, 'Meta', None)
-        else:
-            meta = attr_meta
-
-        base_meta = getattr(new_class, '_meta', None)
-
-        new_class.add_to_class('_meta', new_class.options_cls(meta))
-
-        new_class._meta.is_interface = new_class.is_interface(parents)
-        new_class._meta.is_mutation = new_class.is_mutation(parents) or (base_meta and base_meta.is_mutation)
-        union_types = list(filter(is_objecttype, parents))
-
-        new_class._meta.is_union = len(union_types) > 1
-        new_class._meta.types = union_types
-
-        assert not (
-            new_class._meta.is_interface and new_class._meta.is_mutation)
-
-        assert not (
-            new_class._meta.is_interface and new_class._meta.is_union)
-
-        # Add all attributes to the class.
-        for obj_name, obj in attrs.items():
-            new_class.add_to_class(obj_name, obj)
-
-        if abstract:
-            new_class._prepare()
-            return new_class
-
-        if new_class._meta.is_mutation:
-            assert hasattr(
-                new_class, 'mutate'), "All mutations must implement mutate method"
-
-        new_class.add_extra_fields()
-
-        new_fields = new_class._meta.local_fields
-        assert not(new_class._meta.is_union and new_fields), 'An union cannot have extra fields'
-
-        field_names = {f.name: f for f in new_fields}
-
-        for base in parents:
-            if not hasattr(base, '_meta'):
-                # Things without _meta aren't functional models, so they're
-                # uninteresting parents.
-                continue
-            # if base._meta.schema != new_class._meta.schema:
-            #     raise Exception('The parent schema is not the same')
-
-            parent_fields = base._meta.local_fields
-            # Check for clashes between locally declared fields and those
-            # on the base classes (we cannot handle shadowed fields at the
-            # moment).
-            for field in parent_fields:
-                if field.name in field_names and field.type.__class__ != field_names[
-                        field.name].type.__class__:
-                    raise Exception(
-                        'Local field %r in class %r (%r) clashes '
-                        'with field with similar name from '
-                        'Interface %s (%r)' % (
-                            field.name,
-                            new_class.__name__,
-                            field.__class__,
-                            base.__name__,
-                            field_names[field.name].__class__)
-                    )
-                new_field = copy.copy(field)
-                new_class.add_to_class(field.attname, new_field)
-
-            new_class._meta.parents.append(base)
-            if base._meta.is_interface:
-                new_class._meta.interfaces.append(base)
-            # new_class._meta.parents.extend(base._meta.parents)
-
-        setattr(new_class, 'NonNull', NonNull(new_class))
-        setattr(new_class, 'List', List(new_class))
-
-        new_class._prepare()
-        return new_class
-
-    def add_extra_fields(cls):
-        pass
-
-    def _prepare(cls):
-        if hasattr(cls, '_prepare_class'):
-            cls._prepare_class()
-        signals.class_prepared.send(cls)
-
-    def add_to_class(cls, name, value):
-        # We should call the contribute_to_class method only if it's bound
-        if not inspect.isclass(value) and hasattr(
-                value, 'contribute_to_class'):
-            value.contribute_to_class(cls, name)
-        else:
-            setattr(cls, name, value)
-
-
-class BaseObjectType(BaseType):
-
-    def __new__(cls, *args, **kwargs):
-        if cls._meta.is_interface:
-            raise Exception("An interface cannot be initialized")
-        elif cls._meta.is_union:
-            raise Exception("An union cannot be initialized")
-        elif cls._meta.abstract:
-            raise Exception("An abstract ObjectType cannot be initialized")
-        return super(BaseObjectType, cls).__new__(cls)
-
-    def __init__(self, *args, **kwargs):
-        signals.pre_init.send(self.__class__, args=args, kwargs=kwargs)
-        self._root = kwargs.pop('_root', None)
-        args_len = len(args)
-        fields = self._meta.fields
-        if args_len > len(fields):
-            # Daft, but matches old exception sans the err msg.
-            raise IndexError("Number of args exceeds number of fields")
-        fields_iter = iter(fields)
-
-        if not kwargs:
-            for val, field in zip(args, fields_iter):
-                setattr(self, field.attname, val)
-        else:
-            for val, field in zip(args, fields_iter):
-                setattr(self, field.attname, val)
-                kwargs.pop(field.attname, None)
-
-        for field in fields_iter:
-            try:
-                val = kwargs.pop(field.attname)
-                setattr(self, field.attname, val)
-            except KeyError:
-                pass
-
-        if kwargs:
-            for prop in list(kwargs):
-                try:
-                    if isinstance(getattr(self.__class__, prop), property):
-                        setattr(self, prop, kwargs.pop(prop))
-                except AttributeError:
-                    pass
-            if kwargs:
-                raise TypeError(
-                    "'%s' is an invalid keyword argument for this function" %
-                    list(kwargs)[0])
-
-        signals.post_init.send(self.__class__, instance=self)
-
-    @classmethod
-    def _resolve_type(cls, schema, instance, *args):
-        return schema.T(instance.__class__)
-
-    @classmethod
-    def internal_type(cls, schema):
-        if cls._meta.abstract:
-            raise Exception("Abstract ObjectTypes don't have a specific type.")
-
-        if cls._meta.is_interface:
-            return GraphQLInterfaceType(
-                cls._meta.type_name,
-                description=cls._meta.description,
-                resolve_type=partial(cls._resolve_type, schema),
-                fields=partial(cls.get_fields, schema)
-            )
-        elif cls._meta.is_union:
-            return GraphQLUnionType(
-                cls._meta.type_name,
-                types=cls._meta.types,
-                description=cls._meta.description,
-            )
-        return GraphQLObjectType(
-            cls._meta.type_name,
-            description=cls._meta.description,
-            interfaces=[schema.T(i) for i in cls._meta.interfaces],
-            fields=partial(cls.get_fields, schema),
-            is_type_of=getattr(cls, 'is_type_of', None)
-        )
-
-    @classmethod
-    def get_fields(cls, schema):
-        fields = []
-        for field in cls._meta.fields:
-            try:
-                fields.append((field.name, schema.T(field)))
-            except SkipField:
-                continue
-
-        return OrderedDict(fields)
-
-    @classmethod
-    def wrap(cls, instance, args, info):
-        return cls(_root=instance)
-
-
-class Interface(six.with_metaclass(ObjectTypeMeta, BaseObjectType)):
-    pass
-
-
-class ObjectType(six.with_metaclass(ObjectTypeMeta, BaseObjectType)):
-    pass
-
-
-class Mutation(six.with_metaclass(ObjectTypeMeta, BaseObjectType)):
-
-    @classmethod
-    def _construct_arguments(cls, items):
-        return ArgumentsGroup(**items)
-
-    @classmethod
-    def _prepare_class(cls):
-        input_class = getattr(cls, 'Input', None)
-        if input_class:
-            items = dict(vars(input_class))
-            items.pop('__dict__', None)
-            items.pop('__doc__', None)
-            items.pop('__module__', None)
-            items.pop('__weakref__', None)
-            cls.add_to_class('arguments', cls._construct_arguments(items))
-            delattr(cls, 'Input')
-
-    @classmethod
-    def get_arguments(cls):
-        return cls.arguments
-
-
-class InputObjectType(ObjectType):
-
-    @classmethod
-    def internal_type(cls, schema):
-        return GraphQLInputObjectType(
-            cls._meta.type_name,
-            description=cls._meta.description,
-            fields=partial(cls.get_fields, schema),
-        )
+__all__ = ['ObjectType', 'Interface', 'Mutation', 'InputObjectType']
diff --git a/graphene/core/types/tests/test_objecttype.py b/graphene/core/types/tests/test_objecttype.py
deleted file mode 100644
index 51b84f61..00000000
--- a/graphene/core/types/tests/test_objecttype.py
+++ /dev/null
@@ -1,194 +0,0 @@
-from graphql.core.execution.middlewares.utils import (resolver_has_tag,
-                                                      tag_resolver)
-from graphql.core.type import (GraphQLInterfaceType, GraphQLObjectType,
-                               GraphQLUnionType)
-from py.test import raises
-
-from graphene.core.schema import Schema
-from graphene.core.types import Int, Interface, ObjectType, String
-
-
-class Character(Interface):
-    '''Character description'''
-    name = String()
-
-    class Meta:
-        type_name = 'core_Character'
-
-
-class Human(Character):
-    '''Human description'''
-    friends = String()
-
-    class Meta:
-        type_name = 'core_Human'
-
-    @property
-    def readonly_prop(self):
-        return 'readonly'
-
-    @property
-    def write_prop(self):
-        return self._write_prop
-
-    @write_prop.setter
-    def write_prop(self, value):
-        self._write_prop = value
-
-
-class Droid(Character):
-    '''Droid description'''
-
-
-class CharacterType(Droid, Human):
-    '''Union Type'''
-
-schema = Schema()
-
-
-def test_interface():
-    object_type = schema.T(Character)
-    assert Character._meta.is_interface is True
-    assert isinstance(object_type, GraphQLInterfaceType)
-    assert Character._meta.type_name == 'core_Character'
-    assert object_type.description == 'Character description'
-    assert list(object_type.get_fields().keys()) == ['name']
-
-
-def test_interface_cannot_initialize():
-    with raises(Exception) as excinfo:
-        Character()
-    assert 'An interface cannot be initialized' == str(excinfo.value)
-
-
-def test_union():
-    object_type = schema.T(CharacterType)
-    assert CharacterType._meta.is_union is True
-    assert isinstance(object_type, GraphQLUnionType)
-    assert object_type.description == 'Union Type'
-
-
-def test_union_cannot_initialize():
-    with raises(Exception) as excinfo:
-        CharacterType()
-    assert 'An union cannot be initialized' == str(excinfo.value)
-
-
-def test_interface_resolve_type():
-    resolve_type = Character._resolve_type(schema, Human(object()))
-    assert isinstance(resolve_type, GraphQLObjectType)
-
-
-def test_object_type():
-    object_type = schema.T(Human)
-    assert Human._meta.is_interface is False
-    assert Human._meta.type_name == 'core_Human'
-    assert isinstance(object_type, GraphQLObjectType)
-    assert object_type.description == 'Human description'
-    assert list(object_type.get_fields().keys()) == ['name', 'friends']
-    assert object_type.get_interfaces() == [schema.T(Character)]
-    assert Human._meta.fields_map['name'].object_type == Human
-
-
-def test_object_type_container():
-    h = Human(name='My name')
-    assert h.name == 'My name'
-
-
-def test_object_type_set_properties():
-    h = Human(readonly_prop='custom', write_prop='custom')
-    assert h.readonly_prop == 'readonly'
-    assert h.write_prop == 'custom'
-
-
-def test_object_type_container_invalid_kwarg():
-    with raises(TypeError):
-        Human(invalid='My name')
-
-
-def test_object_type_container_too_many_args():
-    with raises(IndexError):
-        Human('Peter', 'No friends :(', None)
-
-
-def test_field_clashes():
-    with raises(Exception) as excinfo:
-        class Droid(Character):
-            name = Int()
-
-    assert 'clashes' in str(excinfo.value)
-
-
-def test_fields_inherited_should_be_different():
-    assert Character._meta.fields_map['name'] != Human._meta.fields_map['name']
-
-
-def test_field_mantain_resolver_tags():
-    class Droid(Character):
-        name = String()
-
-        def resolve_name(self, *args):
-            return 'My Droid'
-
-        tag_resolver(resolve_name, 'test')
-
-    field = schema.T(Droid._meta.fields_map['name'])
-    assert resolver_has_tag(field.resolver, 'test')
-
-
-def test_type_has_nonnull():
-    class Droid(Character):
-        name = String()
-
-    assert Droid.NonNull.of_type == Droid
-
-
-def test_type_has_list():
-    class Droid(Character):
-        name = String()
-
-    assert Droid.List.of_type == Droid
-
-
-def test_abstracttype():
-    class MyObject1(ObjectType):
-        class Meta:
-            abstract = True
-        name1 = String()
-
-    class MyObject2(ObjectType):
-        class Meta:
-            abstract = True
-        name2 = String()
-
-    class MyObject(MyObject1, MyObject2):
-        pass
-
-    object_type = schema.T(MyObject)
-
-    assert list(MyObject._meta.fields_map.keys()) == ['name1', 'name2']
-    assert MyObject._meta.fields_map['name1'].object_type == MyObject
-    assert MyObject._meta.fields_map['name2'].object_type == MyObject
-    assert isinstance(object_type, GraphQLObjectType)
-
-
-def test_abstracttype_initialize():
-    class MyAbstractObjectType(ObjectType):
-        class Meta:
-            abstract = True
-
-    with raises(Exception) as excinfo:
-        MyAbstractObjectType()
-
-    assert 'An abstract ObjectType cannot be initialized' == str(excinfo.value)
-
-
-def test_abstracttype_type():
-    class MyAbstractObjectType(ObjectType):
-        class Meta:
-            abstract = True
-
-    with raises(Exception) as excinfo:
-        schema.T(MyAbstractObjectType)
-
-    assert 'Abstract ObjectTypes don\'t have a specific type.' == str(excinfo.value)

From 5b3000f734559219174a9ef3f98ed7aacab93db5 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 2 Dec 2015 22:47:37 -0800
Subject: [PATCH 053/173] Improved classtypes relay support

---
 graphene/core/classtypes/interface.py |  3 -
 graphene/relay/fields.py              |  6 --
 graphene/relay/types.py               | 89 ++++++++++++++++-----------
 graphene/relay/utils.py               |  7 ++-
 4 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/graphene/core/classtypes/interface.py b/graphene/core/classtypes/interface.py
index f689c709..2586bfce 100644
--- a/graphene/core/classtypes/interface.py
+++ b/graphene/core/classtypes/interface.py
@@ -40,9 +40,6 @@ class Interface(six.with_metaclass(InterfaceMeta, ObjectType)):
 
     @classmethod
     def internal_type(cls, schema):
-        if cls._meta.abstract:
-            raise Exception("Abstract Interfaces don't have a specific type.")
-
         if not cls._meta.interface:
             return super(Interface, cls).internal_type(schema)
 
diff --git a/graphene/relay/fields.py b/graphene/relay/fields.py
index b3829ad8..dc8c4973 100644
--- a/graphene/relay/fields.py
+++ b/graphene/relay/fields.py
@@ -90,11 +90,5 @@ class GlobalIDField(Field):
     def __init__(self, *args, **kwargs):
         super(GlobalIDField, self).__init__(NonNull(ID()), *args, **kwargs)
 
-    def contribute_to_class(self, cls, name):
-        from graphene.relay.utils import is_node, is_node_type
-        in_node = is_node(cls) or is_node_type(cls)
-        assert in_node, 'GlobalIDField could only be inside a Node, but got %r' % cls
-        super(GlobalIDField, self).contribute_to_class(cls, name)
-
     def resolver(self, instance, args, info):
         return instance.to_global_id()
diff --git a/graphene/relay/types.py b/graphene/relay/types.py
index 9fa673ef..4cece989 100644
--- a/graphene/relay/types.py
+++ b/graphene/relay/types.py
@@ -1,4 +1,5 @@
 import inspect
+import six
 import warnings
 from collections import Iterable
 from functools import wraps
@@ -6,8 +7,10 @@ from functools import wraps
 from graphql_relay.connection.arrayconnection import connection_from_list
 from graphql_relay.node.node import to_global_id
 
-from ..core.types import (Boolean, Field, InputObjectType, Interface, List,
-                          Mutation, ObjectType, String)
+from ..core.classtypes import InputObjectType, Interface, Mutation, ObjectType
+from ..core.classtypes.mutation import MutationMeta
+from ..core.classtypes.interface import InterfaceMeta
+from ..core.types import Boolean, Field, List, String
 from ..core.types.argument import ArgumentsGroup
 from ..core.types.definitions import NonNull
 from ..utils import memoize
@@ -83,33 +86,43 @@ class Connection(ObjectType):
         return self._connection_data
 
 
-class BaseNode(object):
+class NodeMeta(InterfaceMeta):
+    def construct_get_node(cls):
+        get_node = getattr(cls, 'get_node', None)
+        assert get_node, 'get_node classmethod not found in %s Node' % cls
+        assert callable(get_node), 'get_node have to be callable'
+        args = 3
+        if isinstance(get_node, staticmethod):
+            args -= 1
 
-    @classmethod
-    def _prepare_class(cls):
-        from graphene.relay.utils import is_node
-        if is_node(cls):
-            get_node = getattr(cls, 'get_node')
-            assert get_node, 'get_node classmethod not found in %s Node' % cls
-            assert callable(get_node), 'get_node have to be callable'
-            args = 3
-            if isinstance(get_node, staticmethod):
-                args -= 1
+        get_node_num_args = len(inspect.getargspec(get_node).args)
+        if get_node_num_args < args:
+            warnings.warn("get_node will receive also the info arg"
+                          " in future versions of graphene".format(cls.__name__),
+                          FutureWarning)
 
-            get_node_num_args = len(inspect.getargspec(get_node).args)
-            if get_node_num_args < args:
-                warnings.warn("get_node will receive also the info arg"
-                              " in future versions of graphene".format(cls.__name__),
-                              FutureWarning)
+            @staticmethod
+            @wraps(get_node)
+            def wrapped_node(*node_args):
+                if len(node_args) < args:
+                    node_args += (None, )
+                return get_node(*node_args[:-1])
 
-                @staticmethod
-                @wraps(get_node)
-                def wrapped_node(*node_args):
-                    if len(node_args) < args:
-                        node_args += (None, )
-                    return get_node(*node_args[:-1])
+            setattr(cls, 'get_node', wrapped_node)
 
-                setattr(cls, 'get_node', wrapped_node)
+    def construct(cls, *args, **kwargs):
+        cls = super(NodeMeta, cls).construct(*args, **kwargs)
+        if not cls._meta.abstract:
+            cls.construct_get_node()
+        return cls
+
+
+class Node(six.with_metaclass(NodeMeta, Interface)):
+    '''An object with an ID'''
+    id = GlobalIDField()
+
+    class Meta:
+        abstract = True
 
     def to_global_id(self):
         type_name = self._meta.type_name
@@ -127,27 +140,31 @@ class BaseNode(object):
         return cls.edge_type
 
 
-class Node(BaseNode, Interface):
-    '''An object with an ID'''
-    id = GlobalIDField()
-
-
 class MutationInputType(InputObjectType):
     client_mutation_id = String(required=True)
 
 
-class ClientIDMutation(Mutation):
-    client_mutation_id = String(required=True)
+class RelayMutationMeta(MutationMeta):
+    def construct(cls, *args, **kwargs):
+        cls = super(RelayMutationMeta, cls).construct(*args, **kwargs)
+        if not cls._meta.abstract:
+            assert hasattr(
+                cls, 'mutate_and_get_payload'), 'You have to implement mutate_and_get_payload'
+        return cls
 
-    @classmethod
-    def _construct_arguments(cls, items):
-        assert hasattr(
-            cls, 'mutate_and_get_payload'), 'You have to implement mutate_and_get_payload'
+    def construct_arguments(cls, items):
         new_input_type = type('{}Input'.format(
             cls._meta.type_name), (MutationInputType, ), items)
         cls.add_to_class('input_type', new_input_type)
         return ArgumentsGroup(input=NonNull(new_input_type))
 
+
+class ClientIDMutation(six.with_metaclass(RelayMutationMeta, Mutation)):
+    client_mutation_id = String(required=True)
+
+    class Meta:
+        abstract = True
+
     @classmethod
     def mutate(cls, instance, args, info):
         input = args.get('input')
diff --git a/graphene/relay/utils.py b/graphene/relay/utils.py
index dc281830..98cb81dd 100644
--- a/graphene/relay/utils.py
+++ b/graphene/relay/utils.py
@@ -1,10 +1,11 @@
-from .types import BaseNode
+from .types import Node
 
 
 def is_node(object_type):
     return object_type and issubclass(
-        object_type, BaseNode) and not is_node_type(object_type)
+        object_type, Node) and not object_type._meta.abstract
 
 
 def is_node_type(object_type):
-    return BaseNode in object_type.__bases__
+    return object_type and issubclass(
+        object_type, Node) and object_type._meta.abstract

From f5837ac4f3560d7d9d471164f79b7d3d296fe9e9 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 2 Dec 2015 23:36:51 -0800
Subject: [PATCH 054/173] Improved classtypes django support

---
 graphene/contrib/django/__init__.py         |  5 +-
 graphene/contrib/django/options.py          | 23 ++-------
 graphene/contrib/django/tests/test_types.py | 37 +++----------
 graphene/contrib/django/types.py            | 57 ++++++++++++++-------
 graphene/core/classtypes/base.py            |  5 +-
 5 files changed, 53 insertions(+), 74 deletions(-)

diff --git a/graphene/contrib/django/__init__.py b/graphene/contrib/django/__init__.py
index ec39b7f9..11720f9f 100644
--- a/graphene/contrib/django/__init__.py
+++ b/graphene/contrib/django/__init__.py
@@ -1,7 +1,6 @@
 from graphene.contrib.django.types import (
     DjangoConnection,
     DjangoObjectType,
-    DjangoInterface,
     DjangoNode
 )
 from graphene.contrib.django.fields import (
@@ -9,5 +8,5 @@ from graphene.contrib.django.fields import (
     DjangoModelField
 )
 
-__all__ = ['DjangoObjectType', 'DjangoInterface', 'DjangoNode',
-           'DjangoConnection', 'DjangoConnectionField', 'DjangoModelField']
+__all__ = ['DjangoObjectType', 'DjangoNode', 'DjangoConnection',
+           'DjangoConnectionField', 'DjangoModelField']
diff --git a/graphene/contrib/django/options.py b/graphene/contrib/django/options.py
index 812e2b03..61dd37a3 100644
--- a/graphene/contrib/django/options.py
+++ b/graphene/contrib/django/options.py
@@ -1,24 +1,15 @@
-import inspect
-
-from django.db import models
-
-from ...core.options import Options
+from ...core.classtypes.objecttype import ObjectTypeOptions
 from ...relay.types import Node
 from ...relay.utils import is_node
 
 VALID_ATTRS = ('model', 'only_fields', 'exclude_fields')
 
 
-def is_base(cls):
-    from graphene.contrib.django.types import DjangoObjectType
-    return DjangoObjectType in cls.__bases__
-
-
-class DjangoOptions(Options):
+class DjangoOptions(ObjectTypeOptions):
 
     def __init__(self, *args, **kwargs):
-        self.model = None
         super(DjangoOptions, self).__init__(*args, **kwargs)
+        self.model = None
         self.valid_attrs += VALID_ATTRS
         self.only_fields = None
         self.exclude_fields = []
@@ -28,11 +19,3 @@ class DjangoOptions(Options):
         if is_node(cls):
             self.exclude_fields = list(self.exclude_fields) + ['id']
             self.interfaces.append(Node)
-        if not is_node(cls) and not is_base(cls):
-            return
-        if not self.model:
-            raise Exception(
-                'Django ObjectType %s must have a model in the Meta class attr' %
-                cls)
-        elif not inspect.isclass(self.model) or not issubclass(self.model, models.Model):
-            raise Exception('Provided model in %s is not a Django model' % cls)
diff --git a/graphene/contrib/django/tests/test_types.py b/graphene/contrib/django/tests/test_types.py
index 4d709580..959a7d45 100644
--- a/graphene/contrib/django/tests/test_types.py
+++ b/graphene/contrib/django/tests/test_types.py
@@ -3,7 +3,7 @@ from mock import patch
 from pytest import raises
 
 from graphene import Schema
-from graphene.contrib.django.types import DjangoInterface, DjangoNode
+from graphene.contrib.django.types import DjangoNode, DjangoObjectType
 from graphene.core.fields import Field
 from graphene.core.types.scalars import Int
 from graphene.relay.fields import GlobalIDField
@@ -14,7 +14,8 @@ from .models import Article, Reporter
 schema = Schema()
 
 
-class Character(DjangoInterface):
+@schema.register
+class Character(DjangoObjectType):
     '''Character description'''
     class Meta:
         model = Reporter
@@ -31,7 +32,7 @@ class Human(DjangoNode):
 
 
 def test_django_interface():
-    assert DjangoNode._meta.is_interface is True
+    assert DjangoNode._meta.interface is True
 
 
 @patch('graphene.contrib.django.tests.models.Article.objects.get', return_value=Article(id=1))
@@ -41,17 +42,6 @@ def test_django_get_node(get):
     assert human.id == 1
 
 
-def test_pseudo_interface_registered():
-    object_type = schema.T(Character)
-    assert Character._meta.is_interface is True
-    assert isinstance(object_type, GraphQLInterfaceType)
-    assert Character._meta.model == Reporter
-    assert_equal_lists(
-        object_type.get_fields().keys(),
-        ['articles', 'firstName', 'lastName', 'email', 'pets', 'id']
-    )
-
-
 def test_djangonode_idfield():
     idfield = DjangoNode._meta.fields_map['id']
     assert isinstance(idfield, GlobalIDField)
@@ -68,32 +58,21 @@ def test_node_replacedfield():
     assert schema.T(idfield).type == schema.T(Int())
 
 
-def test_interface_resolve_type():
-    resolve_type = Character._resolve_type(schema, Human())
-    assert isinstance(resolve_type, GraphQLObjectType)
-
-
-def test_interface_objecttype_init_none():
+def test_objecttype_init_none():
     h = Human()
     assert h._root is None
 
 
-def test_interface_objecttype_init_good():
+def test_objecttype_init_good():
     instance = Article()
     h = Human(instance)
     assert h._root == instance
 
 
-def test_interface_objecttype_init_unexpected():
-    with raises(AssertionError) as excinfo:
-        Human(object())
-    assert str(excinfo.value) == "Human received a non-compatible instance (object) when expecting Article"
-
-
 def test_object_type():
     object_type = schema.T(Human)
     Human._meta.fields_map
-    assert Human._meta.is_interface is False
+    assert Human._meta.interface is False
     assert isinstance(object_type, GraphQLObjectType)
     assert_equal_lists(
         object_type.get_fields().keys(),
@@ -103,5 +82,5 @@ def test_object_type():
 
 
 def test_node_notinterface():
-    assert Human._meta.is_interface is False
+    assert Human._meta.interface is False
     assert DjangoNode in Human._meta.interfaces
diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py
index b5097c72..0d7b75fe 100644
--- a/graphene/contrib/django/types.py
+++ b/graphene/contrib/django/types.py
@@ -1,22 +1,19 @@
 import six
+import inspect
 
-from ...core.types import BaseObjectType, ObjectTypeMeta
-from ...relay.fields import GlobalIDField
-from ...relay.types import BaseNode, Connection
+from django.db import models
+
+from ...core.classtypes.objecttype import ObjectTypeMeta, ObjectType
+from ...relay.types import Node, NodeMeta, Connection
 from .converter import convert_django_field
 from .options import DjangoOptions
 from .utils import get_reverse_fields, maybe_queryset
 
 
 class DjangoObjectTypeMeta(ObjectTypeMeta):
-    options_cls = DjangoOptions
+    options_class = DjangoOptions
 
-    def is_interface(cls, parents):
-        return DjangoInterface in parents
-
-    def add_extra_fields(cls):
-        if not cls._meta.model:
-            return
+    def construct_fields(cls):
         only_fields = cls._meta.only_fields
         reverse_fields = get_reverse_fields(cls._meta.model)
         all_fields = sorted(list(cls._meta.model._meta.fields) +
@@ -35,8 +32,23 @@ class DjangoObjectTypeMeta(ObjectTypeMeta):
             converted_field = convert_django_field(field)
             cls.add_to_class(field.name, converted_field)
 
+    def construct(cls, *args, **kwargs):
+        cls = super(DjangoObjectTypeMeta, cls).construct(*args, **kwargs)
+        if not cls._meta.abstract:
+            if not cls._meta.model:
+                raise Exception(
+                    'Django ObjectType %s must have a model in the Meta class attr' %
+                    cls)
+            elif not inspect.isclass(cls._meta.model) or not issubclass(cls._meta.model, models.Model):
+                raise Exception('Provided model in %s is not a Django model' % cls)
 
-class InstanceObjectType(BaseObjectType):
+            cls.construct_fields()
+        return cls
+
+
+class InstanceObjectType(ObjectType):
+    class Meta:
+        abstract = True
 
     def __init__(self, _root=None):
         if _root:
@@ -63,12 +75,8 @@ class InstanceObjectType(BaseObjectType):
 
 class DjangoObjectType(six.with_metaclass(
         DjangoObjectTypeMeta, InstanceObjectType)):
-    pass
-
-
-class DjangoInterface(six.with_metaclass(
-        DjangoObjectTypeMeta, InstanceObjectType)):
-    pass
+    class Meta:
+        abstract = True
 
 
 class DjangoConnection(Connection):
@@ -79,8 +87,19 @@ class DjangoConnection(Connection):
         return super(DjangoConnection, cls).from_list(iterable, *args, **kwargs)
 
 
-class DjangoNode(BaseNode, DjangoInterface):
-    id = GlobalIDField()
+class DjangoNodeMeta(DjangoObjectTypeMeta, NodeMeta):
+    pass
+
+
+class NodeInstance(Node, InstanceObjectType):
+    class Meta:
+        abstract = True
+
+
+class DjangoNode(six.with_metaclass(
+        DjangoNodeMeta, NodeInstance)):
+    class Meta:
+        abstract = True
 
     @classmethod
     def get_node(cls, id, info=None):
diff --git a/graphene/core/classtypes/base.py b/graphene/core/classtypes/base.py
index c6d4dc58..52588fc8 100644
--- a/graphene/core/classtypes/base.py
+++ b/graphene/core/classtypes/base.py
@@ -87,7 +87,7 @@ class FieldsClassTypeMeta(ClassTypeMeta):
         field_names = {f.name: f for f in new_fields}
 
         for base in bases:
-            if not issubclass(base, FieldsClassType):
+            if not isinstance(base, FieldsClassTypeMeta):
                 continue
 
             parent_fields = base._meta.local_fields
@@ -110,8 +110,7 @@ class FieldsClassTypeMeta(ClassTypeMeta):
 
     def construct(cls, bases, attrs):
         cls = super(FieldsClassTypeMeta, cls).construct(bases, attrs)
-        if not cls._meta.abstract:
-            cls.extend_fields(bases)
+        cls.extend_fields(bases)
         return cls
 
 

From b417a65f19f1f422eaf9e17c004ead0fb119998d Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 2 Dec 2015 23:42:15 -0800
Subject: [PATCH 055/173] Fixed options tests

---
 .../core/{tests => classtypes}/test_options.py   | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)
 rename graphene/core/{tests => classtypes}/test_options.py (76%)

diff --git a/graphene/core/tests/test_options.py b/graphene/core/classtypes/test_options.py
similarity index 76%
rename from graphene/core/tests/test_options.py
rename to graphene/core/classtypes/test_options.py
index 3b656bd4..28340757 100644
--- a/graphene/core/tests/test_options.py
+++ b/graphene/core/classtypes/test_options.py
@@ -1,11 +1,10 @@
 from py.test import raises
 
 from graphene.core.fields import Field
-from graphene.core.options import Options
+from graphene.core.classtypes import Options
 
 
 class Meta:
-    is_interface = True
     type_name = 'Character'
 
 
@@ -13,19 +12,6 @@ class InvalidMeta:
     other_value = True
 
 
-def test_field_added_in_meta():
-    opt = Options(Meta)
-
-    class ObjectType(object):
-        pass
-
-    opt.contribute_to_class(ObjectType, '_meta')
-    f = Field(None)
-    f.attname = 'string_field'
-    opt.add_field(f)
-    assert f in opt.fields
-
-
 def test_options_contribute():
     opt = Options(Meta)
 

From 9b839f19e53fbb39c30ceb62094f780ce46745f8 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 2 Dec 2015 23:46:49 -0800
Subject: [PATCH 056/173] Fixed lint errors

---
 bin/autolinter                                        |  6 +++---
 graphene/contrib/django/tests/test_types.py           |  3 +--
 graphene/contrib/django/types.py                      | 10 +++++++---
 graphene/core/classtypes/base.py                      | 11 +++++++----
 graphene/core/classtypes/inputobjecttype.py           |  1 +
 graphene/core/classtypes/interface.py                 |  4 +++-
 graphene/core/classtypes/mutation.py                  |  2 ++
 graphene/core/classtypes/objecttype.py                |  8 ++++++--
 graphene/core/classtypes/options.py                   |  1 +
 graphene/core/classtypes/scalar.py                    |  2 +-
 graphene/core/classtypes/test_options.py              |  1 -
 graphene/core/classtypes/tests/test_base.py           |  8 +++-----
 .../core/classtypes/tests/test_inputobjecttype.py     |  2 +-
 graphene/core/classtypes/tests/test_interface.py      |  5 +++--
 graphene/core/classtypes/tests/test_mutation.py       |  4 ++--
 graphene/core/classtypes/tests/test_objecttype.py     |  6 +++---
 graphene/core/classtypes/tests/test_uniontype.py      |  1 +
 graphene/core/classtypes/uniontype.py                 |  5 +++--
 graphene/core/schema.py                               |  2 +-
 graphene/core/types/field.py                          |  2 +-
 graphene/core/types/objecttype.py                     |  2 +-
 graphene/relay/types.py                               |  6 ++++--
 graphene/signals.py                                   |  1 +
 23 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/bin/autolinter b/bin/autolinter
index 164618ae..7f749242 100755
--- a/bin/autolinter
+++ b/bin/autolinter
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-autoflake ./ -r --remove-unused-variables --remove-all-unused-imports --in-place
-autopep8 ./ -r --in-place --experimental --aggressive --max-line-length 120
-isort -rc .
+autoflake ./examples/ ./graphene/ -r --remove-unused-variables --remove-all-unused-imports --in-place
+autopep8 ./examples/ ./graphene/ -r --in-place --experimental --aggressive --max-line-length 120
+isort -rc ./examples/ ./graphene/
diff --git a/graphene/contrib/django/tests/test_types.py b/graphene/contrib/django/tests/test_types.py
index 959a7d45..42028a5e 100644
--- a/graphene/contrib/django/tests/test_types.py
+++ b/graphene/contrib/django/tests/test_types.py
@@ -1,6 +1,5 @@
-from graphql.core.type import GraphQLInterfaceType, GraphQLObjectType
+from graphql.core.type import GraphQLObjectType
 from mock import patch
-from pytest import raises
 
 from graphene import Schema
 from graphene.contrib.django.types import DjangoNode, DjangoObjectType
diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py
index 0d7b75fe..5b68ebbb 100644
--- a/graphene/contrib/django/types.py
+++ b/graphene/contrib/django/types.py
@@ -1,10 +1,10 @@
-import six
 import inspect
 
+import six
 from django.db import models
 
-from ...core.classtypes.objecttype import ObjectTypeMeta, ObjectType
-from ...relay.types import Node, NodeMeta, Connection
+from ...core.classtypes.objecttype import ObjectType, ObjectTypeMeta
+from ...relay.types import Connection, Node, NodeMeta
 from .converter import convert_django_field
 from .options import DjangoOptions
 from .utils import get_reverse_fields, maybe_queryset
@@ -47,6 +47,7 @@ class DjangoObjectTypeMeta(ObjectTypeMeta):
 
 
 class InstanceObjectType(ObjectType):
+
     class Meta:
         abstract = True
 
@@ -75,6 +76,7 @@ class InstanceObjectType(ObjectType):
 
 class DjangoObjectType(six.with_metaclass(
         DjangoObjectTypeMeta, InstanceObjectType)):
+
     class Meta:
         abstract = True
 
@@ -92,12 +94,14 @@ class DjangoNodeMeta(DjangoObjectTypeMeta, NodeMeta):
 
 
 class NodeInstance(Node, InstanceObjectType):
+
     class Meta:
         abstract = True
 
 
 class DjangoNode(six.with_metaclass(
         DjangoNodeMeta, NodeInstance)):
+
     class Meta:
         abstract = True
 
diff --git a/graphene/core/classtypes/base.py b/graphene/core/classtypes/base.py
index 52588fc8..31a2c8d2 100644
--- a/graphene/core/classtypes/base.py
+++ b/graphene/core/classtypes/base.py
@@ -1,7 +1,8 @@
-from collections import OrderedDict
-import inspect
-import six
 import copy
+import inspect
+from collections import OrderedDict
+
+import six
 
 from ..exceptions import SkipField
 from .options import Options
@@ -54,6 +55,7 @@ class ClassTypeMeta(type):
 
 
 class ClassType(six.with_metaclass(ClassTypeMeta)):
+
     class Meta:
         abstract = True
 
@@ -63,6 +65,7 @@ class ClassType(six.with_metaclass(ClassTypeMeta)):
 
 
 class FieldsOptions(Options):
+
     def __init__(self, *args, **kwargs):
         super(FieldsOptions, self).__init__(*args, **kwargs)
         self.local_fields = []
@@ -107,7 +110,6 @@ class FieldsClassTypeMeta(ClassTypeMeta):
                 new_field = copy.copy(field)
                 cls.add_to_class(field.attname, new_field)
 
-
     def construct(cls, bases, attrs):
         cls = super(FieldsClassTypeMeta, cls).construct(bases, attrs)
         cls.extend_fields(bases)
@@ -115,6 +117,7 @@ class FieldsClassTypeMeta(ClassTypeMeta):
 
 
 class FieldsClassType(six.with_metaclass(FieldsClassTypeMeta, ClassType)):
+
     class Meta:
         abstract = True
 
diff --git a/graphene/core/classtypes/inputobjecttype.py b/graphene/core/classtypes/inputobjecttype.py
index 393173e8..43f4c897 100644
--- a/graphene/core/classtypes/inputobjecttype.py
+++ b/graphene/core/classtypes/inputobjecttype.py
@@ -6,6 +6,7 @@ from .base import FieldsClassType
 
 
 class InputObjectType(FieldsClassType):
+
     class Meta:
         abstract = True
 
diff --git a/graphene/core/classtypes/interface.py b/graphene/core/classtypes/interface.py
index 2586bfce..c3aa3110 100644
--- a/graphene/core/classtypes/interface.py
+++ b/graphene/core/classtypes/interface.py
@@ -1,6 +1,6 @@
-import six
 from functools import partial
 
+import six
 from graphql.core.type import GraphQLInterfaceType
 
 from .base import FieldsClassTypeMeta
@@ -8,6 +8,7 @@ from .objecttype import ObjectType, ObjectTypeMeta
 
 
 class InterfaceMeta(ObjectTypeMeta):
+
     def construct(cls, bases, attrs):
         if cls._meta.abstract or Interface in bases:
             # Return Interface type
@@ -26,6 +27,7 @@ class InterfaceMeta(ObjectTypeMeta):
 
 
 class Interface(six.with_metaclass(InterfaceMeta, ObjectType)):
+
     class Meta:
         abstract = True
 
diff --git a/graphene/core/classtypes/mutation.py b/graphene/core/classtypes/mutation.py
index 90aa5cf8..63743974 100644
--- a/graphene/core/classtypes/mutation.py
+++ b/graphene/core/classtypes/mutation.py
@@ -5,6 +5,7 @@ from .objecttype import ObjectType, ObjectTypeMeta
 
 
 class MutationMeta(ObjectTypeMeta):
+
     def construct(cls, bases, attrs):
         input_class = attrs.pop('Input', None)
         if input_class:
@@ -22,6 +23,7 @@ class MutationMeta(ObjectTypeMeta):
 
 
 class Mutation(six.with_metaclass(MutationMeta, ObjectType)):
+
     class Meta:
         abstract = True
 
diff --git a/graphene/core/classtypes/objecttype.py b/graphene/core/classtypes/objecttype.py
index 13e93cb3..5658d570 100644
--- a/graphene/core/classtypes/objecttype.py
+++ b/graphene/core/classtypes/objecttype.py
@@ -1,10 +1,11 @@
-import six
 from functools import partial
 
+import six
 from graphql.core.type import GraphQLObjectType
 
 from graphene import signals
-from .base import FieldsOptions, FieldsClassType, FieldsClassTypeMeta
+
+from .base import FieldsClassType, FieldsClassTypeMeta, FieldsOptions
 from .uniontype import UnionType
 
 
@@ -15,6 +16,7 @@ def is_objecttype(cls):
 
 
 class ObjectTypeOptions(FieldsOptions):
+
     def __init__(self, *args, **kwargs):
         super(ObjectTypeOptions, self).__init__(*args, **kwargs)
         self.interface = False
@@ -22,6 +24,7 @@ class ObjectTypeOptions(FieldsOptions):
 
 
 class ObjectTypeMeta(FieldsClassTypeMeta):
+
     def construct(cls, bases, attrs):
         cls = super(ObjectTypeMeta, cls).construct(bases, attrs)
         if not cls._meta.abstract:
@@ -39,6 +42,7 @@ class ObjectTypeMeta(FieldsClassTypeMeta):
 
 
 class ObjectType(six.with_metaclass(ObjectTypeMeta, FieldsClassType)):
+
     class Meta:
         abstract = True
 
diff --git a/graphene/core/classtypes/options.py b/graphene/core/classtypes/options.py
index 7a965a2c..52e4536e 100644
--- a/graphene/core/classtypes/options.py
+++ b/graphene/core/classtypes/options.py
@@ -1,4 +1,5 @@
 class Options(object):
+
     def __init__(self, meta=None, **defaults):
         self.meta = meta
         self.abstract = False
diff --git a/graphene/core/classtypes/scalar.py b/graphene/core/classtypes/scalar.py
index fe4087e8..8d34eba0 100644
--- a/graphene/core/classtypes/scalar.py
+++ b/graphene/core/classtypes/scalar.py
@@ -1,7 +1,7 @@
 from graphql.core.type import GraphQLScalarType
 
-from .base import ClassType
 from ..types.base import MountedType
+from .base import ClassType
 
 
 class Scalar(ClassType, MountedType):
diff --git a/graphene/core/classtypes/test_options.py b/graphene/core/classtypes/test_options.py
index 28340757..512c3e6a 100644
--- a/graphene/core/classtypes/test_options.py
+++ b/graphene/core/classtypes/test_options.py
@@ -1,6 +1,5 @@
 from py.test import raises
 
-from graphene.core.fields import Field
 from graphene.core.classtypes import Options
 
 
diff --git a/graphene/core/classtypes/tests/test_base.py b/graphene/core/classtypes/tests/test_base.py
index 546cd943..5017f94d 100644
--- a/graphene/core/classtypes/tests/test_base.py
+++ b/graphene/core/classtypes/tests/test_base.py
@@ -1,18 +1,18 @@
-from ..base import ClassType, FieldsClassType
-from ...types import Field, String, List, NonNull
 from ...schema import Schema
+from ...types import Field, List, NonNull, String
+from ..base import ClassType, FieldsClassType
 
 
 def test_classtype_basic():
     class Character(ClassType):
         '''Character description'''
-        pass
     assert Character._meta.type_name == 'Character'
     assert Character._meta.description == 'Character description'
 
 
 def test_classtype_advanced():
     class Character(ClassType):
+
         class Meta:
             type_name = 'OtherCharacter'
             description = 'OtherCharacter description'
@@ -23,7 +23,6 @@ def test_classtype_advanced():
 def test_classtype_definition_list():
     class Character(ClassType):
         '''Character description'''
-        pass
     assert isinstance(Character.List, List)
     assert Character.List.of_type == Character
 
@@ -31,7 +30,6 @@ def test_classtype_definition_list():
 def test_classtype_definition_nonnull():
     class Character(ClassType):
         '''Character description'''
-        pass
     assert isinstance(Character.NonNull, NonNull)
     assert Character.NonNull.of_type == Character
 
diff --git a/graphene/core/classtypes/tests/test_inputobjecttype.py b/graphene/core/classtypes/tests/test_inputobjecttype.py
index 67306bc3..2268d46f 100644
--- a/graphene/core/classtypes/tests/test_inputobjecttype.py
+++ b/graphene/core/classtypes/tests/test_inputobjecttype.py
@@ -1,9 +1,9 @@
-from py.test import raises
 
 from graphql.core.type import GraphQLInputObjectType
 
 from graphene.core.schema import Schema
 from graphene.core.types import String
+
 from ..inputobjecttype import InputObjectType
 
 
diff --git a/graphene/core/classtypes/tests/test_interface.py b/graphene/core/classtypes/tests/test_interface.py
index 3a07f172..7994659a 100644
--- a/graphene/core/classtypes/tests/test_interface.py
+++ b/graphene/core/classtypes/tests/test_interface.py
@@ -1,9 +1,9 @@
-from py.test import raises
-
 from graphql.core.type import GraphQLInterfaceType, GraphQLObjectType
+from py.test import raises
 
 from graphene.core.schema import Schema
 from graphene.core.types import String
+
 from ..interface import Interface
 from ..objecttype import ObjectType
 
@@ -38,6 +38,7 @@ def test_interface_inheritance_abstract():
         pass
 
     class ShouldBeInterface(Character):
+
         class Meta:
             abstract = True
 
diff --git a/graphene/core/classtypes/tests/test_mutation.py b/graphene/core/classtypes/tests/test_mutation.py
index ded164ea..ac32585e 100644
--- a/graphene/core/classtypes/tests/test_mutation.py
+++ b/graphene/core/classtypes/tests/test_mutation.py
@@ -1,11 +1,11 @@
-from py.test import raises
 
 from graphql.core.type import GraphQLObjectType
 
 from graphene.core.schema import Schema
 from graphene.core.types import String
-from ..mutation import Mutation
+
 from ...types.argument import ArgumentsGroup
+from ..mutation import Mutation
 
 
 def test_mutation():
diff --git a/graphene/core/classtypes/tests/test_objecttype.py b/graphene/core/classtypes/tests/test_objecttype.py
index 95134bef..93cabc76 100644
--- a/graphene/core/classtypes/tests/test_objecttype.py
+++ b/graphene/core/classtypes/tests/test_objecttype.py
@@ -1,9 +1,9 @@
+from graphql.core.type import GraphQLObjectType
 from py.test import raises
 
-from graphql.core.type import GraphQLObjectType
-
 from graphene.core.schema import Schema
-from graphene.core.types import Int, String
+from graphene.core.types import String
+
 from ..objecttype import ObjectType
 from ..uniontype import UnionType
 
diff --git a/graphene/core/classtypes/tests/test_uniontype.py b/graphene/core/classtypes/tests/test_uniontype.py
index d19615fa..308b2ce0 100644
--- a/graphene/core/classtypes/tests/test_uniontype.py
+++ b/graphene/core/classtypes/tests/test_uniontype.py
@@ -2,6 +2,7 @@ from graphql.core.type import GraphQLUnionType
 
 from graphene.core.schema import Schema
 from graphene.core.types import String
+
 from ..objecttype import ObjectType
 from ..uniontype import UnionType
 
diff --git a/graphene/core/classtypes/uniontype.py b/graphene/core/classtypes/uniontype.py
index c1fb86e3..51d63121 100644
--- a/graphene/core/classtypes/uniontype.py
+++ b/graphene/core/classtypes/uniontype.py
@@ -1,11 +1,11 @@
 import six
-
 from graphql.core.type import GraphQLUnionType
 
-from .base import FieldsOptions, FieldsClassType, FieldsClassTypeMeta
+from .base import FieldsClassType, FieldsClassTypeMeta, FieldsOptions
 
 
 class UnionTypeOptions(FieldsOptions):
+
     def __init__(self, *args, **kwargs):
         super(UnionTypeOptions, self).__init__(*args, **kwargs)
         self.types = []
@@ -19,6 +19,7 @@ class UnionTypeMeta(FieldsClassTypeMeta):
 
 
 class UnionType(six.with_metaclass(UnionTypeMeta, FieldsClassType)):
+
     class Meta:
         abstract = True
 
diff --git a/graphene/core/schema.py b/graphene/core/schema.py
index 48c9cf1e..1b0ce8f9 100644
--- a/graphene/core/schema.py
+++ b/graphene/core/schema.py
@@ -10,8 +10,8 @@ from graphql.core.utils.schema_printer import print_schema
 
 from graphene import signals
 
-from .types.base import BaseType
 from .classtypes.base import ClassType
+from .types.base import BaseType
 
 
 class GraphQLSchema(_GraphQLSchema):
diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py
index 5a429b64..d7643b5e 100644
--- a/graphene/core/types/field.py
+++ b/graphene/core/types/field.py
@@ -6,8 +6,8 @@ from graphql.core.type import GraphQLField, GraphQLInputObjectField
 
 from ...utils import to_camel_case
 from ..classtypes.base import FieldsClassType
-from ..classtypes.mutation import Mutation
 from ..classtypes.inputobjecttype import InputObjectType
+from ..classtypes.mutation import Mutation
 from .argument import ArgumentsGroup, snake_case_args
 from .base import LazyType, MountType, OrderedType
 from .definitions import NonNull
diff --git a/graphene/core/types/objecttype.py b/graphene/core/types/objecttype.py
index 140b291e..d7cf42ab 100644
--- a/graphene/core/types/objecttype.py
+++ b/graphene/core/types/objecttype.py
@@ -1,3 +1,3 @@
-from ..classtypes import ObjectType, Interface, Mutation, InputObjectType
+from ..classtypes import InputObjectType, Interface, Mutation, ObjectType
 
 __all__ = ['ObjectType', 'Interface', 'Mutation', 'InputObjectType']
diff --git a/graphene/relay/types.py b/graphene/relay/types.py
index 4cece989..672042e7 100644
--- a/graphene/relay/types.py
+++ b/graphene/relay/types.py
@@ -1,15 +1,15 @@
 import inspect
-import six
 import warnings
 from collections import Iterable
 from functools import wraps
 
+import six
 from graphql_relay.connection.arrayconnection import connection_from_list
 from graphql_relay.node.node import to_global_id
 
 from ..core.classtypes import InputObjectType, Interface, Mutation, ObjectType
-from ..core.classtypes.mutation import MutationMeta
 from ..core.classtypes.interface import InterfaceMeta
+from ..core.classtypes.mutation import MutationMeta
 from ..core.types import Boolean, Field, List, String
 from ..core.types.argument import ArgumentsGroup
 from ..core.types.definitions import NonNull
@@ -87,6 +87,7 @@ class Connection(ObjectType):
 
 
 class NodeMeta(InterfaceMeta):
+
     def construct_get_node(cls):
         get_node = getattr(cls, 'get_node', None)
         assert get_node, 'get_node classmethod not found in %s Node' % cls
@@ -145,6 +146,7 @@ class MutationInputType(InputObjectType):
 
 
 class RelayMutationMeta(MutationMeta):
+
     def construct(cls, *args, **kwargs):
         cls = super(RelayMutationMeta, cls).construct(*args, **kwargs)
         if not cls._meta.abstract:
diff --git a/graphene/signals.py b/graphene/signals.py
index cdfa3d06..3183eeec 100644
--- a/graphene/signals.py
+++ b/graphene/signals.py
@@ -2,6 +2,7 @@ try:
     from blinker import Signal
 except ImportError:
     class Signal(object):
+
         def send(self, *args, **kwargs):
             pass
 

From df9dd33c747610db9950384c3a17a8b132161e21 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 2 Dec 2015 23:48:40 -0800
Subject: [PATCH 057/173] Fixed Python3 errors

---
 graphene/core/classtypes/objecttype.py | 2 +-
 graphene/core/classtypes/uniontype.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/graphene/core/classtypes/objecttype.py b/graphene/core/classtypes/objecttype.py
index 5658d570..32294d4e 100644
--- a/graphene/core/classtypes/objecttype.py
+++ b/graphene/core/classtypes/objecttype.py
@@ -93,7 +93,7 @@ class ObjectType(six.with_metaclass(ObjectTypeMeta, FieldsClassType)):
         return GraphQLObjectType(
             cls._meta.type_name,
             description=cls._meta.description,
-            interfaces=map(schema.T, cls._meta.interfaces),
+            interfaces=list(map(schema.T, cls._meta.interfaces)),
             fields=partial(cls.fields_internal_types, schema),
             is_type_of=getattr(cls, 'is_type_of', None)
         )
diff --git a/graphene/core/classtypes/uniontype.py b/graphene/core/classtypes/uniontype.py
index 51d63121..62003005 100644
--- a/graphene/core/classtypes/uniontype.py
+++ b/graphene/core/classtypes/uniontype.py
@@ -34,7 +34,7 @@ class UnionType(six.with_metaclass(UnionTypeMeta, FieldsClassType)):
 
         return GraphQLUnionType(
             cls._meta.type_name,
-            types=map(schema.T, cls._meta.types),
+            types=list(map(schema.T, cls._meta.types)),
             resolve_type=cls._resolve_type,
             description=cls._meta.description,
         )

From d251a5244283c718985d766223ad192c09a3549d Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 2 Dec 2015 23:54:45 -0800
Subject: [PATCH 058/173] Fixed Python3 import error

---
 graphene/core/classtypes/mutation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene/core/classtypes/mutation.py b/graphene/core/classtypes/mutation.py
index 63743974..ab443607 100644
--- a/graphene/core/classtypes/mutation.py
+++ b/graphene/core/classtypes/mutation.py
@@ -1,6 +1,5 @@
 import six
 
-from ..types.argument import ArgumentsGroup
 from .objecttype import ObjectType, ObjectTypeMeta
 
 
@@ -19,6 +18,7 @@ class MutationMeta(ObjectTypeMeta):
         return cls
 
     def construct_arguments(cls, items):
+        from ..types.argument import ArgumentsGroup
         return ArgumentsGroup(**items)
 
 

From 6e63e7b42d70f74ee0ff25e803825202935ba35e Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Wed, 2 Dec 2015 20:51:20 +0000
Subject: [PATCH 059/173] Work on Django integration as per #48

Discussion can be found here:
https://github.com/graphql-python/graphene/issues/48

Original gist can be found here:
https://gist.github.com/adamcharnock/ad051b419d4c613d40fe
---
 graphene/contrib/django/__init__.py       |  3 +-
 graphene/contrib/django/converter.py      | 15 +++-
 graphene/contrib/django/fields.py         | 30 ++++++++
 graphene/contrib/django/form_converter.py | 63 ++++++++++++++++
 graphene/contrib/django/resolvers.py      | 90 +++++++++++++++++++++++
 setup.py                                  |  3 +-
 6 files changed, 198 insertions(+), 6 deletions(-)
 create mode 100644 graphene/contrib/django/form_converter.py
 create mode 100644 graphene/contrib/django/resolvers.py

diff --git a/graphene/contrib/django/__init__.py b/graphene/contrib/django/__init__.py
index 11720f9f..793644c0 100644
--- a/graphene/contrib/django/__init__.py
+++ b/graphene/contrib/django/__init__.py
@@ -5,7 +5,8 @@ from graphene.contrib.django.types import (
 )
 from graphene.contrib.django.fields import (
     DjangoConnectionField,
-    DjangoModelField
+    DjangoModelField,
+    DjangoFilterConnectionField
 )
 
 __all__ = ['DjangoObjectType', 'DjangoNode', 'DjangoConnection',
diff --git a/graphene/contrib/django/converter.py b/graphene/contrib/django/converter.py
index 5dc34aba..00c8cfe4 100644
--- a/graphene/contrib/django/converter.py
+++ b/graphene/contrib/django/converter.py
@@ -1,14 +1,17 @@
+from django import forms
 from django.db import models
 from singledispatch import singledispatch
 
 from ...core.types.scalars import ID, Boolean, Float, Int, String
-from .fields import ConnectionOrListField, DjangoModelField
 
 try:
-    UUIDField = models.UUIDField
+    UUIDModelField = models.UUIDField
+    UUIDFormField = forms.UUIDField
 except AttributeError:
     # Improved compatibility for Django 1.6
-    class UUIDField(object):
+    class UUIDModelField(object):
+        pass
+    class UUIDFormField(object):
         pass
 
 
@@ -25,7 +28,7 @@ def convert_django_field(field):
 @convert_django_field.register(models.EmailField)
 @convert_django_field.register(models.SlugField)
 @convert_django_field.register(models.URLField)
-@convert_django_field.register(UUIDField)
+@convert_django_field.register(UUIDModelField)
 def convert_field_to_string(field):
     return String(description=field.help_text)
 
@@ -63,6 +66,7 @@ def convert_field_to_float(field):
 @convert_django_field.register(models.ManyToManyField)
 @convert_django_field.register(models.ManyToOneRel)
 def convert_field_to_list_or_connection(field):
+    from .fields import DjangoModelField, ConnectionOrListField
     model_field = DjangoModelField(field.related_model)
     return ConnectionOrListField(model_field)
 
@@ -70,4 +74,7 @@ def convert_field_to_list_or_connection(field):
 @convert_django_field.register(models.OneToOneField)
 @convert_django_field.register(models.ForeignKey)
 def convert_field_to_djangomodel(field):
+    from .fields import DjangoModelField
     return DjangoModelField(field.related_model, description=field.help_text)
+
+
diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index 7b990b86..87ea4b6b 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -1,11 +1,17 @@
 import warnings
 
+import six
+
+
 from ...core.exceptions import SkipField
 from ...core.fields import Field
+from ...core.types import Argument, String
 from ...core.types.base import FieldType
 from ...core.types.definitions import List
 from ...relay import ConnectionField
 from ...relay.utils import is_node
+from .form_converter import convert_form_field
+from .resolvers import FilterConnectionResolver
 from .utils import get_type_for_model
 
 
@@ -58,3 +64,27 @@ class DjangoModelField(FieldType):
 
     def get_object_type(self, schema):
         return get_type_for_model(schema, self.model)
+
+
+class DjangoFilterConnectionField(DjangoConnectionField):
+
+    def __init__(self, type, filterset_class, resolver=None, on=None, *args, **kwargs):
+        if not resolver:
+            resolver = FilterConnectionResolver(type, on, filterset_class)
+
+        kwargs.setdefault('args', {})
+        kwargs['args'].update(**self.get_filtering_args(type, filterset_class))
+        super(DjangoFilterConnectionField, self).__init__(type, resolver, *args, **kwargs)
+
+    def get_filtering_args(self, type, filterset_class):
+        args = {}
+        for name, filter_field in six.iteritems(filterset_class.base_filters):
+            field_type = Argument(convert_form_field(filter_field.field))
+            # Is this correct? I don't quite grok the 'parent' system yet
+            field_type.mount(type)
+            args[name] = field_type
+
+        # Also add the 'order_by' field
+        args[filterset_class.order_by_field] = Argument(String)
+        return args
+
diff --git a/graphene/contrib/django/form_converter.py b/graphene/contrib/django/form_converter.py
new file mode 100644
index 00000000..eb321268
--- /dev/null
+++ b/graphene/contrib/django/form_converter.py
@@ -0,0 +1,63 @@
+from django import forms
+from django.forms.fields import BaseTemporalField
+from singledispatch import singledispatch
+
+from graphene import String, Int, Boolean, Float, ID
+from .converter import UUIDFormField
+
+
+@singledispatch
+def convert_form_field(field):
+    raise Exception(
+        "Don't know how to convert the Django form field %s (%s) "
+        "to Graphene type" %
+        (field, field.__class__)
+    )
+
+
+@convert_form_field.register(BaseTemporalField)
+@convert_form_field.register(forms.CharField)
+@convert_form_field.register(forms.EmailField)
+@convert_form_field.register(forms.SlugField)
+@convert_form_field.register(forms.URLField)
+@convert_form_field.register(forms.ChoiceField)
+@convert_form_field.register(forms.Field)
+@convert_form_field.register(UUIDFormField)
+def convert_form_field_to_string(field):
+    return String(description=field.help_text)
+
+
+@convert_form_field.register(forms.IntegerField)
+@convert_form_field.register(forms.NumberInput)
+def convert_form_field_to_int(field):
+    return Int(description=field.help_text)
+
+
+@convert_form_field.register(forms.BooleanField)
+@convert_form_field.register(forms.NullBooleanField)
+def convert_form_field_to_boolean(field):
+    return Boolean(description=field.help_text, required=True)
+
+
+@convert_form_field.register(forms.NullBooleanField)
+def convert_form_field_to_nullboolean(field):
+    return Boolean(description=field.help_text)
+
+
+@convert_form_field.register(forms.DecimalField)
+@convert_form_field.register(forms.FloatField)
+def convert_form_field_to_float(field):
+    return Float(description=field.help_text)
+
+
+@convert_form_field.register(forms.ModelMultipleChoiceField)
+def convert_form_field_to_list_or_connection(field):
+    from .fields import DjangoModelField, ConnectionOrListField
+    model_field = DjangoModelField(field.related_model)
+    return ConnectionOrListField(model_field)
+
+
+@convert_form_field.register(forms.ModelChoiceField)
+def convert_form_field_to_djangomodel(field):
+    return ID()
+    # return DjangoModelField(field.queryset.model, description=field.help_text)
diff --git a/graphene/contrib/django/resolvers.py b/graphene/contrib/django/resolvers.py
new file mode 100644
index 00000000..21408b32
--- /dev/null
+++ b/graphene/contrib/django/resolvers.py
@@ -0,0 +1,90 @@
+from django.core.exceptions import ImproperlyConfigured
+from django_filters.filterset import filterset_factory
+
+
+class BaseQuerySetConnectionResolver(object):
+
+    def __init__(self, node, on=None):
+        self.node = node
+        self.model = node._meta.model
+        # The name of the field on the model which contains the
+        # manager upon which to perform the query. Optional.
+        # If omitted the model's default manager will be used.
+        self.on = on
+
+    def __call__(self, inst, args, info):
+        self.inst = inst
+        self.args = args
+        self.info = info
+        return self.make_query()
+
+    def get_manager(self):
+        if self.on:
+            return getattr(self.inst, self.on)
+        else:
+            return self.model._default_manager
+
+    def make_query(self):
+        raise NotImplemented()
+
+
+class SimpleQuerySetConnectionResolver(BaseQuerySetConnectionResolver):
+    # Simple querying without using django-filter (ported from previous gist)
+
+    def make_query(self):
+        filter_kwargs = self.get_filter_kwargs()
+        query = self.get_manager().filter(**filter_kwargs)
+        order = self.get_order()
+        if order:
+            query = query.order_by(order)
+        return query
+
+    def get_filter_kwargs(self):
+        ignore = ['first', 'last', 'before', 'after', 'order']
+        return {k: v for k, v in self.args.items() if k not in ignore}
+
+    def get_order(self):
+        return self.args.get('order', None)
+
+
+class FilterConnectionResolver(BaseQuerySetConnectionResolver):
+    # Querying using django-filter
+
+    def __init__(self, node, on=None, filterset_class=None):
+        self.filterset_class = filterset_class
+        super(FilterConnectionResolver, self).__init__(node, on)
+
+    def make_query(self):
+        filterset_class = self.get_filterset_class()
+        filterset = self.get_filterset(filterset_class)
+        return filterset.qs
+
+    def get_filterset_class(self):
+        if self.filterset_class:
+            return self.filterset_class
+        elif self.model:
+            return filterset_factory(self.model)
+        else:
+            msg = "'%s' must define 'filterset_class' or 'model'"
+            raise ImproperlyConfigured(msg % self.__class__.__name__)
+
+    def get_filterset(self, filterset_class):
+        kwargs = self.get_filterset_kwargs(filterset_class)
+        return filterset_class(**kwargs)
+
+    def get_filterset_kwargs(self, filterset_class):
+        kwargs = {'data': self.args or None}
+        try:
+            kwargs.update({
+                'queryset': self.get_manager(),
+            })
+        except ImproperlyConfigured:
+            # ignore the error here if the filterset has a model defined
+            # to acquire a queryset from
+            if filterset_class._meta.model is None:
+                msg = ("'%s' does not define a 'model' and the resolver '%s' "
+                       "does not return a valid queryset from 'get_queryset'. "
+                       "You must fix one of them.")
+                args = (filterset_class.__name__, self.__class__.__name__)
+                raise ImproperlyConfigured(msg % args)
+        return kwargs
diff --git a/setup.py b/setup.py
index e8c61433..fda136f1 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,8 @@ setup(
     install_requires=[
         'six>=1.10.0',
         'graphql-core==0.4.9',
-        'graphql-relay==0.3.3'
+        'graphql-relay==0.3.3',
+        'django_filter>=0.10.0',
     ],
     tests_require=[
         'pytest>=2.7.2',

From 377e3f66cd0774644159ef01e2dbc50b476119bf Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Wed, 2 Dec 2015 20:53:17 +0000
Subject: [PATCH 060/173] Adding PyCharm entry to .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index e6447ce7..426bb3fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,6 @@ target/
 /docs/static/playground/lib
 
 /docs/static/playground
+
+# PyCharm
+/.idea

From a5d73ac2113e0bf71a5f705a44dde9b56f9787b1 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Wed, 2 Dec 2015 21:17:13 +0000
Subject: [PATCH 061/173] pep8 fixes

---
 graphene/contrib/django/__init__.py  | 3 ++-
 graphene/contrib/django/converter.py | 3 +--
 graphene/contrib/django/fields.py    | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/graphene/contrib/django/__init__.py b/graphene/contrib/django/__init__.py
index 793644c0..68d54fff 100644
--- a/graphene/contrib/django/__init__.py
+++ b/graphene/contrib/django/__init__.py
@@ -10,4 +10,5 @@ from graphene.contrib.django.fields import (
 )
 
 __all__ = ['DjangoObjectType', 'DjangoNode', 'DjangoConnection',
-           'DjangoConnectionField', 'DjangoModelField']
+           'DjangoConnectionField', 'DjangoModelField',
+           'DjangoFilterConnectionField']
diff --git a/graphene/contrib/django/converter.py b/graphene/contrib/django/converter.py
index 00c8cfe4..cd9fa7ab 100644
--- a/graphene/contrib/django/converter.py
+++ b/graphene/contrib/django/converter.py
@@ -11,6 +11,7 @@ except AttributeError:
     # Improved compatibility for Django 1.6
     class UUIDModelField(object):
         pass
+
     class UUIDFormField(object):
         pass
 
@@ -76,5 +77,3 @@ def convert_field_to_list_or_connection(field):
 def convert_field_to_djangomodel(field):
     from .fields import DjangoModelField
     return DjangoModelField(field.related_model, description=field.help_text)
-
-
diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index 87ea4b6b..41e3bd68 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -87,4 +87,3 @@ class DjangoFilterConnectionField(DjangoConnectionField):
         # Also add the 'order_by' field
         args[filterset_class.order_by_field] = Argument(String)
         return args
-

From 4a087ecb24801aad89f7861768ae3592b4fedf83 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 10:46:43 +0000
Subject: [PATCH 062/173] Adding tests for form field conversion

---
 graphene/contrib/django/form_converter.py     |   4 +-
 .../django/tests/test_form_converter.py       | 106 ++++++++++++++++++
 2 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 graphene/contrib/django/tests/test_form_converter.py

diff --git a/graphene/contrib/django/form_converter.py b/graphene/contrib/django/form_converter.py
index eb321268..10f52608 100644
--- a/graphene/contrib/django/form_converter.py
+++ b/graphene/contrib/django/form_converter.py
@@ -21,6 +21,7 @@ def convert_form_field(field):
 @convert_form_field.register(forms.SlugField)
 @convert_form_field.register(forms.URLField)
 @convert_form_field.register(forms.ChoiceField)
+@convert_form_field.register(forms.RegexField)
 @convert_form_field.register(forms.Field)
 @convert_form_field.register(UUIDFormField)
 def convert_form_field_to_string(field):
@@ -52,8 +53,9 @@ def convert_form_field_to_float(field):
 
 @convert_form_field.register(forms.ModelMultipleChoiceField)
 def convert_form_field_to_list_or_connection(field):
+    # TODO: Consider how filtering on a many-to-many should work
     from .fields import DjangoModelField, ConnectionOrListField
-    model_field = DjangoModelField(field.related_model)
+    model_field = DjangoModelField(field.queryset.model)
     return ConnectionOrListField(model_field)
 
 
diff --git a/graphene/contrib/django/tests/test_form_converter.py b/graphene/contrib/django/tests/test_form_converter.py
new file mode 100644
index 00000000..0ab530b7
--- /dev/null
+++ b/graphene/contrib/django/tests/test_form_converter.py
@@ -0,0 +1,106 @@
+from django import forms
+from py.test import raises
+
+import graphene
+from graphene.contrib.django.form_converter import convert_form_field
+from graphene.contrib.django.fields import (ConnectionOrListField,
+                                            DjangoModelField)
+
+from .models import Reporter
+
+
+def assert_conversion(django_field, graphene_field, *args):
+    field = django_field(*args, help_text='Custom Help Text')
+    graphene_type = convert_form_field(field)
+    assert isinstance(graphene_type, graphene_field)
+    field = graphene_type.as_field()
+    assert field.description == 'Custom Help Text'
+    return field
+
+
+def test_should_unknown_django_field_raise_exception():
+    with raises(Exception) as excinfo:
+        convert_form_field(None)
+    assert 'Don\'t know how to convert the Django form field' in str(excinfo.value)
+
+
+def test_should_date_convert_string():
+    assert_conversion(forms.DateField, graphene.String)
+
+
+def test_should_time_convert_string():
+    assert_conversion(forms.TimeField, graphene.String)
+
+
+def test_should_date_time_convert_string():
+    assert_conversion(forms.DateTimeField, graphene.String)
+
+
+def test_should_char_convert_string():
+    assert_conversion(forms.CharField, graphene.String)
+
+
+def test_should_email_convert_string():
+    assert_conversion(forms.EmailField, graphene.String)
+
+
+def test_should_slug_convert_string():
+    assert_conversion(forms.SlugField, graphene.String)
+
+
+def test_should_url_convert_string():
+    assert_conversion(forms.URLField, graphene.String)
+
+
+def test_should_choice_convert_string():
+    assert_conversion(forms.ChoiceField, graphene.String)
+
+
+def test_should_base_field_convert_string():
+    assert_conversion(forms.Field, graphene.String)
+
+
+def test_should_regex_convert_string():
+    assert_conversion(forms.RegexField, graphene.String, '[0-9]+')
+
+
+def test_should_uuid_convert_string():
+    if hasattr(forms, 'UUIDField'):
+        assert_conversion(forms.UUIDField, graphene.String)
+
+
+def test_should_integer_convert_int():
+    assert_conversion(forms.IntegerField, graphene.Int)
+
+
+def test_should_boolean_convert_boolean():
+    field = assert_conversion(forms.BooleanField, graphene.Boolean)
+    assert field.required is True
+
+
+def test_should_nullboolean_convert_boolean():
+    field = assert_conversion(forms.NullBooleanField, graphene.Boolean)
+    assert field.required is False
+
+
+def test_should_float_convert_float():
+    assert_conversion(forms.FloatField, graphene.Float)
+
+
+def test_should_decimal_convert_float():
+    assert_conversion(forms.DecimalField, graphene.Float)
+
+
+def test_should_multiple_choice_convert_connectionorlist():
+    field = forms.ModelMultipleChoiceField(Reporter.objects.all())
+    graphene_type = convert_form_field(field)
+    assert isinstance(graphene_type, ConnectionOrListField)
+    assert isinstance(graphene_type.type, DjangoModelField)
+    assert graphene_type.type.model == Reporter
+
+
+def test_should_manytoone_convert_connectionorlist():
+    field = forms.ModelChoiceField(Reporter.objects.all())
+    graphene_type = convert_form_field(field)
+    assert isinstance(graphene_type, graphene.ID)
+

From d959cf5a84ce47fb4fd57918fbdebf0d1bb6d853 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 11:09:34 +0000
Subject: [PATCH 063/173] Adding tests for DjangoFilterConnectionField

---
 graphene/contrib/django/tests/filters.py     | 24 ++++++++
 graphene/contrib/django/tests/test_fields.py | 63 ++++++++++++++++++++
 setup.py                                     |  1 +
 3 files changed, 88 insertions(+)
 create mode 100644 graphene/contrib/django/tests/filters.py
 create mode 100644 graphene/contrib/django/tests/test_fields.py

diff --git a/graphene/contrib/django/tests/filters.py b/graphene/contrib/django/tests/filters.py
new file mode 100644
index 00000000..a2cffa5e
--- /dev/null
+++ b/graphene/contrib/django/tests/filters.py
@@ -0,0 +1,24 @@
+import django_filters
+
+from .models import Article, Pet
+
+
+class ArticleFilter(django_filters.FilterSet):
+
+    class Meta:
+        model = Article
+        fields = {
+            'headline': ['exact', 'icontains'],
+            'pub_date': ['gt', 'lt', 'exact'],
+            'reporter': ['exact'],
+        }
+        order_by = True
+
+
+class PetFilter(django_filters.FilterSet):
+
+    class Meta:
+        model = Pet
+        fields = ['name']
+        order_by = False
+
diff --git a/graphene/contrib/django/tests/test_fields.py b/graphene/contrib/django/tests/test_fields.py
new file mode 100644
index 00000000..b765c04c
--- /dev/null
+++ b/graphene/contrib/django/tests/test_fields.py
@@ -0,0 +1,63 @@
+from graphene import Schema
+from graphene.contrib.django import DjangoFilterConnectionField, DjangoNode
+from graphene.contrib.django.tests.filters import ArticleFilter, PetFilter
+from graphene.contrib.django.tests.models import Article, Pet
+
+schema = Schema()
+
+
+@schema.register
+class ArticleNode(DjangoNode):
+
+    class Meta:
+        model = Article
+
+
+@schema.register
+class PetNode(DjangoNode):
+
+    class Meta:
+        model = Pet
+
+
+def assert_arguments(field, *arguments):
+    ignore = ('after', 'before', 'first', 'last', 'o')
+    actual = [
+        name
+        for name in field.arguments.arguments.keys()
+        if name not in ignore and not name.startswith('_')
+    ]
+    assert set(arguments) == set(actual), \
+        'Expected arguments ({}) did not match actual ({])'.format(
+            arguments,
+            actual
+        )
+
+
+def assert_orderable(field):
+    assert 'o' in field.arguments.arguments.keys(), \
+        'Field cannot be ordered'
+
+
+def assert_not_orderable(field):
+    assert 'o' in field.arguments.arguments.keys(), \
+        'Field cannot be ordered'
+
+
+def test_filter_explicit_filterset_arguments():
+    field = DjangoFilterConnectionField(ArticleNode, filterset_class=ArticleFilter)
+    assert_arguments(field,
+                     'headline', 'headlineIcontains',
+                     'pubDate', 'pubDateGt', 'pubDateLt',
+                     'reporter',
+                     )
+
+
+def test_filter_explicit_filterset_orderable():
+    field = DjangoFilterConnectionField(ArticleNode, filterset_class=ArticleFilter)
+    assert_orderable(field)
+
+
+def test_filter_explicit_filterset_not_orderable():
+    field = DjangoFilterConnectionField(PetNode, filterset_class=PetFilter)
+    assert_not_orderable(field)
diff --git a/setup.py b/setup.py
index fda136f1..a7fb389b 100644
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,7 @@ setup(
         'django_filter>=0.10.0',
     ],
     tests_require=[
+        'django-filter>=0.11.0',
         'pytest>=2.7.2',
         'pytest-django',
         'mock',

From 0c7be5c86e85b9a27def1aa0d45104eb3ed8e10c Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 11:30:14 +0000
Subject: [PATCH 064/173] pep8 fixes

---
 graphene/contrib/django/tests/filters.py             | 1 -
 graphene/contrib/django/tests/test_form_converter.py | 1 -
 2 files changed, 2 deletions(-)

diff --git a/graphene/contrib/django/tests/filters.py b/graphene/contrib/django/tests/filters.py
index a2cffa5e..99df2939 100644
--- a/graphene/contrib/django/tests/filters.py
+++ b/graphene/contrib/django/tests/filters.py
@@ -21,4 +21,3 @@ class PetFilter(django_filters.FilterSet):
         model = Pet
         fields = ['name']
         order_by = False
-
diff --git a/graphene/contrib/django/tests/test_form_converter.py b/graphene/contrib/django/tests/test_form_converter.py
index 0ab530b7..451f91ad 100644
--- a/graphene/contrib/django/tests/test_form_converter.py
+++ b/graphene/contrib/django/tests/test_form_converter.py
@@ -103,4 +103,3 @@ def test_should_manytoone_convert_connectionorlist():
     field = forms.ModelChoiceField(Reporter.objects.all())
     graphene_type = convert_form_field(field)
     assert isinstance(graphene_type, graphene.ID)
-

From e270792674e3c016d1de066945b538da86d478c5 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 11:42:08 +0000
Subject: [PATCH 065/173] No need to create a Schema in test_fields.py

---
 graphene/contrib/django/tests/test_fields.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/graphene/contrib/django/tests/test_fields.py b/graphene/contrib/django/tests/test_fields.py
index b765c04c..0305d6f5 100644
--- a/graphene/contrib/django/tests/test_fields.py
+++ b/graphene/contrib/django/tests/test_fields.py
@@ -1,21 +1,14 @@
-from graphene import Schema
 from graphene.contrib.django import DjangoFilterConnectionField, DjangoNode
 from graphene.contrib.django.tests.filters import ArticleFilter, PetFilter
 from graphene.contrib.django.tests.models import Article, Pet
 
-schema = Schema()
 
-
-@schema.register
 class ArticleNode(DjangoNode):
-
     class Meta:
         model = Article
 
 
-@schema.register
 class PetNode(DjangoNode):
-
     class Meta:
         model = Pet
 

From 930f7179d0dd14d9361ac2e7531df586ca4a1d87 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 12:08:22 +0000
Subject: [PATCH 066/173] Adding tests for SimpleQuerySetConnectionResolver

---
 .../contrib/django/tests/test_resolvers.py    | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 graphene/contrib/django/tests/test_resolvers.py

diff --git a/graphene/contrib/django/tests/test_resolvers.py b/graphene/contrib/django/tests/test_resolvers.py
new file mode 100644
index 00000000..b712deed
--- /dev/null
+++ b/graphene/contrib/django/tests/test_resolvers.py
@@ -0,0 +1,53 @@
+from django.db.models import Manager
+from django.db.models.query import QuerySet
+
+from graphene.contrib.django import DjangoNode
+from graphene.contrib.django.resolvers import SimpleQuerySetConnectionResolver
+from graphene.contrib.django.tests.models import Reporter
+
+
+class ReporterNode(DjangoNode):
+    class Meta:
+        model = Reporter
+
+
+def test_simple_resolve():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = SimpleQuerySetConnectionResolver(ReporterNode, on='articles')
+    resolved = resolver(inst=reporter, args={}, info=None)
+    assert isinstance(resolved, QuerySet), 'Did not resolve to a queryset'
+
+
+def test_simple_get_manager_related():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = SimpleQuerySetConnectionResolver(ReporterNode, on='articles')
+    resolver(inst=reporter, args={}, info=None)
+    assert resolver.get_manager().instance == reporter, 'Resolver did not return a RelatedManager'
+
+
+def test_simple_get_manager_all():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = SimpleQuerySetConnectionResolver(ReporterNode)
+    resolver(inst=reporter, args={}, info=None)
+    assert type(resolver.get_manager()) == Manager, 'Resolver did not return a Manager'
+
+
+def test_simple_filter():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = SimpleQuerySetConnectionResolver(ReporterNode)
+    resolved = resolver(inst=reporter, args={
+        'first_name': 'Elmo'
+    }, info=None)
+    assert '"first_name" = Elmo' in str(resolved.query)
+    assert 'ORDER BY' not in str(resolved.query)
+
+
+def test_simple_order():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = SimpleQuerySetConnectionResolver(ReporterNode)
+    resolved = resolver(inst=reporter, args={
+        'order': 'last_name'
+    }, info=None)
+    assert 'WHERE' not in str(resolved.query)
+    assert 'ORDER BY' in str(resolved.query)
+    assert '"last_name" ASC' in str(resolved.query)

From b9f93918c851765d172fdaeb49f19cf2ec59f156 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 12:50:00 +0000
Subject: [PATCH 067/173] Simplifying get_filterset_kwargs() as
 ImproperlyConfigured cannot be raised

---
 graphene/contrib/django/resolvers.py | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/graphene/contrib/django/resolvers.py b/graphene/contrib/django/resolvers.py
index 21408b32..7960106b 100644
--- a/graphene/contrib/django/resolvers.py
+++ b/graphene/contrib/django/resolvers.py
@@ -73,18 +73,8 @@ class FilterConnectionResolver(BaseQuerySetConnectionResolver):
         return filterset_class(**kwargs)
 
     def get_filterset_kwargs(self, filterset_class):
-        kwargs = {'data': self.args or None}
-        try:
-            kwargs.update({
-                'queryset': self.get_manager(),
-            })
-        except ImproperlyConfigured:
-            # ignore the error here if the filterset has a model defined
-            # to acquire a queryset from
-            if filterset_class._meta.model is None:
-                msg = ("'%s' does not define a 'model' and the resolver '%s' "
-                       "does not return a valid queryset from 'get_queryset'. "
-                       "You must fix one of them.")
-                args = (filterset_class.__name__, self.__class__.__name__)
-                raise ImproperlyConfigured(msg % args)
+        kwargs = {
+            'data': self.args or None,
+            'queryset': self.get_manager()
+        }
         return kwargs

From 7bfeb086a40bf10f6240c732a48b0d2aecc2a745 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 12:52:15 +0000
Subject: [PATCH 068/173] Adding filter tests

---
 graphene/contrib/django/tests/filters.py      |  9 ++
 .../contrib/django/tests/test_resolvers.py    | 83 ++++++++++++++++++-
 2 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/graphene/contrib/django/tests/filters.py b/graphene/contrib/django/tests/filters.py
index 99df2939..4100ed77 100644
--- a/graphene/contrib/django/tests/filters.py
+++ b/graphene/contrib/django/tests/filters.py
@@ -1,5 +1,6 @@
 import django_filters
 
+from graphene.contrib.django.tests.models import Reporter
 from .models import Article, Pet
 
 
@@ -15,6 +16,14 @@ class ArticleFilter(django_filters.FilterSet):
         order_by = True
 
 
+class ReporterFilter(django_filters.FilterSet):
+
+    class Meta:
+        model = Reporter
+        fields = ['first_name', 'last_name', 'email', 'pets']
+        order_by = False
+
+
 class PetFilter(django_filters.FilterSet):
 
     class Meta:
diff --git a/graphene/contrib/django/tests/test_resolvers.py b/graphene/contrib/django/tests/test_resolvers.py
index b712deed..9daa55b0 100644
--- a/graphene/contrib/django/tests/test_resolvers.py
+++ b/graphene/contrib/django/tests/test_resolvers.py
@@ -1,9 +1,12 @@
+from django.core.exceptions import ImproperlyConfigured
+from py.test import raises
 from django.db.models import Manager
 from django.db.models.query import QuerySet
 
 from graphene.contrib.django import DjangoNode
-from graphene.contrib.django.resolvers import SimpleQuerySetConnectionResolver
-from graphene.contrib.django.tests.models import Reporter
+from graphene.contrib.django.resolvers import SimpleQuerySetConnectionResolver, FilterConnectionResolver
+from graphene.contrib.django.tests.filters import ReporterFilter, ArticleFilter
+from graphene.contrib.django.tests.models import Reporter, Article
 
 
 class ReporterNode(DjangoNode):
@@ -11,6 +14,11 @@ class ReporterNode(DjangoNode):
         model = Reporter
 
 
+class ArticleNode(DjangoNode):
+    class Meta:
+        model = Article
+
+
 def test_simple_resolve():
     reporter = Reporter(id=1, first_name='Cookie Monster')
     resolver = SimpleQuerySetConnectionResolver(ReporterNode, on='articles')
@@ -51,3 +59,74 @@ def test_simple_order():
     assert 'WHERE' not in str(resolved.query)
     assert 'ORDER BY' in str(resolved.query)
     assert '"last_name" ASC' in str(resolved.query)
+
+
+def test_filter_get_filterset_class_explicit():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = FilterConnectionResolver(ReporterNode,
+                                        filterset_class=ReporterFilter)
+    resolver(inst=reporter, args={}, info=None)
+    assert resolver.get_filterset_class() == ReporterFilter, \
+        'ReporterFilter not returned'
+
+
+def test_filter_get_filterset_class_implicit():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = FilterConnectionResolver(ReporterNode)
+    resolver(inst=reporter, args={}, info=None)
+    assert resolver.get_filterset_class().__name__ == 'ReporterFilterSet'
+
+
+def test_filter_get_filterset_class_error():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = FilterConnectionResolver(ReporterNode)
+    resolver.model = None
+    with raises(ImproperlyConfigured) as excinfo:
+        resolver(inst=reporter, args={}, info=None)
+    assert "must define 'filterset_class' or 'model'" in str(excinfo.value)
+
+
+def test_filter_filter():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = FilterConnectionResolver(ReporterNode,
+                                        filterset_class=ReporterFilter)
+    resolved = resolver(inst=reporter, args={
+        'first_name': 'Elmo'
+    }, info=None)
+    assert '"first_name" = Elmo' in str(resolved.query)
+    assert 'ORDER BY' not in str(resolved.query)
+
+
+def test_filter_filter_contains():
+    article = Article(id=1, headline='Cookie Monster eats fruit')
+    resolver = FilterConnectionResolver(ArticleNode,
+                                        filterset_class=ArticleFilter)
+    resolved = resolver(inst=article, args={
+        'headline__icontains': 'Elmo'
+    }, info=None)
+    assert '"headline" LIKE %Elmo%' in str(resolved.query)
+
+
+def test_filter_order():
+    article = Article(id=1, headline='Cookie Monster eats fruit')
+    resolver = FilterConnectionResolver(ArticleNode,
+                                        filterset_class=ArticleFilter)
+    resolved = resolver(inst=article, args={
+        # TODO: This should be 'order', not 'o'
+        'o': 'headline'
+    }, info=None)
+    assert 'WHERE' not in str(resolved.query)
+    assert 'ORDER BY' in str(resolved.query)
+    assert '"headline" ASC' in str(resolved.query)
+
+
+def test_filter_order_not_available():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = FilterConnectionResolver(ReporterNode,
+                                        filterset_class=ReporterFilter)
+    resolved = resolver(inst=reporter, args={
+        # TODO: This should be 'order', not 'o'
+        'o': 'last_name'
+    }, info=None)
+    assert 'WHERE' not in str(resolved.query)
+    assert 'ORDER BY' not in str(resolved.query)

From 49258827f805fa787d5c397b9f67f2c5a118fec2 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 13:32:43 +0000
Subject: [PATCH 069/173] DjangoFilterConnectionField now accepts fields,
 order_by, and extra_filter_meta

---
 graphene/contrib/django/fields.py            | 28 +++++++++++++--
 graphene/contrib/django/tests/test_fields.py | 36 ++++++++++++++++++++
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index 41e3bd68..973edc17 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -1,7 +1,7 @@
 import warnings
 
 import six
-
+from django_filters import FilterSet
 
 from ...core.exceptions import SkipField
 from ...core.fields import Field
@@ -66,12 +66,36 @@ class DjangoModelField(FieldType):
         return get_type_for_model(schema, self.model)
 
 
+def custom_filterset_factory(model, filter_base_class=FilterSet, **meta):
+    meta.update({
+        'model': model,
+    })
+    meta_class = type(str('Meta'), (object,), meta)
+    filterset = type(str('%sFilterSet' % model._meta.object_name),
+                     (filter_base_class,), {'Meta': meta_class})
+    return filterset
+
+
 class DjangoFilterConnectionField(DjangoConnectionField):
 
-    def __init__(self, type, filterset_class, resolver=None, on=None, *args, **kwargs):
+    def __init__(self, type, filterset_class=None, resolver=None, on=None,
+                 fields=None, order_by=None, extra_filter_meta=None,
+                 *args, **kwargs):
         if not resolver:
             resolver = FilterConnectionResolver(type, on, filterset_class)
 
+        if not filterset_class:
+            # If no filter class is specified then create one given the
+            # information provided
+            meta = dict(
+                model=type._meta.model,
+                fields=fields,
+                order_by=order_by,
+            )
+            if extra_filter_meta:
+                meta.update(extra_filter_meta)
+            filterset_class = custom_filterset_factory(**meta)
+
         kwargs.setdefault('args', {})
         kwargs['args'].update(**self.get_filtering_args(type, filterset_class))
         super(DjangoFilterConnectionField, self).__init__(type, resolver, *args, **kwargs)
diff --git a/graphene/contrib/django/tests/test_fields.py b/graphene/contrib/django/tests/test_fields.py
index 0305d6f5..1797527a 100644
--- a/graphene/contrib/django/tests/test_fields.py
+++ b/graphene/contrib/django/tests/test_fields.py
@@ -46,11 +46,47 @@ def test_filter_explicit_filterset_arguments():
                      )
 
 
+def test_filter_shortcut_filterset_arguments_list():
+    field = DjangoFilterConnectionField(ArticleNode, fields=['pub_date', 'reporter'])
+    assert_arguments(field,
+                     'pubDate',
+                     'reporter',
+                     )
+
+
+def test_filter_shortcut_filterset_arguments_dict():
+    field = DjangoFilterConnectionField(ArticleNode, fields={
+            'headline': ['exact', 'icontains'],
+            'reporter': ['exact'],
+        })
+    assert_arguments(field,
+                     'headline', 'headlineIcontains',
+                     'reporter',
+                     )
+
+
 def test_filter_explicit_filterset_orderable():
     field = DjangoFilterConnectionField(ArticleNode, filterset_class=ArticleFilter)
     assert_orderable(field)
 
 
+def test_filter_shortcut_filterset_orderable_true():
+    field = DjangoFilterConnectionField(ArticleNode, order_by=True)
+    assert_orderable(field)
+
+
+def test_filter_shortcut_filterset_orderable_headline():
+    field = DjangoFilterConnectionField(ArticleNode, order_by=['headline'])
+    assert_orderable(field)
+
+
 def test_filter_explicit_filterset_not_orderable():
     field = DjangoFilterConnectionField(PetNode, filterset_class=PetFilter)
     assert_not_orderable(field)
+
+
+def test_filter_shortcut_filterset_extra_meta():
+    field = DjangoFilterConnectionField(ArticleNode, extra_filter_meta={
+        'ordering': True
+    })
+    assert_orderable(field)

From 463c1f98df4451b81e0103aa5c189917e3f3b1e1 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 13:37:29 +0000
Subject: [PATCH 070/173] Relocating UUID form field import code from
 converter.py to form_converter.py

---
 graphene/contrib/django/converter.py      | 10 +++-------
 graphene/contrib/django/form_converter.py |  8 ++++++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/graphene/contrib/django/converter.py b/graphene/contrib/django/converter.py
index cd9fa7ab..a0a062cf 100644
--- a/graphene/contrib/django/converter.py
+++ b/graphene/contrib/django/converter.py
@@ -5,14 +5,10 @@ from singledispatch import singledispatch
 from ...core.types.scalars import ID, Boolean, Float, Int, String
 
 try:
-    UUIDModelField = models.UUIDField
-    UUIDFormField = forms.UUIDField
+    UUIDField = models.UUIDField
 except AttributeError:
     # Improved compatibility for Django 1.6
-    class UUIDModelField(object):
-        pass
-
-    class UUIDFormField(object):
+    class UUIDField(object):
         pass
 
 
@@ -29,7 +25,7 @@ def convert_django_field(field):
 @convert_django_field.register(models.EmailField)
 @convert_django_field.register(models.SlugField)
 @convert_django_field.register(models.URLField)
-@convert_django_field.register(UUIDModelField)
+@convert_django_field.register(UUIDField)
 def convert_field_to_string(field):
     return String(description=field.help_text)
 
diff --git a/graphene/contrib/django/form_converter.py b/graphene/contrib/django/form_converter.py
index 10f52608..626f77e5 100644
--- a/graphene/contrib/django/form_converter.py
+++ b/graphene/contrib/django/form_converter.py
@@ -3,8 +3,12 @@ from django.forms.fields import BaseTemporalField
 from singledispatch import singledispatch
 
 from graphene import String, Int, Boolean, Float, ID
-from .converter import UUIDFormField
 
+try:
+    UUIDField = forms.UUIDField
+except AttributeError:
+    class UUIDField(object):
+        pass
 
 @singledispatch
 def convert_form_field(field):
@@ -23,7 +27,7 @@ def convert_form_field(field):
 @convert_form_field.register(forms.ChoiceField)
 @convert_form_field.register(forms.RegexField)
 @convert_form_field.register(forms.Field)
-@convert_form_field.register(UUIDFormField)
+@convert_form_field.register(UUIDField)
 def convert_form_field_to_string(field):
     return String(description=field.help_text)
 

From 70cedc046f7ef2ef8f5290ebcf381ea157c770bc Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 17:55:41 +0000
Subject: [PATCH 071/173] Adding support for filtering by global ID

This is supported for AutoFields, OneToOneFields, and ForeignKey.
I have also added the GrapheneFilterSet base class. This provides
customsiations needed for Graphene. However, making developers
tie their FilterSets to Graphene would not be ideal as it would
prevent their use elsewhere. I therefore wrap any FilterSets
provided to Graphene with this additional functionality.

See `setup_filterset()` for how this is done. Such FilterSets
are also created by `custom_filterset_factory()` (in times
when a filterset is implicitly required via the `fields`
or `order_by` params passed to `DjangoFilterConnectionField`.
---
 graphene/contrib/django/converter.py         |  1 -
 graphene/contrib/django/fields.py            | 20 ++----
 graphene/contrib/django/filterset.py         | 71 ++++++++++++++++++++
 graphene/contrib/django/form_converter.py    |  1 +
 graphene/contrib/django/forms.py             | 30 +++++++++
 graphene/contrib/django/tests/test_fields.py | 39 ++++++++++-
 graphene/contrib/django/tests/test_forms.py  | 36 ++++++++++
 7 files changed, 181 insertions(+), 17 deletions(-)
 create mode 100644 graphene/contrib/django/filterset.py
 create mode 100644 graphene/contrib/django/forms.py
 create mode 100644 graphene/contrib/django/tests/test_forms.py

diff --git a/graphene/contrib/django/converter.py b/graphene/contrib/django/converter.py
index a0a062cf..255ec8a5 100644
--- a/graphene/contrib/django/converter.py
+++ b/graphene/contrib/django/converter.py
@@ -1,4 +1,3 @@
-from django import forms
 from django.db import models
 from singledispatch import singledispatch
 
diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index 973edc17..77785dae 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -1,8 +1,8 @@
 import warnings
 
 import six
-from django_filters import FilterSet
 
+from graphene.contrib.django.filterset import setup_filterset
 from ...core.exceptions import SkipField
 from ...core.fields import Field
 from ...core.types import Argument, String
@@ -13,6 +13,7 @@ from ...relay.utils import is_node
 from .form_converter import convert_form_field
 from .resolvers import FilterConnectionResolver
 from .utils import get_type_for_model
+from .filterset import custom_filterset_factory
 
 
 class DjangoConnectionField(ConnectionField):
@@ -66,23 +67,11 @@ class DjangoModelField(FieldType):
         return get_type_for_model(schema, self.model)
 
 
-def custom_filterset_factory(model, filter_base_class=FilterSet, **meta):
-    meta.update({
-        'model': model,
-    })
-    meta_class = type(str('Meta'), (object,), meta)
-    filterset = type(str('%sFilterSet' % model._meta.object_name),
-                     (filter_base_class,), {'Meta': meta_class})
-    return filterset
-
-
 class DjangoFilterConnectionField(DjangoConnectionField):
 
     def __init__(self, type, filterset_class=None, resolver=None, on=None,
                  fields=None, order_by=None, extra_filter_meta=None,
                  *args, **kwargs):
-        if not resolver:
-            resolver = FilterConnectionResolver(type, on, filterset_class)
 
         if not filterset_class:
             # If no filter class is specified then create one given the
@@ -95,6 +84,11 @@ class DjangoFilterConnectionField(DjangoConnectionField):
             if extra_filter_meta:
                 meta.update(extra_filter_meta)
             filterset_class = custom_filterset_factory(**meta)
+        else:
+            filterset_class = setup_filterset(filterset_class)
+
+        if not resolver:
+            resolver = FilterConnectionResolver(type, on, filterset_class)
 
         kwargs.setdefault('args', {})
         kwargs['args'].update(**self.get_filtering_args(type, filterset_class))
diff --git a/graphene/contrib/django/filterset.py b/graphene/contrib/django/filterset.py
new file mode 100644
index 00000000..4345c34b
--- /dev/null
+++ b/graphene/contrib/django/filterset.py
@@ -0,0 +1,71 @@
+import six
+from django.db import models
+from django_filters import Filter
+from django_filters.filterset import FilterSetMetaclass, FilterSet
+from graphql_relay.node.node import from_global_id
+
+from graphene.contrib.django.forms import GlobalIDFormField
+
+
+class GlobalIDFilter(Filter):
+    field_class = GlobalIDFormField
+
+    def filter(self, qs, value):
+        gid = from_global_id(value)
+        return super(GlobalIDFilter, self).filter(qs, gid.id)
+
+
+GRAPHENE_FILTER_SET_OVERRIDES = {
+    models.AutoField: {
+        'filter_class': GlobalIDFilter,
+    },
+    models.OneToOneField: {
+        'filter_class': GlobalIDFilter,
+    },
+    models.ForeignKey: {
+        'filter_class': GlobalIDFilter,
+    }
+    # TODO: Support ManyToManyFields. GlobalIDFilterList?
+}
+
+
+class GrapheneFilterSetMetaclass(FilterSetMetaclass):
+    def __new__(cls, name, bases, attrs):
+        new_class = super(GrapheneFilterSetMetaclass, cls).__new__(cls, name, bases, attrs)
+        # Customise the filter_overrides for Graphene
+        for k, v in GRAPHENE_FILTER_SET_OVERRIDES.items():
+            new_class.filter_overrides.setdefault(k, v)
+        return new_class
+
+
+class GrapheneFilterSet(six.with_metaclass(GrapheneFilterSetMetaclass, FilterSet)):
+    """ Base class for FilterSets used by Graphene
+
+    You shouldn't usually need to use this class. The
+    DjangoFilterConnectionField will wrap FilterSets with this class as
+    necessary
+    """
+    pass
+
+
+def setup_filterset(filterset_class):
+    """ Wrap a provided filterset in Graphene-specific functionality
+    """
+    return type(
+        'Graphene{}'.format(filterset_class.__name__),
+        (six.with_metaclass(GrapheneFilterSetMetaclass, filterset_class),),
+        {},
+    )
+
+
+def custom_filterset_factory(model, filterset_base_class=GrapheneFilterSet,
+                             **meta):
+    """ Create a filterset for the given model using the provided meta data
+    """
+    meta.update({
+        'model': model,
+    })
+    meta_class = type(str('Meta'), (object,), meta)
+    filterset = type(str('%sFilterSet' % model._meta.object_name),
+                     (filterset_base_class,), {'Meta': meta_class})
+    return filterset
diff --git a/graphene/contrib/django/form_converter.py b/graphene/contrib/django/form_converter.py
index 626f77e5..e48c3be9 100644
--- a/graphene/contrib/django/form_converter.py
+++ b/graphene/contrib/django/form_converter.py
@@ -10,6 +10,7 @@ except AttributeError:
     class UUIDField(object):
         pass
 
+
 @singledispatch
 def convert_form_field(field):
     raise Exception(
diff --git a/graphene/contrib/django/forms.py b/graphene/contrib/django/forms.py
new file mode 100644
index 00000000..aed9359f
--- /dev/null
+++ b/graphene/contrib/django/forms.py
@@ -0,0 +1,30 @@
+import binascii
+
+from django.core.exceptions import ValidationError
+from django.forms import Field, IntegerField, CharField
+from django.utils.translation import ugettext_lazy as _
+
+from graphql_relay import from_global_id
+
+
+class GlobalIDFormField(Field):
+    default_error_messages = {
+        'invalid': _('Invalid ID specified.'),
+    }
+
+    def clean(self, value):
+        if not value and not self.required:
+            return None
+
+        try:
+            gid = from_global_id(value)
+        except (UnicodeDecodeError, TypeError, binascii.Error):
+            raise ValidationError(self.error_messages['invalid'])
+
+        try:
+            IntegerField().clean(gid.id)
+            CharField().clean(gid.type)
+        except ValidationError:
+            raise ValidationError(self.error_messages['invalid'])
+
+        return value
diff --git a/graphene/contrib/django/tests/test_fields.py b/graphene/contrib/django/tests/test_fields.py
index 1797527a..d5aeb22a 100644
--- a/graphene/contrib/django/tests/test_fields.py
+++ b/graphene/contrib/django/tests/test_fields.py
@@ -1,4 +1,8 @@
+import django_filters
+
 from graphene.contrib.django import DjangoFilterConnectionField, DjangoNode
+from graphene.contrib.django.filterset import GlobalIDFilter
+from graphene.contrib.django.forms import GlobalIDFormField
 from graphene.contrib.django.tests.filters import ArticleFilter, PetFilter
 from graphene.contrib.django.tests.models import Article, Pet
 
@@ -56,9 +60,9 @@ def test_filter_shortcut_filterset_arguments_list():
 
 def test_filter_shortcut_filterset_arguments_dict():
     field = DjangoFilterConnectionField(ArticleNode, fields={
-            'headline': ['exact', 'icontains'],
-            'reporter': ['exact'],
-        })
+        'headline': ['exact', 'icontains'],
+        'reporter': ['exact'],
+    })
     assert_arguments(field,
                      'headline', 'headlineIcontains',
                      'reporter',
@@ -90,3 +94,32 @@ def test_filter_shortcut_filterset_extra_meta():
         'ordering': True
     })
     assert_orderable(field)
+
+
+def test_global_id_field_implicit():
+    field = DjangoFilterConnectionField(ArticleNode, fields=['id'])
+    filterset_class = field.resolver_fn.filterset_class
+    id_filter = filterset_class.base_filters['id']
+    assert isinstance(id_filter, GlobalIDFilter)
+    assert id_filter.field_class == GlobalIDFormField
+
+
+def test_global_id_field_explicit():
+    class ArticleIdFilter(django_filters.FilterSet):
+        class Meta:
+            model = Article
+            fields = ['id']
+
+    field = DjangoFilterConnectionField(ArticleNode, filterset_class=ArticleIdFilter)
+    filterset_class = field.resolver_fn.filterset_class
+    id_filter = filterset_class.base_filters['id']
+    assert isinstance(id_filter, GlobalIDFilter)
+    assert id_filter.field_class == GlobalIDFormField
+
+
+def test_global_id_field_relation():
+    field = DjangoFilterConnectionField(ArticleNode, fields=['reporter'])
+    filterset_class = field.resolver_fn.filterset_class
+    id_filter = filterset_class.base_filters['reporter']
+    assert isinstance(id_filter, GlobalIDFilter)
+    assert id_filter.field_class == GlobalIDFormField
diff --git a/graphene/contrib/django/tests/test_forms.py b/graphene/contrib/django/tests/test_forms.py
new file mode 100644
index 00000000..c499728a
--- /dev/null
+++ b/graphene/contrib/django/tests/test_forms.py
@@ -0,0 +1,36 @@
+from django.core.exceptions import ValidationError
+from py.test import raises
+
+from graphene.contrib.django.forms import GlobalIDFormField
+
+
+# 'TXlUeXBlOjEwMA==' -> 'MyType', 100
+# 'TXlUeXBlOmFiYw==' -> 'MyType', 'abc'
+
+
+def test_global_id_valid():
+    field = GlobalIDFormField()
+    field.clean('TXlUeXBlOjEwMA==')
+
+
+def test_global_id_invalid():
+    field = GlobalIDFormField()
+    with raises(ValidationError):
+        field.clean('badvalue')
+
+
+def test_global_id_none():
+    field = GlobalIDFormField()
+    with raises(ValidationError):
+        field.clean(None)
+
+
+def test_global_id_none_optional():
+    field = GlobalIDFormField(required=False)
+    field.clean(None)
+
+
+def test_global_id_bad_int():
+    field = GlobalIDFormField()
+    with raises(ValidationError):
+        field.clean('TXlUeXBlOmFiYw==')

From 70024ed0ebb5955873393313b47dcf1c10fd8b5d Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 18:21:28 +0000
Subject: [PATCH 072/173] Fixes for python 2.7 & PyPy

---
 graphene/contrib/django/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene/contrib/django/forms.py b/graphene/contrib/django/forms.py
index aed9359f..b8fc9106 100644
--- a/graphene/contrib/django/forms.py
+++ b/graphene/contrib/django/forms.py
@@ -18,7 +18,7 @@ class GlobalIDFormField(Field):
 
         try:
             gid = from_global_id(value)
-        except (UnicodeDecodeError, TypeError, binascii.Error):
+        except (TypeError, ValueError, UnicodeDecodeError, binascii.Error):
             raise ValidationError(self.error_messages['invalid'])
 
         try:

From 3709f9450b37a7298c0a3658b30ef93a1cb0145f Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 19:22:23 +0000
Subject: [PATCH 073/173] Refactoring filterset creation logic

I have moved it from `DjangoFilterConnectionField` and pushed it
down into `FilterConnectionResolver` where I think it makes
more sense for it to live.

I have also pulled out `get_filtering_args_from_filterset()` as
a utility method.
---
 graphene/contrib/django/fields.py             | 49 +++++--------------
 graphene/contrib/django/resolvers.py          | 37 ++++++++++++--
 graphene/contrib/django/tests/test_fields.py  |  6 +--
 .../contrib/django/tests/test_resolvers.py    |  4 +-
 graphene/contrib/django/utils.py              | 21 ++++++++
 5 files changed, 71 insertions(+), 46 deletions(-)

diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index 77785dae..3c222470 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -1,19 +1,14 @@
 import warnings
 
-import six
-
-from graphene.contrib.django.filterset import setup_filterset
+from graphene.contrib.django.utils import get_filtering_args_from_filterset
+from .resolvers import FilterConnectionResolver
+from .utils import get_type_for_model
 from ...core.exceptions import SkipField
 from ...core.fields import Field
-from ...core.types import Argument, String
 from ...core.types.base import FieldType
 from ...core.types.definitions import List
 from ...relay import ConnectionField
 from ...relay.utils import is_node
-from .form_converter import convert_form_field
-from .resolvers import FilterConnectionResolver
-from .utils import get_type_for_model
-from .filterset import custom_filterset_factory
 
 
 class DjangoConnectionField(ConnectionField):
@@ -69,39 +64,21 @@ class DjangoModelField(FieldType):
 
 class DjangoFilterConnectionField(DjangoConnectionField):
 
-    def __init__(self, type, filterset_class=None, resolver=None, on=None,
-                 fields=None, order_by=None, extra_filter_meta=None,
+    def __init__(self, type, on=None, fields=None, order_by=None,
+                 extra_filter_meta=None, filterset_class=None, resolver=None,
                  *args, **kwargs):
 
-        if not filterset_class:
-            # If no filter class is specified then create one given the
-            # information provided
-            meta = dict(
-                model=type._meta.model,
+        if not resolver:
+            resolver = FilterConnectionResolver(
+                node=type,
+                on=on,
+                filterset_class=filterset_class,
                 fields=fields,
                 order_by=order_by,
+                extra_filter_meta=extra_filter_meta,
             )
-            if extra_filter_meta:
-                meta.update(extra_filter_meta)
-            filterset_class = custom_filterset_factory(**meta)
-        else:
-            filterset_class = setup_filterset(filterset_class)
-
-        if not resolver:
-            resolver = FilterConnectionResolver(type, on, filterset_class)
 
+        filtering_args = get_filtering_args_from_filterset(resolver.get_filterset_class(), type)
         kwargs.setdefault('args', {})
-        kwargs['args'].update(**self.get_filtering_args(type, filterset_class))
+        kwargs['args'].update(**filtering_args)
         super(DjangoFilterConnectionField, self).__init__(type, resolver, *args, **kwargs)
-
-    def get_filtering_args(self, type, filterset_class):
-        args = {}
-        for name, filter_field in six.iteritems(filterset_class.base_filters):
-            field_type = Argument(convert_form_field(filter_field.field))
-            # Is this correct? I don't quite grok the 'parent' system yet
-            field_type.mount(type)
-            args[name] = field_type
-
-        # Also add the 'order_by' field
-        args[filterset_class.order_by_field] = Argument(String)
-        return args
diff --git a/graphene/contrib/django/resolvers.py b/graphene/contrib/django/resolvers.py
index 7960106b..39daecea 100644
--- a/graphene/contrib/django/resolvers.py
+++ b/graphene/contrib/django/resolvers.py
@@ -1,5 +1,6 @@
 from django.core.exceptions import ImproperlyConfigured
-from django_filters.filterset import filterset_factory
+
+from graphene.contrib.django.filterset import setup_filterset, custom_filterset_factory
 
 
 class BaseQuerySetConnectionResolver(object):
@@ -50,8 +51,13 @@ class SimpleQuerySetConnectionResolver(BaseQuerySetConnectionResolver):
 class FilterConnectionResolver(BaseQuerySetConnectionResolver):
     # Querying using django-filter
 
-    def __init__(self, node, on=None, filterset_class=None):
+    def __init__(self, node, on=None, filterset_class=None,
+                 fields=None, order_by=None, extra_filter_meta=None):
         self.filterset_class = filterset_class
+        self.fields = fields
+        self.order_by = order_by
+        self.extra_filter_meta = extra_filter_meta or {}
+        self._filterset_class = None
         super(FilterConnectionResolver, self).__init__(node, on)
 
     def make_query(self):
@@ -60,19 +66,40 @@ class FilterConnectionResolver(BaseQuerySetConnectionResolver):
         return filterset.qs
 
     def get_filterset_class(self):
+        """Get the class to be used as the FilterSet"""
+        if self._filterset_class:
+            return self._filterset_class
+
         if self.filterset_class:
-            return self.filterset_class
+            # If were given a FilterSet class, then set it up and
+            # return it
+            self._filterset_class = setup_filterset(self.filterset_class)
         elif self.model:
-            return filterset_factory(self.model)
+            # If no filter class was specified then create one given the
+            # other information provided
+            meta = dict(
+                model=self.model,
+                fields=self.fields,
+                order_by=self.order_by,
+            )
+            meta.update(self.extra_filter_meta)
+            self._filterset_class = custom_filterset_factory(**meta)
         else:
-            msg = "'%s' must define 'filterset_class' or 'model'"
+            msg = "Neither 'filterset_class' or 'model' available in '%s'. " \
+                  "Either pass in 'filterset_class' or 'model' when " \
+                  "initialising, or extend this class and override " \
+                  "get_filterset() or get_filterset_class()"
             raise ImproperlyConfigured(msg % self.__class__.__name__)
 
+        return self._filterset_class
+
     def get_filterset(self, filterset_class):
+        """Get an instance of the FilterSet"""
         kwargs = self.get_filterset_kwargs(filterset_class)
         return filterset_class(**kwargs)
 
     def get_filterset_kwargs(self, filterset_class):
+        """Get the kwargs to use when initialising the FilterSet class"""
         kwargs = {
             'data': self.args or None,
             'queryset': self.get_manager()
diff --git a/graphene/contrib/django/tests/test_fields.py b/graphene/contrib/django/tests/test_fields.py
index d5aeb22a..3c703796 100644
--- a/graphene/contrib/django/tests/test_fields.py
+++ b/graphene/contrib/django/tests/test_fields.py
@@ -98,7 +98,7 @@ def test_filter_shortcut_filterset_extra_meta():
 
 def test_global_id_field_implicit():
     field = DjangoFilterConnectionField(ArticleNode, fields=['id'])
-    filterset_class = field.resolver_fn.filterset_class
+    filterset_class = field.resolver_fn.get_filterset_class()
     id_filter = filterset_class.base_filters['id']
     assert isinstance(id_filter, GlobalIDFilter)
     assert id_filter.field_class == GlobalIDFormField
@@ -111,7 +111,7 @@ def test_global_id_field_explicit():
             fields = ['id']
 
     field = DjangoFilterConnectionField(ArticleNode, filterset_class=ArticleIdFilter)
-    filterset_class = field.resolver_fn.filterset_class
+    filterset_class = field.resolver_fn.get_filterset_class()
     id_filter = filterset_class.base_filters['id']
     assert isinstance(id_filter, GlobalIDFilter)
     assert id_filter.field_class == GlobalIDFormField
@@ -119,7 +119,7 @@ def test_global_id_field_explicit():
 
 def test_global_id_field_relation():
     field = DjangoFilterConnectionField(ArticleNode, fields=['reporter'])
-    filterset_class = field.resolver_fn.filterset_class
+    filterset_class = field.resolver_fn.get_filterset_class()
     id_filter = filterset_class.base_filters['reporter']
     assert isinstance(id_filter, GlobalIDFilter)
     assert id_filter.field_class == GlobalIDFormField
diff --git a/graphene/contrib/django/tests/test_resolvers.py b/graphene/contrib/django/tests/test_resolvers.py
index 9daa55b0..8f7ab7d6 100644
--- a/graphene/contrib/django/tests/test_resolvers.py
+++ b/graphene/contrib/django/tests/test_resolvers.py
@@ -66,7 +66,7 @@ def test_filter_get_filterset_class_explicit():
     resolver = FilterConnectionResolver(ReporterNode,
                                         filterset_class=ReporterFilter)
     resolver(inst=reporter, args={}, info=None)
-    assert resolver.get_filterset_class() == ReporterFilter, \
+    assert issubclass(resolver.get_filterset_class(), ReporterFilter), \
         'ReporterFilter not returned'
 
 
@@ -83,7 +83,7 @@ def test_filter_get_filterset_class_error():
     resolver.model = None
     with raises(ImproperlyConfigured) as excinfo:
         resolver(inst=reporter, args={}, info=None)
-    assert "must define 'filterset_class' or 'model'" in str(excinfo.value)
+    assert "Neither 'filterset_class' or 'model' available" in str(excinfo.value)
 
 
 def test_filter_filter():
diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index 54c6420c..2b4519fc 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -1,6 +1,10 @@
+import six
 from django.db import models
 from django.db.models.manager import Manager
 
+from graphene import Argument, String
+from graphene.contrib.django.form_converter import convert_form_field
+
 
 def get_type_for_model(schema, model):
     schema = schema
@@ -23,3 +27,20 @@ def maybe_queryset(value):
     if isinstance(value, Manager):
         value = value.get_queryset()
     return value
+
+
+def get_filtering_args_from_filterset(filterset_class, type):
+    """ Inspect a FilterSet and produce the arguments to pass to
+        a Graphene Field. These arguments will be available to
+        filter against in the GraphQL
+    """
+    args = {}
+    for name, filter_field in six.iteritems(filterset_class.base_filters):
+        field_type = Argument(convert_form_field(filter_field.field))
+        # Is this correct? I don't quite grok the 'parent' system yet
+        field_type.mount(type)
+        args[name] = field_type
+
+    # Also add the 'order_by' field
+    args[filterset_class.order_by_field] = Argument(String)
+    return args

From fb45a839257fb6d4effb42de0371c760693c861a Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 20:01:37 +0000
Subject: [PATCH 074/173] Moving django-filter dependent code into
 graphene.contrib.django.filter

Graphene should now run fine without django-filter. Tests will
also run without django-filter. However, I'm leaving it as a
requirement in setup.py's `tests_require` setting as testing
without it is probably not to be encouraged.
---
 graphene/contrib/django/__init__.py           |  6 +-
 graphene/contrib/django/fields.py             | 22 -----
 graphene/contrib/django/filter/__init__.py    |  3 +
 graphene/contrib/django/filter/fields.py      | 25 ++++++
 .../contrib/django/{ => filter}/filterset.py  |  0
 graphene/contrib/django/filter/resolvers.py   | 63 ++++++++++++++
 graphene/contrib/django/resolvers.py          | 62 --------------
 .../contrib/django/tests/filter/__init__.py   |  0
 .../django/tests/{ => filter}/filters.py      |  2 +-
 .../django/tests/{ => filter}/test_fields.py  | 14 +++-
 .../django/tests/filter/test_resolvers.py     | 84 +++++++++++++++++++
 .../contrib/django/tests/test_resolvers.py    | 76 +----------------
 setup.py                                      |  3 +-
 13 files changed, 190 insertions(+), 170 deletions(-)
 create mode 100644 graphene/contrib/django/filter/__init__.py
 create mode 100644 graphene/contrib/django/filter/fields.py
 rename graphene/contrib/django/{ => filter}/filterset.py (100%)
 create mode 100644 graphene/contrib/django/filter/resolvers.py
 create mode 100644 graphene/contrib/django/tests/filter/__init__.py
 rename graphene/contrib/django/tests/{ => filter}/filters.py (91%)
 rename graphene/contrib/django/tests/{ => filter}/test_fields.py (90%)
 create mode 100644 graphene/contrib/django/tests/filter/test_resolvers.py

diff --git a/graphene/contrib/django/__init__.py b/graphene/contrib/django/__init__.py
index 68d54fff..be48bdee 100644
--- a/graphene/contrib/django/__init__.py
+++ b/graphene/contrib/django/__init__.py
@@ -5,10 +5,8 @@ from graphene.contrib.django.types import (
 )
 from graphene.contrib.django.fields import (
     DjangoConnectionField,
-    DjangoModelField,
-    DjangoFilterConnectionField
+    DjangoModelField
 )
 
 __all__ = ['DjangoObjectType', 'DjangoNode', 'DjangoConnection',
-           'DjangoConnectionField', 'DjangoModelField',
-           'DjangoFilterConnectionField']
+           'DjangoModelField']
diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index 3c222470..98f3c327 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -1,7 +1,5 @@
 import warnings
 
-from graphene.contrib.django.utils import get_filtering_args_from_filterset
-from .resolvers import FilterConnectionResolver
 from .utils import get_type_for_model
 from ...core.exceptions import SkipField
 from ...core.fields import Field
@@ -62,23 +60,3 @@ class DjangoModelField(FieldType):
         return get_type_for_model(schema, self.model)
 
 
-class DjangoFilterConnectionField(DjangoConnectionField):
-
-    def __init__(self, type, on=None, fields=None, order_by=None,
-                 extra_filter_meta=None, filterset_class=None, resolver=None,
-                 *args, **kwargs):
-
-        if not resolver:
-            resolver = FilterConnectionResolver(
-                node=type,
-                on=on,
-                filterset_class=filterset_class,
-                fields=fields,
-                order_by=order_by,
-                extra_filter_meta=extra_filter_meta,
-            )
-
-        filtering_args = get_filtering_args_from_filterset(resolver.get_filterset_class(), type)
-        kwargs.setdefault('args', {})
-        kwargs['args'].update(**filtering_args)
-        super(DjangoFilterConnectionField, self).__init__(type, resolver, *args, **kwargs)
diff --git a/graphene/contrib/django/filter/__init__.py b/graphene/contrib/django/filter/__init__.py
new file mode 100644
index 00000000..2e516550
--- /dev/null
+++ b/graphene/contrib/django/filter/__init__.py
@@ -0,0 +1,3 @@
+from .fields import DjangoFilterConnectionField
+from .filterset import GrapheneFilterSet, GlobalIDFilter
+from .resolvers import FilterConnectionResolver
diff --git a/graphene/contrib/django/filter/fields.py b/graphene/contrib/django/filter/fields.py
new file mode 100644
index 00000000..8c402fbe
--- /dev/null
+++ b/graphene/contrib/django/filter/fields.py
@@ -0,0 +1,25 @@
+from graphene.contrib.django import DjangoConnectionField
+from graphene.contrib.django.filter.resolvers import FilterConnectionResolver
+from graphene.contrib.django.utils import get_filtering_args_from_filterset
+
+
+class DjangoFilterConnectionField(DjangoConnectionField):
+
+    def __init__(self, type, on=None, fields=None, order_by=None,
+                 extra_filter_meta=None, filterset_class=None, resolver=None,
+                 *args, **kwargs):
+
+        if not resolver:
+            resolver = FilterConnectionResolver(
+                node=type,
+                on=on,
+                filterset_class=filterset_class,
+                fields=fields,
+                order_by=order_by,
+                extra_filter_meta=extra_filter_meta,
+            )
+
+        filtering_args = get_filtering_args_from_filterset(resolver.get_filterset_class(), type)
+        kwargs.setdefault('args', {})
+        kwargs['args'].update(**filtering_args)
+        super(DjangoFilterConnectionField, self).__init__(type, resolver, *args, **kwargs)
diff --git a/graphene/contrib/django/filterset.py b/graphene/contrib/django/filter/filterset.py
similarity index 100%
rename from graphene/contrib/django/filterset.py
rename to graphene/contrib/django/filter/filterset.py
diff --git a/graphene/contrib/django/filter/resolvers.py b/graphene/contrib/django/filter/resolvers.py
new file mode 100644
index 00000000..5f696a08
--- /dev/null
+++ b/graphene/contrib/django/filter/resolvers.py
@@ -0,0 +1,63 @@
+from django.core.exceptions import ImproperlyConfigured
+
+from graphene.contrib.django.filter.filterset import setup_filterset, custom_filterset_factory
+from graphene.contrib.django.resolvers import BaseQuerySetConnectionResolver
+
+
+class FilterConnectionResolver(BaseQuerySetConnectionResolver):
+    # Querying using django-filter
+
+    def __init__(self, node, on=None, filterset_class=None,
+                 fields=None, order_by=None, extra_filter_meta=None):
+        self.filterset_class = filterset_class
+        self.fields = fields
+        self.order_by = order_by
+        self.extra_filter_meta = extra_filter_meta or {}
+        self._filterset_class = None
+        super(FilterConnectionResolver, self).__init__(node, on)
+
+    def make_query(self):
+        filterset_class = self.get_filterset_class()
+        filterset = self.get_filterset(filterset_class)
+        return filterset.qs
+
+    def get_filterset_class(self):
+        """Get the class to be used as the FilterSet"""
+        if self._filterset_class:
+            return self._filterset_class
+
+        if self.filterset_class:
+            # If were given a FilterSet class, then set it up and
+            # return it
+            self._filterset_class = setup_filterset(self.filterset_class)
+        elif self.model:
+            # If no filter class was specified then create one given the
+            # other information provided
+            meta = dict(
+                model=self.model,
+                fields=self.fields,
+                order_by=self.order_by,
+            )
+            meta.update(self.extra_filter_meta)
+            self._filterset_class = custom_filterset_factory(**meta)
+        else:
+            msg = "Neither 'filterset_class' or 'model' available in '%s'. " \
+                  "Either pass in 'filterset_class' or 'model' when " \
+                  "initialising, or extend this class and override " \
+                  "get_filterset() or get_filterset_class()"
+            raise ImproperlyConfigured(msg % self.__class__.__name__)
+
+        return self._filterset_class
+
+    def get_filterset(self, filterset_class):
+        """Get an instance of the FilterSet"""
+        kwargs = self.get_filterset_kwargs(filterset_class)
+        return filterset_class(**kwargs)
+
+    def get_filterset_kwargs(self, filterset_class):
+        """Get the kwargs to use when initialising the FilterSet class"""
+        kwargs = {
+            'data': self.args or None,
+            'queryset': self.get_manager()
+        }
+        return kwargs
diff --git a/graphene/contrib/django/resolvers.py b/graphene/contrib/django/resolvers.py
index 39daecea..67c99503 100644
--- a/graphene/contrib/django/resolvers.py
+++ b/graphene/contrib/django/resolvers.py
@@ -1,8 +1,3 @@
-from django.core.exceptions import ImproperlyConfigured
-
-from graphene.contrib.django.filterset import setup_filterset, custom_filterset_factory
-
-
 class BaseQuerySetConnectionResolver(object):
 
     def __init__(self, node, on=None):
@@ -48,60 +43,3 @@ class SimpleQuerySetConnectionResolver(BaseQuerySetConnectionResolver):
         return self.args.get('order', None)
 
 
-class FilterConnectionResolver(BaseQuerySetConnectionResolver):
-    # Querying using django-filter
-
-    def __init__(self, node, on=None, filterset_class=None,
-                 fields=None, order_by=None, extra_filter_meta=None):
-        self.filterset_class = filterset_class
-        self.fields = fields
-        self.order_by = order_by
-        self.extra_filter_meta = extra_filter_meta or {}
-        self._filterset_class = None
-        super(FilterConnectionResolver, self).__init__(node, on)
-
-    def make_query(self):
-        filterset_class = self.get_filterset_class()
-        filterset = self.get_filterset(filterset_class)
-        return filterset.qs
-
-    def get_filterset_class(self):
-        """Get the class to be used as the FilterSet"""
-        if self._filterset_class:
-            return self._filterset_class
-
-        if self.filterset_class:
-            # If were given a FilterSet class, then set it up and
-            # return it
-            self._filterset_class = setup_filterset(self.filterset_class)
-        elif self.model:
-            # If no filter class was specified then create one given the
-            # other information provided
-            meta = dict(
-                model=self.model,
-                fields=self.fields,
-                order_by=self.order_by,
-            )
-            meta.update(self.extra_filter_meta)
-            self._filterset_class = custom_filterset_factory(**meta)
-        else:
-            msg = "Neither 'filterset_class' or 'model' available in '%s'. " \
-                  "Either pass in 'filterset_class' or 'model' when " \
-                  "initialising, or extend this class and override " \
-                  "get_filterset() or get_filterset_class()"
-            raise ImproperlyConfigured(msg % self.__class__.__name__)
-
-        return self._filterset_class
-
-    def get_filterset(self, filterset_class):
-        """Get an instance of the FilterSet"""
-        kwargs = self.get_filterset_kwargs(filterset_class)
-        return filterset_class(**kwargs)
-
-    def get_filterset_kwargs(self, filterset_class):
-        """Get the kwargs to use when initialising the FilterSet class"""
-        kwargs = {
-            'data': self.args or None,
-            'queryset': self.get_manager()
-        }
-        return kwargs
diff --git a/graphene/contrib/django/tests/filter/__init__.py b/graphene/contrib/django/tests/filter/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/graphene/contrib/django/tests/filters.py b/graphene/contrib/django/tests/filter/filters.py
similarity index 91%
rename from graphene/contrib/django/tests/filters.py
rename to graphene/contrib/django/tests/filter/filters.py
index 4100ed77..4549a83e 100644
--- a/graphene/contrib/django/tests/filters.py
+++ b/graphene/contrib/django/tests/filter/filters.py
@@ -1,7 +1,7 @@
 import django_filters
 
 from graphene.contrib.django.tests.models import Reporter
-from .models import Article, Pet
+from graphene.contrib.django.tests.models import Article, Pet
 
 
 class ArticleFilter(django_filters.FilterSet):
diff --git a/graphene/contrib/django/tests/test_fields.py b/graphene/contrib/django/tests/filter/test_fields.py
similarity index 90%
rename from graphene/contrib/django/tests/test_fields.py
rename to graphene/contrib/django/tests/filter/test_fields.py
index 3c703796..011c82c0 100644
--- a/graphene/contrib/django/tests/test_fields.py
+++ b/graphene/contrib/django/tests/filter/test_fields.py
@@ -1,9 +1,15 @@
-import django_filters
+import pytest
 
-from graphene.contrib.django import DjangoFilterConnectionField, DjangoNode
-from graphene.contrib.django.filterset import GlobalIDFilter
+try:
+    import django_filters
+except ImportError:
+    pytestmark = pytest.mark.skipif(True, reason='django_filters not installed')
+else:
+    from graphene.contrib.django.filter import GlobalIDFilter, DjangoFilterConnectionField
+    from graphene.contrib.django.tests.filter.filters import ArticleFilter, PetFilter
+
+from graphene.contrib.django import DjangoNode
 from graphene.contrib.django.forms import GlobalIDFormField
-from graphene.contrib.django.tests.filters import ArticleFilter, PetFilter
 from graphene.contrib.django.tests.models import Article, Pet
 
 
diff --git a/graphene/contrib/django/tests/filter/test_resolvers.py b/graphene/contrib/django/tests/filter/test_resolvers.py
new file mode 100644
index 00000000..4419b809
--- /dev/null
+++ b/graphene/contrib/django/tests/filter/test_resolvers.py
@@ -0,0 +1,84 @@
+import pytest
+from django.core.exceptions import ImproperlyConfigured
+
+try:
+    import django_filters
+except ImportError:
+    pytestmark = pytest.mark.skipif(True, reason='django_filters not installed')
+else:
+    from graphene.contrib.django.filter.resolvers import FilterConnectionResolver
+    from graphene.contrib.django.tests.filter.filters import ReporterFilter, ArticleFilter
+
+from graphene.contrib.django.tests.models import Reporter, Article
+from graphene.contrib.django.tests.test_resolvers import ReporterNode, ArticleNode
+
+
+def test_filter_get_filterset_class_explicit():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = FilterConnectionResolver(ReporterNode,
+                                        filterset_class=ReporterFilter)
+    resolver(inst=reporter, args={}, info=None)
+    assert issubclass(resolver.get_filterset_class(), ReporterFilter), \
+        'ReporterFilter not returned'
+
+
+def test_filter_get_filterset_class_implicit():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = FilterConnectionResolver(ReporterNode)
+    resolver(inst=reporter, args={}, info=None)
+    assert resolver.get_filterset_class().__name__ == 'ReporterFilterSet'
+
+
+def test_filter_get_filterset_class_error():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = FilterConnectionResolver(ReporterNode)
+    resolver.model = None
+    with pytest.raises(ImproperlyConfigured) as excinfo:
+        resolver(inst=reporter, args={}, info=None)
+    assert "Neither 'filterset_class' or 'model' available" in str(excinfo.value)
+
+
+def test_filter_filter():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = FilterConnectionResolver(ReporterNode,
+                                        filterset_class=ReporterFilter)
+    resolved = resolver(inst=reporter, args={
+        'first_name': 'Elmo'
+    }, info=None)
+    assert '"first_name" = Elmo' in str(resolved.query)
+    assert 'ORDER BY' not in str(resolved.query)
+
+
+def test_filter_filter_contains():
+    article = Article(id=1, headline='Cookie Monster eats fruit')
+    resolver = FilterConnectionResolver(ArticleNode,
+                                        filterset_class=ArticleFilter)
+    resolved = resolver(inst=article, args={
+        'headline__icontains': 'Elmo'
+    }, info=None)
+    assert '"headline" LIKE %Elmo%' in str(resolved.query)
+
+
+def test_filter_order():
+    article = Article(id=1, headline='Cookie Monster eats fruit')
+    resolver = FilterConnectionResolver(ArticleNode,
+                                        filterset_class=ArticleFilter)
+    resolved = resolver(inst=article, args={
+        # TODO: This should be 'order', not 'o'
+        'o': 'headline'
+    }, info=None)
+    assert 'WHERE' not in str(resolved.query)
+    assert 'ORDER BY' in str(resolved.query)
+    assert '"headline" ASC' in str(resolved.query)
+
+
+def test_filter_order_not_available():
+    reporter = Reporter(id=1, first_name='Cookie Monster')
+    resolver = FilterConnectionResolver(ReporterNode,
+                                        filterset_class=ReporterFilter)
+    resolved = resolver(inst=reporter, args={
+        # TODO: This should be 'order', not 'o'
+        'o': 'last_name'
+    }, info=None)
+    assert 'WHERE' not in str(resolved.query)
+    assert 'ORDER BY' not in str(resolved.query)
diff --git a/graphene/contrib/django/tests/test_resolvers.py b/graphene/contrib/django/tests/test_resolvers.py
index 8f7ab7d6..38d98aba 100644
--- a/graphene/contrib/django/tests/test_resolvers.py
+++ b/graphene/contrib/django/tests/test_resolvers.py
@@ -1,11 +1,8 @@
-from django.core.exceptions import ImproperlyConfigured
-from py.test import raises
 from django.db.models import Manager
 from django.db.models.query import QuerySet
 
 from graphene.contrib.django import DjangoNode
-from graphene.contrib.django.resolvers import SimpleQuerySetConnectionResolver, FilterConnectionResolver
-from graphene.contrib.django.tests.filters import ReporterFilter, ArticleFilter
+from graphene.contrib.django.resolvers import SimpleQuerySetConnectionResolver
 from graphene.contrib.django.tests.models import Reporter, Article
 
 
@@ -59,74 +56,3 @@ def test_simple_order():
     assert 'WHERE' not in str(resolved.query)
     assert 'ORDER BY' in str(resolved.query)
     assert '"last_name" ASC' in str(resolved.query)
-
-
-def test_filter_get_filterset_class_explicit():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = FilterConnectionResolver(ReporterNode,
-                                        filterset_class=ReporterFilter)
-    resolver(inst=reporter, args={}, info=None)
-    assert issubclass(resolver.get_filterset_class(), ReporterFilter), \
-        'ReporterFilter not returned'
-
-
-def test_filter_get_filterset_class_implicit():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = FilterConnectionResolver(ReporterNode)
-    resolver(inst=reporter, args={}, info=None)
-    assert resolver.get_filterset_class().__name__ == 'ReporterFilterSet'
-
-
-def test_filter_get_filterset_class_error():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = FilterConnectionResolver(ReporterNode)
-    resolver.model = None
-    with raises(ImproperlyConfigured) as excinfo:
-        resolver(inst=reporter, args={}, info=None)
-    assert "Neither 'filterset_class' or 'model' available" in str(excinfo.value)
-
-
-def test_filter_filter():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = FilterConnectionResolver(ReporterNode,
-                                        filterset_class=ReporterFilter)
-    resolved = resolver(inst=reporter, args={
-        'first_name': 'Elmo'
-    }, info=None)
-    assert '"first_name" = Elmo' in str(resolved.query)
-    assert 'ORDER BY' not in str(resolved.query)
-
-
-def test_filter_filter_contains():
-    article = Article(id=1, headline='Cookie Monster eats fruit')
-    resolver = FilterConnectionResolver(ArticleNode,
-                                        filterset_class=ArticleFilter)
-    resolved = resolver(inst=article, args={
-        'headline__icontains': 'Elmo'
-    }, info=None)
-    assert '"headline" LIKE %Elmo%' in str(resolved.query)
-
-
-def test_filter_order():
-    article = Article(id=1, headline='Cookie Monster eats fruit')
-    resolver = FilterConnectionResolver(ArticleNode,
-                                        filterset_class=ArticleFilter)
-    resolved = resolver(inst=article, args={
-        # TODO: This should be 'order', not 'o'
-        'o': 'headline'
-    }, info=None)
-    assert 'WHERE' not in str(resolved.query)
-    assert 'ORDER BY' in str(resolved.query)
-    assert '"headline" ASC' in str(resolved.query)
-
-
-def test_filter_order_not_available():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = FilterConnectionResolver(ReporterNode,
-                                        filterset_class=ReporterFilter)
-    resolved = resolver(inst=reporter, args={
-        # TODO: This should be 'order', not 'o'
-        'o': 'last_name'
-    }, info=None)
-    assert 'WHERE' not in str(resolved.query)
-    assert 'ORDER BY' not in str(resolved.query)
diff --git a/setup.py b/setup.py
index a7fb389b..8b2c324c 100644
--- a/setup.py
+++ b/setup.py
@@ -57,10 +57,9 @@ setup(
         'six>=1.10.0',
         'graphql-core==0.4.9',
         'graphql-relay==0.3.3',
-        'django_filter>=0.10.0',
     ],
     tests_require=[
-        'django-filter>=0.11.0',
+        'django-filter>=0.10.0',
         'pytest>=2.7.2',
         'pytest-django',
         'mock',

From 375dfcbcc240558c7c9a2970eadcbff31e5f8573 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 20:48:29 +0000
Subject: [PATCH 075/173] Fixing flake8 errors

---
 graphene/contrib/django/__init__.py                    | 2 +-
 graphene/contrib/django/fields.py                      | 2 --
 graphene/contrib/django/filter/__init__.py             | 3 +++
 graphene/contrib/django/resolvers.py                   | 2 --
 graphene/contrib/django/tests/filter/test_resolvers.py | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/graphene/contrib/django/__init__.py b/graphene/contrib/django/__init__.py
index be48bdee..047fe0a3 100644
--- a/graphene/contrib/django/__init__.py
+++ b/graphene/contrib/django/__init__.py
@@ -9,4 +9,4 @@ from graphene.contrib.django.fields import (
 )
 
 __all__ = ['DjangoObjectType', 'DjangoNode', 'DjangoConnection',
-           'DjangoModelField']
+           'DjangoModelField', 'DjangoConnectionField']
diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index 98f3c327..16568883 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -58,5 +58,3 @@ class DjangoModelField(FieldType):
 
     def get_object_type(self, schema):
         return get_type_for_model(schema, self.model)
-
-
diff --git a/graphene/contrib/django/filter/__init__.py b/graphene/contrib/django/filter/__init__.py
index 2e516550..9df733cd 100644
--- a/graphene/contrib/django/filter/__init__.py
+++ b/graphene/contrib/django/filter/__init__.py
@@ -1,3 +1,6 @@
 from .fields import DjangoFilterConnectionField
 from .filterset import GrapheneFilterSet, GlobalIDFilter
 from .resolvers import FilterConnectionResolver
+
+__all__ = ['DjangoFilterConnectionField', 'GrapheneFilterSet',
+           'GlobalIDFilter', 'FilterConnectionResolver']
diff --git a/graphene/contrib/django/resolvers.py b/graphene/contrib/django/resolvers.py
index 67c99503..0499acc5 100644
--- a/graphene/contrib/django/resolvers.py
+++ b/graphene/contrib/django/resolvers.py
@@ -41,5 +41,3 @@ class SimpleQuerySetConnectionResolver(BaseQuerySetConnectionResolver):
 
     def get_order(self):
         return self.args.get('order', None)
-
-
diff --git a/graphene/contrib/django/tests/filter/test_resolvers.py b/graphene/contrib/django/tests/filter/test_resolvers.py
index 4419b809..78bc77cd 100644
--- a/graphene/contrib/django/tests/filter/test_resolvers.py
+++ b/graphene/contrib/django/tests/filter/test_resolvers.py
@@ -2,7 +2,7 @@ import pytest
 from django.core.exceptions import ImproperlyConfigured
 
 try:
-    import django_filters
+    import django_filters  # noqa
 except ImportError:
     pytestmark = pytest.mark.skipif(True, reason='django_filters not installed')
 else:

From 4f054b364002ec8c2f8a085d4bb8b85ab6c62a41 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 20:53:10 +0000
Subject: [PATCH 076/173] Adding django-filter to .travis.yml

As pip doesn't seem inclined to pickup on tests_require
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ac80f4b0..fba19076 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ before_install:
 install:
 - |
   if [ "$TEST_TYPE" = build ]; then
-    pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django
+    pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django django-filter
     pip install --download-cache $HOME/.cache/pip/ -e .[django]
     python setup.py develop
   elif [ "$TEST_TYPE" = build_website ]; then

From 6e07ef0c3846e2cabe8b448c7786af859f49ab93 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 21:07:44 +0000
Subject: [PATCH 077/173] Ordering parameter now called 'order' rather than 'o'

This can be customsied via the GRAPHENE_ORDER_BY_FIELD setting,
or by extending GrapheneFilterSet.

I'm open to this being called 'order_by'.
---
 graphene/contrib/django/filter/filterset.py   | 19 +++++++++++++++----
 .../django/tests/filter/test_fields.py        | 10 +++++-----
 .../django/tests/filter/test_resolvers.py     |  6 ++----
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/graphene/contrib/django/filter/filterset.py b/graphene/contrib/django/filter/filterset.py
index 4345c34b..430c0eb4 100644
--- a/graphene/contrib/django/filter/filterset.py
+++ b/graphene/contrib/django/filter/filterset.py
@@ -1,4 +1,5 @@
 import six
+from django.conf import settings
 from django.db import models
 from django_filters import Filter
 from django_filters.filterset import FilterSetMetaclass, FilterSet
@@ -15,6 +16,9 @@ class GlobalIDFilter(Filter):
         return super(GlobalIDFilter, self).filter(qs, gid.id)
 
 
+ORDER_BY_FIELD = getattr(settings, 'GRAPHENE_ORDER_BY_FIELD', 'order')
+
+
 GRAPHENE_FILTER_SET_OVERRIDES = {
     models.AutoField: {
         'filter_class': GlobalIDFilter,
@@ -45,7 +49,7 @@ class GrapheneFilterSet(six.with_metaclass(GrapheneFilterSetMetaclass, FilterSet
     DjangoFilterConnectionField will wrap FilterSets with this class as
     necessary
     """
-    pass
+    order_by_field = ORDER_BY_FIELD
 
 
 def setup_filterset(filterset_class):
@@ -54,7 +58,9 @@ def setup_filterset(filterset_class):
     return type(
         'Graphene{}'.format(filterset_class.__name__),
         (six.with_metaclass(GrapheneFilterSetMetaclass, filterset_class),),
-        {},
+        {
+            'order_by_field': ORDER_BY_FIELD
+        },
     )
 
 
@@ -66,6 +72,11 @@ def custom_filterset_factory(model, filterset_base_class=GrapheneFilterSet,
         'model': model,
     })
     meta_class = type(str('Meta'), (object,), meta)
-    filterset = type(str('%sFilterSet' % model._meta.object_name),
-                     (filterset_base_class,), {'Meta': meta_class})
+    filterset = type(
+        str('%sFilterSet' % model._meta.object_name),
+        (filterset_base_class,),
+        {
+            'Meta': meta_class
+        }
+    )
     return filterset
diff --git a/graphene/contrib/django/tests/filter/test_fields.py b/graphene/contrib/django/tests/filter/test_fields.py
index 011c82c0..14170977 100644
--- a/graphene/contrib/django/tests/filter/test_fields.py
+++ b/graphene/contrib/django/tests/filter/test_fields.py
@@ -24,27 +24,27 @@ class PetNode(DjangoNode):
 
 
 def assert_arguments(field, *arguments):
-    ignore = ('after', 'before', 'first', 'last', 'o')
+    ignore = ('after', 'before', 'first', 'last', 'order')
     actual = [
         name
         for name in field.arguments.arguments.keys()
         if name not in ignore and not name.startswith('_')
     ]
     assert set(arguments) == set(actual), \
-        'Expected arguments ({}) did not match actual ({])'.format(
+        'Expected arguments ({}) did not match actual ({})'.format(
             arguments,
             actual
         )
 
 
 def assert_orderable(field):
-    assert 'o' in field.arguments.arguments.keys(), \
+    assert 'order' in field.arguments.arguments.keys(), \
         'Field cannot be ordered'
 
 
 def assert_not_orderable(field):
-    assert 'o' in field.arguments.arguments.keys(), \
-        'Field cannot be ordered'
+    assert 'order' in field.arguments.arguments.keys(), \
+        'Field can be ordered'
 
 
 def test_filter_explicit_filterset_arguments():
diff --git a/graphene/contrib/django/tests/filter/test_resolvers.py b/graphene/contrib/django/tests/filter/test_resolvers.py
index 78bc77cd..af8bfc47 100644
--- a/graphene/contrib/django/tests/filter/test_resolvers.py
+++ b/graphene/contrib/django/tests/filter/test_resolvers.py
@@ -64,8 +64,7 @@ def test_filter_order():
     resolver = FilterConnectionResolver(ArticleNode,
                                         filterset_class=ArticleFilter)
     resolved = resolver(inst=article, args={
-        # TODO: This should be 'order', not 'o'
-        'o': 'headline'
+        'order': 'headline'
     }, info=None)
     assert 'WHERE' not in str(resolved.query)
     assert 'ORDER BY' in str(resolved.query)
@@ -77,8 +76,7 @@ def test_filter_order_not_available():
     resolver = FilterConnectionResolver(ReporterNode,
                                         filterset_class=ReporterFilter)
     resolved = resolver(inst=reporter, args={
-        # TODO: This should be 'order', not 'o'
-        'o': 'last_name'
+        'order': 'last_name'
     }, info=None)
     assert 'WHERE' not in str(resolved.query)
     assert 'ORDER BY' not in str(resolved.query)

From ed8eac9cdfe63be5e34ff9d0d701a47f457c2f09 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 21:16:09 +0000
Subject: [PATCH 078/173] removing stray commented line

---
 graphene/contrib/django/form_converter.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/graphene/contrib/django/form_converter.py b/graphene/contrib/django/form_converter.py
index e48c3be9..7229b968 100644
--- a/graphene/contrib/django/form_converter.py
+++ b/graphene/contrib/django/form_converter.py
@@ -67,4 +67,3 @@ def convert_form_field_to_list_or_connection(field):
 @convert_form_field.register(forms.ModelChoiceField)
 def convert_form_field_to_djangomodel(field):
     return ID()
-    # return DjangoModelField(field.queryset.model, description=field.help_text)

From 64ec0ca94fc576bf56af508ce90cb3330b502c9d Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 23:13:37 +0000
Subject: [PATCH 079/173] Adding support for filtering on to-many fields

---
 graphene/contrib/django/filter/__init__.py    |  5 +-
 graphene/contrib/django/filter/filterset.py   | 43 ++++++++++---
 graphene/contrib/django/form_converter.py     |  9 +--
 graphene/contrib/django/forms.py              | 14 ++++-
 .../django/tests/filter/test_fields.py        | 60 ++++++++++++++++++-
 .../django/tests/test_form_converter.py       |  9 ++-
 6 files changed, 116 insertions(+), 24 deletions(-)

diff --git a/graphene/contrib/django/filter/__init__.py b/graphene/contrib/django/filter/__init__.py
index 9df733cd..21e65b56 100644
--- a/graphene/contrib/django/filter/__init__.py
+++ b/graphene/contrib/django/filter/__init__.py
@@ -1,6 +1,7 @@
 from .fields import DjangoFilterConnectionField
-from .filterset import GrapheneFilterSet, GlobalIDFilter
+from .filterset import GrapheneFilterSet, GlobalIDFilter, GlobalIDMultipleChoiceFilter
 from .resolvers import FilterConnectionResolver
 
 __all__ = ['DjangoFilterConnectionField', 'GrapheneFilterSet',
-           'GlobalIDFilter', 'FilterConnectionResolver']
+           'GlobalIDFilter', 'GlobalIDMultipleChoiceFilter',
+           'FilterConnectionResolver']
diff --git a/graphene/contrib/django/filter/filterset.py b/graphene/contrib/django/filter/filterset.py
index 430c0eb4..50fe288c 100644
--- a/graphene/contrib/django/filter/filterset.py
+++ b/graphene/contrib/django/filter/filterset.py
@@ -1,11 +1,12 @@
 import six
 from django.conf import settings
 from django.db import models
-from django_filters import Filter
+from django.utils.text import capfirst
+from django_filters import Filter, MultipleChoiceFilter
 from django_filters.filterset import FilterSetMetaclass, FilterSet
 from graphql_relay.node.node import from_global_id
 
-from graphene.contrib.django.forms import GlobalIDFormField
+from graphene.contrib.django.forms import GlobalIDFormField, GlobalIDMultipleChoiceField
 
 
 class GlobalIDFilter(Filter):
@@ -16,6 +17,14 @@ class GlobalIDFilter(Filter):
         return super(GlobalIDFilter, self).filter(qs, gid.id)
 
 
+class GlobalIDMultipleChoiceFilter(MultipleChoiceFilter):
+    field_class = GlobalIDMultipleChoiceField
+
+    def filter(self, qs, value):
+        gids = [from_global_id(v).id for v in value]
+        return super(GlobalIDMultipleChoiceFilter, self).filter(qs, gids)
+
+
 ORDER_BY_FIELD = getattr(settings, 'GRAPHENE_ORDER_BY_FIELD', 'order')
 
 
@@ -28,8 +37,10 @@ GRAPHENE_FILTER_SET_OVERRIDES = {
     },
     models.ForeignKey: {
         'filter_class': GlobalIDFilter,
+    },
+    models.ManyToManyField: {
+        'filter_class': GlobalIDMultipleChoiceFilter,
     }
-    # TODO: Support ManyToManyFields. GlobalIDFilterList?
 }
 
 
@@ -42,14 +53,30 @@ class GrapheneFilterSetMetaclass(FilterSetMetaclass):
         return new_class
 
 
-class GrapheneFilterSet(six.with_metaclass(GrapheneFilterSetMetaclass, FilterSet)):
+class GrapheneFilterSetMixin(object):
+    order_by_field = ORDER_BY_FIELD
+
+    @classmethod
+    def filter_for_reverse_field(cls, f, name):
+        rel = f.field.rel
+        default = {
+            'name': name,
+            'label': capfirst(rel.related_name)
+        }
+        if rel.multiple:
+            return GlobalIDMultipleChoiceFilter(**default)
+        else:
+            return GlobalIDFilter(**default)
+
+
+class GrapheneFilterSet(six.with_metaclass(GrapheneFilterSetMetaclass, GrapheneFilterSetMixin, FilterSet)):
     """ Base class for FilterSets used by Graphene
 
     You shouldn't usually need to use this class. The
     DjangoFilterConnectionField will wrap FilterSets with this class as
     necessary
     """
-    order_by_field = ORDER_BY_FIELD
+    pass
 
 
 def setup_filterset(filterset_class):
@@ -57,10 +84,8 @@ def setup_filterset(filterset_class):
     """
     return type(
         'Graphene{}'.format(filterset_class.__name__),
-        (six.with_metaclass(GrapheneFilterSetMetaclass, filterset_class),),
-        {
-            'order_by_field': ORDER_BY_FIELD
-        },
+        (six.with_metaclass(GrapheneFilterSetMetaclass, GrapheneFilterSetMixin, filterset_class),),
+        {},
     )
 
 
diff --git a/graphene/contrib/django/form_converter.py b/graphene/contrib/django/form_converter.py
index 7229b968..f5acf202 100644
--- a/graphene/contrib/django/form_converter.py
+++ b/graphene/contrib/django/form_converter.py
@@ -3,6 +3,8 @@ from django.forms.fields import BaseTemporalField
 from singledispatch import singledispatch
 
 from graphene import String, Int, Boolean, Float, ID
+from graphene.contrib.django.forms import GlobalIDFormField, GlobalIDMultipleChoiceField
+from graphene.core.types.definitions import List
 
 try:
     UUIDField = forms.UUIDField
@@ -57,13 +59,12 @@ def convert_form_field_to_float(field):
 
 
 @convert_form_field.register(forms.ModelMultipleChoiceField)
+@convert_form_field.register(GlobalIDMultipleChoiceField)
 def convert_form_field_to_list_or_connection(field):
-    # TODO: Consider how filtering on a many-to-many should work
-    from .fields import DjangoModelField, ConnectionOrListField
-    model_field = DjangoModelField(field.queryset.model)
-    return ConnectionOrListField(model_field)
+    return List(ID())
 
 
 @convert_form_field.register(forms.ModelChoiceField)
+@convert_form_field.register(GlobalIDFormField)
 def convert_form_field_to_djangomodel(field):
     return ID()
diff --git a/graphene/contrib/django/forms.py b/graphene/contrib/django/forms.py
index b8fc9106..f971897b 100644
--- a/graphene/contrib/django/forms.py
+++ b/graphene/contrib/django/forms.py
@@ -1,7 +1,7 @@
 import binascii
 
 from django.core.exceptions import ValidationError
-from django.forms import Field, IntegerField, CharField
+from django.forms import Field, IntegerField, CharField, MultipleChoiceField
 from django.utils.translation import ugettext_lazy as _
 
 from graphql_relay import from_global_id
@@ -28,3 +28,15 @@ class GlobalIDFormField(Field):
             raise ValidationError(self.error_messages['invalid'])
 
         return value
+
+
+class GlobalIDMultipleChoiceField(MultipleChoiceField):
+    default_error_messages = {
+        'invalid_choice': _('One of the specified IDs was invalid (%(value)s).'),
+        'invalid_list': _('Enter a list of values.'),
+    }
+
+    def valid_value(self, value):
+        # Clean will raise a validation error if there is a problem
+        GlobalIDFormField().clean(value)
+        return True
diff --git a/graphene/contrib/django/tests/filter/test_fields.py b/graphene/contrib/django/tests/filter/test_fields.py
index 14170977..fc99a273 100644
--- a/graphene/contrib/django/tests/filter/test_fields.py
+++ b/graphene/contrib/django/tests/filter/test_fields.py
@@ -5,12 +5,13 @@ try:
 except ImportError:
     pytestmark = pytest.mark.skipif(True, reason='django_filters not installed')
 else:
-    from graphene.contrib.django.filter import GlobalIDFilter, DjangoFilterConnectionField
+    from graphene.contrib.django.filter import (GlobalIDFilter, DjangoFilterConnectionField,
+                                                GlobalIDMultipleChoiceFilter)
     from graphene.contrib.django.tests.filter.filters import ArticleFilter, PetFilter
 
 from graphene.contrib.django import DjangoNode
-from graphene.contrib.django.forms import GlobalIDFormField
-from graphene.contrib.django.tests.models import Article, Pet
+from graphene.contrib.django.forms import GlobalIDFormField, GlobalIDMultipleChoiceField
+from graphene.contrib.django.tests.models import Article, Pet, Reporter
 
 
 class ArticleNode(DjangoNode):
@@ -18,6 +19,11 @@ class ArticleNode(DjangoNode):
         model = Article
 
 
+class ReporterNode(DjangoNode):
+    class Meta:
+        model = Reporter
+
+
 class PetNode(DjangoNode):
     class Meta:
         model = Pet
@@ -129,3 +135,51 @@ def test_global_id_field_relation():
     id_filter = filterset_class.base_filters['reporter']
     assert isinstance(id_filter, GlobalIDFilter)
     assert id_filter.field_class == GlobalIDFormField
+
+
+def test_global_id_multiple_field_implicit():
+    field = DjangoFilterConnectionField(ReporterNode, fields=['pets'])
+    filterset_class = field.resolver_fn.get_filterset_class()
+    multiple_filter = filterset_class.base_filters['pets']
+    assert isinstance(multiple_filter, GlobalIDMultipleChoiceFilter)
+    assert multiple_filter.field_class == GlobalIDMultipleChoiceField
+
+
+def test_global_id_multiple_field_explicit():
+    class ReporterPetsFilter(django_filters.FilterSet):
+        class Meta:
+            model = Reporter
+            fields = ['pets']
+
+    field = DjangoFilterConnectionField(ReporterNode, filterset_class=ReporterPetsFilter)
+    filterset_class = field.resolver_fn.get_filterset_class()
+    multiple_filter = filterset_class.base_filters['pets']
+    assert isinstance(multiple_filter, GlobalIDMultipleChoiceFilter)
+    assert multiple_filter.field_class == GlobalIDMultipleChoiceField
+
+
+@pytest.mark.skipif(True, reason="Trying to test GrapheneFilterSetMixin.filter_for_reverse_field"
+                                 "but django has not loaded the models, so the test fails as "
+                                 "reverse relations are not ready yet")
+def test_global_id_multiple_field_implicit_reverse():
+    field = DjangoFilterConnectionField(ReporterNode, fields=['articles'])
+    filterset_class = field.resolver_fn.get_filterset_class()
+    multiple_filter = filterset_class.base_filters['articles']
+    assert isinstance(multiple_filter, GlobalIDMultipleChoiceFilter)
+    assert multiple_filter.field_class == GlobalIDMultipleChoiceField
+
+
+@pytest.mark.skipif(True, reason="Trying to test GrapheneFilterSetMixin.filter_for_reverse_field"
+                                 "but django has not loaded the models, so the test fails as "
+                                 "reverse relations are not ready yet")
+def test_global_id_multiple_field_explicit_reverse():
+    class ReporterPetsFilter(django_filters.FilterSet):
+        class Meta:
+            model = Reporter
+            fields = ['articles']
+
+    field = DjangoFilterConnectionField(ReporterNode, filterset_class=ReporterPetsFilter)
+    filterset_class = field.resolver_fn.get_filterset_class()
+    multiple_filter = filterset_class.base_filters['articles']
+    assert isinstance(multiple_filter, GlobalIDMultipleChoiceFilter)
+    assert multiple_filter.field_class == GlobalIDMultipleChoiceField
diff --git a/graphene/contrib/django/tests/test_form_converter.py b/graphene/contrib/django/tests/test_form_converter.py
index 451f91ad..7492fc51 100644
--- a/graphene/contrib/django/tests/test_form_converter.py
+++ b/graphene/contrib/django/tests/test_form_converter.py
@@ -1,10 +1,10 @@
 from django import forms
+from graphene.core.types import List, ID
 from py.test import raises
 
 import graphene
 from graphene.contrib.django.form_converter import convert_form_field
-from graphene.contrib.django.fields import (ConnectionOrListField,
-                                            DjangoModelField)
+
 
 from .models import Reporter
 
@@ -94,9 +94,8 @@ def test_should_decimal_convert_float():
 def test_should_multiple_choice_convert_connectionorlist():
     field = forms.ModelMultipleChoiceField(Reporter.objects.all())
     graphene_type = convert_form_field(field)
-    assert isinstance(graphene_type, ConnectionOrListField)
-    assert isinstance(graphene_type.type, DjangoModelField)
-    assert graphene_type.type.model == Reporter
+    assert isinstance(graphene_type, List)
+    assert isinstance(graphene_type.of_type, ID)
 
 
 def test_should_manytoone_convert_connectionorlist():

From be6b2bf2900e9de13b9dcd46d6f31c78013d451f Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 01:57:43 +0000
Subject: [PATCH 080/173] Adding comments to filter_for_reverse_field()

---
 graphene/contrib/django/filter/filterset.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/graphene/contrib/django/filter/filterset.py b/graphene/contrib/django/filter/filterset.py
index 50fe288c..c71478ee 100644
--- a/graphene/contrib/django/filter/filterset.py
+++ b/graphene/contrib/django/filter/filterset.py
@@ -58,14 +58,22 @@ class GrapheneFilterSetMixin(object):
 
     @classmethod
     def filter_for_reverse_field(cls, f, name):
+        """Handles retrieving filters for reverse relationships
+
+        We override the default implementation so that we can handle
+        Global IDs (the default implementation expects database
+        primary keys)
+        """
         rel = f.field.rel
         default = {
             'name': name,
             'label': capfirst(rel.related_name)
         }
         if rel.multiple:
+            # For to-many relationships
             return GlobalIDMultipleChoiceFilter(**default)
         else:
+            # For to-one relationships
             return GlobalIDFilter(**default)
 
 

From a4e225d09ff483e36754e67bb6052879776f177d Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 02:30:45 +0000
Subject: [PATCH 081/173] Initial work on new django docs

---
 docs/pages/docs/quickstart-django.md | 62 ++++++++--------------------
 1 file changed, 18 insertions(+), 44 deletions(-)

diff --git a/docs/pages/docs/quickstart-django.md b/docs/pages/docs/quickstart-django.md
index 7ae15113..535ca150 100644
--- a/docs/pages/docs/quickstart-django.md
+++ b/docs/pages/docs/quickstart-django.md
@@ -5,48 +5,32 @@ description: A Quick guide to Graphene in Django
 
 # Django Tutorial
 
-In our previous quickstart page we created a very simple schema.
+Graphene has a number of additional features that are designed to make
+working with Django simple.
 
-Now we will adapt the schema to automatically map some Django models,
-and expose this schema in a `/graphql` API endpoint.
+If you need help getting started with django then head over to
+Django's getting started page.
 
-## Project setup
+First let's create a few simple models
 
-```bash
-# Create the project directory
-mkdir tutorial
-cd tutorial
+## Some models
 
-# Create a virtualenv to isolate our package dependencies locally
-virtualenv env
-source env/bin/activate  # On Windows use `env\Scripts\activate`
+Let's get started with these models **in an app called ingredients**:
 
-# Install Django and Graphene with Django support
-pip install django
-pip install graphene[django]
-pip install django-graphiql
+```python
+# cookbook/ingredients/models.py
+from django.db import models
 
-# Set up a new project with a single application
-django-admin.py startproject tutorial .  # Note the trailing '.' character
-django-admin.py startapp quickstart
+
+class Category(models.Model):
+    name = models.CharField(max_length=100)
+
+
+class Ingredient(models.Model):
+    name = models.CharField(max_length=100)
+    category = models.ForeignKey(Category)
 ```
 
-Now sync your database for the first time:
-
-```bash
-python manage.py migrate
-```
-
-We'll also create an initial user named `admin` with a password of `password`.
-
-```bash
-python manage.py createsuperuser
-```
-
-Once you've set up a database and initial user created and ready to go, open up the app's directory and we'll get coding...
-
-
-
 ## Schema
 
 GraphQL presents your objects to the world as a graph structure rather than a more
@@ -81,21 +65,11 @@ class GroupType(DjangoObjectType):
 
 
 class Query(graphene.ObjectType):
-    all_users = graphene.List(UserType)
     get_user = graphene.Field(UserType,
                               id=graphene.String().NonNull)
     get_group = graphene.Field(GroupType,
                                id=graphene.String().NonNull)
 
-    def resolve_all_users(self, args, info):
-        return User.objects.all()
-
-    def resolve_get_user(self, args, info):
-        return User.objects.get(id=args.get('id'))
-
-    def resolve_get_group(self, args, info):
-        return Group.objects.get(id=args.get('id'))
-
 schema = graphene.Schema(query=Query)
 ```
 

From 53de24b705b40b683a202a2c4fa5ab0a9a5835e7 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 3 Dec 2015 18:24:19 -0800
Subject: [PATCH 082/173] Improved django example

---
 examples/starwars_django/schema.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/starwars_django/schema.py b/examples/starwars_django/schema.py
index 501ccce6..88407103 100644
--- a/examples/starwars_django/schema.py
+++ b/examples/starwars_django/schema.py
@@ -63,15 +63,15 @@ class Query(graphene.ObjectType):
 
     @resolve_only_args
     def resolve_ships(self):
-        return [Ship(s) for s in get_ships()]
+        return get_ships()
 
     @resolve_only_args
     def resolve_rebels(self):
-        return Faction(get_rebels())
+        return get_rebels()
 
     @resolve_only_args
     def resolve_empire(self):
-        return Faction(get_empire())
+        return get_empire()
 
 
 class Mutation(graphene.ObjectType):

From 256a94bc81283a833c2bf0189d9c874fe5a0898e Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 3 Dec 2015 19:08:06 -0800
Subject: [PATCH 083/173] Improved travis build

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ac80f4b0..6e8e5f31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,9 @@ cache:
   - $HOME/docs/node_modules
 before_install:
 - |
-  if [ "$TEST_TYPE" != build_website ] && \
-    ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.md$)|(^(docs))/'
+  git_diff=$(git diff --name-only $TRAVIS_COMMIT_RANGE)
+  if [ "$?" == 0 ] && [ "$TEST_TYPE" != build_website ] && \
+    ! echo "$git_diff" | grep -qvE '(\.md$)|(^(docs))/'
   then
     echo "Only docs were updated, stopping build process."
     exit

From f4cfd7dc8a5e126cc43baf81463b993b3032212d Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 3 Dec 2015 20:50:14 -0800
Subject: [PATCH 084/173] Improved package imports

---
 graphene/__init__.py      | 12 +++-------
 graphene/core/__init__.py | 46 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/graphene/__init__.py b/graphene/__init__.py
index 88d3a365..88404d62 100644
--- a/graphene/__init__.py
+++ b/graphene/__init__.py
@@ -4,19 +4,13 @@ from graphql.core.type import (
 
 from graphene import signals
 
-from graphene.core.schema import (
-    Schema
-)
-
-from graphene.core.classtypes import (
+from .core import (
+    Schema,
     ObjectType,
     InputObjectType,
     Interface,
     Mutation,
-    Scalar
-)
-
-from graphene.core.types import (
+    Scalar,
     BaseType,
     LazyType,
     Argument,
diff --git a/graphene/core/__init__.py b/graphene/core/__init__.py
index e69de29b..d27a72bb 100644
--- a/graphene/core/__init__.py
+++ b/graphene/core/__init__.py
@@ -0,0 +1,46 @@
+from .schema import (
+    Schema
+)
+
+from .classtypes import (
+    ObjectType,
+    InputObjectType,
+    Interface,
+    Mutation,
+    Scalar
+)
+
+from .types import (
+    BaseType,
+    LazyType,
+    Argument,
+    Field,
+    InputField,
+    String,
+    Int,
+    Boolean,
+    ID,
+    Float,
+    List,
+    NonNull
+)
+
+__all__ = [
+    'Argument',
+    'String',
+    'Int',
+    'Boolean',
+    'Float',
+    'ID',
+    'List',
+    'NonNull',
+    'Schema',
+    'BaseType',
+    'LazyType',
+    'ObjectType',
+    'InputObjectType',
+    'Interface',
+    'Mutation',
+    'Scalar',
+    'Field',
+    'InputField']

From 0fa7f5c9aab734027adbafa11170750b5fbc6815 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 3 Dec 2015 21:49:10 -0800
Subject: [PATCH 085/173] Improved tests

---
 graphene/contrib/django/tests/models.py | 4 ----
 tests/django_settings.py                | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/graphene/contrib/django/tests/models.py b/graphene/contrib/django/tests/models.py
index 172352e4..a4ff3386 100644
--- a/graphene/contrib/django/tests/models.py
+++ b/graphene/contrib/django/tests/models.py
@@ -16,9 +16,6 @@ class Reporter(models.Model):
     def __str__(self):              # __unicode__ on Python 2
         return "%s %s" % (self.first_name, self.last_name)
 
-    class Meta:
-        app_label = 'contrib_django'
-
 
 class Article(models.Model):
     headline = models.CharField(max_length=100)
@@ -30,4 +27,3 @@ class Article(models.Model):
 
     class Meta:
         ordering = ('headline',)
-        app_label = 'contrib_django'
diff --git a/tests/django_settings.py b/tests/django_settings.py
index 2af62bb3..998f68ab 100644
--- a/tests/django_settings.py
+++ b/tests/django_settings.py
@@ -1,6 +1,7 @@
 SECRET_KEY = 1
 
 INSTALLED_APPS = [
+    'graphene.contrib.django.tests',
     'examples.starwars_django',
 ]
 

From 14439155eec40c72afcaa42651c2d3345246edb6 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 3 Dec 2015 22:15:09 -0800
Subject: [PATCH 086/173] Initial version debug schema in django

---
 graphene/contrib/django/debug/__init__.py     |   4 +
 graphene/contrib/django/debug/schema.py       |  68 ++++++++
 graphene/contrib/django/debug/sql/__init__.py |   0
 graphene/contrib/django/debug/sql/tracking.py | 165 ++++++++++++++++++
 graphene/contrib/django/debug/sql/types.py    |  19 ++
 .../contrib/django/debug/tests/__init__.py    |   0
 .../contrib/django/debug/tests/test_query.py  |  70 ++++++++
 graphene/contrib/django/debug/types.py        |   7 +
 8 files changed, 333 insertions(+)
 create mode 100644 graphene/contrib/django/debug/__init__.py
 create mode 100644 graphene/contrib/django/debug/schema.py
 create mode 100644 graphene/contrib/django/debug/sql/__init__.py
 create mode 100644 graphene/contrib/django/debug/sql/tracking.py
 create mode 100644 graphene/contrib/django/debug/sql/types.py
 create mode 100644 graphene/contrib/django/debug/tests/__init__.py
 create mode 100644 graphene/contrib/django/debug/tests/test_query.py
 create mode 100644 graphene/contrib/django/debug/types.py

diff --git a/graphene/contrib/django/debug/__init__.py b/graphene/contrib/django/debug/__init__.py
new file mode 100644
index 00000000..0636c3fa
--- /dev/null
+++ b/graphene/contrib/django/debug/__init__.py
@@ -0,0 +1,4 @@
+from .schema import DebugSchema
+from .types import DjangoDebug
+
+__all__ = ['DebugSchema', 'DjangoDebug']
diff --git a/graphene/contrib/django/debug/schema.py b/graphene/contrib/django/debug/schema.py
new file mode 100644
index 00000000..443f2545
--- /dev/null
+++ b/graphene/contrib/django/debug/schema.py
@@ -0,0 +1,68 @@
+from django.db import connections
+
+from ....core.schema import Schema
+from ....core.types import Field
+from .sql.tracking import unwrap_cursor, wrap_cursor
+from .sql.types import DjangoDebugSQL
+from .types import DjangoDebug
+
+
+class WrappedRoot(object):
+
+    def __init__(self, root):
+        self._recorded = []
+        self._root = root
+
+    def record(self, **log):
+        self._recorded.append(DjangoDebugSQL(**log))
+
+    def debug(self):
+        return DjangoDebug(sql=self._recorded)
+
+
+class WrapRoot(object):
+
+    @property
+    def _root(self):
+        return self._wrapped_root.root
+
+    @_root.setter
+    def _root(self, value):
+        self._wrapped_root = value
+
+    def resolve_debug(self, args, info):
+        return self._wrapped_root.debug()
+
+
+def debug_objecttype(objecttype):
+    return type('Debug{}'.format(objecttype._meta.type_name), (WrapRoot, objecttype), {'debug': Field(DjangoDebug, name='__debug')})
+
+
+class DebugSchema(Schema):
+
+    @property
+    def query(self):
+        if not self._query:
+            return
+        return debug_objecttype(self._query)
+
+    @query.setter
+    def query(self, value):
+        self._query = value
+
+    def enable_instrumentation(self, wrapped_root):
+        # This is thread-safe because database connections are thread-local.
+        for connection in connections.all():
+            wrap_cursor(connection, wrapped_root)
+
+    def disable_instrumentation(self):
+        for connection in connections.all():
+            unwrap_cursor(connection)
+
+    def execute(self, *args, **kwargs):
+        root = kwargs.pop('root', object())
+        wrapped_root = WrappedRoot(root=root)
+        self.enable_instrumentation(wrapped_root)
+        result = super(DebugSchema, self).execute(root=wrapped_root, *args, **kwargs)
+        self.disable_instrumentation()
+        return result
diff --git a/graphene/contrib/django/debug/sql/__init__.py b/graphene/contrib/django/debug/sql/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/graphene/contrib/django/debug/sql/tracking.py b/graphene/contrib/django/debug/sql/tracking.py
new file mode 100644
index 00000000..487b092c
--- /dev/null
+++ b/graphene/contrib/django/debug/sql/tracking.py
@@ -0,0 +1,165 @@
+# Code obtained from django-debug-toolbar sql panel tracking
+from __future__ import absolute_import, unicode_literals
+
+import json
+from threading import local
+from time import time
+
+from django.utils import six
+from django.utils.encoding import force_text
+
+
+class SQLQueryTriggered(Exception):
+    """Thrown when template panel triggers a query"""
+
+
+class ThreadLocalState(local):
+
+    def __init__(self):
+        self.enabled = True
+
+    @property
+    def Wrapper(self):
+        if self.enabled:
+            return NormalCursorWrapper
+        return ExceptionCursorWrapper
+
+    def recording(self, v):
+        self.enabled = v
+
+
+state = ThreadLocalState()
+recording = state.recording  # export function
+
+
+def wrap_cursor(connection, panel):
+    if not hasattr(connection, '_djdt_cursor'):
+        connection._djdt_cursor = connection.cursor
+
+        def cursor():
+            return state.Wrapper(connection._djdt_cursor(), connection, panel)
+
+        connection.cursor = cursor
+        return cursor
+
+
+def unwrap_cursor(connection):
+    if hasattr(connection, '_djdt_cursor'):
+        del connection._djdt_cursor
+        del connection.cursor
+
+
+class ExceptionCursorWrapper(object):
+    """
+    Wraps a cursor and raises an exception on any operation.
+    Used in Templates panel.
+    """
+
+    def __init__(self, cursor, db, logger):
+        pass
+
+    def __getattr__(self, attr):
+        raise SQLQueryTriggered()
+
+
+class NormalCursorWrapper(object):
+    """
+    Wraps a cursor and logs queries.
+    """
+
+    def __init__(self, cursor, db, logger):
+        self.cursor = cursor
+        # Instance of a BaseDatabaseWrapper subclass
+        self.db = db
+        # logger must implement a ``record`` method
+        self.logger = logger
+
+    def _quote_expr(self, element):
+        if isinstance(element, six.string_types):
+            return "'%s'" % force_text(element).replace("'", "''")
+        else:
+            return repr(element)
+
+    def _quote_params(self, params):
+        if not params:
+            return params
+        if isinstance(params, dict):
+            return dict((key, self._quote_expr(value))
+                        for key, value in params.items())
+        return list(map(self._quote_expr, params))
+
+    def _decode(self, param):
+        try:
+            return force_text(param, strings_only=True)
+        except UnicodeDecodeError:
+            return '(encoded string)'
+
+    def _record(self, method, sql, params):
+        start_time = time()
+        try:
+            return method(sql, params)
+        finally:
+            stop_time = time()
+            duration = (stop_time - start_time) * 1000
+            _params = ''
+            try:
+                _params = json.dumps(list(map(self._decode, params)))
+            except Exception:
+                pass  # object not JSON serializable
+
+            alias = getattr(self.db, 'alias', 'default')
+            conn = self.db.connection
+            vendor = getattr(conn, 'vendor', 'unknown')
+
+            params = {
+                'vendor': vendor,
+                'alias': alias,
+                'sql': self.db.ops.last_executed_query(
+                    self.cursor, sql, self._quote_params(params)),
+                'duration': duration,
+                'raw_sql': sql,
+                'params': _params,
+                'start_time': start_time,
+                'stop_time': stop_time,
+                'is_slow': duration > 10,
+                'is_select': sql.lower().strip().startswith('select'),
+            }
+
+            if vendor == 'postgresql':
+                # If an erroneous query was ran on the connection, it might
+                # be in a state where checking isolation_level raises an
+                # exception.
+                try:
+                    iso_level = conn.isolation_level
+                except conn.InternalError:
+                    iso_level = 'unknown'
+                params.update({
+                    'trans_id': self.logger.get_transaction_id(alias),
+                    'trans_status': conn.get_transaction_status(),
+                    'iso_level': iso_level,
+                    'encoding': conn.encoding,
+                })
+
+            # We keep `sql` to maintain backwards compatibility
+            self.logger.record(**params)
+
+    def callproc(self, procname, params=()):
+        return self._record(self.cursor.callproc, procname, params)
+
+    def execute(self, sql, params=()):
+        return self._record(self.cursor.execute, sql, params)
+
+    def executemany(self, sql, param_list):
+        return self._record(self.cursor.executemany, sql, param_list)
+
+    def __getattr__(self, attr):
+        return getattr(self.cursor, attr)
+
+    def __iter__(self):
+        return iter(self.cursor)
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self.close()
diff --git a/graphene/contrib/django/debug/sql/types.py b/graphene/contrib/django/debug/sql/types.py
new file mode 100644
index 00000000..7ee1894f
--- /dev/null
+++ b/graphene/contrib/django/debug/sql/types.py
@@ -0,0 +1,19 @@
+from .....core import Float, ObjectType, String
+
+
+class DjangoDebugSQL(ObjectType):
+    vendor = String()
+    alias = String()
+    sql = String()
+    duration = Float()
+    raw_sql = String()
+    params = String()
+    start_time = Float()
+    stop_time = Float()
+    is_slow = String()
+    is_select = String()
+
+    trans_id = String()
+    trans_status = String()
+    iso_level = String()
+    encoding = String()
diff --git a/graphene/contrib/django/debug/tests/__init__.py b/graphene/contrib/django/debug/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/graphene/contrib/django/debug/tests/test_query.py b/graphene/contrib/django/debug/tests/test_query.py
new file mode 100644
index 00000000..3b4de477
--- /dev/null
+++ b/graphene/contrib/django/debug/tests/test_query.py
@@ -0,0 +1,70 @@
+import pytest
+
+import graphene
+from graphene.contrib.django import DjangoObjectType
+
+from ...tests.models import Reporter
+from ..schema import DebugSchema
+
+# from examples.starwars_django.models import Character
+
+pytestmark = pytest.mark.django_db
+
+
+def test_should_query_well():
+    r1 = Reporter(last_name='ABA')
+    r1.save()
+    r2 = Reporter(last_name='Griffin')
+    r2.save()
+
+    class ReporterType(DjangoObjectType):
+
+        class Meta:
+            model = Reporter
+
+    class Query(graphene.ObjectType):
+        reporter = graphene.Field(ReporterType)
+        all_reporters = ReporterType.List
+
+        def resolve_all_reporters(self, *args, **kwargs):
+            return Reporter.objects.all()
+
+        def resolve_reporter(self, *args, **kwargs):
+            return Reporter.objects.first()
+
+    query = '''
+        query ReporterQuery {
+          reporter {
+            lastName
+          }
+          allReporters {
+            lastName
+          }
+          __debug {
+            sql {
+              rawSql
+            }
+          }
+        }
+    '''
+    expected = {
+        'reporter': {
+            'lastName': 'ABA',
+        },
+        'allReporters': [{
+            'lastName': 'ABA',
+        }, {
+            'lastName': 'Griffin',
+        }],
+        '__debug': {
+            'sql': [{
+                'rawSql': str(Reporter.objects.order_by('pk')[:1].query)
+            }, {
+                'rawSql': str(Reporter.objects.all().query)
+            }]
+        }
+    }
+    schema = DebugSchema(query=Query)
+    result = schema.execute(query)
+    assert not result.errors
+    assert result.data == expected
diff --git a/graphene/contrib/django/debug/types.py b/graphene/contrib/django/debug/types.py
new file mode 100644
index 00000000..d84cbb98
--- /dev/null
+++ b/graphene/contrib/django/debug/types.py
@@ -0,0 +1,7 @@
+from ....core.classtypes.objecttype import ObjectType
+from ....core.types import Field
+from .sql.types import DjangoDebugSQL
+
+
+class DjangoDebug(ObjectType):
+    sql = Field(DjangoDebugSQL.List)

From 967a9d2d033c5e4e71a76ecd073277dbcc2f63ce Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 3 Dec 2015 23:23:18 -0800
Subject: [PATCH 087/173] Fixed old DjangoConnectionField usage

---
 graphene/contrib/django/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index 7b990b86..e12fab3a 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -27,7 +27,7 @@ class ConnectionOrListField(Field):
         if not field_object_type:
             raise SkipField()
         if is_node(field_object_type):
-            field = DjangoConnectionField(field_object_type)
+            field = ConnectionField(field_object_type)
         else:
             field = Field(List(field_object_type))
         field.contribute_to_class(self.object_type, self.attname)

From 28414955a2c217e762b039b5bd57d5d4db56de49 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 3 Dec 2015 23:41:28 -0800
Subject: [PATCH 088/173] Improved resolver function decorators

---
 graphene/core/types/field.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py
index d7643b5e..c3fa712f 100644
--- a/graphene/core/types/field.py
+++ b/graphene/core/types/field.py
@@ -63,6 +63,9 @@ class Field(OrderedType):
             return NonNull(self.type)
         return self.type
 
+    def decorate_resolver(self, resolver):
+        return snake_case_args(resolver)
+
     def internal_type(self, schema):
         resolver = self.resolver
         description = self.description
@@ -85,9 +88,9 @@ class Field(OrderedType):
                 return my_resolver(instance, args, info)
             resolver = wrapped_func
 
-        resolver = snake_case_args(resolver)
         assert type, 'Internal type for field %s is None' % str(self)
-        return GraphQLField(type, args=schema.T(arguments), resolver=resolver,
+        return GraphQLField(type, args=schema.T(arguments),
+                            resolver=self.decorate_resolver(resolver),
                             description=description,)
 
     def __repr__(self):

From bee0af11251e93fd45c2c83176e63b3506623c61 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 4 Dec 2015 02:34:12 -0800
Subject: [PATCH 089/173] Improved django debug

---
 graphene/contrib/django/debug/schema.py       | 11 ++++-------
 graphene/contrib/django/debug/sql/tracking.py |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/graphene/contrib/django/debug/schema.py b/graphene/contrib/django/debug/schema.py
index 443f2545..2726f3fb 100644
--- a/graphene/contrib/django/debug/schema.py
+++ b/graphene/contrib/django/debug/schema.py
@@ -42,13 +42,11 @@ class DebugSchema(Schema):
 
     @property
     def query(self):
-        if not self._query:
-            return
-        return debug_objecttype(self._query)
+        return self._query
 
     @query.setter
     def query(self, value):
-        self._query = value
+        self._query = value and debug_objecttype(value)
 
     def enable_instrumentation(self, wrapped_root):
         # This is thread-safe because database connections are thread-local.
@@ -59,10 +57,9 @@ class DebugSchema(Schema):
         for connection in connections.all():
             unwrap_cursor(connection)
 
-    def execute(self, *args, **kwargs):
-        root = kwargs.pop('root', object())
+    def execute(self, query, root=None, *args, **kwargs):
         wrapped_root = WrappedRoot(root=root)
         self.enable_instrumentation(wrapped_root)
-        result = super(DebugSchema, self).execute(root=wrapped_root, *args, **kwargs)
+        result = super(DebugSchema, self).execute(query, wrapped_root, *args, **kwargs)
         self.disable_instrumentation()
         return result
diff --git a/graphene/contrib/django/debug/sql/tracking.py b/graphene/contrib/django/debug/sql/tracking.py
index 487b092c..8ed40492 100644
--- a/graphene/contrib/django/debug/sql/tracking.py
+++ b/graphene/contrib/django/debug/sql/tracking.py
@@ -100,7 +100,7 @@ class NormalCursorWrapper(object):
             return method(sql, params)
         finally:
             stop_time = time()
-            duration = (stop_time - start_time) * 1000
+            duration = (stop_time - start_time)
             _params = ''
             try:
                 _params = json.dumps(list(map(self._decode, params)))

From 3586fdfb77bc544f0c493aa5d376f2420f9cee7f Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 4 Dec 2015 02:41:39 -0800
Subject: [PATCH 090/173] Improvex syntax

---
 graphene/contrib/django/debug/schema.py | 5 ++++-
 graphene/relay/types.py                 | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/graphene/contrib/django/debug/schema.py b/graphene/contrib/django/debug/schema.py
index 2726f3fb..e5e5f30b 100644
--- a/graphene/contrib/django/debug/schema.py
+++ b/graphene/contrib/django/debug/schema.py
@@ -35,7 +35,10 @@ class WrapRoot(object):
 
 
 def debug_objecttype(objecttype):
-    return type('Debug{}'.format(objecttype._meta.type_name), (WrapRoot, objecttype), {'debug': Field(DjangoDebug, name='__debug')})
+    return type(
+        'Debug{}'.format(objecttype._meta.type_name),
+        (WrapRoot, objecttype),
+        {'debug': Field(DjangoDebug, name='__debug')})
 
 
 class DebugSchema(Schema):
diff --git a/graphene/relay/types.py b/graphene/relay/types.py
index 672042e7..425e3038 100644
--- a/graphene/relay/types.py
+++ b/graphene/relay/types.py
@@ -4,6 +4,7 @@ from collections import Iterable
 from functools import wraps
 
 import six
+
 from graphql_relay.connection.arrayconnection import connection_from_list
 from graphql_relay.node.node import to_global_id
 

From 713e148f2993191a0ce2df5682f7d7088620eb78 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 13:57:01 +0000
Subject: [PATCH 091/173] Work in progress on loading django models for tests

---
 .../contrib/django/tests/filter/test_fields.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/graphene/contrib/django/tests/filter/test_fields.py b/graphene/contrib/django/tests/filter/test_fields.py
index fc99a273..43136bc4 100644
--- a/graphene/contrib/django/tests/filter/test_fields.py
+++ b/graphene/contrib/django/tests/filter/test_fields.py
@@ -1,9 +1,13 @@
 import pytest
+from django.apps import apps
+from django.conf import settings
+
+pytestmark = []
 
 try:
     import django_filters
 except ImportError:
-    pytestmark = pytest.mark.skipif(True, reason='django_filters not installed')
+    pytestmark.append(pytest.mark.skipif(True, reason='django_filters not installed'))
 else:
     from graphene.contrib.django.filter import (GlobalIDFilter, DjangoFilterConnectionField,
                                                 GlobalIDMultipleChoiceFilter)
@@ -13,6 +17,11 @@ from graphene.contrib.django import DjangoNode
 from graphene.contrib.django.forms import GlobalIDFormField, GlobalIDMultipleChoiceField
 from graphene.contrib.django.tests.models import Article, Pet, Reporter
 
+# settings.INSTALLED_APPS.append('graphene.contrib.django.tests')
+# apps.set_installed_apps(settings.INSTALLED_APPS)
+
+pytestmark.append(pytest.mark.django_db)
+
 
 class ArticleNode(DjangoNode):
     class Meta:
@@ -158,9 +167,6 @@ def test_global_id_multiple_field_explicit():
     assert multiple_filter.field_class == GlobalIDMultipleChoiceField
 
 
-@pytest.mark.skipif(True, reason="Trying to test GrapheneFilterSetMixin.filter_for_reverse_field"
-                                 "but django has not loaded the models, so the test fails as "
-                                 "reverse relations are not ready yet")
 def test_global_id_multiple_field_implicit_reverse():
     field = DjangoFilterConnectionField(ReporterNode, fields=['articles'])
     filterset_class = field.resolver_fn.get_filterset_class()
@@ -169,10 +175,8 @@ def test_global_id_multiple_field_implicit_reverse():
     assert multiple_filter.field_class == GlobalIDMultipleChoiceField
 
 
-@pytest.mark.skipif(True, reason="Trying to test GrapheneFilterSetMixin.filter_for_reverse_field"
-                                 "but django has not loaded the models, so the test fails as "
-                                 "reverse relations are not ready yet")
 def test_global_id_multiple_field_explicit_reverse():
+    Reporter._meta.get_field("articles")
     class ReporterPetsFilter(django_filters.FilterSet):
         class Meta:
             model = Reporter

From e7d7fad0688758186eafb619bcd63bbf4960a3f3 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 13:58:39 +0000
Subject: [PATCH 092/173] Remove django app loading which is no longer required
 post merge

---
 graphene/contrib/django/tests/filter/test_fields.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/graphene/contrib/django/tests/filter/test_fields.py b/graphene/contrib/django/tests/filter/test_fields.py
index 43136bc4..34429bba 100644
--- a/graphene/contrib/django/tests/filter/test_fields.py
+++ b/graphene/contrib/django/tests/filter/test_fields.py
@@ -17,9 +17,6 @@ from graphene.contrib.django import DjangoNode
 from graphene.contrib.django.forms import GlobalIDFormField, GlobalIDMultipleChoiceField
 from graphene.contrib.django.tests.models import Article, Pet, Reporter
 
-# settings.INSTALLED_APPS.append('graphene.contrib.django.tests')
-# apps.set_installed_apps(settings.INSTALLED_APPS)
-
 pytestmark.append(pytest.mark.django_db)
 
 

From 79e1b1c996ac07337387e6ebc0d42358328ee54a Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 14:10:06 +0000
Subject: [PATCH 093/173] Removing unused imports

---
 graphene/contrib/django/tests/filter/test_fields.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/graphene/contrib/django/tests/filter/test_fields.py b/graphene/contrib/django/tests/filter/test_fields.py
index 34429bba..0af5786f 100644
--- a/graphene/contrib/django/tests/filter/test_fields.py
+++ b/graphene/contrib/django/tests/filter/test_fields.py
@@ -1,6 +1,4 @@
 import pytest
-from django.apps import apps
-from django.conf import settings
 
 pytestmark = []
 

From c42d4a763dae29ff88a329b0aa57356d6a5ef602 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 14:10:31 +0000
Subject: [PATCH 094/173] Removing debug line

---
 graphene/contrib/django/tests/filter/test_fields.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/graphene/contrib/django/tests/filter/test_fields.py b/graphene/contrib/django/tests/filter/test_fields.py
index 0af5786f..d33b8d32 100644
--- a/graphene/contrib/django/tests/filter/test_fields.py
+++ b/graphene/contrib/django/tests/filter/test_fields.py
@@ -171,7 +171,6 @@ def test_global_id_multiple_field_implicit_reverse():
 
 
 def test_global_id_multiple_field_explicit_reverse():
-    Reporter._meta.get_field("articles")
     class ReporterPetsFilter(django_filters.FilterSet):
         class Meta:
             model = Reporter

From 818b9109917453ccddf8977f4f3908c2017742a8 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 15:46:48 +0000
Subject: [PATCH 095/173] Now supports django 1.9

---
 graphene/contrib/django/tests/test_converter.py | 5 ++++-
 graphene/contrib/django/utils.py                | 4 +++-
 setup.py                                        | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/graphene/contrib/django/tests/test_converter.py b/graphene/contrib/django/tests/test_converter.py
index d868ec97..d9f2ea26 100644
--- a/graphene/contrib/django/tests/test_converter.py
+++ b/graphene/contrib/django/tests/test_converter.py
@@ -94,7 +94,10 @@ def test_should_manytomany_convert_connectionorlist():
 
 
 def test_should_manytoone_convert_connectionorlist():
-    graphene_type = convert_django_field(Reporter.articles.related)
+    # Django 1.9 uses 'rel', <1.9 uses 'related
+    related = getattr(Reporter.articles, 'rel', None) or \
+              getattr(Reporter.articles, 'related')
+    graphene_type = convert_django_field(related)
     assert isinstance(graphene_type, ConnectionOrListField)
     assert isinstance(graphene_type.type, DjangoModelField)
     assert graphene_type.type.model == Article
diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index 2b4519fc..2b1ec6aa 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -18,7 +18,9 @@ def get_type_for_model(schema, model):
 
 def get_reverse_fields(model):
     for name, attr in model.__dict__.items():
-        related = getattr(attr, 'related', None)
+        # Django =>1.9 uses 'rel', django <1.9 uses 'related'
+        related = getattr(attr, 'rel', None) or \
+                  getattr(attr, 'related', None)
         if isinstance(related, models.ManyToOneRel):
             yield related
 
diff --git a/setup.py b/setup.py
index 8b2c324c..c40a4c35 100644
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ setup(
     ],
     extras_require={
         'django': [
-            'Django>=1.6.0,<1.9',
+            'Django>=1.6.0',
             'singledispatch>=3.4.0.3',
             'graphql-django-view>=1.0.0',
         ],

From 1bace349da177fca8ebaea0d855600ba0088d359 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 16:00:17 +0000
Subject: [PATCH 096/173] Updating travis config to build for multiple django
 versions

---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3319c5c0..8852b3ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,7 @@ install:
   if [ "$TEST_TYPE" = build ]; then
     pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django django-filter
     pip install --download-cache $HOME/.cache/pip/ -e .[django]
+    pip install --download-cache django==$DJANGO_VERSION
     python setup.py develop
   elif [ "$TEST_TYPE" = build_website ]; then
     pip install --download-cache $HOME/.cache/pip/ -e .
@@ -73,7 +74,10 @@ after_success:
   fi
 env:
   matrix:
-  - TEST_TYPE=build
+  - TEST_TYPE=build DJANGO_VERSION=1.6
+  - TEST_TYPE=build DJANGO_VERSION=1.7
+  - TEST_TYPE=build DJANGO_VERSION=1.8
+  - TEST_TYPE=build DJANGO_VERSION=1.9
   global:
     secure: SQC0eCWCWw8bZxbLE8vQn+UjJOp3Z1m779s9SMK3lCLwJxro/VCLBZ7hj4xsrq1MtcFO2U2Kqf068symw4Hr/0amYI3HFTCFiwXAC3PAKXeURca03eNO2heku+FtnQcOjBanExTsIBQRLDXMOaUkf3MIztpLJ4LHqMfUupKmw9YSB0v40jDbSN8khBnndFykmOnVVHznFp8USoN5F0CiPpnfEvHnJkaX76lNf7Kc9XNShBTTtJsnsHMhuYQeInt0vg9HSjoIYC38Tv2hmMj1myNdzyrHF+LgRjI6ceGi50ApAnGepXC/DNRhXROfECKez+LON/ZSqBGdJhUILqC8A4WmWmIjNcwitVFp3JGBqO7LULS0BI96EtSLe8rD1rkkdTbjivajkbykM1Q0Tnmg1adzGwLxRUbTq9tJQlTTkHBCuXIkpKb1mAtb/TY7A6BqfnPi2xTc/++qEawUG7ePhscdTj0IBrUfZsUNUYZqD8E8XbSWKIuS3SHE+cZ+s/kdAsm4q+FFAlpZKOYGxIkwvgyfu4/Plfol4b7X6iAP9J3r1Kv0DgBVFst5CXEwzZs19/g0CgokQbCXf1N+xeNnUELl6/fImaR3RKP22EaABoil4z8vzl4EqxqVoH1nfhE+WlpryXsuSaF/1R+WklR7aQ1FwoCk8V8HxM2zrj4tI8k=
 matrix:

From e8f491c1ff3bd49677f98613909d73e6632d30bb Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 16:13:45 +0000
Subject: [PATCH 097/173] Debugging travis django install

---
 .travis.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8852b3ce..72c9caca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,8 @@ install:
   if [ "$TEST_TYPE" = build ]; then
     pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django django-filter
     pip install --download-cache $HOME/.cache/pip/ -e .[django]
-    pip install --download-cache django==$DJANGO_VERSION
+    pip install django==$DJANGO_VERSION
+    echo "DJANGO_VERSION: $DJANGO_VERSION"
     python setup.py develop
   elif [ "$TEST_TYPE" = build_website ]; then
     pip install --download-cache $HOME/.cache/pip/ -e .
@@ -87,3 +88,10 @@ matrix:
     env: TEST_TYPE=build_website
   - python: '2.7'
     env: TEST_TYPE=lint
+  exclude:
+  - python: '3.3'
+    env: TEST_TYPE=build DJANGO_VERSION=1.6
+  - python: '3.3'
+    env: TEST_TYPE=build DJANGO_VERSION=1.7
+  - python: '3.3'
+    env: TEST_TYPE=build DJANGO_VERSION=1.8

From 4398f6d6bd2b10bf40ca3de54cb45be937e0be30 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 16:19:30 +0000
Subject: [PATCH 098/173] Removing debug line from travis.yml. Omitting
 --download-cache seems to fix the issue

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 72c9caca..0b26af36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,6 @@ install:
     pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django django-filter
     pip install --download-cache $HOME/.cache/pip/ -e .[django]
     pip install django==$DJANGO_VERSION
-    echo "DJANGO_VERSION: $DJANGO_VERSION"
     python setup.py develop
   elif [ "$TEST_TYPE" = build_website ]; then
     pip install --download-cache $HOME/.cache/pip/ -e .

From 993a3751c48ee23f44dcf236b9c711e954e96075 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 16:21:43 +0000
Subject: [PATCH 099/173] Work on travis excludes

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0b26af36..c0e7c1f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,8 +89,8 @@ matrix:
     env: TEST_TYPE=lint
   exclude:
   - python: '3.3'
-    env: TEST_TYPE=build DJANGO_VERSION=1.6
+    env: DJANGO_VERSION=1.6
   - python: '3.3'
-    env: TEST_TYPE=build DJANGO_VERSION=1.7
+    env: DJANGO_VERSION=1.7
   - python: '3.3'
-    env: TEST_TYPE=build DJANGO_VERSION=1.8
+    env: DJANGO_VERSION=1.8

From 1877c45f05d77915b7353c342491c55f8131cab5 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 16:52:43 +0000
Subject: [PATCH 100/173] Updating django version requirement to Django 1.8

---
 .travis.yml | 6 ------
 setup.py    | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c0e7c1f8..f26c9cd2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,8 +74,6 @@ after_success:
   fi
 env:
   matrix:
-  - TEST_TYPE=build DJANGO_VERSION=1.6
-  - TEST_TYPE=build DJANGO_VERSION=1.7
   - TEST_TYPE=build DJANGO_VERSION=1.8
   - TEST_TYPE=build DJANGO_VERSION=1.9
   global:
@@ -88,9 +86,5 @@ matrix:
   - python: '2.7'
     env: TEST_TYPE=lint
   exclude:
-  - python: '3.3'
-    env: DJANGO_VERSION=1.6
-  - python: '3.3'
-    env: DJANGO_VERSION=1.7
   - python: '3.3'
     env: DJANGO_VERSION=1.8
diff --git a/setup.py b/setup.py
index c40a4c35..b2c18c1e 100644
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ setup(
     ],
     extras_require={
         'django': [
-            'Django>=1.6.0',
+            'Django>=1.8.0',
             'singledispatch>=3.4.0.3',
             'graphql-django-view>=1.0.0',
         ],

From d9f1df1125854196922cb6e11062c37090991dfb Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 16:58:04 +0000
Subject: [PATCH 101/173] No longer building python 3.3 + django 1.9

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index f26c9cd2..ba581d47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,3 +88,5 @@ matrix:
   exclude:
   - python: '3.3'
     env: DJANGO_VERSION=1.8
+  - python: '3.3'
+    env: DJANGO_VERSION=1.9

From c93492bacb75fbbf62254a5d7a654d42ca989f2b Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 17:03:29 +0000
Subject: [PATCH 102/173] pep8 fixes

---
 graphene/contrib/django/tests/test_converter.py | 2 +-
 graphene/contrib/django/utils.py                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/graphene/contrib/django/tests/test_converter.py b/graphene/contrib/django/tests/test_converter.py
index d9f2ea26..dcbb3e30 100644
--- a/graphene/contrib/django/tests/test_converter.py
+++ b/graphene/contrib/django/tests/test_converter.py
@@ -96,7 +96,7 @@ def test_should_manytomany_convert_connectionorlist():
 def test_should_manytoone_convert_connectionorlist():
     # Django 1.9 uses 'rel', <1.9 uses 'related
     related = getattr(Reporter.articles, 'rel', None) or \
-              getattr(Reporter.articles, 'related')
+        getattr(Reporter.articles, 'related')
     graphene_type = convert_django_field(related)
     assert isinstance(graphene_type, ConnectionOrListField)
     assert isinstance(graphene_type.type, DjangoModelField)
diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index 2b1ec6aa..7c59e045 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -20,7 +20,7 @@ def get_reverse_fields(model):
     for name, attr in model.__dict__.items():
         # Django =>1.9 uses 'rel', django <1.9 uses 'related'
         related = getattr(attr, 'rel', None) or \
-                  getattr(attr, 'related', None)
+            getattr(attr, 'related', None)
         if isinstance(related, models.ManyToOneRel):
             yield related
 

From 166a143c18f10f73df98c5bfa9054b7869938c22 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 17:08:58 +0000
Subject: [PATCH 103/173] No longer testing on python 3.3 as no supported
 django versions support it

---
 .travis.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ba581d47..93f4550f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 sudo: false
 python:
 - 2.7
-- 3.3
 - 3.4
 - 3.5
 - pypy
@@ -85,8 +84,3 @@ matrix:
     env: TEST_TYPE=build_website
   - python: '2.7'
     env: TEST_TYPE=lint
-  exclude:
-  - python: '3.3'
-    env: DJANGO_VERSION=1.8
-  - python: '3.3'
-    env: DJANGO_VERSION=1.9

From b4b42db73efade255db1289eef5791843f95d594 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 17:48:33 +0000
Subject: [PATCH 104/173] Updating imports to work when singledispatch is
 available natively

---
 graphene/contrib/django/converter.py       |  4 +++-
 graphene/contrib/django/filter/__init__.py |  8 +++++++
 graphene/contrib/django/form_converter.py  |  4 ++--
 graphene/contrib/django/utils.py           | 26 +++++++++++++++++++++-
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/graphene/contrib/django/converter.py b/graphene/contrib/django/converter.py
index 255ec8a5..0722643b 100644
--- a/graphene/contrib/django/converter.py
+++ b/graphene/contrib/django/converter.py
@@ -1,8 +1,10 @@
 from django.db import models
-from singledispatch import singledispatch
 
+from .utils import import_single_dispatch
 from ...core.types.scalars import ID, Boolean, Float, Int, String
 
+singledispatch = import_single_dispatch()
+
 try:
     UUIDField = models.UUIDField
 except AttributeError:
diff --git a/graphene/contrib/django/filter/__init__.py b/graphene/contrib/django/filter/__init__.py
index 21e65b56..78a9507b 100644
--- a/graphene/contrib/django/filter/__init__.py
+++ b/graphene/contrib/django/filter/__init__.py
@@ -1,3 +1,11 @@
+try:
+    import django_filters
+except:
+    raise Exception(
+        "Use of django filtering requires the django-filter package "
+        "be installed. You can do so using `pip install django-filter`"
+    )
+
 from .fields import DjangoFilterConnectionField
 from .filterset import GrapheneFilterSet, GlobalIDFilter, GlobalIDMultipleChoiceFilter
 from .resolvers import FilterConnectionResolver
diff --git a/graphene/contrib/django/form_converter.py b/graphene/contrib/django/form_converter.py
index f5acf202..8acd574c 100644
--- a/graphene/contrib/django/form_converter.py
+++ b/graphene/contrib/django/form_converter.py
@@ -1,10 +1,10 @@
 from django import forms
 from django.forms.fields import BaseTemporalField
-from singledispatch import singledispatch
-
 from graphene import String, Int, Boolean, Float, ID
 from graphene.contrib.django.forms import GlobalIDFormField, GlobalIDMultipleChoiceField
+from graphene.contrib.django.utils import import_single_dispatch
 from graphene.core.types.definitions import List
+singledispatch = import_single_dispatch()
 
 try:
     UUIDField = forms.UUIDField
diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index 7c59e045..b4136eda 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -3,7 +3,6 @@ from django.db import models
 from django.db.models.manager import Manager
 
 from graphene import Argument, String
-from graphene.contrib.django.form_converter import convert_form_field
 
 
 def get_type_for_model(schema, model):
@@ -36,6 +35,8 @@ def get_filtering_args_from_filterset(filterset_class, type):
         a Graphene Field. These arguments will be available to
         filter against in the GraphQL
     """
+    from graphene.contrib.django.form_converter import convert_form_field
+
     args = {}
     for name, filter_field in six.iteritems(filterset_class.base_filters):
         field_type = Argument(convert_form_field(filter_field.field))
@@ -46,3 +47,26 @@ def get_filtering_args_from_filterset(filterset_class, type):
     # Also add the 'order_by' field
     args[filterset_class.order_by_field] = Argument(String)
     return args
+
+
+def import_single_dispatch():
+    singledispatch = None
+    try:
+        from functools import singledispatch
+    except ImportError:
+        pass
+
+    try:
+        from singledispatch import singledispatch
+    except ImportError:
+        pass
+
+    if not singledispatch:
+        raise Exception(
+            "It seems your python version does not include "
+            "functools.singledispatch. Please install the 'singledispatch' "
+            "package. More information here: "
+            "https://pypi.python.org/pypi/singledispatch"
+        )
+
+    return singledispatch

From 3a23c1f940fbd30293b5722c872daa9a86c4c924 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 18:41:20 +0000
Subject: [PATCH 105/173] Filtering options will now be read from the
 destination node's Meta data

---
 graphene/contrib/django/filter/resolvers.py         |  4 ++--
 graphene/contrib/django/options.py                  |  5 ++++-
 graphene/contrib/django/tests/filter/test_fields.py | 12 ++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/graphene/contrib/django/filter/resolvers.py b/graphene/contrib/django/filter/resolvers.py
index 5f696a08..c2204d6c 100644
--- a/graphene/contrib/django/filter/resolvers.py
+++ b/graphene/contrib/django/filter/resolvers.py
@@ -10,8 +10,8 @@ class FilterConnectionResolver(BaseQuerySetConnectionResolver):
     def __init__(self, node, on=None, filterset_class=None,
                  fields=None, order_by=None, extra_filter_meta=None):
         self.filterset_class = filterset_class
-        self.fields = fields
-        self.order_by = order_by
+        self.fields = fields or node._meta.filter_fields
+        self.order_by = order_by or node._meta.filter_order_by
         self.extra_filter_meta = extra_filter_meta or {}
         self._filterset_class = None
         super(FilterConnectionResolver, self).__init__(node, on)
diff --git a/graphene/contrib/django/options.py b/graphene/contrib/django/options.py
index 61dd37a3..f8c08e38 100644
--- a/graphene/contrib/django/options.py
+++ b/graphene/contrib/django/options.py
@@ -2,7 +2,8 @@ from ...core.classtypes.objecttype import ObjectTypeOptions
 from ...relay.types import Node
 from ...relay.utils import is_node
 
-VALID_ATTRS = ('model', 'only_fields', 'exclude_fields')
+VALID_ATTRS = ('model', 'only_fields', 'exclude_fields',
+               'filter_fields', 'filter_order_by')
 
 
 class DjangoOptions(ObjectTypeOptions):
@@ -13,6 +14,8 @@ class DjangoOptions(ObjectTypeOptions):
         self.valid_attrs += VALID_ATTRS
         self.only_fields = None
         self.exclude_fields = []
+        self.filter_fields = None
+        self.filter_order_by = None
 
     def contribute_to_class(self, cls, name):
         super(DjangoOptions, self).contribute_to_class(cls, name)
diff --git a/graphene/contrib/django/tests/filter/test_fields.py b/graphene/contrib/django/tests/filter/test_fields.py
index d33b8d32..127b0588 100644
--- a/graphene/contrib/django/tests/filter/test_fields.py
+++ b/graphene/contrib/django/tests/filter/test_fields.py
@@ -112,6 +112,18 @@ def test_filter_shortcut_filterset_extra_meta():
     assert_orderable(field)
 
 
+def test_filter_filterset_information_on_meta():
+    class ReporterFilterNode(DjangoNode):
+        class Meta:
+            model = Reporter
+            filter_fields = ['first_name', 'articles']
+            filter_order_by = True
+
+    field = DjangoFilterConnectionField(ReporterFilterNode)
+    assert_arguments(field, 'firstName', 'articles')
+    assert_orderable(field)
+
+
 def test_global_id_field_implicit():
     field = DjangoFilterConnectionField(ArticleNode, fields=['id'])
     filterset_class = field.resolver_fn.get_filterset_class()

From f616b597ac2d5c57c32d9cd2268756e4496db94e Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 18:55:05 +0000
Subject: [PATCH 106/173] Updating form converter method names to make more
 sense

---
 graphene/contrib/django/form_converter.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/graphene/contrib/django/form_converter.py b/graphene/contrib/django/form_converter.py
index 8acd574c..826c8c69 100644
--- a/graphene/contrib/django/form_converter.py
+++ b/graphene/contrib/django/form_converter.py
@@ -60,11 +60,11 @@ def convert_form_field_to_float(field):
 
 @convert_form_field.register(forms.ModelMultipleChoiceField)
 @convert_form_field.register(GlobalIDMultipleChoiceField)
-def convert_form_field_to_list_or_connection(field):
+def convert_form_field_to_list(field):
     return List(ID())
 
 
 @convert_form_field.register(forms.ModelChoiceField)
 @convert_form_field.register(GlobalIDFormField)
-def convert_form_field_to_djangomodel(field):
+def convert_form_field_to_id(field):
     return ID()

From bbbf6884492360e6ae1b57263d02f067b18c7d7c Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Fri, 4 Dec 2015 21:39:55 +0000
Subject: [PATCH 107/173] Renaming order -> order_by (and fixing
 assert_not_orderable())

---
 graphene/contrib/django/filter/filterset.py            | 2 +-
 graphene/contrib/django/resolvers.py                   | 4 ++--
 graphene/contrib/django/tests/filter/test_fields.py    | 8 ++++----
 graphene/contrib/django/tests/filter/test_resolvers.py | 4 ++--
 graphene/contrib/django/tests/test_resolvers.py        | 2 +-
 graphene/contrib/django/utils.py                       | 3 ++-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/graphene/contrib/django/filter/filterset.py b/graphene/contrib/django/filter/filterset.py
index c71478ee..4755eac2 100644
--- a/graphene/contrib/django/filter/filterset.py
+++ b/graphene/contrib/django/filter/filterset.py
@@ -25,7 +25,7 @@ class GlobalIDMultipleChoiceFilter(MultipleChoiceFilter):
         return super(GlobalIDMultipleChoiceFilter, self).filter(qs, gids)
 
 
-ORDER_BY_FIELD = getattr(settings, 'GRAPHENE_ORDER_BY_FIELD', 'order')
+ORDER_BY_FIELD = getattr(settings, 'GRAPHENE_ORDER_BY_FIELD', 'order_by')
 
 
 GRAPHENE_FILTER_SET_OVERRIDES = {
diff --git a/graphene/contrib/django/resolvers.py b/graphene/contrib/django/resolvers.py
index 0499acc5..a5494bfb 100644
--- a/graphene/contrib/django/resolvers.py
+++ b/graphene/contrib/django/resolvers.py
@@ -36,8 +36,8 @@ class SimpleQuerySetConnectionResolver(BaseQuerySetConnectionResolver):
         return query
 
     def get_filter_kwargs(self):
-        ignore = ['first', 'last', 'before', 'after', 'order']
+        ignore = ['first', 'last', 'before', 'after', 'order_by']
         return {k: v for k, v in self.args.items() if k not in ignore}
 
     def get_order(self):
-        return self.args.get('order', None)
+        return self.args.get('order_by', None)
diff --git a/graphene/contrib/django/tests/filter/test_fields.py b/graphene/contrib/django/tests/filter/test_fields.py
index 127b0588..0609710a 100644
--- a/graphene/contrib/django/tests/filter/test_fields.py
+++ b/graphene/contrib/django/tests/filter/test_fields.py
@@ -34,7 +34,7 @@ class PetNode(DjangoNode):
 
 
 def assert_arguments(field, *arguments):
-    ignore = ('after', 'before', 'first', 'last', 'order')
+    ignore = ('after', 'before', 'first', 'last', 'orderBy')
     actual = [
         name
         for name in field.arguments.arguments.keys()
@@ -48,12 +48,12 @@ def assert_arguments(field, *arguments):
 
 
 def assert_orderable(field):
-    assert 'order' in field.arguments.arguments.keys(), \
+    assert 'orderBy' in field.arguments.arguments.keys(), \
         'Field cannot be ordered'
 
 
 def assert_not_orderable(field):
-    assert 'order' in field.arguments.arguments.keys(), \
+    assert 'orderBy' not in field.arguments.arguments.keys(), \
         'Field can be ordered'
 
 
@@ -107,7 +107,7 @@ def test_filter_explicit_filterset_not_orderable():
 
 def test_filter_shortcut_filterset_extra_meta():
     field = DjangoFilterConnectionField(ArticleNode, extra_filter_meta={
-        'ordering': True
+        'order_by': True
     })
     assert_orderable(field)
 
diff --git a/graphene/contrib/django/tests/filter/test_resolvers.py b/graphene/contrib/django/tests/filter/test_resolvers.py
index af8bfc47..a19d8276 100644
--- a/graphene/contrib/django/tests/filter/test_resolvers.py
+++ b/graphene/contrib/django/tests/filter/test_resolvers.py
@@ -64,7 +64,7 @@ def test_filter_order():
     resolver = FilterConnectionResolver(ArticleNode,
                                         filterset_class=ArticleFilter)
     resolved = resolver(inst=article, args={
-        'order': 'headline'
+        'order_by': 'headline'
     }, info=None)
     assert 'WHERE' not in str(resolved.query)
     assert 'ORDER BY' in str(resolved.query)
@@ -76,7 +76,7 @@ def test_filter_order_not_available():
     resolver = FilterConnectionResolver(ReporterNode,
                                         filterset_class=ReporterFilter)
     resolved = resolver(inst=reporter, args={
-        'order': 'last_name'
+        'order_by': 'last_name'
     }, info=None)
     assert 'WHERE' not in str(resolved.query)
     assert 'ORDER BY' not in str(resolved.query)
diff --git a/graphene/contrib/django/tests/test_resolvers.py b/graphene/contrib/django/tests/test_resolvers.py
index 38d98aba..fe617666 100644
--- a/graphene/contrib/django/tests/test_resolvers.py
+++ b/graphene/contrib/django/tests/test_resolvers.py
@@ -51,7 +51,7 @@ def test_simple_order():
     reporter = Reporter(id=1, first_name='Cookie Monster')
     resolver = SimpleQuerySetConnectionResolver(ReporterNode)
     resolved = resolver(inst=reporter, args={
-        'order': 'last_name'
+        'order_by': 'last_name'
     }, info=None)
     assert 'WHERE' not in str(resolved.query)
     assert 'ORDER BY' in str(resolved.query)
diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index b4136eda..089e06cf 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -45,7 +45,8 @@ def get_filtering_args_from_filterset(filterset_class, type):
         args[name] = field_type
 
     # Also add the 'order_by' field
-    args[filterset_class.order_by_field] = Argument(String)
+    if filterset_class._meta.order_by:
+        args[filterset_class.order_by_field] = Argument(String)
     return args
 
 

From ee19445290a0fe38671853cde13e8a28fd5ab263 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 4 Dec 2015 19:27:54 -0800
Subject: [PATCH 108/173] Improved queryset getter for use .count instead of
 len

---
 graphene/contrib/django/utils.py      | 14 +++++++++
 graphene/relay/types.py               |  1 +
 graphene/utils/__init__.py            |  3 +-
 graphene/utils/lazylist.py            | 43 +++++++++++++++++++++++++++
 graphene/utils/tests/test_lazylist.py | 23 ++++++++++++++
 5 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 graphene/utils/lazylist.py
 create mode 100644 graphene/utils/tests/test_lazylist.py

diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index 54c6420c..3c72a0e1 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -1,5 +1,8 @@
 from django.db import models
 from django.db.models.manager import Manager
+from django.db.models.query import QuerySet
+
+from graphene.utils import LazyList
 
 
 def get_type_for_model(schema, model):
@@ -19,7 +22,18 @@ def get_reverse_fields(model):
             yield related
 
 
+class WrappedQueryset(LazyList):
+
+    def __len__(self):
+        # Dont calculate the length using len(queryset), as this will
+        # evaluate the whole queryset and return it's length.
+        # Use .count() instead
+        return self._origin.count()
+
+
 def maybe_queryset(value):
     if isinstance(value, Manager):
         value = value.get_queryset()
+    if isinstance(value, QuerySet):
+        return WrappedQueryset(value)
     return value
diff --git a/graphene/relay/types.py b/graphene/relay/types.py
index 672042e7..425e3038 100644
--- a/graphene/relay/types.py
+++ b/graphene/relay/types.py
@@ -4,6 +4,7 @@ from collections import Iterable
 from functools import wraps
 
 import six
+
 from graphql_relay.connection.arrayconnection import connection_from_list
 from graphql_relay.node.node import to_global_id
 
diff --git a/graphene/utils/__init__.py b/graphene/utils/__init__.py
index 52fb6417..6adb1f73 100644
--- a/graphene/utils/__init__.py
+++ b/graphene/utils/__init__.py
@@ -3,8 +3,9 @@ from .proxy_snake_dict import ProxySnakeDict
 from .caching import cached_property, memoize
 from .misc import enum_to_graphql_enum
 from .resolve_only_args import resolve_only_args
+from .lazylist import LazyList
 
 
 __all__ = ['to_camel_case', 'to_snake_case', 'ProxySnakeDict',
            'cached_property', 'memoize', 'enum_to_graphql_enum',
-           'resolve_only_args']
+           'resolve_only_args', 'LazyList']
diff --git a/graphene/utils/lazylist.py b/graphene/utils/lazylist.py
new file mode 100644
index 00000000..434dcfd4
--- /dev/null
+++ b/graphene/utils/lazylist.py
@@ -0,0 +1,43 @@
+class LazyList(object):
+
+    def __init__(self, origin, state=None):
+        self._origin = origin
+        self._state = state or []
+        self._origin_iter = None
+        self._finished = False
+
+    def __iter__(self):
+        return self if not self._finished else iter(self._state)
+
+    def iter(self):
+        return self.__iter__()
+
+    def __len__(self):
+        return self._origin.__len__()
+
+    def __next__(self):
+        try:
+            if not self._origin_iter:
+                self._origin_iter = self._origin.__iter__()
+            n = next(self._origin_iter)
+        except StopIteration as e:
+            self._finished = True
+            raise e
+        else:
+            self._state.append(n)
+            return n
+
+    def next(self):
+        return self.__next__()
+
+    def __getitem__(self, key):
+        item = self._origin[key]
+        if isinstance(key, slice):
+            return self.__class__(item)
+        return item
+
+    def __getattr__(self, name):
+        return getattr(self._origin, name)
+
+    def __repr__(self):
+        return "<{} {}>".format(self.__class__.__name__, repr(self._origin))
diff --git a/graphene/utils/tests/test_lazylist.py b/graphene/utils/tests/test_lazylist.py
new file mode 100644
index 00000000..972e2942
--- /dev/null
+++ b/graphene/utils/tests/test_lazylist.py
@@ -0,0 +1,23 @@
+from py.test import raises
+
+from ..lazylist import LazyList
+
+
+def test_lazymap():
+    data = list(range(10))
+    lm = LazyList(data)
+    assert len(lm) == 10
+    assert lm[1] == 1
+    assert isinstance(lm[1:4], LazyList)
+    assert lm.append == data.append
+    assert repr(lm) == '<LazyList [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]>'
+
+
+def test_lazymap_iter():
+    data = list(range(2))
+    lm = LazyList(data)
+    iter_lm = iter(lm)
+    assert iter_lm.next() == 0
+    assert iter_lm.next() == 1
+    with raises(StopIteration):
+        iter_lm.next()

From 2f6fb89f23691bb1c06073b59433c421920e4c04 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 4 Dec 2015 19:50:30 -0800
Subject: [PATCH 109/173] Fixed List, NonNull accessors as functions instead of
 properties

---
 graphene/core/classtypes/base.py            |  5 +++--
 graphene/core/classtypes/tests/test_base.py | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/graphene/core/classtypes/base.py b/graphene/core/classtypes/base.py
index 31a2c8d2..4f2de009 100644
--- a/graphene/core/classtypes/base.py
+++ b/graphene/core/classtypes/base.py
@@ -1,5 +1,6 @@
 import copy
 import inspect
+from functools import partial
 from collections import OrderedDict
 
 import six
@@ -48,8 +49,8 @@ class ClassTypeMeta(type):
 
         if not cls._meta.abstract:
             from ..types import List, NonNull
-            setattr(cls, 'NonNull', NonNull(cls))
-            setattr(cls, 'List', List(cls))
+            setattr(cls, 'NonNull', partial(NonNull, cls))
+            setattr(cls, 'List', partial(List, cls))
 
         return cls
 
diff --git a/graphene/core/classtypes/tests/test_base.py b/graphene/core/classtypes/tests/test_base.py
index 5017f94d..4666fdc2 100644
--- a/graphene/core/classtypes/tests/test_base.py
+++ b/graphene/core/classtypes/tests/test_base.py
@@ -23,15 +23,26 @@ def test_classtype_advanced():
 def test_classtype_definition_list():
     class Character(ClassType):
         '''Character description'''
-    assert isinstance(Character.List, List)
-    assert Character.List.of_type == Character
+    assert isinstance(Character.List(), List)
+    assert Character.List().of_type == Character
 
 
 def test_classtype_definition_nonnull():
     class Character(ClassType):
         '''Character description'''
-    assert isinstance(Character.NonNull, NonNull)
-    assert Character.NonNull.of_type == Character
+    assert isinstance(Character.NonNull(), NonNull)
+    assert Character.NonNull().of_type == Character
+
+
+def test_fieldsclasstype_definition_order():
+    class Character(ClassType):
+        '''Character description'''
+
+    class Query(FieldsClassType):
+        name = String()
+        char = Character.NonNull()
+
+    assert list(Query._meta.fields_map.keys()) == ['name', 'char']
 
 
 def test_fieldsclasstype():

From afdddafb3db95b99f3f17b4ed0970d91ebbcab3f Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 4 Dec 2015 19:54:57 -0800
Subject: [PATCH 110/173] Updated version

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e8c61433..2c36fcec 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ class PyTest(TestCommand):
 
 setup(
     name='graphene',
-    version='0.4.2',
+    version='0.4.3',
 
     description='Graphene: Python DSL for GraphQL',
     long_description=open('README.rst').read(),

From 19885195360fe7483907f851471678e55a6f67a5 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Sat, 5 Dec 2015 09:01:11 +0000
Subject: [PATCH 111/173] Fixes to how singledispatch is imported

---
 graphene/contrib/django/utils.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index 089e06cf..6cd5f32a 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -51,16 +51,16 @@ def get_filtering_args_from_filterset(filterset_class, type):
 
 
 def import_single_dispatch():
-    singledispatch = None
     try:
         from functools import singledispatch
     except ImportError:
-        pass
+        singledispatch = None
 
-    try:
-        from singledispatch import singledispatch
-    except ImportError:
-        pass
+    if not singledispatch:
+        try:
+            from singledispatch import singledispatch
+        except ImportError:
+            pass
 
     if not singledispatch:
         raise Exception(

From eb665d569da31101b37a70aa8d727111befcb2de Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Sat, 5 Dec 2015 09:02:15 +0000
Subject: [PATCH 112/173] Adding .editorconfig to help enforce whitespace rules

(and to stop me keep adding too many blank lines at the
end of files)
---
 .editorconfig | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..5ebeb47b
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{py,rst,ini}]
+indent_style = space
+indent_size = 4
+

From bfd43bc995298a86d91d1468c3918c8d61afa41b Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Sat, 5 Dec 2015 09:03:19 +0000
Subject: [PATCH 113/173] Flake8 fixes

---
 graphene/contrib/django/filter/__init__.py | 2 +-
 graphene/contrib/django/types.py           | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/graphene/contrib/django/filter/__init__.py b/graphene/contrib/django/filter/__init__.py
index 78a9507b..c9592a60 100644
--- a/graphene/contrib/django/filter/__init__.py
+++ b/graphene/contrib/django/filter/__init__.py
@@ -1,5 +1,5 @@
 try:
-    import django_filters
+    import django_filters  # noqa
 except:
     raise Exception(
         "Use of django filtering requires the django-filter package "
diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py
index 5b68ebbb..37cc2fa7 100644
--- a/graphene/contrib/django/types.py
+++ b/graphene/contrib/django/types.py
@@ -29,9 +29,12 @@ class DjangoObjectTypeMeta(ObjectTypeMeta):
                 # We skip this field if we specify only_fields and is not
                 # in there. Or when we exclude this field in exclude_fields
                 continue
-            converted_field = convert_django_field(field)
+            converted_field = cls.convert_django_field(field)
             cls.add_to_class(field.name, converted_field)
 
+    def convert_django_field(cls, field):
+        return convert_django_field(field)
+
     def construct(cls, *args, **kwargs):
         cls = super(DjangoObjectTypeMeta, cls).construct(*args, **kwargs)
         if not cls._meta.abstract:

From 66189be4a980e92fe46bd5a428fd9063018d5c5c Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Sat, 5 Dec 2015 11:15:17 +0000
Subject: [PATCH 114/173] Filtering now available on nodes without defining
 fields

---
 graphene/contrib/django/fields.py             |  3 +-
 graphene/contrib/django/filter/__init__.py    |  6 +--
 graphene/contrib/django/options.py            |  7 ++-
 .../django/tests/filter/test_fields.py        | 47 +++++++++++++++----
 .../django/tests/filter/test_resolvers.py     | 10 ++--
 graphene/contrib/django/types.py              | 18 ++++++-
 graphene/contrib/django/utils.py              |  6 +++
 7 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index 85c0082f..76a85580 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -20,6 +20,7 @@ class DjangoConnectionField(ConnectionField):
 
 
 class ConnectionOrListField(Field):
+    connection_field_class = ConnectionField
 
     def internal_type(self, schema):
         model_field = self.type
@@ -27,7 +28,7 @@ class ConnectionOrListField(Field):
         if not field_object_type:
             raise SkipField()
         if is_node(field_object_type):
-            field = ConnectionField(field_object_type)
+            field = self.connection_field_class(field_object_type)
         else:
             field = Field(List(field_object_type))
         field.contribute_to_class(self.object_type, self.attname)
diff --git a/graphene/contrib/django/filter/__init__.py b/graphene/contrib/django/filter/__init__.py
index c9592a60..95b28aff 100644
--- a/graphene/contrib/django/filter/__init__.py
+++ b/graphene/contrib/django/filter/__init__.py
@@ -1,6 +1,6 @@
-try:
-    import django_filters  # noqa
-except:
+from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
+
+if not DJANGO_FILTER_INSTALLED:
     raise Exception(
         "Use of django filtering requires the django-filter package "
         "be installed. You can do so using `pip install django-filter`"
diff --git a/graphene/contrib/django/options.py b/graphene/contrib/django/options.py
index f8c08e38..55868dd7 100644
--- a/graphene/contrib/django/options.py
+++ b/graphene/contrib/django/options.py
@@ -1,9 +1,12 @@
+from .utils import DJANGO_FILTER_INSTALLED
 from ...core.classtypes.objecttype import ObjectTypeOptions
 from ...relay.types import Node
 from ...relay.utils import is_node
 
-VALID_ATTRS = ('model', 'only_fields', 'exclude_fields',
-               'filter_fields', 'filter_order_by')
+VALID_ATTRS = ('model', 'only_fields', 'exclude_fields')
+
+if DJANGO_FILTER_INSTALLED:
+    VALID_ATTRS += ('filter_fields', 'filter_order_by')
 
 
 class DjangoOptions(ObjectTypeOptions):
diff --git a/graphene/contrib/django/tests/filter/test_fields.py b/graphene/contrib/django/tests/filter/test_fields.py
index 0609710a..33cc2421 100644
--- a/graphene/contrib/django/tests/filter/test_fields.py
+++ b/graphene/contrib/django/tests/filter/test_fields.py
@@ -1,20 +1,23 @@
 import pytest
 
-pytestmark = []
+from graphene import ObjectType, Schema
+from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
+from graphene.relay import NodeField
 
-try:
-    import django_filters
-except ImportError:
-    pytestmark.append(pytest.mark.skipif(True, reason='django_filters not installed'))
-else:
-    from graphene.contrib.django.filter import (GlobalIDFilter, DjangoFilterConnectionField,
-                                                GlobalIDMultipleChoiceFilter)
-    from graphene.contrib.django.tests.filter.filters import ArticleFilter, PetFilter
 
 from graphene.contrib.django import DjangoNode
 from graphene.contrib.django.forms import GlobalIDFormField, GlobalIDMultipleChoiceField
 from graphene.contrib.django.tests.models import Article, Pet, Reporter
 
+pytestmark = []
+if DJANGO_FILTER_INSTALLED:
+    import django_filters
+    from graphene.contrib.django.filter import (GlobalIDFilter, DjangoFilterConnectionField,
+                                                GlobalIDMultipleChoiceFilter)
+    from graphene.contrib.django.tests.filter.filters import ArticleFilter, PetFilter
+else:
+    pytestmark.append(pytest.mark.skipif(True, reason='django_filters not installed'))
+
 pytestmark.append(pytest.mark.django_db)
 
 
@@ -124,6 +127,32 @@ def test_filter_filterset_information_on_meta():
     assert_orderable(field)
 
 
+def test_filter_filterset_information_on_meta_related():
+    class ReporterFilterNode(DjangoNode):
+        class Meta:
+            model = Reporter
+            filter_fields = ['first_name', 'articles']
+            filter_order_by = True
+
+    class ArticleFilterNode(DjangoNode):
+        class Meta:
+            model = Article
+            filter_fields = ['headline', 'reporter']
+            filter_order_by = True
+
+    class Query(ObjectType):
+        all_reporters = DjangoFilterConnectionField(ReporterFilterNode)
+        all_articles = DjangoFilterConnectionField(ArticleFilterNode)
+        reporter = NodeField(ReporterFilterNode)
+        article = NodeField(ArticleFilterNode)
+
+    schema = Schema(query=Query)
+    schema.schema  # Trigger the schema loading
+    articles_field = schema.get_type('ReporterFilterNode')._meta.fields_map['articles']
+    assert_arguments(articles_field, 'headline', 'reporter')
+    assert_orderable(articles_field)
+
+
 def test_global_id_field_implicit():
     field = DjangoFilterConnectionField(ArticleNode, fields=['id'])
     filterset_class = field.resolver_fn.get_filterset_class()
diff --git a/graphene/contrib/django/tests/filter/test_resolvers.py b/graphene/contrib/django/tests/filter/test_resolvers.py
index a19d8276..a336cddf 100644
--- a/graphene/contrib/django/tests/filter/test_resolvers.py
+++ b/graphene/contrib/django/tests/filter/test_resolvers.py
@@ -1,13 +1,13 @@
 import pytest
 from django.core.exceptions import ImproperlyConfigured
 
-try:
-    import django_filters  # noqa
-except ImportError:
-    pytestmark = pytest.mark.skipif(True, reason='django_filters not installed')
-else:
+from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
+
+if DJANGO_FILTER_INSTALLED:
     from graphene.contrib.django.filter.resolvers import FilterConnectionResolver
     from graphene.contrib.django.tests.filter.filters import ReporterFilter, ArticleFilter
+else:
+    pytestmark = pytest.mark.skipif(True, reason='django_filters not installed')
 
 from graphene.contrib.django.tests.models import Reporter, Article
 from graphene.contrib.django.tests.test_resolvers import ReporterNode, ArticleNode
diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py
index 37cc2fa7..3a3ce1c3 100644
--- a/graphene/contrib/django/types.py
+++ b/graphene/contrib/django/types.py
@@ -5,6 +5,7 @@ from django.db import models
 
 from ...core.classtypes.objecttype import ObjectType, ObjectTypeMeta
 from ...relay.types import Connection, Node, NodeMeta
+from .utils import DJANGO_FILTER_INSTALLED
 from .converter import convert_django_field
 from .options import DjangoOptions
 from .utils import get_reverse_fields, maybe_queryset
@@ -49,6 +50,15 @@ class DjangoObjectTypeMeta(ObjectTypeMeta):
         return cls
 
 
+class DjangoFilterObjectTypeMeta():
+
+    def convert_django_field(cls, field):
+        from graphene.contrib.django.filter import DjangoFilterConnectionField
+        field = super(DjangoFilterObjectTypeMeta, cls).convert_django_field(field)
+        field.connection_field_class = DjangoFilterConnectionField
+        return field
+
+
 class InstanceObjectType(ObjectType):
 
     class Meta:
@@ -92,7 +102,13 @@ class DjangoConnection(Connection):
         return super(DjangoConnection, cls).from_list(iterable, *args, **kwargs)
 
 
-class DjangoNodeMeta(DjangoObjectTypeMeta, NodeMeta):
+django_node_meta_bases = (DjangoObjectTypeMeta, NodeMeta)
+# Only include filter functionality if available
+if DJANGO_FILTER_INSTALLED:
+    django_node_meta_bases = (DjangoFilterObjectTypeMeta,) + django_node_meta_bases
+
+
+class DjangoNodeMeta(*django_node_meta_bases):
     pass
 
 
diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index 134e0631..38bf7546 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -7,6 +7,12 @@ from graphene.utils import LazyList
 
 from graphene import Argument, String
 
+try:
+    import django_filters  # noqa
+    DJANGO_FILTER_INSTALLED = True
+except ImportError:
+    DJANGO_FILTER_INSTALLED = False
+
 
 def get_type_for_model(schema, model):
     schema = schema

From 0f35f4de8db6c9e8f2ae4f52055b03c5ac9057de Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Sat, 5 Dec 2015 11:20:48 +0000
Subject: [PATCH 115/173] Correcting definition of

---
 graphene/contrib/django/types.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py
index 3a3ce1c3..e25130df 100644
--- a/graphene/contrib/django/types.py
+++ b/graphene/contrib/django/types.py
@@ -50,7 +50,7 @@ class DjangoObjectTypeMeta(ObjectTypeMeta):
         return cls
 
 
-class DjangoFilterObjectTypeMeta():
+class DjangoFilterObjectTypeMeta(ObjectTypeMeta):
 
     def convert_django_field(cls, field):
         from graphene.contrib.django.filter import DjangoFilterConnectionField

From 880807dd2f4303df97054a388e38816d0c2bac2f Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Sat, 5 Dec 2015 13:06:44 +0000
Subject: [PATCH 116/173] Replacing django-filter detection with
 GRAPHENE_ENABLE_FILTERING setting

Also moving GRAPHENE_ORDER_BY_FIELD into settings.py which
centralises use of django settings and their default values
---
 graphene/contrib/django/filter/__init__.py             | 9 +++++----
 graphene/contrib/django/filter/filterset.py            | 7 ++-----
 graphene/contrib/django/options.py                     | 4 ++--
 graphene/contrib/django/settings.py                    | 4 ++++
 graphene/contrib/django/tests/__init__.py              | 4 ++++
 graphene/contrib/django/tests/filter/test_fields.py    | 4 ++--
 graphene/contrib/django/tests/filter/test_resolvers.py | 9 ++++-----
 graphene/contrib/django/types.py                       | 4 ++--
 graphene/contrib/django/utils.py                       | 6 ------
 9 files changed, 25 insertions(+), 26 deletions(-)
 create mode 100644 graphene/contrib/django/settings.py

diff --git a/graphene/contrib/django/filter/__init__.py b/graphene/contrib/django/filter/__init__.py
index 95b28aff..1495b99f 100644
--- a/graphene/contrib/django/filter/__init__.py
+++ b/graphene/contrib/django/filter/__init__.py
@@ -1,9 +1,10 @@
-from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
+from graphene.contrib.django import settings
 
-if not DJANGO_FILTER_INSTALLED:
+if not settings.GRAPHENE_ENABLE_FILTERING:
     raise Exception(
-        "Use of django filtering requires the django-filter package "
-        "be installed. You can do so using `pip install django-filter`"
+        "To make use of filtering you configure "
+        "GRAPHENE_ENABLE_FILTERING=True. This will also require "
+        "django-filter be installed"
     )
 
 from .fields import DjangoFilterConnectionField
diff --git a/graphene/contrib/django/filter/filterset.py b/graphene/contrib/django/filter/filterset.py
index 4755eac2..dbcfd128 100644
--- a/graphene/contrib/django/filter/filterset.py
+++ b/graphene/contrib/django/filter/filterset.py
@@ -1,11 +1,11 @@
 import six
-from django.conf import settings
 from django.db import models
 from django.utils.text import capfirst
 from django_filters import Filter, MultipleChoiceFilter
 from django_filters.filterset import FilterSetMetaclass, FilterSet
 from graphql_relay.node.node import from_global_id
 
+from graphene.contrib.django import settings
 from graphene.contrib.django.forms import GlobalIDFormField, GlobalIDMultipleChoiceField
 
 
@@ -25,9 +25,6 @@ class GlobalIDMultipleChoiceFilter(MultipleChoiceFilter):
         return super(GlobalIDMultipleChoiceFilter, self).filter(qs, gids)
 
 
-ORDER_BY_FIELD = getattr(settings, 'GRAPHENE_ORDER_BY_FIELD', 'order_by')
-
-
 GRAPHENE_FILTER_SET_OVERRIDES = {
     models.AutoField: {
         'filter_class': GlobalIDFilter,
@@ -54,7 +51,7 @@ class GrapheneFilterSetMetaclass(FilterSetMetaclass):
 
 
 class GrapheneFilterSetMixin(object):
-    order_by_field = ORDER_BY_FIELD
+    order_by_field = settings.GRAPHENE_ORDER_BY_FIELD
 
     @classmethod
     def filter_for_reverse_field(cls, f, name):
diff --git a/graphene/contrib/django/options.py b/graphene/contrib/django/options.py
index 55868dd7..276b4cfb 100644
--- a/graphene/contrib/django/options.py
+++ b/graphene/contrib/django/options.py
@@ -1,11 +1,11 @@
-from .utils import DJANGO_FILTER_INSTALLED
+from graphene.contrib.django import settings
 from ...core.classtypes.objecttype import ObjectTypeOptions
 from ...relay.types import Node
 from ...relay.utils import is_node
 
 VALID_ATTRS = ('model', 'only_fields', 'exclude_fields')
 
-if DJANGO_FILTER_INSTALLED:
+if settings.GRAPHENE_ENABLE_FILTERING:
     VALID_ATTRS += ('filter_fields', 'filter_order_by')
 
 
diff --git a/graphene/contrib/django/settings.py b/graphene/contrib/django/settings.py
new file mode 100644
index 00000000..c98de70b
--- /dev/null
+++ b/graphene/contrib/django/settings.py
@@ -0,0 +1,4 @@
+from django.conf import settings
+
+GRAPHENE_ORDER_BY_FIELD = getattr(settings, 'GRAPHENE_ORDER_BY_FIELD', 'order_by')
+GRAPHENE_ENABLE_FILTERING = getattr(settings, 'GRAPHENE_ENABLE_FILTERING', False)
diff --git a/graphene/contrib/django/tests/__init__.py b/graphene/contrib/django/tests/__init__.py
index e69de29b..57726259 100644
--- a/graphene/contrib/django/tests/__init__.py
+++ b/graphene/contrib/django/tests/__init__.py
@@ -0,0 +1,4 @@
+from graphene.contrib.django import settings
+
+# Force filtering for tests
+settings.GRAPHENE_ENABLE_FILTERING = True
diff --git a/graphene/contrib/django/tests/filter/test_fields.py b/graphene/contrib/django/tests/filter/test_fields.py
index 33cc2421..a7d9866c 100644
--- a/graphene/contrib/django/tests/filter/test_fields.py
+++ b/graphene/contrib/django/tests/filter/test_fields.py
@@ -1,7 +1,7 @@
 import pytest
 
 from graphene import ObjectType, Schema
-from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
+from graphene.contrib.django import settings
 from graphene.relay import NodeField
 
 
@@ -10,7 +10,7 @@ from graphene.contrib.django.forms import GlobalIDFormField, GlobalIDMultipleCho
 from graphene.contrib.django.tests.models import Article, Pet, Reporter
 
 pytestmark = []
-if DJANGO_FILTER_INSTALLED:
+if settings.GRAPHENE_ENABLE_FILTERING:
     import django_filters
     from graphene.contrib.django.filter import (GlobalIDFilter, DjangoFilterConnectionField,
                                                 GlobalIDMultipleChoiceFilter)
diff --git a/graphene/contrib/django/tests/filter/test_resolvers.py b/graphene/contrib/django/tests/filter/test_resolvers.py
index a336cddf..a16b0755 100644
--- a/graphene/contrib/django/tests/filter/test_resolvers.py
+++ b/graphene/contrib/django/tests/filter/test_resolvers.py
@@ -1,17 +1,16 @@
 import pytest
 from django.core.exceptions import ImproperlyConfigured
 
-from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
+from graphene.contrib.django import settings
+from graphene.contrib.django.tests.models import Reporter, Article
+from graphene.contrib.django.tests.test_resolvers import ReporterNode, ArticleNode
 
-if DJANGO_FILTER_INSTALLED:
+if settings.GRAPHENE_ENABLE_FILTERING:
     from graphene.contrib.django.filter.resolvers import FilterConnectionResolver
     from graphene.contrib.django.tests.filter.filters import ReporterFilter, ArticleFilter
 else:
     pytestmark = pytest.mark.skipif(True, reason='django_filters not installed')
 
-from graphene.contrib.django.tests.models import Reporter, Article
-from graphene.contrib.django.tests.test_resolvers import ReporterNode, ArticleNode
-
 
 def test_filter_get_filterset_class_explicit():
     reporter = Reporter(id=1, first_name='Cookie Monster')
diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py
index e25130df..1e5a5a58 100644
--- a/graphene/contrib/django/types.py
+++ b/graphene/contrib/django/types.py
@@ -3,9 +3,9 @@ import inspect
 import six
 from django.db import models
 
+from graphene.contrib.django import settings
 from ...core.classtypes.objecttype import ObjectType, ObjectTypeMeta
 from ...relay.types import Connection, Node, NodeMeta
-from .utils import DJANGO_FILTER_INSTALLED
 from .converter import convert_django_field
 from .options import DjangoOptions
 from .utils import get_reverse_fields, maybe_queryset
@@ -104,7 +104,7 @@ class DjangoConnection(Connection):
 
 django_node_meta_bases = (DjangoObjectTypeMeta, NodeMeta)
 # Only include filter functionality if available
-if DJANGO_FILTER_INSTALLED:
+if settings.GRAPHENE_ENABLE_FILTERING:
     django_node_meta_bases = (DjangoFilterObjectTypeMeta,) + django_node_meta_bases
 
 
diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index 38bf7546..134e0631 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -7,12 +7,6 @@ from graphene.utils import LazyList
 
 from graphene import Argument, String
 
-try:
-    import django_filters  # noqa
-    DJANGO_FILTER_INSTALLED = True
-except ImportError:
-    DJANGO_FILTER_INSTALLED = False
-
 
 def get_type_for_model(schema, model):
     schema = schema

From fae376cbb08978a80fb231998bb744b687bad26b Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 6 Dec 2015 01:01:23 -0800
Subject: [PATCH 117/173] Moved arguments to a named group

---
 .../core/classtypes/tests/test_mutation.py    |  2 +-
 graphene/core/schema.py                       |  5 +++-
 graphene/core/types/argument.py               | 24 +++------------
 graphene/core/types/base.py                   | 30 ++++++++++++++++++-
 graphene/core/types/field.py                  |  6 ++--
 graphene/core/types/tests/test_field.py       |  3 +-
 graphene/relay/tests/test_mutations.py        |  3 +-
 7 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/graphene/core/classtypes/tests/test_mutation.py b/graphene/core/classtypes/tests/test_mutation.py
index ac32585e..85dd2368 100644
--- a/graphene/core/classtypes/tests/test_mutation.py
+++ b/graphene/core/classtypes/tests/test_mutation.py
@@ -24,4 +24,4 @@ def test_mutation():
     assert list(object_type.get_fields().keys()) == ['name']
     assert MyMutation._meta.fields_map['name'].object_type == MyMutation
     assert isinstance(MyMutation.arguments, ArgumentsGroup)
-    assert 'argName' in MyMutation.arguments
+    assert 'argName' in schema.T(MyMutation.arguments)
diff --git a/graphene/core/schema.py b/graphene/core/schema.py
index 1b0ce8f9..2eea83ea 100644
--- a/graphene/core/schema.py
+++ b/graphene/core/schema.py
@@ -38,6 +38,9 @@ class Schema(object):
     def __repr__(self):
         return '<Schema: %s (%s)>' % (str(self.name), hash(self))
 
+    def get_internal_type(self, objecttype):
+        return objecttype.internal_type(self)
+
     def T(self, object_type):
         if not object_type:
             return
@@ -45,7 +48,7 @@ class Schema(object):
                 object_type, (BaseType, ClassType)) or isinstance(
                 object_type, BaseType):
             if object_type not in self._types:
-                internal_type = object_type.internal_type(self)
+                internal_type = self.get_internal_type(object_type)
                 self._types[object_type] = internal_type
                 is_objecttype = inspect.isclass(
                     object_type) and issubclass(object_type, ClassType)
diff --git a/graphene/core/types/argument.py b/graphene/core/types/argument.py
index 0892c446..0ef7686a 100644
--- a/graphene/core/types/argument.py
+++ b/graphene/core/types/argument.py
@@ -5,10 +5,10 @@ from itertools import chain
 from graphql.core.type import GraphQLArgument
 
 from ...utils import ProxySnakeDict, to_camel_case
-from .base import ArgumentType, BaseType, OrderedType
+from .base import ArgumentType, GroupNamedType, NamedType, OrderedType
 
 
-class Argument(OrderedType):
+class Argument(NamedType, OrderedType):
 
     def __init__(self, type, description=None, default=None,
                  name=None, _creation_counter=None):
@@ -27,27 +27,11 @@ class Argument(OrderedType):
         return self.name
 
 
-class ArgumentsGroup(BaseType):
+class ArgumentsGroup(GroupNamedType):
 
     def __init__(self, *args, **kwargs):
         arguments = to_arguments(*args, **kwargs)
-        self.arguments = OrderedDict([(arg.name, arg) for arg in arguments])
-
-    def internal_type(self, schema):
-        return OrderedDict([(arg.name, schema.T(arg))
-                            for arg in self.arguments.values()])
-
-    def __len__(self):
-        return len(self.arguments)
-
-    def __iter__(self):
-        return iter(self.arguments)
-
-    def __contains__(self, *args):
-        return self.arguments.__contains__(*args)
-
-    def __getitem__(self, *args):
-        return self.arguments.__getitem__(*args)
+        super(ArgumentsGroup, self).__init__(*arguments)
 
 
 def to_arguments(*args, **kwargs):
diff --git a/graphene/core/types/base.py b/graphene/core/types/base.py
index 2b4078e4..920963b6 100644
--- a/graphene/core/types/base.py
+++ b/graphene/core/types/base.py
@@ -1,4 +1,5 @@
-from functools import total_ordering
+from collections import OrderedDict
+from functools import total_ordering, partial
 
 import six
 
@@ -126,3 +127,30 @@ class FieldType(MirroredType):
 
 class MountedType(FieldType, ArgumentType):
     pass
+
+
+class NamedType(BaseType):
+    pass
+
+
+class GroupNamedType(BaseType):
+    def __init__(self, *types):
+        self.types = types
+
+    def get_named_type(self, schema, type):
+        return type.name or type.attname, schema.T(type)
+
+    def internal_type(self, schema):
+        return OrderedDict(map(partial(self.get_named_type, schema), self.types))
+
+    def __len__(self):
+        return len(self.types)
+
+    def __iter__(self):
+        return iter(self.types)
+
+    def __contains__(self, *args):
+        return self.types.__contains__(*args)
+
+    def __getitem__(self, *args):
+        return self.types.__getitem__(*args)
diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py
index c3fa712f..3be90c74 100644
--- a/graphene/core/types/field.py
+++ b/graphene/core/types/field.py
@@ -9,11 +9,11 @@ from ..classtypes.base import FieldsClassType
 from ..classtypes.inputobjecttype import InputObjectType
 from ..classtypes.mutation import Mutation
 from .argument import ArgumentsGroup, snake_case_args
-from .base import LazyType, MountType, OrderedType
+from .base import LazyType, NamedType, MountType, OrderedType
 from .definitions import NonNull
 
 
-class Field(OrderedType):
+class Field(NamedType, OrderedType):
 
     def __init__(
             self, type, description=None, args=None, name=None, resolver=None,
@@ -117,7 +117,7 @@ class Field(OrderedType):
         return hash((self.creation_counter, self.object_type))
 
 
-class InputField(OrderedType):
+class InputField(NamedType, OrderedType):
 
     def __init__(self, type, description=None, default=None,
                  name=None, _creation_counter=None, required=False):
diff --git a/graphene/core/types/tests/test_field.py b/graphene/core/types/tests/test_field.py
index 8253ed20..bb0bcf2c 100644
--- a/graphene/core/types/tests/test_field.py
+++ b/graphene/core/types/tests/test_field.py
@@ -98,9 +98,10 @@ def test_field_string_reference():
 
 def test_field_custom_arguments():
     field = Field(None, name='my_customName', p=String())
+    schema = Schema()
 
     args = field.arguments
-    assert 'p' in args
+    assert 'p' in schema.T(args)
 
 
 def test_inputfield_internal_type():
diff --git a/graphene/relay/tests/test_mutations.py b/graphene/relay/tests/test_mutations.py
index 4356a1ec..02287725 100644
--- a/graphene/relay/tests/test_mutations.py
+++ b/graphene/relay/tests/test_mutations.py
@@ -34,8 +34,7 @@ schema = Schema(query=Query, mutation=MyResultMutation)
 
 def test_mutation_arguments():
     assert ChangeNumber.arguments
-    assert list(ChangeNumber.arguments) == ['input']
-    assert 'input' in ChangeNumber.arguments
+    assert 'input' in schema.T(ChangeNumber.arguments)
     inner_type = ChangeNumber.input_type
     client_mutation_id_field = inner_type._meta.fields_map[
         'client_mutation_id']

From 21dffa4aa8ac2d976aa9208b34601f94418046fb Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 6 Dec 2015 01:34:56 -0800
Subject: [PATCH 118/173] Moved fields to a named group

---
 graphene/core/classtypes/base.py | 15 ++++++---------
 graphene/core/types/field.py     | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/graphene/core/classtypes/base.py b/graphene/core/classtypes/base.py
index 4f2de009..9ab51427 100644
--- a/graphene/core/classtypes/base.py
+++ b/graphene/core/classtypes/base.py
@@ -5,7 +5,6 @@ from collections import OrderedDict
 
 import six
 
-from ..exceptions import SkipField
 from .options import Options
 
 
@@ -82,6 +81,11 @@ class FieldsOptions(Options):
     def fields_map(self):
         return OrderedDict([(f.attname, f) for f in self.fields])
 
+    @property
+    def fields_group_type(self):
+        from ..types.field import FieldsGroupType
+        return FieldsGroupType(*self.local_fields)
+
 
 class FieldsClassTypeMeta(ClassTypeMeta):
     options_class = FieldsOptions
@@ -124,11 +128,4 @@ class FieldsClassType(six.with_metaclass(FieldsClassTypeMeta, ClassType)):
 
     @classmethod
     def fields_internal_types(cls, schema):
-        fields = []
-        for field in cls._meta.fields:
-            try:
-                fields.append((field.name, schema.T(field)))
-            except SkipField:
-                continue
-
-        return OrderedDict(fields)
+        return schema.T(cls._meta.fields_group_type)
diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py
index 3be90c74..9f2c3f01 100644
--- a/graphene/core/types/field.py
+++ b/graphene/core/types/field.py
@@ -8,8 +8,9 @@ from ...utils import to_camel_case
 from ..classtypes.base import FieldsClassType
 from ..classtypes.inputobjecttype import InputObjectType
 from ..classtypes.mutation import Mutation
+from ..exceptions import SkipField
 from .argument import ArgumentsGroup, snake_case_args
-from .base import LazyType, NamedType, MountType, OrderedType
+from .base import LazyType, NamedType, MountType, OrderedType, GroupNamedType
 from .definitions import NonNull
 
 
@@ -146,3 +147,14 @@ class InputField(NamedType, OrderedType):
         return GraphQLInputObjectField(
             schema.T(self.type),
             default_value=self.default, description=self.description)
+
+
+class FieldsGroupType(GroupNamedType):
+    def internal_type(self, schema):
+        fields = []
+        for field in sorted(self.types):
+            try:
+                fields.append(self.get_named_type(schema, field))
+            except SkipField:
+                continue
+        return OrderedDict(fields)

From ec3f29259389b94b294eb74efa0422d06c5727e5 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 6 Dec 2015 01:51:03 -0800
Subject: [PATCH 119/173] Refactored arguments and fields logic

---
 graphene/core/classtypes/base.py           | 10 +++++-----
 graphene/core/tests/test_old_fields.py     |  5 +++--
 graphene/core/types/argument.py            | 21 +++++++++++----------
 graphene/core/types/base.py                |  5 ++++-
 graphene/core/types/field.py               |  5 -----
 graphene/core/types/tests/test_argument.py |  4 ++--
 graphene/core/types/tests/test_field.py    |  4 ++--
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/graphene/core/classtypes/base.py b/graphene/core/classtypes/base.py
index 9ab51427..9dafff0e 100644
--- a/graphene/core/classtypes/base.py
+++ b/graphene/core/classtypes/base.py
@@ -92,7 +92,7 @@ class FieldsClassTypeMeta(ClassTypeMeta):
 
     def extend_fields(cls, bases):
         new_fields = cls._meta.local_fields
-        field_names = {f.name: f for f in new_fields}
+        field_names = {f.attname: f for f in new_fields}
 
         for base in bases:
             if not isinstance(base, FieldsClassTypeMeta):
@@ -100,17 +100,17 @@ class FieldsClassTypeMeta(ClassTypeMeta):
 
             parent_fields = base._meta.local_fields
             for field in parent_fields:
-                if field.name in field_names and field.type.__class__ != field_names[
-                        field.name].type.__class__:
+                if field.attname in field_names and field.type.__class__ != field_names[
+                        field.attname].type.__class__:
                     raise Exception(
                         'Local field %r in class %r (%r) clashes '
                         'with field with similar name from '
                         'Interface %s (%r)' % (
-                            field.name,
+                            field.attname,
                             cls.__name__,
                             field.__class__,
                             base.__name__,
-                            field_names[field.name].__class__)
+                            field_names[field.attname].__class__)
                     )
                 new_field = copy.copy(field)
                 cls.add_to_class(field.attname, new_field)
diff --git a/graphene/core/tests/test_old_fields.py b/graphene/core/tests/test_old_fields.py
index 95bf9aab..3f24aedf 100644
--- a/graphene/core/tests/test_old_fields.py
+++ b/graphene/core/tests/test_old_fields.py
@@ -34,10 +34,11 @@ def test_field_type():
     assert schema.T(f).type == GraphQLString
 
 
-def test_field_name_automatic_camelcase():
+def test_field_name():
     f = Field(GraphQLString)
     f.contribute_to_class(MyOt, 'field_name')
-    assert f.name == 'fieldName'
+    assert f.name is None
+    assert f.attname == 'field_name'
 
 
 def test_field_name_use_name_if_exists():
diff --git a/graphene/core/types/argument.py b/graphene/core/types/argument.py
index 0ef7686a..a8fe343e 100644
--- a/graphene/core/types/argument.py
+++ b/graphene/core/types/argument.py
@@ -1,10 +1,9 @@
-from collections import OrderedDict
 from functools import wraps
 from itertools import chain
 
 from graphql.core.type import GraphQLArgument
 
-from ...utils import ProxySnakeDict, to_camel_case
+from ...utils import ProxySnakeDict
 from .base import ArgumentType, GroupNamedType, NamedType, OrderedType
 
 
@@ -14,6 +13,7 @@ class Argument(NamedType, OrderedType):
                  name=None, _creation_counter=None):
         super(Argument, self).__init__(_creation_counter=_creation_counter)
         self.name = name
+        self.attname = None
         self.type = type
         self.description = description
         self.default = default
@@ -38,20 +38,21 @@ def to_arguments(*args, **kwargs):
     arguments = {}
     iter_arguments = chain(kwargs.items(), [(None, a) for a in args])
 
-    for name, arg in iter_arguments:
+    for attname, arg in iter_arguments:
         if isinstance(arg, Argument):
             argument = arg
         elif isinstance(arg, ArgumentType):
             argument = arg.as_argument()
         else:
-            raise ValueError('Unknown argument %s=%r' % (name, arg))
+            raise ValueError('Unknown argument %s=%r' % (attname, arg))
 
-        if name:
-            argument.name = to_camel_case(name)
-        assert argument.name, 'Argument in field must have a name'
-        assert argument.name not in arguments, 'Found more than one Argument with same name {}'.format(
-            argument.name)
-        arguments[argument.name] = argument
+        if attname:
+            argument.attname = attname
+
+        name = argument.name or argument.attname
+        assert name, 'Argument in field must have a name'
+        assert name not in arguments, 'Found more than one Argument with same name {}'.format(name)
+        arguments[name] = argument
 
     return sorted(arguments.values())
 
diff --git a/graphene/core/types/base.py b/graphene/core/types/base.py
index 920963b6..96523c7b 100644
--- a/graphene/core/types/base.py
+++ b/graphene/core/types/base.py
@@ -3,6 +3,8 @@ from functools import total_ordering, partial
 
 import six
 
+from ...utils import to_camel_case
+
 
 class BaseType(object):
 
@@ -138,7 +140,8 @@ class GroupNamedType(BaseType):
         self.types = types
 
     def get_named_type(self, schema, type):
-        return type.name or type.attname, schema.T(type)
+        name = type.name or to_camel_case(type.attname)
+        return name, schema.T(type)
 
     def internal_type(self, schema):
         return OrderedDict(map(partial(self.get_named_type, schema), self.types))
diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py
index 9f2c3f01..cfe168f7 100644
--- a/graphene/core/types/field.py
+++ b/graphene/core/types/field.py
@@ -4,7 +4,6 @@ from functools import wraps
 import six
 from graphql.core.type import GraphQLField, GraphQLInputObjectField
 
-from ...utils import to_camel_case
 from ..classtypes.base import FieldsClassType
 from ..classtypes.inputobjecttype import InputObjectType
 from ..classtypes.mutation import Mutation
@@ -37,8 +36,6 @@ class Field(NamedType, OrderedType):
         assert issubclass(
             cls, (FieldsClassType)), 'Field {} cannot be mounted in {}'.format(
             self, cls)
-        if not self.name:
-            self.name = to_camel_case(attname)
         self.attname = attname
         self.object_type = cls
         self.mount(cls)
@@ -134,8 +131,6 @@ class InputField(NamedType, OrderedType):
         assert issubclass(
             cls, (InputObjectType)), 'InputField {} cannot be mounted in {}'.format(
             self, cls)
-        if not self.name:
-            self.name = to_camel_case(attname)
         self.attname = attname
         self.object_type = cls
         self.mount(cls)
diff --git a/graphene/core/types/tests/test_argument.py b/graphene/core/types/tests/test_argument.py
index 26bbb310..cf07a7d3 100644
--- a/graphene/core/types/tests/test_argument.py
+++ b/graphene/core/types/tests/test_argument.py
@@ -27,8 +27,8 @@ def test_to_arguments():
         other_kwarg=String(),
     )
 
-    assert [a.name for a in arguments] == [
-        'myArg', 'otherArg', 'myKwarg', 'otherKwarg']
+    assert [a.name or a.attname for a in arguments] == [
+        'myArg', 'otherArg', 'my_kwarg', 'other_kwarg']
 
 
 def test_to_arguments_no_name():
diff --git a/graphene/core/types/tests/test_field.py b/graphene/core/types/tests/test_field.py
index bb0bcf2c..7bb23ca9 100644
--- a/graphene/core/types/tests/test_field.py
+++ b/graphene/core/types/tests/test_field.py
@@ -20,7 +20,7 @@ def test_field_internal_type():
     schema = Schema(query=Query)
 
     type = schema.T(field)
-    assert field.name == 'myField'
+    assert field.name is None
     assert field.attname == 'my_field'
     assert isinstance(type, GraphQLField)
     assert type.description == 'My argument'
@@ -116,7 +116,7 @@ def test_inputfield_internal_type():
     schema = Schema(query=MyObjectType)
 
     type = schema.T(field)
-    assert field.name == 'myField'
+    assert field.name is None
     assert field.attname == 'my_field'
     assert isinstance(type, GraphQLInputObjectField)
     assert type.description == 'My input field'

From 93e758dc13de31be5dfc80e1c2702ccae60a169e Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Sun, 6 Dec 2015 10:08:10 +0000
Subject: [PATCH 120/173] Reverting previous commit following comments by
 @syrusakbary

---
 graphene/contrib/django/filter/__init__.py             | 9 ++++-----
 graphene/contrib/django/filter/filterset.py            | 7 +++++--
 graphene/contrib/django/options.py                     | 4 ++--
 graphene/contrib/django/settings.py                    | 4 ----
 graphene/contrib/django/tests/__init__.py              | 4 ----
 graphene/contrib/django/tests/filter/test_fields.py    | 4 ++--
 graphene/contrib/django/tests/filter/test_resolvers.py | 9 +++++----
 graphene/contrib/django/types.py                       | 4 ++--
 graphene/contrib/django/utils.py                       | 6 ++++++
 9 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 graphene/contrib/django/settings.py

diff --git a/graphene/contrib/django/filter/__init__.py b/graphene/contrib/django/filter/__init__.py
index 1495b99f..95b28aff 100644
--- a/graphene/contrib/django/filter/__init__.py
+++ b/graphene/contrib/django/filter/__init__.py
@@ -1,10 +1,9 @@
-from graphene.contrib.django import settings
+from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
 
-if not settings.GRAPHENE_ENABLE_FILTERING:
+if not DJANGO_FILTER_INSTALLED:
     raise Exception(
-        "To make use of filtering you configure "
-        "GRAPHENE_ENABLE_FILTERING=True. This will also require "
-        "django-filter be installed"
+        "Use of django filtering requires the django-filter package "
+        "be installed. You can do so using `pip install django-filter`"
     )
 
 from .fields import DjangoFilterConnectionField
diff --git a/graphene/contrib/django/filter/filterset.py b/graphene/contrib/django/filter/filterset.py
index dbcfd128..4755eac2 100644
--- a/graphene/contrib/django/filter/filterset.py
+++ b/graphene/contrib/django/filter/filterset.py
@@ -1,11 +1,11 @@
 import six
+from django.conf import settings
 from django.db import models
 from django.utils.text import capfirst
 from django_filters import Filter, MultipleChoiceFilter
 from django_filters.filterset import FilterSetMetaclass, FilterSet
 from graphql_relay.node.node import from_global_id
 
-from graphene.contrib.django import settings
 from graphene.contrib.django.forms import GlobalIDFormField, GlobalIDMultipleChoiceField
 
 
@@ -25,6 +25,9 @@ class GlobalIDMultipleChoiceFilter(MultipleChoiceFilter):
         return super(GlobalIDMultipleChoiceFilter, self).filter(qs, gids)
 
 
+ORDER_BY_FIELD = getattr(settings, 'GRAPHENE_ORDER_BY_FIELD', 'order_by')
+
+
 GRAPHENE_FILTER_SET_OVERRIDES = {
     models.AutoField: {
         'filter_class': GlobalIDFilter,
@@ -51,7 +54,7 @@ class GrapheneFilterSetMetaclass(FilterSetMetaclass):
 
 
 class GrapheneFilterSetMixin(object):
-    order_by_field = settings.GRAPHENE_ORDER_BY_FIELD
+    order_by_field = ORDER_BY_FIELD
 
     @classmethod
     def filter_for_reverse_field(cls, f, name):
diff --git a/graphene/contrib/django/options.py b/graphene/contrib/django/options.py
index 276b4cfb..55868dd7 100644
--- a/graphene/contrib/django/options.py
+++ b/graphene/contrib/django/options.py
@@ -1,11 +1,11 @@
-from graphene.contrib.django import settings
+from .utils import DJANGO_FILTER_INSTALLED
 from ...core.classtypes.objecttype import ObjectTypeOptions
 from ...relay.types import Node
 from ...relay.utils import is_node
 
 VALID_ATTRS = ('model', 'only_fields', 'exclude_fields')
 
-if settings.GRAPHENE_ENABLE_FILTERING:
+if DJANGO_FILTER_INSTALLED:
     VALID_ATTRS += ('filter_fields', 'filter_order_by')
 
 
diff --git a/graphene/contrib/django/settings.py b/graphene/contrib/django/settings.py
deleted file mode 100644
index c98de70b..00000000
--- a/graphene/contrib/django/settings.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from django.conf import settings
-
-GRAPHENE_ORDER_BY_FIELD = getattr(settings, 'GRAPHENE_ORDER_BY_FIELD', 'order_by')
-GRAPHENE_ENABLE_FILTERING = getattr(settings, 'GRAPHENE_ENABLE_FILTERING', False)
diff --git a/graphene/contrib/django/tests/__init__.py b/graphene/contrib/django/tests/__init__.py
index 57726259..e69de29b 100644
--- a/graphene/contrib/django/tests/__init__.py
+++ b/graphene/contrib/django/tests/__init__.py
@@ -1,4 +0,0 @@
-from graphene.contrib.django import settings
-
-# Force filtering for tests
-settings.GRAPHENE_ENABLE_FILTERING = True
diff --git a/graphene/contrib/django/tests/filter/test_fields.py b/graphene/contrib/django/tests/filter/test_fields.py
index a7d9866c..33cc2421 100644
--- a/graphene/contrib/django/tests/filter/test_fields.py
+++ b/graphene/contrib/django/tests/filter/test_fields.py
@@ -1,7 +1,7 @@
 import pytest
 
 from graphene import ObjectType, Schema
-from graphene.contrib.django import settings
+from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
 from graphene.relay import NodeField
 
 
@@ -10,7 +10,7 @@ from graphene.contrib.django.forms import GlobalIDFormField, GlobalIDMultipleCho
 from graphene.contrib.django.tests.models import Article, Pet, Reporter
 
 pytestmark = []
-if settings.GRAPHENE_ENABLE_FILTERING:
+if DJANGO_FILTER_INSTALLED:
     import django_filters
     from graphene.contrib.django.filter import (GlobalIDFilter, DjangoFilterConnectionField,
                                                 GlobalIDMultipleChoiceFilter)
diff --git a/graphene/contrib/django/tests/filter/test_resolvers.py b/graphene/contrib/django/tests/filter/test_resolvers.py
index a16b0755..a336cddf 100644
--- a/graphene/contrib/django/tests/filter/test_resolvers.py
+++ b/graphene/contrib/django/tests/filter/test_resolvers.py
@@ -1,16 +1,17 @@
 import pytest
 from django.core.exceptions import ImproperlyConfigured
 
-from graphene.contrib.django import settings
-from graphene.contrib.django.tests.models import Reporter, Article
-from graphene.contrib.django.tests.test_resolvers import ReporterNode, ArticleNode
+from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
 
-if settings.GRAPHENE_ENABLE_FILTERING:
+if DJANGO_FILTER_INSTALLED:
     from graphene.contrib.django.filter.resolvers import FilterConnectionResolver
     from graphene.contrib.django.tests.filter.filters import ReporterFilter, ArticleFilter
 else:
     pytestmark = pytest.mark.skipif(True, reason='django_filters not installed')
 
+from graphene.contrib.django.tests.models import Reporter, Article
+from graphene.contrib.django.tests.test_resolvers import ReporterNode, ArticleNode
+
 
 def test_filter_get_filterset_class_explicit():
     reporter = Reporter(id=1, first_name='Cookie Monster')
diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py
index 1e5a5a58..e25130df 100644
--- a/graphene/contrib/django/types.py
+++ b/graphene/contrib/django/types.py
@@ -3,9 +3,9 @@ import inspect
 import six
 from django.db import models
 
-from graphene.contrib.django import settings
 from ...core.classtypes.objecttype import ObjectType, ObjectTypeMeta
 from ...relay.types import Connection, Node, NodeMeta
+from .utils import DJANGO_FILTER_INSTALLED
 from .converter import convert_django_field
 from .options import DjangoOptions
 from .utils import get_reverse_fields, maybe_queryset
@@ -104,7 +104,7 @@ class DjangoConnection(Connection):
 
 django_node_meta_bases = (DjangoObjectTypeMeta, NodeMeta)
 # Only include filter functionality if available
-if settings.GRAPHENE_ENABLE_FILTERING:
+if DJANGO_FILTER_INSTALLED:
     django_node_meta_bases = (DjangoFilterObjectTypeMeta,) + django_node_meta_bases
 
 
diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index 134e0631..38bf7546 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -7,6 +7,12 @@ from graphene.utils import LazyList
 
 from graphene import Argument, String
 
+try:
+    import django_filters  # noqa
+    DJANGO_FILTER_INSTALLED = True
+except ImportError:
+    DJANGO_FILTER_INSTALLED = False
+
 
 def get_type_for_model(schema, model):
     schema = schema

From 12e4e2c0068672aac2b1bfd94e0bd42a155b1917 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 6 Dec 2015 02:35:17 -0800
Subject: [PATCH 121/173] Added Plugins structure. Added option in schema for
 auto camel case or not.

---
 graphene/core/schema.py        | 16 +++++++++++++++-
 graphene/core/types/base.py    |  2 +-
 graphene/plugins/__init__.py   |  6 ++++++
 graphene/plugins/base.py       |  6 ++++++
 graphene/plugins/camel_case.py | 22 ++++++++++++++++++++++
 5 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 graphene/plugins/__init__.py
 create mode 100644 graphene/plugins/base.py
 create mode 100644 graphene/plugins/camel_case.py

diff --git a/graphene/core/schema.py b/graphene/core/schema.py
index 2eea83ea..4da067e4 100644
--- a/graphene/core/schema.py
+++ b/graphene/core/schema.py
@@ -12,6 +12,7 @@ from graphene import signals
 
 from .classtypes.base import ClassType
 from .types.base import BaseType
+from ..plugins import Plugin, CamelCase
 
 
 class GraphQLSchema(_GraphQLSchema):
@@ -25,7 +26,7 @@ class Schema(object):
     _executor = None
 
     def __init__(self, query=None, mutation=None, subscription=None,
-                 name='Schema', executor=None):
+                 name='Schema', executor=None, plugins=None, auto_camelcase=True):
         self._types_names = {}
         self._types = {}
         self.mutation = mutation
@@ -33,12 +34,25 @@ class Schema(object):
         self.subscription = subscription
         self.name = name
         self.executor = executor
+        self.plugins = []
+        plugins = plugins or []
+        if auto_camelcase:
+            plugins.append(CamelCase())
+        for plugin in plugins:
+            self.add_plugin(plugin)
         signals.init_schema.send(self)
 
     def __repr__(self):
         return '<Schema: %s (%s)>' % (str(self.name), hash(self))
 
+    def add_plugin(self, plugin):
+        assert isinstance(plugin, Plugin), 'A plugin need to subclass graphene.Plugin and be instantiated'
+        plugin.contribute_to_schema(self)
+        self.plugins.append(plugin)
+
     def get_internal_type(self, objecttype):
+        for plugin in self.plugins:
+            objecttype = plugin.transform_type(objecttype)
         return objecttype.internal_type(self)
 
     def T(self, object_type):
diff --git a/graphene/core/types/base.py b/graphene/core/types/base.py
index 96523c7b..94e8a75c 100644
--- a/graphene/core/types/base.py
+++ b/graphene/core/types/base.py
@@ -140,7 +140,7 @@ class GroupNamedType(BaseType):
         self.types = types
 
     def get_named_type(self, schema, type):
-        name = type.name or to_camel_case(type.attname)
+        name = type.name or type.attname
         return name, schema.T(type)
 
     def internal_type(self, schema):
diff --git a/graphene/plugins/__init__.py b/graphene/plugins/__init__.py
new file mode 100644
index 00000000..5a9bf26b
--- /dev/null
+++ b/graphene/plugins/__init__.py
@@ -0,0 +1,6 @@
+from .base import Plugin
+from .camel_case import CamelCase
+
+__all__ = [
+    'Plugin', 'CamelCase'
+]
diff --git a/graphene/plugins/base.py b/graphene/plugins/base.py
new file mode 100644
index 00000000..557099c7
--- /dev/null
+++ b/graphene/plugins/base.py
@@ -0,0 +1,6 @@
+class Plugin(object):
+    def contribute_to_schema(self, schema):
+        self.schema = schema
+
+    def transform_type(self, objecttype):
+        return objecttype
diff --git a/graphene/plugins/camel_case.py b/graphene/plugins/camel_case.py
new file mode 100644
index 00000000..cba39ad5
--- /dev/null
+++ b/graphene/plugins/camel_case.py
@@ -0,0 +1,22 @@
+from .base import Plugin
+
+from ..core.types.base import GroupNamedType
+from ..utils import memoize, to_camel_case
+
+
+def camelcase_named_type(schema, type):
+    name = type.name or to_camel_case(type.attname)
+    return name, schema.T(type)
+
+
+class CamelCase(Plugin):
+    @memoize
+    def transform_group(self, _type):
+        new_type = _type.__class__(*_type.types)
+        setattr(new_type, 'get_named_type', camelcase_named_type)
+        return new_type
+
+    def transform_type(self, _type):
+        if isinstance(_type, GroupNamedType):
+            return self.transform_group(_type)
+        return _type

From 3d4f593300f640b04b5981dca0cd7cf405d9f62d Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Sun, 6 Dec 2015 10:38:28 +0000
Subject: [PATCH 122/173] DjangoFilterConnectionField now extends
 ConnectionField, as DjangoConnectionField is now deprecated

---
 graphene/contrib/django/filter/fields.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/graphene/contrib/django/filter/fields.py b/graphene/contrib/django/filter/fields.py
index 8c402fbe..012ae00a 100644
--- a/graphene/contrib/django/filter/fields.py
+++ b/graphene/contrib/django/filter/fields.py
@@ -1,9 +1,9 @@
-from graphene.contrib.django import DjangoConnectionField
+from graphene.relay import ConnectionField
 from graphene.contrib.django.filter.resolvers import FilterConnectionResolver
 from graphene.contrib.django.utils import get_filtering_args_from_filterset
 
 
-class DjangoFilterConnectionField(DjangoConnectionField):
+class DjangoFilterConnectionField(ConnectionField):
 
     def __init__(self, type, on=None, fields=None, order_by=None,
                  extra_filter_meta=None, filterset_class=None, resolver=None,

From a153a01f6ba7e5805bed10ec6867961d673835bc Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 6 Dec 2015 03:59:44 -0800
Subject: [PATCH 123/173] Improved debug using plugin structure

---
 graphene/contrib/django/debug/__init__.py     |  4 +--
 .../django/debug/{schema.py => plugin.py}     | 26 +++++++++----------
 .../contrib/django/debug/tests/test_query.py  |  6 ++---
 graphene/contrib/django/debug/types.py        |  2 +-
 graphene/core/schema.py                       | 24 +++++++++++------
 5 files changed, 34 insertions(+), 28 deletions(-)
 rename graphene/contrib/django/debug/{schema.py => plugin.py} (74%)

diff --git a/graphene/contrib/django/debug/__init__.py b/graphene/contrib/django/debug/__init__.py
index 0636c3fa..4c76aeca 100644
--- a/graphene/contrib/django/debug/__init__.py
+++ b/graphene/contrib/django/debug/__init__.py
@@ -1,4 +1,4 @@
-from .schema import DebugSchema
+from .plugin import DjangoDebugPlugin
 from .types import DjangoDebug
 
-__all__ = ['DebugSchema', 'DjangoDebug']
+__all__ = ['DjangoDebugPlugin', 'DjangoDebug']
diff --git a/graphene/contrib/django/debug/schema.py b/graphene/contrib/django/debug/plugin.py
similarity index 74%
rename from graphene/contrib/django/debug/schema.py
rename to graphene/contrib/django/debug/plugin.py
index e5e5f30b..5c21863f 100644
--- a/graphene/contrib/django/debug/schema.py
+++ b/graphene/contrib/django/debug/plugin.py
@@ -1,5 +1,7 @@
+from contextlib import contextmanager
 from django.db import connections
 
+from ....plugins import Plugin
 from ....core.schema import Schema
 from ....core.types import Field
 from .sql.tracking import unwrap_cursor, wrap_cursor
@@ -41,15 +43,11 @@ def debug_objecttype(objecttype):
         {'debug': Field(DjangoDebug, name='__debug')})
 
 
-class DebugSchema(Schema):
-
-    @property
-    def query(self):
-        return self._query
-
-    @query.setter
-    def query(self, value):
-        self._query = value and debug_objecttype(value)
+class DjangoDebugPlugin(Plugin):
+    def transform_type(self, _type):
+        if _type == self.schema.query:
+            return debug_objecttype(_type)
+        return _type
 
     def enable_instrumentation(self, wrapped_root):
         # This is thread-safe because database connections are thread-local.
@@ -60,9 +58,9 @@ class DebugSchema(Schema):
         for connection in connections.all():
             unwrap_cursor(connection)
 
-    def execute(self, query, root=None, *args, **kwargs):
-        wrapped_root = WrappedRoot(root=root)
-        self.enable_instrumentation(wrapped_root)
-        result = super(DebugSchema, self).execute(query, wrapped_root, *args, **kwargs)
+    @contextmanager
+    def context_execution(self, executor):
+        executor['root'] = WrappedRoot(root=executor['root'])
+        self.enable_instrumentation(executor['root'])
+        yield executor
         self.disable_instrumentation()
-        return result
diff --git a/graphene/contrib/django/debug/tests/test_query.py b/graphene/contrib/django/debug/tests/test_query.py
index 3b4de477..4df26e4f 100644
--- a/graphene/contrib/django/debug/tests/test_query.py
+++ b/graphene/contrib/django/debug/tests/test_query.py
@@ -4,7 +4,7 @@ import graphene
 from graphene.contrib.django import DjangoObjectType
 
 from ...tests.models import Reporter
-from ..schema import DebugSchema
+from ..plugin import DjangoDebugPlugin
 
 # from examples.starwars_django.models import Character
 
@@ -24,7 +24,7 @@ def test_should_query_well():
 
     class Query(graphene.ObjectType):
         reporter = graphene.Field(ReporterType)
-        all_reporters = ReporterType.List
+        all_reporters = ReporterType.List()
 
         def resolve_all_reporters(self, *args, **kwargs):
             return Reporter.objects.all()
@@ -64,7 +64,7 @@ def test_should_query_well():
             }]
         }
     }
-    schema = DebugSchema(query=Query)
+    schema = graphene.Schema(query=Query, plugins=[DjangoDebugPlugin()])
     result = schema.execute(query)
     assert not result.errors
     assert result.data == expected
diff --git a/graphene/contrib/django/debug/types.py b/graphene/contrib/django/debug/types.py
index d84cbb98..bceb54b0 100644
--- a/graphene/contrib/django/debug/types.py
+++ b/graphene/contrib/django/debug/types.py
@@ -4,4 +4,4 @@ from .sql.types import DjangoDebugSQL
 
 
 class DjangoDebug(ObjectType):
-    sql = Field(DjangoDebugSQL.List)
+    sql = Field(DjangoDebugSQL.List())
diff --git a/graphene/core/schema.py b/graphene/core/schema.py
index 4da067e4..e8995426 100644
--- a/graphene/core/schema.py
+++ b/graphene/core/schema.py
@@ -127,17 +127,25 @@ class Schema(object):
     def types(self):
         return self._types_names
 
-    def execute(self, request='', root=None, vars=None,
-                operation_name=None, **kwargs):
-        root = root or object()
-        return self.executor.execute(
+    def execute(self, request='', root=None, args=None, **kwargs):
+        executor = kwargs
+        executor['root'] = root
+        executor['args'] = args
+        contexts = []
+        for plugin in self.plugins:
+            if not hasattr(plugin, 'context_execution'):
+                continue
+            context = plugin.context_execution(executor)
+            executor = context.__enter__()
+            contexts.append((context, executor))
+        result = self.executor.execute(
             self.schema,
             request,
-            root=root,
-            args=vars,
-            operation_name=operation_name,
-            **kwargs
+            **executor
         )
+        for context, value in contexts[::-1]:
+            context.__exit__(None, None, None)
+        return result
 
     def introspect(self):
         return self.execute(introspection_query).data

From c9e7f67ff9b7f283e4a7ea2c2887b18982b0dd03 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 6 Dec 2015 14:36:47 -0800
Subject: [PATCH 124/173] Improved logic in GroupNamedType

---
 graphene/core/types/base.py  | 5 ++++-
 graphene/core/types/field.py | 6 ++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/graphene/core/types/base.py b/graphene/core/types/base.py
index 94e8a75c..1892cc0d 100644
--- a/graphene/core/types/base.py
+++ b/graphene/core/types/base.py
@@ -143,8 +143,11 @@ class GroupNamedType(BaseType):
         name = type.name or type.attname
         return name, schema.T(type)
 
+    def iter_types(self, schema):
+        return map(partial(self.get_named_type, schema), self.types)
+
     def internal_type(self, schema):
-        return OrderedDict(map(partial(self.get_named_type, schema), self.types))
+        return OrderedDict(self.iter_types(schema))
 
     def __len__(self):
         return len(self.types)
diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py
index cfe168f7..e5736867 100644
--- a/graphene/core/types/field.py
+++ b/graphene/core/types/field.py
@@ -145,11 +145,9 @@ class InputField(NamedType, OrderedType):
 
 
 class FieldsGroupType(GroupNamedType):
-    def internal_type(self, schema):
-        fields = []
+    def iter_types(self, schema):
         for field in sorted(self.types):
             try:
-                fields.append(self.get_named_type(schema, field))
+                yield self.get_named_type(schema, field)
             except SkipField:
                 continue
-        return OrderedDict(fields)

From 9ea10f562c94747c127eee9321a18801eafd08c7 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 6 Dec 2015 14:37:44 -0800
Subject: [PATCH 125/173] Fixed lint errors

---
 graphene/core/classtypes/base.py | 2 +-
 graphene/core/schema.py          | 2 +-
 graphene/core/types/base.py      | 5 ++---
 graphene/core/types/field.py     | 3 ++-
 graphene/plugins/base.py         | 1 +
 graphene/plugins/camel_case.py   | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/graphene/core/classtypes/base.py b/graphene/core/classtypes/base.py
index 9dafff0e..cabb909a 100644
--- a/graphene/core/classtypes/base.py
+++ b/graphene/core/classtypes/base.py
@@ -1,7 +1,7 @@
 import copy
 import inspect
-from functools import partial
 from collections import OrderedDict
+from functools import partial
 
 import six
 
diff --git a/graphene/core/schema.py b/graphene/core/schema.py
index 4da067e4..f3a0b96d 100644
--- a/graphene/core/schema.py
+++ b/graphene/core/schema.py
@@ -10,9 +10,9 @@ from graphql.core.utils.schema_printer import print_schema
 
 from graphene import signals
 
+from ..plugins import CamelCase, Plugin
 from .classtypes.base import ClassType
 from .types.base import BaseType
-from ..plugins import Plugin, CamelCase
 
 
 class GraphQLSchema(_GraphQLSchema):
diff --git a/graphene/core/types/base.py b/graphene/core/types/base.py
index 1892cc0d..35797f8e 100644
--- a/graphene/core/types/base.py
+++ b/graphene/core/types/base.py
@@ -1,10 +1,8 @@
 from collections import OrderedDict
-from functools import total_ordering, partial
+from functools import partial, total_ordering
 
 import six
 
-from ...utils import to_camel_case
-
 
 class BaseType(object):
 
@@ -136,6 +134,7 @@ class NamedType(BaseType):
 
 
 class GroupNamedType(BaseType):
+
     def __init__(self, *types):
         self.types = types
 
diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py
index e5736867..41dc537b 100644
--- a/graphene/core/types/field.py
+++ b/graphene/core/types/field.py
@@ -9,7 +9,7 @@ from ..classtypes.inputobjecttype import InputObjectType
 from ..classtypes.mutation import Mutation
 from ..exceptions import SkipField
 from .argument import ArgumentsGroup, snake_case_args
-from .base import LazyType, NamedType, MountType, OrderedType, GroupNamedType
+from .base import GroupNamedType, LazyType, MountType, NamedType, OrderedType
 from .definitions import NonNull
 
 
@@ -145,6 +145,7 @@ class InputField(NamedType, OrderedType):
 
 
 class FieldsGroupType(GroupNamedType):
+
     def iter_types(self, schema):
         for field in sorted(self.types):
             try:
diff --git a/graphene/plugins/base.py b/graphene/plugins/base.py
index 557099c7..c881592e 100644
--- a/graphene/plugins/base.py
+++ b/graphene/plugins/base.py
@@ -1,4 +1,5 @@
 class Plugin(object):
+
     def contribute_to_schema(self, schema):
         self.schema = schema
 
diff --git a/graphene/plugins/camel_case.py b/graphene/plugins/camel_case.py
index cba39ad5..281e3d9d 100644
--- a/graphene/plugins/camel_case.py
+++ b/graphene/plugins/camel_case.py
@@ -1,7 +1,6 @@
-from .base import Plugin
-
 from ..core.types.base import GroupNamedType
 from ..utils import memoize, to_camel_case
+from .base import Plugin
 
 
 def camelcase_named_type(schema, type):
@@ -10,6 +9,7 @@ def camelcase_named_type(schema, type):
 
 
 class CamelCase(Plugin):
+
     @memoize
     def transform_group(self, _type):
         new_type = _type.__class__(*_type.types)

From 5e708cc919d30a4eb99b63a0ebfb87b65e73e251 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 6 Dec 2015 15:29:54 -0800
Subject: [PATCH 126/173] Improved tests. Improved schema.type getter. Remove
 duplicated Scalar code

---
 graphene/core/classtypes/base.py          |  2 +-
 graphene/core/schema.py                   | 26 +++++++++-----------
 graphene/core/types/__init__.py           |  5 ++--
 graphene/core/types/scalars.py            | 19 +-------------
 graphene/core/types/tests/test_field.py   |  2 +-
 graphene/core/types/tests/test_scalars.py | 30 ++---------------------
 6 files changed, 19 insertions(+), 65 deletions(-)

diff --git a/graphene/core/classtypes/base.py b/graphene/core/classtypes/base.py
index 4f2de009..214edf6f 100644
--- a/graphene/core/classtypes/base.py
+++ b/graphene/core/classtypes/base.py
@@ -1,7 +1,7 @@
 import copy
 import inspect
-from functools import partial
 from collections import OrderedDict
+from functools import partial
 
 import six
 
diff --git a/graphene/core/schema.py b/graphene/core/schema.py
index 1b0ce8f9..a8ef29e3 100644
--- a/graphene/core/schema.py
+++ b/graphene/core/schema.py
@@ -38,22 +38,20 @@ class Schema(object):
     def __repr__(self):
         return '<Schema: %s (%s)>' % (str(self.name), hash(self))
 
-    def T(self, object_type):
-        if not object_type:
+    def T(self, _type):
+        if not _type:
             return
-        if inspect.isclass(object_type) and issubclass(
-                object_type, (BaseType, ClassType)) or isinstance(
-                object_type, BaseType):
-            if object_type not in self._types:
-                internal_type = object_type.internal_type(self)
-                self._types[object_type] = internal_type
-                is_objecttype = inspect.isclass(
-                    object_type) and issubclass(object_type, ClassType)
-                if is_objecttype:
-                    self.register(object_type)
-            return self._types[object_type]
+        is_classtype = inspect.isclass(_type) and issubclass(_type, ClassType)
+        is_instancetype = isinstance(_type, BaseType)
+        if is_classtype or is_instancetype:
+            if _type not in self._types:
+                internal_type = _type.internal_type(self)
+                self._types[_type] = internal_type
+                if is_classtype:
+                    self.register(_type)
+            return self._types[_type]
         else:
-            return object_type
+            return _type
 
     @property
     def executor(self):
diff --git a/graphene/core/types/__init__.py b/graphene/core/types/__init__.py
index 9260476c..0ffa52bb 100644
--- a/graphene/core/types/__init__.py
+++ b/graphene/core/types/__init__.py
@@ -4,7 +4,7 @@ from .definitions import List, NonNull
 # Compatibility import
 from .objecttype import Interface, ObjectType, Mutation, InputObjectType
 
-from .scalars import String, ID, Boolean, Int, Float, Scalar
+from .scalars import String, ID, Boolean, Int, Float
 from .field import Field, InputField
 
 __all__ = [
@@ -26,5 +26,4 @@ __all__ = [
     'ID',
     'Boolean',
     'Int',
-    'Float',
-    'Scalar']
+    'Float']
diff --git a/graphene/core/types/scalars.py b/graphene/core/types/scalars.py
index 75cd70a3..d0d315b4 100644
--- a/graphene/core/types/scalars.py
+++ b/graphene/core/types/scalars.py
@@ -1,5 +1,5 @@
 from graphql.core.type import (GraphQLBoolean, GraphQLFloat, GraphQLID,
-                               GraphQLInt, GraphQLScalarType, GraphQLString)
+                               GraphQLInt, GraphQLString)
 
 from .base import MountedType
 
@@ -22,20 +22,3 @@ class ID(MountedType):
 
 class Float(MountedType):
     T = GraphQLFloat
-
-
-class Scalar(MountedType):
-
-    @classmethod
-    def internal_type(cls, schema):
-        serialize = getattr(cls, 'serialize')
-        parse_literal = getattr(cls, 'parse_literal')
-        parse_value = getattr(cls, 'parse_value')
-
-        return GraphQLScalarType(
-            name=cls.__name__,
-            description=cls.__doc__,
-            serialize=serialize,
-            parse_value=parse_value,
-            parse_literal=parse_literal
-        )
diff --git a/graphene/core/types/tests/test_field.py b/graphene/core/types/tests/test_field.py
index 8253ed20..df72a6f7 100644
--- a/graphene/core/types/tests/test_field.py
+++ b/graphene/core/types/tests/test_field.py
@@ -13,7 +13,7 @@ from ..scalars import String
 def test_field_internal_type():
     resolver = lambda *args: 'RESOLVED'
 
-    field = Field(String, description='My argument', resolver=resolver)
+    field = Field(String(), description='My argument', resolver=resolver)
 
     class Query(ObjectType):
         my_field = field
diff --git a/graphene/core/types/tests/test_scalars.py b/graphene/core/types/tests/test_scalars.py
index 8b8d930f..39fd6063 100644
--- a/graphene/core/types/tests/test_scalars.py
+++ b/graphene/core/types/tests/test_scalars.py
@@ -1,9 +1,9 @@
 from graphql.core.type import (GraphQLBoolean, GraphQLFloat, GraphQLID,
-                               GraphQLInt, GraphQLScalarType, GraphQLString)
+                               GraphQLInt, GraphQLString)
 
 from graphene.core.schema import Schema
 
-from ..scalars import ID, Boolean, Float, Int, Scalar, String
+from ..scalars import ID, Boolean, Float, Int, String
 
 schema = Schema()
 
@@ -26,29 +26,3 @@ def test_id_scalar():
 
 def test_float_scalar():
     assert schema.T(Float()) == GraphQLFloat
-
-
-def test_custom_scalar():
-    import datetime
-    from graphql.core.language import ast
-
-    class DateTimeScalar(Scalar):
-        '''DateTimeScalar Documentation'''
-        @staticmethod
-        def serialize(dt):
-            return dt.isoformat()
-
-        @staticmethod
-        def parse_literal(node):
-            if isinstance(node, ast.StringValue):
-                return datetime.datetime.strptime(
-                    node.value, "%Y-%m-%dT%H:%M:%S.%f")
-
-        @staticmethod
-        def parse_value(value):
-            return datetime.datetime.strptime(value, "%Y-%m-%dT%H:%M:%S.%f")
-
-    scalar_type = schema.T(DateTimeScalar)
-    assert isinstance(scalar_type, GraphQLScalarType)
-    assert scalar_type.name == 'DateTimeScalar'
-    assert scalar_type.description == 'DateTimeScalar Documentation'

From 37a454b83138e9fc7525af0806654e0de774f984 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 6 Dec 2015 15:49:54 -0800
Subject: [PATCH 127/173] Renamed BaseType to InstanceType for code clarity

---
 graphene/__init__.py            | 4 ++--
 graphene/core/__init__.py       | 4 ++--
 graphene/core/schema.py         | 4 ++--
 graphene/core/types/__init__.py | 4 ++--
 graphene/core/types/argument.py | 4 ++--
 graphene/core/types/base.py     | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/graphene/__init__.py b/graphene/__init__.py
index 88404d62..71066499 100644
--- a/graphene/__init__.py
+++ b/graphene/__init__.py
@@ -11,7 +11,7 @@ from .core import (
     Interface,
     Mutation,
     Scalar,
-    BaseType,
+    InstanceType,
     LazyType,
     Argument,
     Field,
@@ -51,7 +51,7 @@ __all__ = [
     'NonNull',
     'signals',
     'Schema',
-    'BaseType',
+    'InstanceType',
     'LazyType',
     'ObjectType',
     'InputObjectType',
diff --git a/graphene/core/__init__.py b/graphene/core/__init__.py
index d27a72bb..9e8c7108 100644
--- a/graphene/core/__init__.py
+++ b/graphene/core/__init__.py
@@ -11,7 +11,7 @@ from .classtypes import (
 )
 
 from .types import (
-    BaseType,
+    InstanceType,
     LazyType,
     Argument,
     Field,
@@ -35,7 +35,7 @@ __all__ = [
     'List',
     'NonNull',
     'Schema',
-    'BaseType',
+    'InstanceType',
     'LazyType',
     'ObjectType',
     'InputObjectType',
diff --git a/graphene/core/schema.py b/graphene/core/schema.py
index a8ef29e3..8a1e1b7a 100644
--- a/graphene/core/schema.py
+++ b/graphene/core/schema.py
@@ -11,7 +11,7 @@ from graphql.core.utils.schema_printer import print_schema
 from graphene import signals
 
 from .classtypes.base import ClassType
-from .types.base import BaseType
+from .types.base import InstanceType
 
 
 class GraphQLSchema(_GraphQLSchema):
@@ -42,7 +42,7 @@ class Schema(object):
         if not _type:
             return
         is_classtype = inspect.isclass(_type) and issubclass(_type, ClassType)
-        is_instancetype = isinstance(_type, BaseType)
+        is_instancetype = isinstance(_type, InstanceType)
         if is_classtype or is_instancetype:
             if _type not in self._types:
                 internal_type = _type.internal_type(self)
diff --git a/graphene/core/types/__init__.py b/graphene/core/types/__init__.py
index 0ffa52bb..51512ec4 100644
--- a/graphene/core/types/__init__.py
+++ b/graphene/core/types/__init__.py
@@ -1,4 +1,4 @@
-from .base import BaseType, LazyType, OrderedType
+from .base import InstanceType, LazyType, OrderedType
 from .argument import Argument, ArgumentsGroup, to_arguments
 from .definitions import List, NonNull
 # Compatibility import
@@ -8,7 +8,7 @@ from .scalars import String, ID, Boolean, Int, Float
 from .field import Field, InputField
 
 __all__ = [
-    'BaseType',
+    'InstanceType',
     'LazyType',
     'OrderedType',
     'Argument',
diff --git a/graphene/core/types/argument.py b/graphene/core/types/argument.py
index 0892c446..7eb77770 100644
--- a/graphene/core/types/argument.py
+++ b/graphene/core/types/argument.py
@@ -5,7 +5,7 @@ from itertools import chain
 from graphql.core.type import GraphQLArgument
 
 from ...utils import ProxySnakeDict, to_camel_case
-from .base import ArgumentType, BaseType, OrderedType
+from .base import ArgumentType, InstanceType, OrderedType
 
 
 class Argument(OrderedType):
@@ -27,7 +27,7 @@ class Argument(OrderedType):
         return self.name
 
 
-class ArgumentsGroup(BaseType):
+class ArgumentsGroup(InstanceType):
 
     def __init__(self, *args, **kwargs):
         arguments = to_arguments(*args, **kwargs)
diff --git a/graphene/core/types/base.py b/graphene/core/types/base.py
index 2b4078e4..8cfa603f 100644
--- a/graphene/core/types/base.py
+++ b/graphene/core/types/base.py
@@ -3,14 +3,14 @@ from functools import total_ordering
 import six
 
 
-class BaseType(object):
+class InstanceType(object):
 
     @classmethod
     def internal_type(cls, schema):
         return getattr(cls, 'T', None)
 
 
-class MountType(BaseType):
+class MountType(InstanceType):
     parent = None
 
     def mount(self, cls):

From 2724025a5b4029f36fb4cc6a388dfbf17f31d009 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 6 Dec 2015 15:53:56 -0800
Subject: [PATCH 128/173] Improved ScalarTypes code

---
 graphene/core/types/base.py    |  5 ++---
 graphene/core/types/scalars.py | 25 +++++++++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/graphene/core/types/base.py b/graphene/core/types/base.py
index 8cfa603f..35f93267 100644
--- a/graphene/core/types/base.py
+++ b/graphene/core/types/base.py
@@ -5,9 +5,8 @@ import six
 
 class InstanceType(object):
 
-    @classmethod
-    def internal_type(cls, schema):
-        return getattr(cls, 'T', None)
+    def internal_type(self, schema):
+        raise NotImplementedError("internal_type for type {} is not implemented".format(self.__class__.__name__))
 
 
 class MountType(InstanceType):
diff --git a/graphene/core/types/scalars.py b/graphene/core/types/scalars.py
index d0d315b4..a87ddea2 100644
--- a/graphene/core/types/scalars.py
+++ b/graphene/core/types/scalars.py
@@ -4,21 +4,26 @@ from graphql.core.type import (GraphQLBoolean, GraphQLFloat, GraphQLID,
 from .base import MountedType
 
 
-class String(MountedType):
-    T = GraphQLString
+class ScalarType(MountedType):
+    def internal_type(self, schema):
+        return self._internal_type
 
 
-class Int(MountedType):
-    T = GraphQLInt
+class String(ScalarType):
+    _internal_type = GraphQLString
 
 
-class Boolean(MountedType):
-    T = GraphQLBoolean
+class Int(ScalarType):
+    _internal_type = GraphQLInt
 
 
-class ID(MountedType):
-    T = GraphQLID
+class Boolean(ScalarType):
+    _internal_type = GraphQLBoolean
 
 
-class Float(MountedType):
-    T = GraphQLFloat
+class ID(ScalarType):
+    _internal_type = GraphQLID
+
+
+class Float(ScalarType):
+    _internal_type = GraphQLFloat

From cd5d9b8eead87cb20ad902e96984290e79fe02c3 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 6 Dec 2015 16:34:47 -0800
Subject: [PATCH 129/173] Improved plugin structure based on @adamcharnock
 suggestions

---
 graphene/core/schema.py                    | 10 ++++++----
 graphene/core/types/argument.py            | 14 ++++++--------
 graphene/core/types/base.py                |  7 +++++--
 graphene/core/types/field.py               |  6 +++---
 graphene/core/types/tests/test_argument.py |  2 +-
 graphene/plugins/camel_case.py             | 20 +++-----------------
 6 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/graphene/core/schema.py b/graphene/core/schema.py
index 960f0aca..d3bff4bd 100644
--- a/graphene/core/schema.py
+++ b/graphene/core/schema.py
@@ -50,10 +50,12 @@ class Schema(object):
         plugin.contribute_to_schema(self)
         self.plugins.append(plugin)
 
-    def get_internal_type(self, objecttype):
+    def get_default_namedtype_name(self, value):
         for plugin in self.plugins:
-            objecttype = plugin.transform_type(objecttype)
-        return objecttype.internal_type(self)
+            if not hasattr(plugin, 'get_default_namedtype_name'):
+                continue
+            value = plugin.get_default_namedtype_name(value)
+        return value
 
     def T(self, _type):
         if not _type:
@@ -62,7 +64,7 @@ class Schema(object):
         is_instancetype = isinstance(_type, InstanceType)
         if is_classtype or is_instancetype:
             if _type not in self._types:
-                internal_type = self.get_internal_type(_type)
+                internal_type = _type.internal_type(self)
                 self._types[_type] = internal_type
                 if is_classtype:
                     self.register(_type)
diff --git a/graphene/core/types/argument.py b/graphene/core/types/argument.py
index a8fe343e..b10aff21 100644
--- a/graphene/core/types/argument.py
+++ b/graphene/core/types/argument.py
@@ -11,9 +11,7 @@ class Argument(NamedType, OrderedType):
 
     def __init__(self, type, description=None, default=None,
                  name=None, _creation_counter=None):
-        super(Argument, self).__init__(_creation_counter=_creation_counter)
-        self.name = name
-        self.attname = None
+        super(Argument, self).__init__(name=name, _creation_counter=_creation_counter)
         self.type = type
         self.description = description
         self.default = default
@@ -38,18 +36,18 @@ def to_arguments(*args, **kwargs):
     arguments = {}
     iter_arguments = chain(kwargs.items(), [(None, a) for a in args])
 
-    for attname, arg in iter_arguments:
+    for default_name, arg in iter_arguments:
         if isinstance(arg, Argument):
             argument = arg
         elif isinstance(arg, ArgumentType):
             argument = arg.as_argument()
         else:
-            raise ValueError('Unknown argument %s=%r' % (attname, arg))
+            raise ValueError('Unknown argument %s=%r' % (default_name, arg))
 
-        if attname:
-            argument.attname = attname
+        if default_name:
+            argument.default_name = default_name
 
-        name = argument.name or argument.attname
+        name = argument.name or argument.default_name
         assert name, 'Argument in field must have a name'
         assert name not in arguments, 'Found more than one Argument with same name {}'.format(name)
         arguments[name] = argument
diff --git a/graphene/core/types/base.py b/graphene/core/types/base.py
index 96501a19..c9d26cf5 100644
--- a/graphene/core/types/base.py
+++ b/graphene/core/types/base.py
@@ -129,7 +129,10 @@ class MountedType(FieldType, ArgumentType):
 
 
 class NamedType(InstanceType):
-    pass
+    def __init__(self, name=None, default_name=None, *args, **kwargs):
+        self.name = name
+        self.default_name = None
+        super(NamedType, self).__init__(*args, **kwargs)
 
 
 class GroupNamedType(InstanceType):
@@ -138,7 +141,7 @@ class GroupNamedType(InstanceType):
         self.types = types
 
     def get_named_type(self, schema, type):
-        name = type.name or type.attname
+        name = type.name or schema.get_default_namedtype_name(type.default_name)
         return name, schema.T(type)
 
     def iter_types(self, schema):
diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py
index 41dc537b..f6c55edb 100644
--- a/graphene/core/types/field.py
+++ b/graphene/core/types/field.py
@@ -19,8 +19,7 @@ class Field(NamedType, OrderedType):
             self, type, description=None, args=None, name=None, resolver=None,
             required=False, default=None, *args_list, **kwargs):
         _creation_counter = kwargs.pop('_creation_counter', None)
-        super(Field, self).__init__(_creation_counter=_creation_counter)
-        self.name = name
+        super(Field, self).__init__(name=name, _creation_counter=_creation_counter)
         if isinstance(type, six.string_types):
             type = LazyType(type)
         self.required = required
@@ -37,6 +36,7 @@ class Field(NamedType, OrderedType):
             cls, (FieldsClassType)), 'Field {} cannot be mounted in {}'.format(
             self, cls)
         self.attname = attname
+        self.default_name = attname
         self.object_type = cls
         self.mount(cls)
         if isinstance(self.type, MountType):
@@ -120,7 +120,6 @@ class InputField(NamedType, OrderedType):
     def __init__(self, type, description=None, default=None,
                  name=None, _creation_counter=None, required=False):
         super(InputField, self).__init__(_creation_counter=_creation_counter)
-        self.name = name
         if required:
             type = NonNull(type)
         self.type = type
@@ -132,6 +131,7 @@ class InputField(NamedType, OrderedType):
             cls, (InputObjectType)), 'InputField {} cannot be mounted in {}'.format(
             self, cls)
         self.attname = attname
+        self.default_name = attname
         self.object_type = cls
         self.mount(cls)
         if isinstance(self.type, MountType):
diff --git a/graphene/core/types/tests/test_argument.py b/graphene/core/types/tests/test_argument.py
index cf07a7d3..b2f5e239 100644
--- a/graphene/core/types/tests/test_argument.py
+++ b/graphene/core/types/tests/test_argument.py
@@ -27,7 +27,7 @@ def test_to_arguments():
         other_kwarg=String(),
     )
 
-    assert [a.name or a.attname for a in arguments] == [
+    assert [a.name or a.default_name for a in arguments] == [
         'myArg', 'otherArg', 'my_kwarg', 'other_kwarg']
 
 
diff --git a/graphene/plugins/camel_case.py b/graphene/plugins/camel_case.py
index 281e3d9d..c8ebcd11 100644
--- a/graphene/plugins/camel_case.py
+++ b/graphene/plugins/camel_case.py
@@ -1,22 +1,8 @@
-from ..core.types.base import GroupNamedType
-from ..utils import memoize, to_camel_case
+from ..utils import to_camel_case
 from .base import Plugin
 
 
-def camelcase_named_type(schema, type):
-    name = type.name or to_camel_case(type.attname)
-    return name, schema.T(type)
-
-
 class CamelCase(Plugin):
 
-    @memoize
-    def transform_group(self, _type):
-        new_type = _type.__class__(*_type.types)
-        setattr(new_type, 'get_named_type', camelcase_named_type)
-        return new_type
-
-    def transform_type(self, _type):
-        if isinstance(_type, GroupNamedType):
-            return self.transform_group(_type)
-        return _type
+    def get_default_namedtype_name(self, value):
+        return to_camel_case(value)

From dd5b26e6ed8c9188299ff965d18d8c902bc768d2 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 6 Dec 2015 16:50:34 -0800
Subject: [PATCH 130/173] Improved debug plugin structure

---
 graphene/contrib/django/debug/plugin.py | 17 ++++++++++++++---
 graphene/core/schema.py                 |  4 ++--
 graphene/core/types/base.py             |  1 +
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/graphene/contrib/django/debug/plugin.py b/graphene/contrib/django/debug/plugin.py
index 5c21863f..4b6b1b5d 100644
--- a/graphene/contrib/django/debug/plugin.py
+++ b/graphene/contrib/django/debug/plugin.py
@@ -1,9 +1,9 @@
 from contextlib import contextmanager
+
 from django.db import connections
 
-from ....plugins import Plugin
-from ....core.schema import Schema
 from ....core.types import Field
+from ....plugins import Plugin
 from .sql.tracking import unwrap_cursor, wrap_cursor
 from .sql.types import DjangoDebugSQL
 from .types import DjangoDebug
@@ -44,9 +44,10 @@ def debug_objecttype(objecttype):
 
 
 class DjangoDebugPlugin(Plugin):
+
     def transform_type(self, _type):
         if _type == self.schema.query:
-            return debug_objecttype(_type)
+            return
         return _type
 
     def enable_instrumentation(self, wrapped_root):
@@ -58,9 +59,19 @@ class DjangoDebugPlugin(Plugin):
         for connection in connections.all():
             unwrap_cursor(connection)
 
+    def wrap_schema(self, schema_type):
+        query = schema_type._query
+        if query:
+            class_type = self.schema.objecttype(schema_type._query)
+            assert class_type, 'The query in schema is not constructed with graphene'
+            _type = debug_objecttype(class_type)
+            schema_type._query = self.schema.T(_type)
+        return schema_type
+
     @contextmanager
     def context_execution(self, executor):
         executor['root'] = WrappedRoot(root=executor['root'])
+        executor['schema'] = self.wrap_schema(executor['schema'])
         self.enable_instrumentation(executor['root'])
         yield executor
         self.disable_instrumentation()
diff --git a/graphene/core/schema.py b/graphene/core/schema.py
index fc8835c1..d1d33f00 100644
--- a/graphene/core/schema.py
+++ b/graphene/core/schema.py
@@ -131,6 +131,8 @@ class Schema(object):
         executor = kwargs
         executor['root'] = root
         executor['args'] = args
+        executor['schema'] = self.schema
+        executor['request'] = request
         contexts = []
         for plugin in self.plugins:
             if not hasattr(plugin, 'context_execution'):
@@ -139,8 +141,6 @@ class Schema(object):
             executor = context.__enter__()
             contexts.append((context, executor))
         result = self.executor.execute(
-            self.schema,
-            request,
             **executor
         )
         for context, value in contexts[::-1]:
diff --git a/graphene/core/types/base.py b/graphene/core/types/base.py
index c9d26cf5..ec8c7b3b 100644
--- a/graphene/core/types/base.py
+++ b/graphene/core/types/base.py
@@ -129,6 +129,7 @@ class MountedType(FieldType, ArgumentType):
 
 
 class NamedType(InstanceType):
+
     def __init__(self, name=None, default_name=None, *args, **kwargs):
         self.name = name
         self.default_name = None

From dca435a22022ba1f92bd5cd2f2d175f98999c19d Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 9 Dec 2015 19:22:54 -0800
Subject: [PATCH 131/173] Improved plugin system

---
 graphene/core/schema.py        | 21 ++++++-------------
 graphene/plugins/__init__.py   |  4 ++--
 graphene/plugins/base.py       | 37 ++++++++++++++++++++++++++++++++--
 graphene/plugins/camel_case.py |  3 +--
 4 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/graphene/core/schema.py b/graphene/core/schema.py
index d3bff4bd..6c98371f 100644
--- a/graphene/core/schema.py
+++ b/graphene/core/schema.py
@@ -10,7 +10,7 @@ from graphql.core.utils.schema_printer import print_schema
 
 from graphene import signals
 
-from ..plugins import CamelCase, Plugin
+from ..plugins import CamelCase, PluginManager
 from .classtypes.base import ClassType
 from .types.base import InstanceType
 
@@ -34,28 +34,19 @@ class Schema(object):
         self.subscription = subscription
         self.name = name
         self.executor = executor
-        self.plugins = []
         plugins = plugins or []
         if auto_camelcase:
             plugins.append(CamelCase())
-        for plugin in plugins:
-            self.add_plugin(plugin)
+        self.plugins = PluginManager(self, plugins)
         signals.init_schema.send(self)
 
     def __repr__(self):
         return '<Schema: %s (%s)>' % (str(self.name), hash(self))
 
-    def add_plugin(self, plugin):
-        assert isinstance(plugin, Plugin), 'A plugin need to subclass graphene.Plugin and be instantiated'
-        plugin.contribute_to_schema(self)
-        self.plugins.append(plugin)
-
-    def get_default_namedtype_name(self, value):
-        for plugin in self.plugins:
-            if not hasattr(plugin, 'get_default_namedtype_name'):
-                continue
-            value = plugin.get_default_namedtype_name(value)
-        return value
+    def __getattr__(self, name):
+        if name in self.plugins:
+            return getattr(self.plugins, name)
+        return super(Schema, self).__getattr__(name)
 
     def T(self, _type):
         if not _type:
diff --git a/graphene/plugins/__init__.py b/graphene/plugins/__init__.py
index 5a9bf26b..160bffba 100644
--- a/graphene/plugins/__init__.py
+++ b/graphene/plugins/__init__.py
@@ -1,6 +1,6 @@
-from .base import Plugin
+from .base import Plugin, PluginManager
 from .camel_case import CamelCase
 
 __all__ = [
-    'Plugin', 'CamelCase'
+    'Plugin', 'PluginManager', 'CamelCase'
 ]
diff --git a/graphene/plugins/base.py b/graphene/plugins/base.py
index c881592e..8ab5668a 100644
--- a/graphene/plugins/base.py
+++ b/graphene/plugins/base.py
@@ -1,7 +1,40 @@
+from functools import partial, reduce
+
+
 class Plugin(object):
 
     def contribute_to_schema(self, schema):
         self.schema = schema
 
-    def transform_type(self, objecttype):
-        return objecttype
+
+def apply_function(a, b):
+    return b(a)
+
+
+class PluginManager(object):
+
+    PLUGIN_FUNCTIONS = ('get_default_namedtype_name', )
+
+    def __init__(self, schema, plugins=[]):
+        self.schema = schema
+        self.plugins = []
+        for plugin in plugins:
+            self.add_plugin(plugin)
+
+    def add_plugin(self, plugin):
+        if hasattr(plugin, 'contribute_to_schema'):
+            plugin.contribute_to_schema(self.schema)
+        self.plugins.append(plugin)
+
+    def get_plugin_functions(self, function):
+        for plugin in self.plugins:
+            if not hasattr(plugin, function):
+                continue
+            yield getattr(plugin, function)
+
+    def __getattr__(self, name):
+        functions = self.get_plugin_functions(name)
+        return partial(reduce, apply_function, functions)
+
+    def __contains__(self, name):
+        return name in self.PLUGIN_FUNCTIONS
diff --git a/graphene/plugins/camel_case.py b/graphene/plugins/camel_case.py
index c8ebcd11..d9a9084f 100644
--- a/graphene/plugins/camel_case.py
+++ b/graphene/plugins/camel_case.py
@@ -1,8 +1,7 @@
 from ..utils import to_camel_case
-from .base import Plugin
 
 
-class CamelCase(Plugin):
+class CamelCase(object):
 
     def get_default_namedtype_name(self, value):
         return to_camel_case(value)

From c8f4c138224b6e31f01be65a8c1131e2ecf2ed5d Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 9 Dec 2015 19:44:35 -0800
Subject: [PATCH 132/173] Improved plugin execution

---
 graphene/core/schema.py  | 21 +++------------------
 graphene/plugins/base.py | 13 +++++++++++++
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/graphene/core/schema.py b/graphene/core/schema.py
index dd0fce9e..f8f26dc1 100644
--- a/graphene/core/schema.py
+++ b/graphene/core/schema.py
@@ -119,24 +119,9 @@ class Schema(object):
         return self._types_names
 
     def execute(self, request='', root=None, args=None, **kwargs):
-        executor = kwargs
-        executor['root'] = root
-        executor['args'] = args
-        executor['schema'] = self.schema
-        executor['request'] = request
-        contexts = []
-        for plugin in self.plugins:
-            if not hasattr(plugin, 'context_execution'):
-                continue
-            context = plugin.context_execution(executor)
-            executor = context.__enter__()
-            contexts.append((context, executor))
-        result = self.executor.execute(
-            **executor
-        )
-        for context, value in contexts[::-1]:
-            context.__exit__(None, None, None)
-        return result
+        kwargs = dict(kwargs, request=request, root=root, args=args, schema=self.schema)
+        with self.plugins.context_execution(**kwargs) as execute_kwargs:
+            return self.executor.execute(**execute_kwargs)
 
     def introspect(self):
         return self.execute(introspection_query).data
diff --git a/graphene/plugins/base.py b/graphene/plugins/base.py
index 8ab5668a..2347beba 100644
--- a/graphene/plugins/base.py
+++ b/graphene/plugins/base.py
@@ -1,3 +1,4 @@
+from contextlib import contextmanager
 from functools import partial, reduce
 
 
@@ -38,3 +39,15 @@ class PluginManager(object):
 
     def __contains__(self, name):
         return name in self.PLUGIN_FUNCTIONS
+
+    @contextmanager
+    def context_execution(self, **executor):
+        contexts = []
+        functions = self.get_plugin_functions('context_execution')
+        for f in functions:
+            context = f(executor)
+            executor = context.__enter__()
+            contexts.append((context, executor))
+        yield executor
+        for context, value in contexts[::-1]:
+            context.__exit__(None, None, None)

From 930f084912023d5e4e1b633ba2f11b33a1da8838 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 10 Dec 2015 22:11:43 -0800
Subject: [PATCH 133/173] Fixed DjangoDebugPlugin. Improved Django views

---
 graphene/contrib/django/debug/plugin.py     | 16 ++++++++-------
 graphene/contrib/django/debug/sql/types.py  |  6 +++---
 graphene/contrib/django/tests/test_urls.py  | 10 +++++++++-
 graphene/contrib/django/tests/test_views.py | 22 +++++++++++++--------
 graphene/contrib/django/views.py            |  4 ++--
 graphene/core/schema.py                     |  4 ++--
 setup.py                                    |  2 +-
 7 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/graphene/contrib/django/debug/plugin.py b/graphene/contrib/django/debug/plugin.py
index 4b6b1b5d..86f8da58 100644
--- a/graphene/contrib/django/debug/plugin.py
+++ b/graphene/contrib/django/debug/plugin.py
@@ -3,6 +3,7 @@ from contextlib import contextmanager
 from django.db import connections
 
 from ....core.types import Field
+from ....core.schema import GraphQLSchema
 from ....plugins import Plugin
 from .sql.tracking import unwrap_cursor, wrap_cursor
 from .sql.types import DjangoDebugSQL
@@ -45,11 +46,6 @@ def debug_objecttype(objecttype):
 
 class DjangoDebugPlugin(Plugin):
 
-    def transform_type(self, _type):
-        if _type == self.schema.query:
-            return
-        return _type
-
     def enable_instrumentation(self, wrapped_root):
         # This is thread-safe because database connections are thread-local.
         for connection in connections.all():
@@ -62,10 +58,16 @@ class DjangoDebugPlugin(Plugin):
     def wrap_schema(self, schema_type):
         query = schema_type._query
         if query:
-            class_type = self.schema.objecttype(schema_type._query)
+            class_type = self.schema.objecttype(schema_type.get_query_type())
             assert class_type, 'The query in schema is not constructed with graphene'
             _type = debug_objecttype(class_type)
-            schema_type._query = self.schema.T(_type)
+            self.schema.register(_type, force=True)
+            return GraphQLSchema(
+                self.schema,
+                self.schema.T(_type),
+                schema_type.get_mutation_type(),
+                schema_type.get_subscription_type()
+            )
         return schema_type
 
     @contextmanager
diff --git a/graphene/contrib/django/debug/sql/types.py b/graphene/contrib/django/debug/sql/types.py
index 7ee1894f..5df5e9d8 100644
--- a/graphene/contrib/django/debug/sql/types.py
+++ b/graphene/contrib/django/debug/sql/types.py
@@ -1,4 +1,4 @@
-from .....core import Float, ObjectType, String
+from .....core import Float, ObjectType, String, Boolean
 
 
 class DjangoDebugSQL(ObjectType):
@@ -10,8 +10,8 @@ class DjangoDebugSQL(ObjectType):
     params = String()
     start_time = Float()
     stop_time = Float()
-    is_slow = String()
-    is_select = String()
+    is_slow = Boolean()
+    is_select = Boolean()
 
     trans_id = String()
     trans_status = String()
diff --git a/graphene/contrib/django/tests/test_urls.py b/graphene/contrib/django/tests/test_urls.py
index 409471d4..9d38980e 100644
--- a/graphene/contrib/django/tests/test_urls.py
+++ b/graphene/contrib/django/tests/test_urls.py
@@ -29,7 +29,15 @@ class Human(DjangoNode):
     def get_node(self, id):
         pass
 
-schema = Schema(query=Human)
+
+class Query(graphene.ObjectType):
+    human = graphene.Field(Human)
+
+    def resolve_human(self, args, info):
+        return Human()
+
+
+schema = Schema(query=Query)
 
 
 urlpatterns = [
diff --git a/graphene/contrib/django/tests/test_views.py b/graphene/contrib/django/tests/test_views.py
index f82be99f..b4e1b367 100644
--- a/graphene/contrib/django/tests/test_views.py
+++ b/graphene/contrib/django/tests/test_views.py
@@ -7,11 +7,13 @@ def format_response(response):
 
 def test_client_get_good_query(settings, client):
     settings.ROOT_URLCONF = 'graphene.contrib.django.tests.test_urls'
-    response = client.get('/graphql', {'query': '{ headline }'})
+    response = client.get('/graphql', {'query': '{ human { headline } }'})
     json_response = format_response(response)
     expected_json = {
         'data': {
-            'headline': None
+            'human': {
+                'headline': None
+            }
         }
     }
     assert json_response == expected_json
@@ -19,20 +21,22 @@ def test_client_get_good_query(settings, client):
 
 def test_client_get_good_query_with_raise(settings, client):
     settings.ROOT_URLCONF = 'graphene.contrib.django.tests.test_urls'
-    response = client.get('/graphql', {'query': '{ raises }'})
+    response = client.get('/graphql', {'query': '{ human { raises } }'})
     json_response = format_response(response)
     assert json_response['errors'][0]['message'] == 'This field should raise exception'
-    assert json_response['data']['raises'] is None
+    assert json_response['data']['human']['raises'] is None
 
 
 def test_client_post_good_query_json(settings, client):
     settings.ROOT_URLCONF = 'graphene.contrib.django.tests.test_urls'
     response = client.post(
-        '/graphql', json.dumps({'query': '{ headline }'}), 'application/json')
+        '/graphql', json.dumps({'query': '{ human { headline } }'}), 'application/json')
     json_response = format_response(response)
     expected_json = {
         'data': {
-            'headline': None
+            'human': {
+                'headline': None
+            }
         }
     }
     assert json_response == expected_json
@@ -41,11 +45,13 @@ def test_client_post_good_query_json(settings, client):
 def test_client_post_good_query_graphql(settings, client):
     settings.ROOT_URLCONF = 'graphene.contrib.django.tests.test_urls'
     response = client.post(
-        '/graphql', '{ headline }', 'application/graphql')
+        '/graphql', '{ human { headline } }', 'application/graphql')
     json_response = format_response(response)
     expected_json = {
         'data': {
-            'headline': None
+            'human': {
+                'headline': None
+            }
         }
     }
     assert json_response == expected_json
diff --git a/graphene/contrib/django/views.py b/graphene/contrib/django/views.py
index ad245d72..9a4bd96e 100644
--- a/graphene/contrib/django/views.py
+++ b/graphene/contrib/django/views.py
@@ -12,5 +12,5 @@ class GraphQLView(BaseGraphQLView):
             **kwargs
         )
 
-    def get_root_value(self, request):
-        return self.graphene_schema.query(super(GraphQLView, self).get_root_value(request))
+    def execute(self, *args, **kwargs):
+        return self.graphene_schema.execute(*args, **kwargs)
diff --git a/graphene/core/schema.py b/graphene/core/schema.py
index f8f26dc1..c8695317 100644
--- a/graphene/core/schema.py
+++ b/graphene/core/schema.py
@@ -84,9 +84,9 @@ class Schema(object):
             mutation=self.T(self.mutation),
             subscription=self.T(self.subscription))
 
-    def register(self, object_type):
+    def register(self, object_type, force=False):
         type_name = object_type._meta.type_name
-        registered_object_type = self._types_names.get(type_name, None)
+        registered_object_type = not force and self._types_names.get(type_name, None)
         if registered_object_type:
             assert registered_object_type == object_type, 'Type {} already registered with other object type'.format(
                 type_name)
diff --git a/setup.py b/setup.py
index 2c36fcec..7ef809ed 100644
--- a/setup.py
+++ b/setup.py
@@ -67,7 +67,7 @@ setup(
         'django': [
             'Django>=1.6.0,<1.9',
             'singledispatch>=3.4.0.3',
-            'graphql-django-view>=1.0.0',
+            'graphql-django-view>=1.1.0',
         ],
     },
 

From e27af63f3a4bd28ae72478778fde75e463882def Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 10 Dec 2015 22:27:56 -0800
Subject: [PATCH 134/173] Updated version to 0.5.0

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 7ef809ed..b7a3e7c5 100644
--- a/setup.py
+++ b/setup.py
@@ -24,9 +24,9 @@ class PyTest(TestCommand):
 
 setup(
     name='graphene',
-    version='0.4.3',
+    version='0.5.0',
 
-    description='Graphene: Python DSL for GraphQL',
+    description='GraphQL Framework for Python',
     long_description=open('README.rst').read(),
 
     url='https://github.com/graphql-python/graphene',

From ab9d382cdfe414770842c081fec3967604dae00f Mon Sep 17 00:00:00 2001
From: Ustun Ozgur <ustunozgur@gmail.com>
Date: Fri, 11 Dec 2015 19:57:00 +0200
Subject: [PATCH 135/173] Add documentation about using custom input object
 types as arguments

Proper indentation

Add secondary field to make the intent explicit
---
 docs/pages/docs/basic-types.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/pages/docs/basic-types.md b/docs/pages/docs/basic-types.md
index b1acb2f6..defd78b5 100644
--- a/docs/pages/docs/basic-types.md
+++ b/docs/pages/docs/basic-types.md
@@ -82,3 +82,21 @@ graphene.Field(graphene.String(), to=graphene.String())
 # Is equivalent to:
 graphene.Field(graphene.String(), to=graphene.Argument(graphene.String()))
 ```
+
+
+## Using custom object types as argument
+
+To use a custom object type as an argument, you need to inherit `graphene.InputObjectType`, not `graphene.ObjectType`.
+
+```python
+class CustomArgumentObjectType(graphene.InputObjectType):
+    field1 = graphene.String()
+    field2 = graphene.String()
+
+```
+
+Then, when defining this in an argument, you need to wrap it in an `Argument` object.
+
+```python
+graphene.Field(graphene.String(), to=graphene.Argument(CustomArgumentObjectType))
+```

From 2eea03cb62f9c254792f066ca8b697060b2407ed Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 11 Dec 2015 10:42:10 -0800
Subject: [PATCH 136/173] Improved name in Field. Could be an Argument

---
 graphene/core/types/field.py            | 7 +++++--
 graphene/core/types/tests/test_field.py | 8 ++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py
index f6c55edb..17fc9fa2 100644
--- a/graphene/core/types/field.py
+++ b/graphene/core/types/field.py
@@ -8,8 +8,8 @@ from ..classtypes.base import FieldsClassType
 from ..classtypes.inputobjecttype import InputObjectType
 from ..classtypes.mutation import Mutation
 from ..exceptions import SkipField
-from .argument import ArgumentsGroup, snake_case_args
-from .base import GroupNamedType, LazyType, MountType, NamedType, OrderedType
+from .argument import Argument, ArgumentsGroup, snake_case_args
+from .base import GroupNamedType, LazyType, MountType, NamedType, ArgumentType, OrderedType
 from .definitions import NonNull
 
 
@@ -19,6 +19,9 @@ class Field(NamedType, OrderedType):
             self, type, description=None, args=None, name=None, resolver=None,
             required=False, default=None, *args_list, **kwargs):
         _creation_counter = kwargs.pop('_creation_counter', None)
+        if isinstance(name, (Argument, ArgumentType)):
+            kwargs['name'] = name
+            name = None
         super(Field, self).__init__(name=name, _creation_counter=_creation_counter)
         if isinstance(type, six.string_types):
             type = LazyType(type)
diff --git a/graphene/core/types/tests/test_field.py b/graphene/core/types/tests/test_field.py
index dd30e556..2b1f7e40 100644
--- a/graphene/core/types/tests/test_field.py
+++ b/graphene/core/types/tests/test_field.py
@@ -104,6 +104,14 @@ def test_field_custom_arguments():
     assert 'p' in schema.T(args)
 
 
+def test_field_name_as_argument():
+    field = Field(None, name=String())
+    schema = Schema()
+
+    args = field.arguments
+    assert 'name' in schema.T(args)
+
+
 def test_inputfield_internal_type():
     field = InputField(String, description='My input field', default='3')
 

From 9dcd7986b86010c78d8fb2a8d5da6e1bf915653c Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 11 Dec 2015 10:53:05 -0800
Subject: [PATCH 137/173] Improved testing on fields

---
 graphene/core/types/tests/test_field.py | 35 +++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/graphene/core/types/tests/test_field.py b/graphene/core/types/tests/test_field.py
index 2b1f7e40..706cbc59 100644
--- a/graphene/core/types/tests/test_field.py
+++ b/graphene/core/types/tests/test_field.py
@@ -129,3 +129,38 @@ def test_inputfield_internal_type():
     assert isinstance(type, GraphQLInputObjectField)
     assert type.description == 'My input field'
     assert type.default_value == '3'
+
+
+def test_field_resolve_argument():
+    resolver = lambda instance, args, info: args.get('first_name')
+
+    field = Field(String(), first_name=String(), description='My argument', resolver=resolver)
+
+    class Query(ObjectType):
+        my_field = field
+    schema = Schema(query=Query)
+
+    type = schema.T(field)
+    assert type.resolver(None, {'firstName': 'Peter'}, None) == 'Peter'
+
+
+def test_field_resolve_vars():
+    class Query(ObjectType):
+        hello = String(first_name=String())
+
+        def resolve_hello(self, args, info):
+            return 'Hello ' + args.get('first_name')
+
+    schema = Schema(query=Query)
+
+    result = schema.execute("""
+    query foo($firstName:String)
+    {
+            hello(firstName:$firstName)
+    }
+    """, args={"firstName": "Serkan"})
+
+    expected = {
+        'hello': 'Hello Serkan'
+    }
+    assert result.data == expected

From 689db2c70ebfe8a06abda3571378303e8ff04fac Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 11 Dec 2015 11:03:49 -0800
Subject: [PATCH 138/173] Fixed incompatible syntax in Python 2.7

---
 graphene/contrib/django/types.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py
index e25130df..d8fc1b86 100644
--- a/graphene/contrib/django/types.py
+++ b/graphene/contrib/django/types.py
@@ -102,13 +102,13 @@ class DjangoConnection(Connection):
         return super(DjangoConnection, cls).from_list(iterable, *args, **kwargs)
 
 
-django_node_meta_bases = (DjangoObjectTypeMeta, NodeMeta)
+django_filter_metabase = type
 # Only include filter functionality if available
 if DJANGO_FILTER_INSTALLED:
-    django_node_meta_bases = (DjangoFilterObjectTypeMeta,) + django_node_meta_bases
+    django_filter_metabase = DjangoFilterObjectTypeMeta
 
 
-class DjangoNodeMeta(*django_node_meta_bases):
+class DjangoNodeMeta(django_filter_metabase, DjangoObjectTypeMeta, NodeMeta):
     pass
 
 

From b4f7df3c9de122275f33e6a360560c576511601a Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 11 Dec 2015 11:20:35 -0800
Subject: [PATCH 139/173] Fixed argument getter in django filters tests

---
 graphene/contrib/django/tests/filter/test_fields.py | 7 ++++---
 graphene/contrib/django/tests/test_query.py         | 4 ++++
 graphene/contrib/django/utils.py                    | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/graphene/contrib/django/tests/filter/test_fields.py b/graphene/contrib/django/tests/filter/test_fields.py
index 33cc2421..4c93ca1e 100644
--- a/graphene/contrib/django/tests/filter/test_fields.py
+++ b/graphene/contrib/django/tests/filter/test_fields.py
@@ -35,12 +35,13 @@ class PetNode(DjangoNode):
     class Meta:
         model = Pet
 
+schema = Schema()
 
 def assert_arguments(field, *arguments):
     ignore = ('after', 'before', 'first', 'last', 'orderBy')
     actual = [
         name
-        for name in field.arguments.arguments.keys()
+        for name in schema.T(field.arguments)
         if name not in ignore and not name.startswith('_')
     ]
     assert set(arguments) == set(actual), \
@@ -51,12 +52,12 @@ def assert_arguments(field, *arguments):
 
 
 def assert_orderable(field):
-    assert 'orderBy' in field.arguments.arguments.keys(), \
+    assert 'orderBy' in schema.T(field.arguments), \
         'Field cannot be ordered'
 
 
 def assert_not_orderable(field):
-    assert 'orderBy' not in field.arguments.arguments.keys(), \
+    assert 'orderBy' not in schema.T(field.arguments), \
         'Field can be ordered'
 
 
diff --git a/graphene/contrib/django/tests/test_query.py b/graphene/contrib/django/tests/test_query.py
index 090c8695..4b37d517 100644
--- a/graphene/contrib/django/tests/test_query.py
+++ b/graphene/contrib/django/tests/test_query.py
@@ -1,3 +1,4 @@
+import pytest
 from py.test import raises
 
 import graphene
@@ -7,6 +8,9 @@ from graphene.contrib.django import DjangoNode, DjangoObjectType
 from .models import Article, Reporter
 
 
+pytestmark = pytest.mark.django_db
+
+
 def test_should_query_only_fields():
     with raises(Exception):
         class ReporterType(DjangoObjectType):
diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index 38bf7546..4be3c55f 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -66,7 +66,7 @@ def get_filtering_args_from_filterset(filterset_class, type):
 
     # Also add the 'order_by' field
     if filterset_class._meta.order_by:
-        args[filterset_class.order_by_field] = Argument(String)
+        args[filterset_class.order_by_field] = Argument(String())
     return args
 
 

From 35d78320e8dd9a1cf91de01881d757c6b09ea591 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 11 Dec 2015 23:39:41 -0800
Subject: [PATCH 140/173] Simplified filter in types and fields. All tests
 passing

---
 graphene/contrib/django/fields.py |  9 ++++++---
 graphene/contrib/django/types.py  | 22 ++--------------------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index 76a85580..f33cd77e 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -1,6 +1,7 @@
 import warnings
 
-from .utils import get_type_for_model
+from .utils import get_type_for_model, DJANGO_FILTER_INSTALLED
+from .filter.fields import DjangoFilterConnectionField
 from ...core.exceptions import SkipField
 from ...core.fields import Field
 from ...core.types.base import FieldType
@@ -20,7 +21,6 @@ class DjangoConnectionField(ConnectionField):
 
 
 class ConnectionOrListField(Field):
-    connection_field_class = ConnectionField
 
     def internal_type(self, schema):
         model_field = self.type
@@ -28,7 +28,10 @@ class ConnectionOrListField(Field):
         if not field_object_type:
             raise SkipField()
         if is_node(field_object_type):
-            field = self.connection_field_class(field_object_type)
+            if field_object_type._meta.filter_fields:
+                field = DjangoFilterConnectionField(field_object_type)
+            else:
+                field = ConnectionField(field_object_type)
         else:
             field = Field(List(field_object_type))
         field.contribute_to_class(self.object_type, self.attname)
diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py
index d8fc1b86..b961ceed 100644
--- a/graphene/contrib/django/types.py
+++ b/graphene/contrib/django/types.py
@@ -30,12 +30,9 @@ class DjangoObjectTypeMeta(ObjectTypeMeta):
                 # We skip this field if we specify only_fields and is not
                 # in there. Or when we exclude this field in exclude_fields
                 continue
-            converted_field = cls.convert_django_field(field)
+            converted_field = convert_django_field(field)
             cls.add_to_class(field.name, converted_field)
 
-    def convert_django_field(cls, field):
-        return convert_django_field(field)
-
     def construct(cls, *args, **kwargs):
         cls = super(DjangoObjectTypeMeta, cls).construct(*args, **kwargs)
         if not cls._meta.abstract:
@@ -50,15 +47,6 @@ class DjangoObjectTypeMeta(ObjectTypeMeta):
         return cls
 
 
-class DjangoFilterObjectTypeMeta(ObjectTypeMeta):
-
-    def convert_django_field(cls, field):
-        from graphene.contrib.django.filter import DjangoFilterConnectionField
-        field = super(DjangoFilterObjectTypeMeta, cls).convert_django_field(field)
-        field.connection_field_class = DjangoFilterConnectionField
-        return field
-
-
 class InstanceObjectType(ObjectType):
 
     class Meta:
@@ -102,13 +90,7 @@ class DjangoConnection(Connection):
         return super(DjangoConnection, cls).from_list(iterable, *args, **kwargs)
 
 
-django_filter_metabase = type
-# Only include filter functionality if available
-if DJANGO_FILTER_INSTALLED:
-    django_filter_metabase = DjangoFilterObjectTypeMeta
-
-
-class DjangoNodeMeta(django_filter_metabase, DjangoObjectTypeMeta, NodeMeta):
+class DjangoNodeMeta(DjangoObjectTypeMeta, NodeMeta):
     pass
 
 

From 8eaa2cfc4918a4a454ab5783083a0d6ace2127d0 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 12 Dec 2015 00:40:26 -0800
Subject: [PATCH 141/173] Fixed compatibility with Django 1.6, 1.7, 1.8 and 1.9

---
 .travis.yml                                   | 11 ++++++++--
 graphene/contrib/django/compat.py             | 15 +++++++++++++
 graphene/contrib/django/converter.py          | 22 ++++++++++---------
 graphene/contrib/django/debug/plugin.py       |  2 +-
 graphene/contrib/django/debug/sql/types.py    |  2 +-
 graphene/contrib/django/fields.py             |  4 ++--
 graphene/contrib/django/filter/fields.py      |  2 +-
 graphene/contrib/django/filter/filterset.py   | 11 +++++-----
 graphene/contrib/django/filter/resolvers.py   |  3 ++-
 graphene/contrib/django/form_converter.py     |  7 ++++--
 graphene/contrib/django/forms.py              |  2 +-
 graphene/contrib/django/options.py            |  2 +-
 .../contrib/django/tests/filter/filters.py    |  4 +---
 .../django/tests/filter/test_fields.py        | 21 +++++++++++++-----
 .../django/tests/filter/test_resolvers.py     |  6 ++---
 .../contrib/django/tests/test_converter.py    |  6 ++---
 .../django/tests/test_form_converter.py       |  3 +--
 graphene/contrib/django/tests/test_query.py   |  1 -
 .../contrib/django/tests/test_resolvers.py    |  6 +++--
 graphene/contrib/django/types.py              |  1 -
 graphene/contrib/django/utils.py              | 17 ++++++++++++--
 graphene/core/types/field.py                  |  3 ++-
 setup.py                                      |  2 +-
 23 files changed, 101 insertions(+), 52 deletions(-)
 create mode 100644 graphene/contrib/django/compat.py

diff --git a/.travis.yml b/.travis.yml
index 93f4550f..3dbb00e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,13 +73,20 @@ after_success:
   fi
 env:
   matrix:
-  - TEST_TYPE=build DJANGO_VERSION=1.8
-  - TEST_TYPE=build DJANGO_VERSION=1.9
+  - TEST_TYPE=build
   global:
     secure: SQC0eCWCWw8bZxbLE8vQn+UjJOp3Z1m779s9SMK3lCLwJxro/VCLBZ7hj4xsrq1MtcFO2U2Kqf068symw4Hr/0amYI3HFTCFiwXAC3PAKXeURca03eNO2heku+FtnQcOjBanExTsIBQRLDXMOaUkf3MIztpLJ4LHqMfUupKmw9YSB0v40jDbSN8khBnndFykmOnVVHznFp8USoN5F0CiPpnfEvHnJkaX76lNf7Kc9XNShBTTtJsnsHMhuYQeInt0vg9HSjoIYC38Tv2hmMj1myNdzyrHF+LgRjI6ceGi50ApAnGepXC/DNRhXROfECKez+LON/ZSqBGdJhUILqC8A4WmWmIjNcwitVFp3JGBqO7LULS0BI96EtSLe8rD1rkkdTbjivajkbykM1Q0Tnmg1adzGwLxRUbTq9tJQlTTkHBCuXIkpKb1mAtb/TY7A6BqfnPi2xTc/++qEawUG7ePhscdTj0IBrUfZsUNUYZqD8E8XbSWKIuS3SHE+cZ+s/kdAsm4q+FFAlpZKOYGxIkwvgyfu4/Plfol4b7X6iAP9J3r1Kv0DgBVFst5CXEwzZs19/g0CgokQbCXf1N+xeNnUELl6/fImaR3RKP22EaABoil4z8vzl4EqxqVoH1nfhE+WlpryXsuSaF/1R+WklR7aQ1FwoCk8V8HxM2zrj4tI8k=
 matrix:
   fast_finish: true
   include:
+  - python: '2.7'
+    env: DJANGO_VERSION=1.6
+  - python: '2.7'
+    env: DJANGO_VERSION=1.7
+  - python: '2.7'
+    env: DJANGO_VERSION=1.8
+  - python: '2.7'
+    env: DJANGO_VERSION=1.9
   - python: '2.7'
     env: TEST_TYPE=build_website
   - python: '2.7'
diff --git a/graphene/contrib/django/compat.py b/graphene/contrib/django/compat.py
new file mode 100644
index 00000000..a5b444c7
--- /dev/null
+++ b/graphene/contrib/django/compat.py
@@ -0,0 +1,15 @@
+from django.db import models
+
+try:
+    UUIDField = models.UUIDField
+except AttributeError:
+    # Improved compatibility for Django 1.6
+    class UUIDField(object):
+        pass
+
+try:
+    from django.db.models.related import RelatedObject
+except:
+    # Improved compatibility for Django 1.6
+    class RelatedObject(object):
+        pass
diff --git a/graphene/contrib/django/converter.py b/graphene/contrib/django/converter.py
index 0722643b..ef1265ac 100644
--- a/graphene/contrib/django/converter.py
+++ b/graphene/contrib/django/converter.py
@@ -1,17 +1,11 @@
 from django.db import models
 
-from .utils import import_single_dispatch
 from ...core.types.scalars import ID, Boolean, Float, Int, String
+from .compat import RelatedObject, UUIDField
+from .utils import get_related_model, import_single_dispatch
 
 singledispatch = import_single_dispatch()
 
-try:
-    UUIDField = models.UUIDField
-except AttributeError:
-    # Improved compatibility for Django 1.6
-    class UUIDField(object):
-        pass
-
 
 @singledispatch
 def convert_django_field(field):
@@ -65,7 +59,15 @@ def convert_field_to_float(field):
 @convert_django_field.register(models.ManyToOneRel)
 def convert_field_to_list_or_connection(field):
     from .fields import DjangoModelField, ConnectionOrListField
-    model_field = DjangoModelField(field.related_model)
+    model_field = DjangoModelField(get_related_model(field))
+    return ConnectionOrListField(model_field)
+
+
+# For Django 1.6
+@convert_django_field.register(RelatedObject)
+def convert_relatedfield_to_djangomodel(field):
+    from .fields import DjangoModelField, ConnectionOrListField
+    model_field = DjangoModelField(field.model)
     return ConnectionOrListField(model_field)
 
 
@@ -73,4 +75,4 @@ def convert_field_to_list_or_connection(field):
 @convert_django_field.register(models.ForeignKey)
 def convert_field_to_djangomodel(field):
     from .fields import DjangoModelField
-    return DjangoModelField(field.related_model, description=field.help_text)
+    return DjangoModelField(get_related_model(field), description=field.help_text)
diff --git a/graphene/contrib/django/debug/plugin.py b/graphene/contrib/django/debug/plugin.py
index 86f8da58..70cd6741 100644
--- a/graphene/contrib/django/debug/plugin.py
+++ b/graphene/contrib/django/debug/plugin.py
@@ -2,8 +2,8 @@ from contextlib import contextmanager
 
 from django.db import connections
 
-from ....core.types import Field
 from ....core.schema import GraphQLSchema
+from ....core.types import Field
 from ....plugins import Plugin
 from .sql.tracking import unwrap_cursor, wrap_cursor
 from .sql.types import DjangoDebugSQL
diff --git a/graphene/contrib/django/debug/sql/types.py b/graphene/contrib/django/debug/sql/types.py
index 5df5e9d8..995aeaa2 100644
--- a/graphene/contrib/django/debug/sql/types.py
+++ b/graphene/contrib/django/debug/sql/types.py
@@ -1,4 +1,4 @@
-from .....core import Float, ObjectType, String, Boolean
+from .....core import Boolean, Float, ObjectType, String
 
 
 class DjangoDebugSQL(ObjectType):
diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index f33cd77e..d9d6f3da 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -1,13 +1,13 @@
 import warnings
 
-from .utils import get_type_for_model, DJANGO_FILTER_INSTALLED
-from .filter.fields import DjangoFilterConnectionField
 from ...core.exceptions import SkipField
 from ...core.fields import Field
 from ...core.types.base import FieldType
 from ...core.types.definitions import List
 from ...relay import ConnectionField
 from ...relay.utils import is_node
+from .filter.fields import DjangoFilterConnectionField
+from .utils import get_type_for_model
 
 
 class DjangoConnectionField(ConnectionField):
diff --git a/graphene/contrib/django/filter/fields.py b/graphene/contrib/django/filter/fields.py
index 012ae00a..43196f6e 100644
--- a/graphene/contrib/django/filter/fields.py
+++ b/graphene/contrib/django/filter/fields.py
@@ -1,6 +1,6 @@
-from graphene.relay import ConnectionField
 from graphene.contrib.django.filter.resolvers import FilterConnectionResolver
 from graphene.contrib.django.utils import get_filtering_args_from_filterset
+from graphene.relay import ConnectionField
 
 
 class DjangoFilterConnectionField(ConnectionField):
diff --git a/graphene/contrib/django/filter/filterset.py b/graphene/contrib/django/filter/filterset.py
index 4755eac2..3ecd9680 100644
--- a/graphene/contrib/django/filter/filterset.py
+++ b/graphene/contrib/django/filter/filterset.py
@@ -2,11 +2,12 @@ import six
 from django.conf import settings
 from django.db import models
 from django.utils.text import capfirst
-from django_filters import Filter, MultipleChoiceFilter
-from django_filters.filterset import FilterSetMetaclass, FilterSet
-from graphql_relay.node.node import from_global_id
 
-from graphene.contrib.django.forms import GlobalIDFormField, GlobalIDMultipleChoiceField
+from django_filters import Filter, MultipleChoiceFilter
+from django_filters.filterset import FilterSet, FilterSetMetaclass
+from graphene.contrib.django.forms import (GlobalIDFormField,
+                                           GlobalIDMultipleChoiceField)
+from graphql_relay.node.node import from_global_id
 
 
 class GlobalIDFilter(Filter):
@@ -45,6 +46,7 @@ GRAPHENE_FILTER_SET_OVERRIDES = {
 
 
 class GrapheneFilterSetMetaclass(FilterSetMetaclass):
+
     def __new__(cls, name, bases, attrs):
         new_class = super(GrapheneFilterSetMetaclass, cls).__new__(cls, name, bases, attrs)
         # Customise the filter_overrides for Graphene
@@ -84,7 +86,6 @@ class GrapheneFilterSet(six.with_metaclass(GrapheneFilterSetMetaclass, GrapheneF
     DjangoFilterConnectionField will wrap FilterSets with this class as
     necessary
     """
-    pass
 
 
 def setup_filterset(filterset_class):
diff --git a/graphene/contrib/django/filter/resolvers.py b/graphene/contrib/django/filter/resolvers.py
index c2204d6c..76b3e7ad 100644
--- a/graphene/contrib/django/filter/resolvers.py
+++ b/graphene/contrib/django/filter/resolvers.py
@@ -1,6 +1,7 @@
 from django.core.exceptions import ImproperlyConfigured
 
-from graphene.contrib.django.filter.filterset import setup_filterset, custom_filterset_factory
+from graphene.contrib.django.filter.filterset import (custom_filterset_factory,
+                                                      setup_filterset)
 from graphene.contrib.django.resolvers import BaseQuerySetConnectionResolver
 
 
diff --git a/graphene/contrib/django/form_converter.py b/graphene/contrib/django/form_converter.py
index 826c8c69..de2a40d8 100644
--- a/graphene/contrib/django/form_converter.py
+++ b/graphene/contrib/django/form_converter.py
@@ -1,9 +1,12 @@
 from django import forms
 from django.forms.fields import BaseTemporalField
-from graphene import String, Int, Boolean, Float, ID
-from graphene.contrib.django.forms import GlobalIDFormField, GlobalIDMultipleChoiceField
+
+from graphene import ID, Boolean, Float, Int, String
+from graphene.contrib.django.forms import (GlobalIDFormField,
+                                           GlobalIDMultipleChoiceField)
 from graphene.contrib.django.utils import import_single_dispatch
 from graphene.core.types.definitions import List
+
 singledispatch = import_single_dispatch()
 
 try:
diff --git a/graphene/contrib/django/forms.py b/graphene/contrib/django/forms.py
index f971897b..88f1665e 100644
--- a/graphene/contrib/django/forms.py
+++ b/graphene/contrib/django/forms.py
@@ -1,7 +1,7 @@
 import binascii
 
 from django.core.exceptions import ValidationError
-from django.forms import Field, IntegerField, CharField, MultipleChoiceField
+from django.forms import CharField, Field, IntegerField, MultipleChoiceField
 from django.utils.translation import ugettext_lazy as _
 
 from graphql_relay import from_global_id
diff --git a/graphene/contrib/django/options.py b/graphene/contrib/django/options.py
index 55868dd7..dbd88aca 100644
--- a/graphene/contrib/django/options.py
+++ b/graphene/contrib/django/options.py
@@ -1,7 +1,7 @@
-from .utils import DJANGO_FILTER_INSTALLED
 from ...core.classtypes.objecttype import ObjectTypeOptions
 from ...relay.types import Node
 from ...relay.utils import is_node
+from .utils import DJANGO_FILTER_INSTALLED
 
 VALID_ATTRS = ('model', 'only_fields', 'exclude_fields')
 
diff --git a/graphene/contrib/django/tests/filter/filters.py b/graphene/contrib/django/tests/filter/filters.py
index 4549a83e..94c0dffe 100644
--- a/graphene/contrib/django/tests/filter/filters.py
+++ b/graphene/contrib/django/tests/filter/filters.py
@@ -1,7 +1,5 @@
 import django_filters
-
-from graphene.contrib.django.tests.models import Reporter
-from graphene.contrib.django.tests.models import Article, Pet
+from graphene.contrib.django.tests.models import Article, Pet, Reporter
 
 
 class ArticleFilter(django_filters.FilterSet):
diff --git a/graphene/contrib/django/tests/filter/test_fields.py b/graphene/contrib/django/tests/filter/test_fields.py
index 4c93ca1e..efa1757f 100644
--- a/graphene/contrib/django/tests/filter/test_fields.py
+++ b/graphene/contrib/django/tests/filter/test_fields.py
@@ -1,14 +1,13 @@
 import pytest
 
 from graphene import ObjectType, Schema
+from graphene.contrib.django import DjangoNode
+from graphene.contrib.django.forms import (GlobalIDFormField,
+                                           GlobalIDMultipleChoiceField)
+from graphene.contrib.django.tests.models import Article, Pet, Reporter
 from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
 from graphene.relay import NodeField
 
-
-from graphene.contrib.django import DjangoNode
-from graphene.contrib.django.forms import GlobalIDFormField, GlobalIDMultipleChoiceField
-from graphene.contrib.django.tests.models import Article, Pet, Reporter
-
 pytestmark = []
 if DJANGO_FILTER_INSTALLED:
     import django_filters
@@ -22,21 +21,25 @@ pytestmark.append(pytest.mark.django_db)
 
 
 class ArticleNode(DjangoNode):
+
     class Meta:
         model = Article
 
 
 class ReporterNode(DjangoNode):
+
     class Meta:
         model = Reporter
 
 
 class PetNode(DjangoNode):
+
     class Meta:
         model = Pet
 
 schema = Schema()
 
+
 def assert_arguments(field, *arguments):
     ignore = ('after', 'before', 'first', 'last', 'orderBy')
     actual = [
@@ -48,7 +51,7 @@ def assert_arguments(field, *arguments):
         'Expected arguments ({}) did not match actual ({})'.format(
             arguments,
             actual
-        )
+    )
 
 
 def assert_orderable(field):
@@ -118,6 +121,7 @@ def test_filter_shortcut_filterset_extra_meta():
 
 def test_filter_filterset_information_on_meta():
     class ReporterFilterNode(DjangoNode):
+
         class Meta:
             model = Reporter
             filter_fields = ['first_name', 'articles']
@@ -130,12 +134,14 @@ def test_filter_filterset_information_on_meta():
 
 def test_filter_filterset_information_on_meta_related():
     class ReporterFilterNode(DjangoNode):
+
         class Meta:
             model = Reporter
             filter_fields = ['first_name', 'articles']
             filter_order_by = True
 
     class ArticleFilterNode(DjangoNode):
+
         class Meta:
             model = Article
             filter_fields = ['headline', 'reporter']
@@ -164,6 +170,7 @@ def test_global_id_field_implicit():
 
 def test_global_id_field_explicit():
     class ArticleIdFilter(django_filters.FilterSet):
+
         class Meta:
             model = Article
             fields = ['id']
@@ -193,6 +200,7 @@ def test_global_id_multiple_field_implicit():
 
 def test_global_id_multiple_field_explicit():
     class ReporterPetsFilter(django_filters.FilterSet):
+
         class Meta:
             model = Reporter
             fields = ['pets']
@@ -214,6 +222,7 @@ def test_global_id_multiple_field_implicit_reverse():
 
 def test_global_id_multiple_field_explicit_reverse():
     class ReporterPetsFilter(django_filters.FilterSet):
+
         class Meta:
             model = Reporter
             fields = ['articles']
diff --git a/graphene/contrib/django/tests/filter/test_resolvers.py b/graphene/contrib/django/tests/filter/test_resolvers.py
index a336cddf..dd9940f0 100644
--- a/graphene/contrib/django/tests/filter/test_resolvers.py
+++ b/graphene/contrib/django/tests/filter/test_resolvers.py
@@ -1,6 +1,9 @@
 import pytest
 from django.core.exceptions import ImproperlyConfigured
 
+from graphene.contrib.django.tests.models import Article, Reporter
+from graphene.contrib.django.tests.test_resolvers import (ArticleNode,
+                                                          ReporterNode)
 from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
 
 if DJANGO_FILTER_INSTALLED:
@@ -9,9 +12,6 @@ if DJANGO_FILTER_INSTALLED:
 else:
     pytestmark = pytest.mark.skipif(True, reason='django_filters not installed')
 
-from graphene.contrib.django.tests.models import Reporter, Article
-from graphene.contrib.django.tests.test_resolvers import ReporterNode, ArticleNode
-
 
 def test_filter_get_filterset_class_explicit():
     reporter = Reporter(id=1, first_name='Cookie Monster')
diff --git a/graphene/contrib/django/tests/test_converter.py b/graphene/contrib/django/tests/test_converter.py
index dcbb3e30..3a02b03a 100644
--- a/graphene/contrib/django/tests/test_converter.py
+++ b/graphene/contrib/django/tests/test_converter.py
@@ -9,8 +9,8 @@ from graphene.contrib.django.fields import (ConnectionOrListField,
 from .models import Article, Reporter
 
 
-def assert_conversion(django_field, graphene_field, *args):
-    field = django_field(*args, help_text='Custom Help Text')
+def assert_conversion(django_field, graphene_field, *args, **kwargs):
+    field = django_field(help_text='Custom Help Text', *args, **kwargs)
     graphene_type = convert_django_field(field)
     assert isinstance(graphene_type, graphene_field)
     field = graphene_type.as_field()
@@ -49,7 +49,7 @@ def test_should_url_convert_string():
 
 
 def test_should_auto_convert_id():
-    assert_conversion(models.AutoField, graphene.ID)
+    assert_conversion(models.AutoField, graphene.ID, primary_key=True)
 
 
 def test_should_positive_integer_convert_int():
diff --git a/graphene/contrib/django/tests/test_form_converter.py b/graphene/contrib/django/tests/test_form_converter.py
index 7492fc51..44d9bec3 100644
--- a/graphene/contrib/django/tests/test_form_converter.py
+++ b/graphene/contrib/django/tests/test_form_converter.py
@@ -1,10 +1,9 @@
 from django import forms
-from graphene.core.types import List, ID
 from py.test import raises
 
 import graphene
 from graphene.contrib.django.form_converter import convert_form_field
-
+from graphene.core.types import ID, List
 
 from .models import Reporter
 
diff --git a/graphene/contrib/django/tests/test_query.py b/graphene/contrib/django/tests/test_query.py
index 4b37d517..460c8e22 100644
--- a/graphene/contrib/django/tests/test_query.py
+++ b/graphene/contrib/django/tests/test_query.py
@@ -7,7 +7,6 @@ from graphene.contrib.django import DjangoNode, DjangoObjectType
 
 from .models import Article, Reporter
 
-
 pytestmark = pytest.mark.django_db
 
 
diff --git a/graphene/contrib/django/tests/test_resolvers.py b/graphene/contrib/django/tests/test_resolvers.py
index fe617666..db1610c9 100644
--- a/graphene/contrib/django/tests/test_resolvers.py
+++ b/graphene/contrib/django/tests/test_resolvers.py
@@ -3,15 +3,17 @@ from django.db.models.query import QuerySet
 
 from graphene.contrib.django import DjangoNode
 from graphene.contrib.django.resolvers import SimpleQuerySetConnectionResolver
-from graphene.contrib.django.tests.models import Reporter, Article
+from graphene.contrib.django.tests.models import Article, Reporter
 
 
 class ReporterNode(DjangoNode):
+
     class Meta:
         model = Reporter
 
 
 class ArticleNode(DjangoNode):
+
     class Meta:
         model = Article
 
@@ -34,7 +36,7 @@ def test_simple_get_manager_all():
     reporter = Reporter(id=1, first_name='Cookie Monster')
     resolver = SimpleQuerySetConnectionResolver(ReporterNode)
     resolver(inst=reporter, args={}, info=None)
-    assert type(resolver.get_manager()) == Manager, 'Resolver did not return a Manager'
+    assert isinstance(resolver.get_manager(), Manager), 'Resolver did not return a Manager'
 
 
 def test_simple_filter():
diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py
index b961ceed..5b68ebbb 100644
--- a/graphene/contrib/django/types.py
+++ b/graphene/contrib/django/types.py
@@ -5,7 +5,6 @@ from django.db import models
 
 from ...core.classtypes.objecttype import ObjectType, ObjectTypeMeta
 from ...relay.types import Connection, Node, NodeMeta
-from .utils import DJANGO_FILTER_INSTALLED
 from .converter import convert_django_field
 from .options import DjangoOptions
 from .utils import get_reverse_fields, maybe_queryset
diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index 4be3c55f..76f4477c 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -3,9 +3,10 @@ from django.db import models
 from django.db.models.manager import Manager
 from django.db.models.query import QuerySet
 
+from graphene import Argument, String
 from graphene.utils import LazyList
 
-from graphene import Argument, String
+from .compat import RelatedObject
 
 try:
     import django_filters  # noqa
@@ -29,7 +30,12 @@ def get_reverse_fields(model):
         # Django =>1.9 uses 'rel', django <1.9 uses 'related'
         related = getattr(attr, 'rel', None) or \
             getattr(attr, 'related', None)
-        if isinstance(related, models.ManyToOneRel):
+        if isinstance(related, RelatedObject):
+            # Hack for making it compatible with Django 1.6
+            new_related = RelatedObject(related.parent_model, related.model, related.field)
+            new_related.name = name
+            yield new_related
+        elif isinstance(related, models.ManyToOneRel):
             yield related
 
 
@@ -70,6 +76,13 @@ def get_filtering_args_from_filterset(filterset_class, type):
     return args
 
 
+def get_related_model(field):
+    if hasattr(field, 'rel'):
+        # Django 1.6, 1.7
+        return field.rel.to
+    return field.related_model
+
+
 def import_single_dispatch():
     try:
         from functools import singledispatch
diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py
index 17fc9fa2..6cbfff96 100644
--- a/graphene/core/types/field.py
+++ b/graphene/core/types/field.py
@@ -9,7 +9,8 @@ from ..classtypes.inputobjecttype import InputObjectType
 from ..classtypes.mutation import Mutation
 from ..exceptions import SkipField
 from .argument import Argument, ArgumentsGroup, snake_case_args
-from .base import GroupNamedType, LazyType, MountType, NamedType, ArgumentType, OrderedType
+from .base import (ArgumentType, GroupNamedType, LazyType, MountType,
+                   NamedType, OrderedType)
 from .definitions import NonNull
 
 
diff --git a/setup.py b/setup.py
index 74865f3f..ac0e3d0f 100644
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ setup(
     ],
     extras_require={
         'django': [
-            'Django>=1.8.0',
+            'Django>=1.6.0',
             'singledispatch>=3.4.0.3',
             'graphql-django-view>=1.1.0',
         ],

From c7026329d3a5a0186019b5d5f774ec5e83a74e0c Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 12 Dec 2015 00:54:51 -0800
Subject: [PATCH 142/173] Moved django filter tests

---
 .../contrib/django/{tests/filter => filter/tests}/__init__.py   | 0
 .../contrib/django/{tests/filter => filter/tests}/filters.py    | 0
 .../django/{tests/filter => filter/tests}/test_fields.py        | 2 +-
 .../django/{tests/filter => filter/tests}/test_resolvers.py     | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename graphene/contrib/django/{tests/filter => filter/tests}/__init__.py (100%)
 rename graphene/contrib/django/{tests/filter => filter/tests}/filters.py (100%)
 rename graphene/contrib/django/{tests/filter => filter/tests}/test_fields.py (99%)
 rename graphene/contrib/django/{tests/filter => filter/tests}/test_resolvers.py (97%)

diff --git a/graphene/contrib/django/tests/filter/__init__.py b/graphene/contrib/django/filter/tests/__init__.py
similarity index 100%
rename from graphene/contrib/django/tests/filter/__init__.py
rename to graphene/contrib/django/filter/tests/__init__.py
diff --git a/graphene/contrib/django/tests/filter/filters.py b/graphene/contrib/django/filter/tests/filters.py
similarity index 100%
rename from graphene/contrib/django/tests/filter/filters.py
rename to graphene/contrib/django/filter/tests/filters.py
diff --git a/graphene/contrib/django/tests/filter/test_fields.py b/graphene/contrib/django/filter/tests/test_fields.py
similarity index 99%
rename from graphene/contrib/django/tests/filter/test_fields.py
rename to graphene/contrib/django/filter/tests/test_fields.py
index efa1757f..45c1f0d0 100644
--- a/graphene/contrib/django/tests/filter/test_fields.py
+++ b/graphene/contrib/django/filter/tests/test_fields.py
@@ -13,7 +13,7 @@ if DJANGO_FILTER_INSTALLED:
     import django_filters
     from graphene.contrib.django.filter import (GlobalIDFilter, DjangoFilterConnectionField,
                                                 GlobalIDMultipleChoiceFilter)
-    from graphene.contrib.django.tests.filter.filters import ArticleFilter, PetFilter
+    from graphene.contrib.django.filter.tests.filters import ArticleFilter, PetFilter
 else:
     pytestmark.append(pytest.mark.skipif(True, reason='django_filters not installed'))
 
diff --git a/graphene/contrib/django/tests/filter/test_resolvers.py b/graphene/contrib/django/filter/tests/test_resolvers.py
similarity index 97%
rename from graphene/contrib/django/tests/filter/test_resolvers.py
rename to graphene/contrib/django/filter/tests/test_resolvers.py
index dd9940f0..670e87c8 100644
--- a/graphene/contrib/django/tests/filter/test_resolvers.py
+++ b/graphene/contrib/django/filter/tests/test_resolvers.py
@@ -8,7 +8,7 @@ from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
 
 if DJANGO_FILTER_INSTALLED:
     from graphene.contrib.django.filter.resolvers import FilterConnectionResolver
-    from graphene.contrib.django.tests.filter.filters import ReporterFilter, ArticleFilter
+    from graphene.contrib.django.filter.tests.filters import ArticleFilter, ReporterFilter
 else:
     pytestmark = pytest.mark.skipif(True, reason='django_filters not installed')
 

From 6c0bc4c5450de321d0518317809b4559ebbe417d Mon Sep 17 00:00:00 2001
From: Kevin Abiera <kevin@abiera.com>
Date: Sat, 12 Dec 2015 22:16:20 +0800
Subject: [PATCH 143/173] Add support for GenericIPAddressField

---
 graphene/contrib/django/converter.py            | 1 +
 graphene/contrib/django/tests/test_converter.py | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/graphene/contrib/django/converter.py b/graphene/contrib/django/converter.py
index 5dc34aba..adabdece 100644
--- a/graphene/contrib/django/converter.py
+++ b/graphene/contrib/django/converter.py
@@ -25,6 +25,7 @@ def convert_django_field(field):
 @convert_django_field.register(models.EmailField)
 @convert_django_field.register(models.SlugField)
 @convert_django_field.register(models.URLField)
+@convert_django_field.register(models.GenericIPAddressField)
 @convert_django_field.register(UUIDField)
 def convert_field_to_string(field):
     return String(description=field.help_text)
diff --git a/graphene/contrib/django/tests/test_converter.py b/graphene/contrib/django/tests/test_converter.py
index d868ec97..b7a1e198 100644
--- a/graphene/contrib/django/tests/test_converter.py
+++ b/graphene/contrib/django/tests/test_converter.py
@@ -48,6 +48,10 @@ def test_should_url_convert_string():
     assert_conversion(models.URLField, graphene.String)
 
 
+def test_should_ipaddress_convert_string():
+    assert_conversion(models.GenericIPAddressField, graphene.String)
+
+
 def test_should_auto_convert_id():
     assert_conversion(models.AutoField, graphene.ID)
 

From 73c04f22c8400c17af377fc532bb73cca59d1c0b Mon Sep 17 00:00:00 2001
From: Kevin Abiera <kevin@abiera.com>
Date: Fri, 18 Dec 2015 20:41:28 +0800
Subject: [PATCH 144/173] Implement Django command for dumping schema.json

* Implement Django `./manage.py graphql_schema`

* Required to have 'graphene.django.contrib' in INSTALLED_APPS setting

* Introduces two new optional settings GRAPHENE_SCHEMA and
  GRAPHENE_SCHEMA_OUTPUT

* GRAPHENE_SCHEMA for the Django app containing the schema

* GRAPHENE_SCHEMA_OUTPUT for the output file (defaults to schema.json)

* Use `./manage.py graphql_schema -h` for help in command line
---
 .../contrib/django/management/__init__.py     |  0
 .../django/management/commands/__init__.py    |  0
 .../management/commands/graphql_schema.py     | 38 +++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 graphene/contrib/django/management/__init__.py
 create mode 100644 graphene/contrib/django/management/commands/__init__.py
 create mode 100644 graphene/contrib/django/management/commands/graphql_schema.py

diff --git a/graphene/contrib/django/management/__init__.py b/graphene/contrib/django/management/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/graphene/contrib/django/management/commands/__init__.py b/graphene/contrib/django/management/commands/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/graphene/contrib/django/management/commands/graphql_schema.py b/graphene/contrib/django/management/commands/graphql_schema.py
new file mode 100644
index 00000000..35eb2772
--- /dev/null
+++ b/graphene/contrib/django/management/commands/graphql_schema.py
@@ -0,0 +1,38 @@
+from django.core.management.base import BaseCommand, CommandError
+
+import importlib
+import json
+
+
+class Command(BaseCommand):
+    help = 'Dump Graphene schema JSON to file'
+    can_import_settings = True
+
+    def add_arguments(self, parser):
+        from django.conf import settings
+        parser.add_argument(
+            '--schema',
+            type=str,
+            dest='schema',
+            default=getattr(settings, 'GRAPHENE_SCHEMA', ''),
+            help='Django app containing schema to dump, e.g. myproject.core.schema')
+
+        parser.add_argument(
+            '--out',
+            type=str,
+            dest='out',
+            default=getattr(settings, 'GRAPHENE_SCHEMA_OUTPUT', 'schema.json'),
+            help='Output file (default: schema.json)')
+
+    def handle(self, *args, **options):
+        schema_module = options['schema']
+        if schema_module == '':
+            raise CommandError('Specify schema on GRAPHENE_SCHEMA setting or by using --schema')
+        i = importlib.import_module(schema_module)
+
+        schema_dict = {'data': i.schema.introspect()}
+
+        with open(options['out'], 'w') as outfile:
+            json.dump(schema_dict, outfile)
+
+        self.stdout.write(self.style.SUCCESS('Successfully dumped GraphQL schema to %s' % options['out']))

From 7182aeec178b40b81d06de0bbdc7dcf16a764dab Mon Sep 17 00:00:00 2001
From: Adam Charnock <acharnock@twitter.com>
Date: Tue, 29 Dec 2015 13:29:20 +0000
Subject: [PATCH 145/173] Minor updates to django-quickstart

---
 docs/pages/docs/quickstart-django.md | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/docs/pages/docs/quickstart-django.md b/docs/pages/docs/quickstart-django.md
index 535ca150..9d0c816d 100644
--- a/docs/pages/docs/quickstart-django.md
+++ b/docs/pages/docs/quickstart-django.md
@@ -11,11 +11,16 @@ working with Django simple.
 If you need help getting started with django then head over to
 Django's getting started page.
 
-First let's create a few simple models
+First let's create a few simple models...
 
-## Some models
+## Defining our models
 
-Let's get started with these models **in an app called ingredients**:
+Before continuing, create the following:
+
+* A Django project called `cookbook`
+* An app within `cookbook` called `ingredients`
+
+Let's get started with these models:
 
 ```python
 # cookbook/ingredients/models.py
@@ -34,24 +39,25 @@ class Ingredient(models.Model):
 ## Schema
 
 GraphQL presents your objects to the world as a graph structure rather than a more
-heiricarcal structure to which you may be acustomed. In order to create this
+hierarchical structure to which you may be accustomed. In order to create this
 representation, Graphene needs to know about each *type* of object which will appear in
 the graph. Below we define these as the `UserType` and `GroupType` classes.
 
 This graph also has a 'root' through which all access begins. This is the `Query` class below.
 In this example, we provide the ability to list all users via `all_users`, and the
-ability to obtain a single user via `get_user`.
+ability to obtain a specific user via `get_user`.
 
-Open `tutorial/quickstart/schema.py` and type the following:
+Create `cookbook/ingredients/schema.py` and type the following:
 
 ```python
+# cookbook/ingredients/schema.py
 import graphene
 from graphene.contrib.django import DjangoObjectType
 
 from django.contrib.auth.models import User, Group
 
 # Graphene will automatically map the User model's fields onto the UserType.
-# This is configured in the UserType's Meta class
+# This is configured in the UserType's Meta class (as you can see below)
 class UserType(DjangoObjectType):
     class Meta:
         model = User

From 5e6f4cf302ea1e8615db1b1eb7c0e6c886ef0393 Mon Sep 17 00:00:00 2001
From: Adam Charnock <acharnock@twitter.com>
Date: Tue, 29 Dec 2015 14:18:32 +0000
Subject: [PATCH 146/173] Further work on django quickstart

---
 docs/pages/docs/quickstart-django.md | 162 ++++++++++++++++++++++-----
 1 file changed, 132 insertions(+), 30 deletions(-)

diff --git a/docs/pages/docs/quickstart-django.md b/docs/pages/docs/quickstart-django.md
index 9d0c816d..b944ef4c 100644
--- a/docs/pages/docs/quickstart-django.md
+++ b/docs/pages/docs/quickstart-django.md
@@ -30,10 +30,17 @@ from django.db import models
 class Category(models.Model):
     name = models.CharField(max_length=100)
 
+    def __str__(self):
+        return self.name
+
 
 class Ingredient(models.Model):
     name = models.CharField(max_length=100)
-    category = models.ForeignKey(Category)
+    notes = models.TextField()
+    category = models.ForeignKey(Category, related_name='ingredients')
+
+    def __str__(self):
+        return self.name
 ```
 
 ## Schema
@@ -51,84 +58,179 @@ Create `cookbook/ingredients/schema.py` and type the following:
 
 ```python
 # cookbook/ingredients/schema.py
-import graphene
-from graphene.contrib.django import DjangoObjectType
+from graphene import relay, ObjectType
+from graphene.contrib.django.filter import DjangoFilterConnectionField
+from graphene.contrib.django.types import DjangoNode
+
+from cookbook.ingredients.models import Category, Ingredient
 
-from django.contrib.auth.models import User, Group
 
 # Graphene will automatically map the User model's fields onto the UserType.
 # This is configured in the UserType's Meta class (as you can see below)
-class UserType(DjangoObjectType):
+class CategoryNode(DjangoNode):
     class Meta:
-        model = User
-        only_fields = ('username', 'email', 'groups')
+        model = Category
+        filter_fields = ['name', 'ingredients']
 
 
-class GroupType(DjangoObjectType):
+class IngredientNode(DjangoNode):
     class Meta:
-        model = Group
-        only_fields = ('name', )
+        model = Ingredient
+        filter_fields = ['name', 'notes', 'category']
 
 
-class Query(graphene.ObjectType):
-    get_user = graphene.Field(UserType,
-                              id=graphene.String().NonNull)
-    get_group = graphene.Field(GroupType,
-                               id=graphene.String().NonNull)
+class Query(ObjectType):
+    category = relay.NodeField(CategoryNode)
+    all_categories = DjangoFilterConnectionField(CategoryNode)
 
-schema = graphene.Schema(query=Query)
+    ingredient = relay.NodeField(IngredientNode)
+    all_ingredients = DjangoFilterConnectionField(IngredientNode)
+
+    class Meta:
+        abstract = True
 ```
 
+Note that the above `Query` class is marked as 'abstract'. This is because we
+want will now create a project-level query which will combine all our app-level
+queries.
+
+Create the parent project-level `cookbook/schema.py`:
+
+```python
+import graphene
+
+import cookbook.ingredients.schema
+
+
+class Query(cookbook.ingredients.schema.Query):
+    # This class will inherit from multiple Queries
+    # as we begin to add more apps to our project
+    pass
+
+schema = graphene.Schema(name='Cookbook Schema')
+schema.query = Query
+```
+
+You can think of this as being something like your top-level `urls.py`
+file (although it currently lacks any namespacing).
 
 ## Adding GraphiQL
 
-For having the GraphiQL static assets we need to append `django_graphiql` in `INSTALLED_APPS` in `tutorial/settings.py`:
+GraphiQL is a web-based integrated development environment to assist in the
+writing and executing of GraphQL queries. It will provide us with a simple
+and easy way of testing our cookbook project.
+
+Add `django_graphiql` to `INSTALLED_APPS` in `cookbook/settings.py`:
 
 ```python
 INSTALLED_APPS = [
-    # The other installed apps
+    ...
     'django_graphiql',
 ]
 ```
 
 ## Creating GraphQL and GraphiQL views
 
-Unlike a RESTful API, there is only a single URL from which a GraphQL is accessed.
+Unlike a RESTful API, there is only a single URL from which GraphQL is accessed.
 Requests to this URL are handled by Graphene's `GraphQLView` view.
 
-Additionally, an interface for navigating this API will be very useful. Graphene
-includes the [graphiql](https://github.com/graphql/graphiql) in-browser IDE
-which assists in exploring and querying your new API. We’ll add a URL for this too.
+Additionally, we'll add a URL for aforementioned GraphiQL, and for the Django admin
+interface (the latter can be useful for creating test data).
 
 ```python
 from django.conf.urls import url, include
+from django.contrib import admin
 from django.views.decorators.csrf import csrf_exempt
+
 from graphene.contrib.django.views import GraphQLView
-from quickstart.schema import schema
 
+from cookbook.schema import schema
 
-# Wire up our GraphQL schema to /graphql.
-# Additionally, we include GraphiQL view for querying easily our schema.
 urlpatterns = [
+    url(r'^admin/', admin.site.urls),
     url(r'^graphql', csrf_exempt(GraphQLView.as_view(schema=schema))),
     url(r'^graphiql', include('django_graphiql.urls')),
 ]
 ```
 
+## Load some test data
+
+**TODO:** Insert link to fixture
+
+Now is a good time to load up some test data. The easiest option will be to download
+the ingredients.json fixture and place it in
+`cookbook/ingredients/fixtures/ingredients.json`. You can then run the following:
+
+```
+$ python ./manage.py loaddata ingredients
+
+Installed 6 object(s) from 1 fixture(s)
+```
+
+Alternatively you can use the Django admin interface to create some data youself.
+You'll need to run the development server (see below), and probably create a login
+for yourself too (`./manage.py createsuperuser`).
+
 ## Testing our GraphQL schema
 
 We're now ready to test the API we've built. Let's fire up the server from the command line.
 
 ```bash
-python ./manage.py runserver
+$ python ./manage.py runserver
+
+Performing system checks...
+Django version 1.9, using settings 'cookbook.settings'
+Starting development server at http://127.0.0.1:8000/
+Quit the server with CONTROL-C.
 ```
 
-Go to [localhost:8080/graphiql](http://localhost:8080/graphiql) and type your first query!
+Go to [localhost:8000/graphiql](http://localhost:8000/graphiql) and type your first query!
 
 ```graphql
-myQuery {
-    getUser(id:"1") {
-        username
+query {
+  allIngredients {
+    edges {
+      node {
+        id,
+        name
+      }
     }
+  }
+}
+```
+
+The above will return the names & IDs for all ingredients. But perhaps you want
+a specific ingredient:
+
+```graphql
+query {
+  # Graphene creates globally unique IDs for all objects.
+  # You may need to copy this value from the results of the first query
+  ingredient(id: "SW5ncmVkaWVudE5vZGU6MQ==") {
+    name
+  }
+}
+```
+
+You can also get each ingredient for each category:
+
+```graphql
+query {
+  allCategories {
+    edges {
+      node {
+        name,
+
+        ingredients {
+          edges {
+            node {
+              name
+            }
+          }
+        }
+
+      }
+    }
+  }
 }
 ```

From b44bae115dc139e068127c763ce7b432f1da9482 Mon Sep 17 00:00:00 2001
From: Adam Charnock <acharnock@twitter.com>
Date: Tue, 29 Dec 2015 16:57:41 +0000
Subject: [PATCH 147/173] Adding test to reproduce bug whereby the
 FilterConnectionResolver does not correctly traverse relationships

---
 .../django/filter/tests/test_fields.py        | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/graphene/contrib/django/filter/tests/test_fields.py b/graphene/contrib/django/filter/tests/test_fields.py
index 45c1f0d0..b2591d1e 100644
--- a/graphene/contrib/django/filter/tests/test_fields.py
+++ b/graphene/contrib/django/filter/tests/test_fields.py
@@ -1,4 +1,7 @@
+from datetime import datetime
+
 import pytest
+from graphql.core.execution.base import ResolveInfo, ExecutionContext
 
 from graphene import ObjectType, Schema
 from graphene.contrib.django import DjangoNode
@@ -7,6 +10,7 @@ from graphene.contrib.django.forms import (GlobalIDFormField,
 from graphene.contrib.django.tests.models import Article, Pet, Reporter
 from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
 from graphene.relay import NodeField
+from graphene.utils import ProxySnakeDict
 
 pytestmark = []
 if DJANGO_FILTER_INSTALLED:
@@ -160,6 +164,57 @@ def test_filter_filterset_information_on_meta_related():
     assert_orderable(articles_field)
 
 
+def test_filter_filterset_related_results():
+    class ReporterFilterNode(DjangoNode):
+
+        class Meta:
+            model = Reporter
+            filter_fields = ['first_name', 'articles']
+            filter_order_by = True
+
+    class ArticleFilterNode(DjangoNode):
+
+        class Meta:
+            model = Article
+            filter_fields = ['headline', 'reporter']
+            filter_order_by = True
+
+    class Query(ObjectType):
+        all_reporters = DjangoFilterConnectionField(ReporterFilterNode)
+        all_articles = DjangoFilterConnectionField(ArticleFilterNode)
+        reporter = NodeField(ReporterFilterNode)
+        article = NodeField(ArticleFilterNode)
+
+    r1 = Reporter.objects.create(first_name='r1', last_name='r1', email='r1@test.com')
+    r2 = Reporter.objects.create(first_name='r2', last_name='r2', email='r2@test.com')
+    a1 = Article.objects.create(headline='a1', pub_date=datetime.now(), reporter=r1)
+    a2 = Article.objects.create(headline='a2', pub_date=datetime.now(), reporter=r2)
+
+    query = '''
+    query {
+        allReporters {
+            edges {
+                node {
+                    articles {
+                        edges {
+                            node {
+                                headline
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    '''
+    schema = Schema(query=Query)
+    result = schema.execute(query)
+    assert not result.errors
+    # We should only get back a single article for each reporter
+    assert len(result.data['allReporters']['edges'][0]['node']['articles']['edges']) == 1
+    assert len(result.data['allReporters']['edges'][1]['node']['articles']['edges']) == 1
+
+
 def test_global_id_field_implicit():
     field = DjangoFilterConnectionField(ArticleNode, fields=['id'])
     filterset_class = field.resolver_fn.get_filterset_class()

From 216c4350a1cd7e110f54834d5e3d0c825f1640aa Mon Sep 17 00:00:00 2001
From: Adam Charnock <acharnock@twitter.com>
Date: Thu, 31 Dec 2015 02:58:13 +0000
Subject: [PATCH 148/173] Further additions to docs for new django
 functionality

---
 docs/config.toml                     |   1 +
 docs/pages/docs/filtering.md         | 147 +++++++++++++++++++++++++++
 docs/pages/docs/quickstart-django.md |  38 +++++--
 3 files changed, 176 insertions(+), 10 deletions(-)
 create mode 100644 docs/pages/docs/filtering.md

diff --git a/docs/config.toml b/docs/config.toml
index 569605d9..5e39bed6 100644
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -16,4 +16,5 @@ ga = "UA-12613282-7"
 	  "/docs/mutations/",
 	  "/docs/basic-types/",
 	  "/docs/relay/",
+	  "/docs/filtering/",
 	]
diff --git a/docs/pages/docs/filtering.md b/docs/pages/docs/filtering.md
new file mode 100644
index 00000000..5ef57ea5
--- /dev/null
+++ b/docs/pages/docs/filtering.md
@@ -0,0 +1,147 @@
+---
+title: Filtering (Django)
+description: Details of how to perform filtering
+---
+
+# Filtering (Django)
+
+Graphene integrates with [django-filter](https://django-filter.readthedocs.org)
+to provide filtering of results. See the
+[usage documentation](https://django-filter.readthedocs.org/en/latest/usage.html#the-filter)
+for details on the format for `filter_fields`.
+
+**Note 1:** This filtering is only available when using the Django integrations
+(i.e. nodes which extend `DjangoNode`)
+
+**Note 2:** `django-filter` is an optional dependency of Graphene. You will need to
+install it manually, which can be done as follows:
+
+```bash
+pip install django-filter
+```
+
+## Filterable fields
+
+The `filter_fields` parameter is used to specify the fields which can be filtered upon.
+The value specified here is passed directly to `django-filter`, so see the
+[filtering documentation](https://django-filter.readthedocs.org/en/latest/usage.html#the-filter)
+for full details on the range of options available.
+
+For example:
+
+```python
+class AnimalNode(DjangoNode):
+    class Meta:
+        # Assume you have an Animal model defined with the following fields
+        model = Animal
+        filter_fields = ['name', 'genus', 'is_domesticated']
+
+class Query(ObjectType):
+    animal = relay.NodeField(AnimalNode)
+    all_animals = DjangoFilterConnectionField(AnimalNode)
+```
+
+You could then perform a query such as:
+
+```graphql
+query {
+  # Note that fields names become camelcased
+  allAnimals(genus: "cat", isDomesticated: true) {
+    edges {
+      node {
+        id,
+        name
+}}}}
+```
+
+You can also make more complex lookup types available:
+
+```python
+class AnimalNode(DjangoNode):
+    class Meta:
+        model = Animal
+        # Provide more complex lookup types
+        filter_fields = {
+            'name': ['exact', 'icontains', 'istartswith'],
+            'genus': ['exact'],
+            'is_domesticated': ['exact'],
+        }
+```
+
+Which you could query as follows:
+
+```graphql
+query {
+  # Note that fields names become camelcased
+  allAnimals(nameIcontains: "lion") {
+    edges {
+      node {
+        id,
+        name
+}}}}
+```
+
+## Orderable fields
+
+Ordering can also be specified using `filter_order_by`. Like `filter_fields`,
+this value is also passed directly to `django-filter` as the `order_by` field.
+For full details see the
+[order_by documentation](https://django-filter.readthedocs.org/en/latest/usage.html#ordering-using-order-by).
+
+For example:
+
+```python
+class AnimalNode(DjangoNode):
+    class Meta:
+        model = Animal
+        filter_fields = ['name', 'genus', 'is_domesticated']
+        # Either a tuple/list of fields upon which ordering is allowed, or
+        # True to allow filtering on all fields specified in filter_fields
+        order_by_fields = True
+```
+
+You can then control the ordering via the `orderBy` argument:
+
+```graphql
+query {
+  allAnimals(orderBy: "name") {
+    edges {
+      node {
+        id,
+        name
+}}}}
+```
+
+## Custom Filtersets
+
+By default Graphene provides easy access to the most commonly used
+features of `django-filter`. This is done by transparently creating a
+`django_filters.FilterSet` class for you and passing in the values for
+`filter_fields` and `order_by_fields`.
+
+However, you may find this to be insufficient. In these cases you can
+create your own `Filterset` as follows:
+
+```python
+class AnimalNode(DjangoNode):
+    class Meta:
+        # Assume you have an Animal model defined with the following fields
+        model = Animal
+        filter_fields = ['name', 'genus', 'is_domesticated']
+
+
+class AnimalFilter(django_filters.FilterSet):
+    # Do case-insensitive lookups on 'name'
+    name = django_filters.CharFilter(lookup_type='iexact')
+
+    class Meta:
+        model = Animal
+        fields = ['name', 'genus', 'is_domesticated']
+
+
+class Query(ObjectType):
+    animal = relay.NodeField(AnimalNode)
+    # We specify our custom AnimalFilter using the filterset_class param
+    all_animals = DjangoFilterConnectionField(AnimalNode,
+                                              filterset_class=AnimalFilter)
+```
diff --git a/docs/pages/docs/quickstart-django.md b/docs/pages/docs/quickstart-django.md
index b944ef4c..e2b94761 100644
--- a/docs/pages/docs/quickstart-django.md
+++ b/docs/pages/docs/quickstart-django.md
@@ -1,5 +1,5 @@
 ---
-title: Django Tutorial
+title: Django Quickstart
 description: A Quick guide to Graphene in Django
 ---
 
@@ -71,12 +71,20 @@ class CategoryNode(DjangoNode):
     class Meta:
         model = Category
         filter_fields = ['name', 'ingredients']
+        filter_order_by = ['name']
 
 
 class IngredientNode(DjangoNode):
     class Meta:
         model = Ingredient
-        filter_fields = ['name', 'notes', 'category']
+        # Allow for some more advanced filtering here
+        filter_fields = {
+            'name': ['exact', 'icontains', 'istartswith'],
+            'notes': ['exact', 'icontains'],
+            'category': ['exact'],
+            'category__name': ['exact'],
+        }
+        filter_order_by = ['name', 'category__name']
 
 
 class Query(ObjectType):
@@ -90,6 +98,11 @@ class Query(ObjectType):
         abstract = True
 ```
 
+The filtering functionality is provided by
+[django-filter](https://django-filter.readthedocs.org). See the
+[usage documentation](https://django-filter.readthedocs.org/en/latest/usage.html#the-filter)
+for details on the format for `filter_fields`.
+
 Note that the above `Query` class is marked as 'abstract'. This is because we
 want will now create a project-level query which will combine all our app-level
 queries.
@@ -225,12 +238,17 @@ query {
           edges {
             node {
               name
-            }
-          }
-        }
-
-      }
-    }
-  }
-}
+}}}}}}}
+```
+
+Or you can get only 'meat' ingredients containing the letter 'e':
+
+```graphql
+query {
+  # You can also use `category: "CATEGORY GLOBAL ID"`
+  allIngredients(nameIcontains: "e", categoryName: "Meat") {
+    edges {
+      node {
+        name
+}}}}
 ```

From c70b5f2f0d796b8add92b18293213f11e255714b Mon Sep 17 00:00:00 2001
From: Adam Charnock <acharnock@twitter.com>
Date: Thu, 31 Dec 2015 03:01:36 +0000
Subject: [PATCH 149/173] Adding cookbook example app demoing new django
 functionality

---
 .gitignore                                    |   5 +-
 examples/cookbook/cookbook/__init__.py        |   0
 .../cookbook/cookbook/ingredients/__init__.py |   0
 .../cookbook/cookbook/ingredients/admin.py    |   6 +
 .../cookbook/cookbook/ingredients/apps.py     |   7 +
 .../ingredients/fixtures/ingredients.json     |   1 +
 .../ingredients/migrations/0001_initial.py    |  33 +++++
 .../ingredients/migrations/__init__.py        |   0
 .../cookbook/cookbook/ingredients/models.py   |  17 +++
 .../cookbook/cookbook/ingredients/schema.py   |  38 ++++++
 .../cookbook/cookbook/ingredients/tests.py    |   3 +
 .../cookbook/cookbook/ingredients/views.py    |   3 +
 .../cookbook/cookbook/recipes/__init__.py     |   0
 examples/cookbook/cookbook/recipes/admin.py   |   6 +
 examples/cookbook/cookbook/recipes/apps.py    |   7 +
 .../recipes/migrations/0001_initial.py        |  36 +++++
 .../cookbook/recipes/migrations/__init__.py   |   0
 examples/cookbook/cookbook/recipes/models.py  |  19 +++
 examples/cookbook/cookbook/recipes/tests.py   |   3 +
 examples/cookbook/cookbook/recipes/views.py   |   3 +
 examples/cookbook/cookbook/schema.py          |  10 ++
 examples/cookbook/cookbook/settings.py        | 125 ++++++++++++++++++
 examples/cookbook/cookbook/urls.py            |  13 ++
 examples/cookbook/cookbook/wsgi.py            |  16 +++
 examples/cookbook/manage.py                   |  10 ++
 examples/cookbook/requirements.txt            |   5 +
 26 files changed, 365 insertions(+), 1 deletion(-)
 create mode 100644 examples/cookbook/cookbook/__init__.py
 create mode 100644 examples/cookbook/cookbook/ingredients/__init__.py
 create mode 100644 examples/cookbook/cookbook/ingredients/admin.py
 create mode 100644 examples/cookbook/cookbook/ingredients/apps.py
 create mode 100644 examples/cookbook/cookbook/ingredients/fixtures/ingredients.json
 create mode 100644 examples/cookbook/cookbook/ingredients/migrations/0001_initial.py
 create mode 100644 examples/cookbook/cookbook/ingredients/migrations/__init__.py
 create mode 100644 examples/cookbook/cookbook/ingredients/models.py
 create mode 100644 examples/cookbook/cookbook/ingredients/schema.py
 create mode 100644 examples/cookbook/cookbook/ingredients/tests.py
 create mode 100644 examples/cookbook/cookbook/ingredients/views.py
 create mode 100644 examples/cookbook/cookbook/recipes/__init__.py
 create mode 100644 examples/cookbook/cookbook/recipes/admin.py
 create mode 100644 examples/cookbook/cookbook/recipes/apps.py
 create mode 100644 examples/cookbook/cookbook/recipes/migrations/0001_initial.py
 create mode 100644 examples/cookbook/cookbook/recipes/migrations/__init__.py
 create mode 100644 examples/cookbook/cookbook/recipes/models.py
 create mode 100644 examples/cookbook/cookbook/recipes/tests.py
 create mode 100644 examples/cookbook/cookbook/recipes/views.py
 create mode 100644 examples/cookbook/cookbook/schema.py
 create mode 100644 examples/cookbook/cookbook/settings.py
 create mode 100644 examples/cookbook/cookbook/urls.py
 create mode 100644 examples/cookbook/cookbook/wsgi.py
 create mode 100755 examples/cookbook/manage.py
 create mode 100644 examples/cookbook/requirements.txt

diff --git a/.gitignore b/.gitignore
index 426bb3fb..5b7b0767 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,4 +74,7 @@ target/
 /docs/static/playground
 
 # PyCharm
-/.idea
+.idea
+
+# Databases
+*.sqlite3
diff --git a/examples/cookbook/cookbook/__init__.py b/examples/cookbook/cookbook/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/examples/cookbook/cookbook/ingredients/__init__.py b/examples/cookbook/cookbook/ingredients/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/examples/cookbook/cookbook/ingredients/admin.py b/examples/cookbook/cookbook/ingredients/admin.py
new file mode 100644
index 00000000..b3d92366
--- /dev/null
+++ b/examples/cookbook/cookbook/ingredients/admin.py
@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+from cookbook.ingredients.models import Ingredient, Category
+
+admin.site.register(Ingredient)
+admin.site.register(Category)
diff --git a/examples/cookbook/cookbook/ingredients/apps.py b/examples/cookbook/cookbook/ingredients/apps.py
new file mode 100644
index 00000000..21b4b08a
--- /dev/null
+++ b/examples/cookbook/cookbook/ingredients/apps.py
@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class IngredientsConfig(AppConfig):
+    name = 'cookbook.ingredients'
+    label = 'ingredients'
+    verbose_name = 'Ingredients'
diff --git a/examples/cookbook/cookbook/ingredients/fixtures/ingredients.json b/examples/cookbook/cookbook/ingredients/fixtures/ingredients.json
new file mode 100644
index 00000000..8625d3c7
--- /dev/null
+++ b/examples/cookbook/cookbook/ingredients/fixtures/ingredients.json
@@ -0,0 +1 @@
+[{"model": "ingredients.category", "pk": 1, "fields": {"name": "Dairy"}}, {"model": "ingredients.category", "pk": 2, "fields": {"name": "Meat"}}, {"model": "ingredients.ingredient", "pk": 1, "fields": {"name": "Eggs", "notes": "Good old eggs", "category": 1}}, {"model": "ingredients.ingredient", "pk": 2, "fields": {"name": "Milk", "notes": "Comes from a cow", "category": 1}}, {"model": "ingredients.ingredient", "pk": 3, "fields": {"name": "Beef", "notes": "Much like milk, this comes from a cow", "category": 2}}, {"model": "ingredients.ingredient", "pk": 4, "fields": {"name": "Chicken", "notes": "Definitely doesn't come from a cow", "category": 2}}]
\ No newline at end of file
diff --git a/examples/cookbook/cookbook/ingredients/migrations/0001_initial.py b/examples/cookbook/cookbook/ingredients/migrations/0001_initial.py
new file mode 100644
index 00000000..3249c5a1
--- /dev/null
+++ b/examples/cookbook/cookbook/ingredients/migrations/0001_initial.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2015-12-04 18:15
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Category',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Ingredient',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('notes', models.TextField()),
+                ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ingredients', to='ingredients.Category')),
+            ],
+        ),
+    ]
diff --git a/examples/cookbook/cookbook/ingredients/migrations/__init__.py b/examples/cookbook/cookbook/ingredients/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/examples/cookbook/cookbook/ingredients/models.py b/examples/cookbook/cookbook/ingredients/models.py
new file mode 100644
index 00000000..cffdf1ea
--- /dev/null
+++ b/examples/cookbook/cookbook/ingredients/models.py
@@ -0,0 +1,17 @@
+from django.db import models
+
+
+class Category(models.Model):
+    name = models.CharField(max_length=100)
+
+    def __str__(self):
+        return self.name
+
+
+class Ingredient(models.Model):
+    name = models.CharField(max_length=100)
+    notes = models.TextField()
+    category = models.ForeignKey(Category, related_name='ingredients')
+
+    def __str__(self):
+        return self.name
diff --git a/examples/cookbook/cookbook/ingredients/schema.py b/examples/cookbook/cookbook/ingredients/schema.py
new file mode 100644
index 00000000..6c640dff
--- /dev/null
+++ b/examples/cookbook/cookbook/ingredients/schema.py
@@ -0,0 +1,38 @@
+from graphene import relay, ObjectType
+from graphene.contrib.django.filter import DjangoFilterConnectionField
+from graphene.contrib.django.types import DjangoNode
+
+from cookbook.ingredients.models import Category, Ingredient
+
+
+# Graphene will automatically map the User model's fields onto the UserType.
+# This is configured in the UserType's Meta class (as you can see below)
+class CategoryNode(DjangoNode):
+    class Meta:
+        model = Category
+        filter_fields = ['name', 'ingredients']
+        filter_order_by = ['name']
+
+
+class IngredientNode(DjangoNode):
+    class Meta:
+        model = Ingredient
+        # Allow for some more advanced filtering here
+        filter_fields = {
+            'name': ['exact', 'icontains', 'istartswith'],
+            'notes': ['exact', 'icontains'],
+            'category': ['exact'],
+            'category__name': ['exact'],
+        }
+        filter_order_by = ['name', 'category__name']
+
+
+class Query(ObjectType):
+    category = relay.NodeField(CategoryNode)
+    all_categories = DjangoFilterConnectionField(CategoryNode)
+
+    ingredient = relay.NodeField(IngredientNode)
+    all_ingredients = DjangoFilterConnectionField(IngredientNode)
+
+    class Meta:
+        abstract = True
diff --git a/examples/cookbook/cookbook/ingredients/tests.py b/examples/cookbook/cookbook/ingredients/tests.py
new file mode 100644
index 00000000..7ce503c2
--- /dev/null
+++ b/examples/cookbook/cookbook/ingredients/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/examples/cookbook/cookbook/ingredients/views.py b/examples/cookbook/cookbook/ingredients/views.py
new file mode 100644
index 00000000..91ea44a2
--- /dev/null
+++ b/examples/cookbook/cookbook/ingredients/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
diff --git a/examples/cookbook/cookbook/recipes/__init__.py b/examples/cookbook/cookbook/recipes/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/examples/cookbook/cookbook/recipes/admin.py b/examples/cookbook/cookbook/recipes/admin.py
new file mode 100644
index 00000000..862dd4cb
--- /dev/null
+++ b/examples/cookbook/cookbook/recipes/admin.py
@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+from cookbook.recipes.models import Recipe, RecipeIngredient
+
+admin.site.register(Recipe)
+admin.site.register(RecipeIngredient)
diff --git a/examples/cookbook/cookbook/recipes/apps.py b/examples/cookbook/cookbook/recipes/apps.py
new file mode 100644
index 00000000..1f24f13e
--- /dev/null
+++ b/examples/cookbook/cookbook/recipes/apps.py
@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class RecipesConfig(AppConfig):
+    name = 'cookbook.recipes'
+    label = 'recipes'
+    verbose_name = 'Recipes'
diff --git a/examples/cookbook/cookbook/recipes/migrations/0001_initial.py b/examples/cookbook/cookbook/recipes/migrations/0001_initial.py
new file mode 100644
index 00000000..2071afc5
--- /dev/null
+++ b/examples/cookbook/cookbook/recipes/migrations/0001_initial.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2015-12-04 18:20
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('ingredients', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Recipe',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=100)),
+                ('instructions', models.TextField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='RecipeIngredient',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('amount', models.FloatField()),
+                ('unit', models.CharField(choices=[('kg', 'Kilograms'), ('l', 'Litres'), ('', 'Units')], max_length=20)),
+                ('ingredient', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='used_by', to='ingredients.Ingredient')),
+                ('recipes', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='amounts', to='recipes.Recipe')),
+            ],
+        ),
+    ]
diff --git a/examples/cookbook/cookbook/recipes/migrations/__init__.py b/examples/cookbook/cookbook/recipes/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/examples/cookbook/cookbook/recipes/models.py b/examples/cookbook/cookbook/recipes/models.py
new file mode 100644
index 00000000..a767dd23
--- /dev/null
+++ b/examples/cookbook/cookbook/recipes/models.py
@@ -0,0 +1,19 @@
+from django.db import models
+
+from cookbook.ingredients.models import Ingredient
+
+
+class Recipe(models.Model):
+    title = models.CharField(max_length=100)
+    instructions = models.TextField()
+
+
+class RecipeIngredient(models.Model):
+    recipes = models.ForeignKey(Recipe, related_name='amounts')
+    ingredient = models.ForeignKey(Ingredient, related_name='used_by')
+    amount = models.FloatField()
+    unit = models.CharField(max_length=20, choices=(
+        ('kg', 'Kilograms'),
+        ('l', 'Litres'),
+        ('', 'Units'),
+    ))
diff --git a/examples/cookbook/cookbook/recipes/tests.py b/examples/cookbook/cookbook/recipes/tests.py
new file mode 100644
index 00000000..7ce503c2
--- /dev/null
+++ b/examples/cookbook/cookbook/recipes/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/examples/cookbook/cookbook/recipes/views.py b/examples/cookbook/cookbook/recipes/views.py
new file mode 100644
index 00000000..91ea44a2
--- /dev/null
+++ b/examples/cookbook/cookbook/recipes/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
diff --git a/examples/cookbook/cookbook/schema.py b/examples/cookbook/cookbook/schema.py
new file mode 100644
index 00000000..d417ce8e
--- /dev/null
+++ b/examples/cookbook/cookbook/schema.py
@@ -0,0 +1,10 @@
+import graphene
+
+import cookbook.ingredients.schema
+
+
+class Query(cookbook.ingredients.schema.Query):
+    pass
+
+schema = graphene.Schema(name='Cookbook Schema')
+schema.query = Query
diff --git a/examples/cookbook/cookbook/settings.py b/examples/cookbook/cookbook/settings.py
new file mode 100644
index 00000000..bdc1f1c5
--- /dev/null
+++ b/examples/cookbook/cookbook/settings.py
@@ -0,0 +1,125 @@
+"""
+Django settings for cookbook project.
+
+Generated by 'django-admin startproject' using Django 1.9.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.9/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.9/ref/settings/
+"""
+
+import os
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = '_$=$%eqxk$8ss4n7mtgarw^5$8^d5+c83!vwatr@i_81myb=e4'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'django_graphiql',
+
+    'cookbook.ingredients.apps.IngredientsConfig',
+    'cookbook.recipes.apps.RecipesConfig',
+]
+
+MIDDLEWARE_CLASSES = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+ROOT_URLCONF = 'cookbook.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'cookbook.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/1.9/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.9/howto/static-files/
+
+STATIC_URL = '/static/'
diff --git a/examples/cookbook/cookbook/urls.py b/examples/cookbook/cookbook/urls.py
new file mode 100644
index 00000000..f0ad66f3
--- /dev/null
+++ b/examples/cookbook/cookbook/urls.py
@@ -0,0 +1,13 @@
+from django.conf.urls import url, include
+from django.contrib import admin
+from django.views.decorators.csrf import csrf_exempt
+
+from graphene.contrib.django.views import GraphQLView
+
+from cookbook.schema import schema
+
+urlpatterns = [
+    url(r'^admin/', admin.site.urls),
+    url(r'^graphql', csrf_exempt(GraphQLView.as_view(schema=schema))),
+    url(r'^graphiql', include('django_graphiql.urls')),
+]
diff --git a/examples/cookbook/cookbook/wsgi.py b/examples/cookbook/cookbook/wsgi.py
new file mode 100644
index 00000000..954b0a80
--- /dev/null
+++ b/examples/cookbook/cookbook/wsgi.py
@@ -0,0 +1,16 @@
+"""
+WSGI config for cookbook project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.9/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "cookbook.settings")
+
+application = get_wsgi_application()
diff --git a/examples/cookbook/manage.py b/examples/cookbook/manage.py
new file mode 100755
index 00000000..8d8a34d6
--- /dev/null
+++ b/examples/cookbook/manage.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "cookbook.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/examples/cookbook/requirements.txt b/examples/cookbook/requirements.txt
new file mode 100644
index 00000000..2c9fa4d2
--- /dev/null
+++ b/examples/cookbook/requirements.txt
@@ -0,0 +1,5 @@
+-e git+https://github.com/adamcharnock/graphene.git@feature/django#egg=graphene
+graphql-core==0.4.12
+django==1.9
+django_graphiql==0.4.2
+django-filter==0.11.0

From a881aa94e4893cdbc935e53cd072f831b47ef529 Mon Sep 17 00:00:00 2001
From: Adam Charnock <acharnock@twitter.com>
Date: Thu, 31 Dec 2015 03:05:19 +0000
Subject: [PATCH 150/173] Adding fixture link to docs. This link will work once
 code is merged

---
 docs/pages/docs/quickstart-django.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/pages/docs/quickstart-django.md b/docs/pages/docs/quickstart-django.md
index e2b94761..2e378aff 100644
--- a/docs/pages/docs/quickstart-django.md
+++ b/docs/pages/docs/quickstart-django.md
@@ -168,10 +168,9 @@ urlpatterns = [
 
 ## Load some test data
 
-**TODO:** Insert link to fixture
-
-Now is a good time to load up some test data. The easiest option will be to download
-the ingredients.json fixture and place it in
+Now is a good time to load up some test data. The easiest option will be to
+[download the ingredients.json](https://raw.githubusercontent.com/graphql-python/graphene/feature/django/examples/cookbook/cookbook/ingredients/fixtures/ingredients.json)
+fixture and place it in
 `cookbook/ingredients/fixtures/ingredients.json`. You can then run the following:
 
 ```

From 716aa8ff66fa0c97586b0882887441626ba2da92 Mon Sep 17 00:00:00 2001
From: Adam Charnock <acharnock@twitter.com>
Date: Thu, 31 Dec 2015 03:18:37 +0000
Subject: [PATCH 151/173] Adding links to the cookbook example app (links
 should work upon merge)

---
 docs/pages/docs/filtering.md         | 11 +++++++----
 docs/pages/docs/quickstart-django.md |  3 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/docs/pages/docs/filtering.md b/docs/pages/docs/filtering.md
index 5ef57ea5..95521dd2 100644
--- a/docs/pages/docs/filtering.md
+++ b/docs/pages/docs/filtering.md
@@ -10,16 +10,19 @@ to provide filtering of results. See the
 [usage documentation](https://django-filter.readthedocs.org/en/latest/usage.html#the-filter)
 for details on the format for `filter_fields`.
 
-**Note 1:** This filtering is only available when using the Django integrations
-(i.e. nodes which extend `DjangoNode`)
-
-**Note 2:** `django-filter` is an optional dependency of Graphene. You will need to
+This filtering is only available when using the Django integrations
+(i.e. nodes which extend `DjangoNode`). Additionally `django-filter`
+is an optional dependency of Graphene. You will need to
 install it manually, which can be done as follows:
 
 ```bash
+# You'll need to django-filter
 pip install django-filter
 ```
 
+**Note: The techniques below are demoed in the
+[cookbook example app](https://github.com/graphql-python/graphene/tree/feature/django/examples/cookbook).**
+
 ## Filterable fields
 
 The `filter_fields` parameter is used to specify the fields which can be filtered upon.
diff --git a/docs/pages/docs/quickstart-django.md b/docs/pages/docs/quickstart-django.md
index 2e378aff..310ec95d 100644
--- a/docs/pages/docs/quickstart-django.md
+++ b/docs/pages/docs/quickstart-django.md
@@ -13,6 +13,9 @@ Django's getting started page.
 
 First let's create a few simple models...
 
+**Note: The code in this quickstart is pulled from the
+[cookbook example app](https://github.com/graphql-python/graphene/tree/feature/django/examples/cookbook)**.
+
 ## Defining our models
 
 Before continuing, create the following:

From 442998cbb387786e5e3748bb8b34d0396d4be438 Mon Sep 17 00:00:00 2001
From: Adam Charnock <acharnock@twitter.com>
Date: Thu, 31 Dec 2015 13:16:23 +0000
Subject: [PATCH 152/173] Adding Readme file to cookbook example project

---
 examples/cookbook/README.md        | 64 ++++++++++++++++++++++++++++++
 examples/cookbook/requirements.txt |  6 +--
 2 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 examples/cookbook/README.md

diff --git a/examples/cookbook/README.md b/examples/cookbook/README.md
new file mode 100644
index 00000000..206d97c3
--- /dev/null
+++ b/examples/cookbook/README.md
@@ -0,0 +1,64 @@
+Cookbook Example Django Project
+===============================
+
+This example project demos integration between Graphene and Django.
+The project contains two apps, one named `ingredients` and another
+named `recepies`.
+
+Getting started
+---------------
+
+First you'll need to get the source of the project. Do this by cloning the
+whole Graphene repository:
+
+```bash
+# Get the example project code
+git clone https://github.com/graphql-python/graphene.git
+cd graphene/examples/cookbook
+```
+
+It is good idea (but not required) to create a virtual environment
+for this project. We'll do this using
+[virtualenv](http://docs.python-guide.org/en/latest/dev/virtualenvs/)
+to keep things simple,
+but you may also find something like
+[virtualenvwrapper](https://virtualenvwrapper.readthedocs.org/en/latest/)
+to be useful:
+
+```bash
+# Create a virtualenv in which we can install the dependencies
+virtualenv env
+source env/bin/activate
+```
+
+Now we can install our dependencies:
+
+```bash
+pip install -r requirements.txt
+```
+
+Now setup our database:
+
+```bash
+# Setup the database
+./manage.py migrate
+
+# Load some example data
+./manage.py loaddata ingredients
+
+# Create an admin user (useful for logging into the admin UI
+# at http://127.0.0.1:8000/admin)
+./manage.py createsuperuser
+```
+
+Now you should be ready to start the server:
+
+```bash
+./manage.py runserver
+```
+
+Now head on over to
+[http://127.0.0.1:8000/graphiql](http://127.0.0.1:8000/graphiql)
+and run some queries!
+(See the [Django quickstart guide](http://graphene-python.org/docs/quickstart-django/)
+for some example queries)
diff --git a/examples/cookbook/requirements.txt b/examples/cookbook/requirements.txt
index 2c9fa4d2..0fd3c2da 100644
--- a/examples/cookbook/requirements.txt
+++ b/examples/cookbook/requirements.txt
@@ -1,5 +1,5 @@
--e git+https://github.com/adamcharnock/graphene.git@feature/django#egg=graphene
-graphql-core==0.4.12
+graphene[django]
+django_graphiql
+graphql-core
 django==1.9
-django_graphiql==0.4.2
 django-filter==0.11.0

From 39a4fe20b3021f8628bf2f39356b3e6f09336b28 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 2 Jan 2016 14:49:08 +0100
Subject: [PATCH 153/173] Fixed builds and flexibilize the graphql-core
 integration

---
 .travis.yml | 8 ++++----
 setup.py    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3dbb00e0..b6996d24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,13 +80,13 @@ matrix:
   fast_finish: true
   include:
   - python: '2.7'
-    env: DJANGO_VERSION=1.6
+    env: TEST_TYPE=build DJANGO_VERSION=1.6
   - python: '2.7'
-    env: DJANGO_VERSION=1.7
+    env: TEST_TYPE=build DJANGO_VERSION=1.7
   - python: '2.7'
-    env: DJANGO_VERSION=1.8
+    env: TEST_TYPE=build DJANGO_VERSION=1.8
   - python: '2.7'
-    env: DJANGO_VERSION=1.9
+    env: TEST_TYPE=build DJANGO_VERSION=1.9
   - python: '2.7'
     env: TEST_TYPE=build_website
   - python: '2.7'
diff --git a/setup.py b/setup.py
index ac0e3d0f..90388c63 100644
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,7 @@ setup(
 
     install_requires=[
         'six>=1.10.0',
-        'graphql-core==0.4.9',
+        'graphql-core>=0.4.9',
         'graphql-relay==0.3.3',
     ],
     tests_require=[

From ffc6707fbf7cac664fdf031a0270ea3e8680e3e8 Mon Sep 17 00:00:00 2001
From: Adam Charnock <acharnock@twitter.com>
Date: Sat, 2 Jan 2016 19:11:38 +0000
Subject: [PATCH 154/173] Adding graphene.contrib.django to INSTALLED_APPS in
 django quickstart

---
 docs/pages/docs/quickstart-django.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/pages/docs/quickstart-django.md b/docs/pages/docs/quickstart-django.md
index 310ec95d..51167d70 100644
--- a/docs/pages/docs/quickstart-django.md
+++ b/docs/pages/docs/quickstart-django.md
@@ -142,6 +142,9 @@ Add `django_graphiql` to `INSTALLED_APPS` in `cookbook/settings.py`:
 INSTALLED_APPS = [
     ...
     'django_graphiql',
+
+    # This will also make the `graphql_schema` management command available
+    'graphene.contrib.django',
 ]
 ```
 

From 33c58f6cfa14771e7d90fa6d6a42eb590b76e5f4 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 2 Jan 2016 21:04:27 +0100
Subject: [PATCH 155/173] Improved default field getter and improved relay
 connection resolver

---
 graphene/core/types/field.py | 10 ++++++++++
 graphene/relay/fields.py     |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py
index 6cbfff96..2d96f1d3 100644
--- a/graphene/core/types/field.py
+++ b/graphene/core/types/field.py
@@ -51,6 +51,16 @@ class Field(NamedType, OrderedType):
     def resolver(self):
         return self.resolver_fn or self.get_resolver_fn()
 
+    @property
+    def default(self):
+        if callable(self._default):
+            return self._default()
+        return self._default
+
+    @default.setter
+    def default(self, value):
+        self._default = value
+
     def get_resolver_fn(self):
         resolve_fn_name = 'resolve_%s' % self.attname
         if hasattr(self.object_type, resolve_fn_name):
diff --git a/graphene/relay/fields.py b/graphene/relay/fields.py
index dc8c4973..aa446083 100644
--- a/graphene/relay/fields.py
+++ b/graphene/relay/fields.py
@@ -23,15 +23,15 @@ class ConnectionField(Field):
         self.connection_type = connection_type
         self.edge_type = edge_type
 
-    def wrap_resolved(self, value, instance, args, info):
-        return value
-
     def resolver(self, instance, args, info):
         schema = info.schema.graphene_schema
         connection_type = self.get_type(schema)
         resolved = super(ConnectionField, self).resolver(instance, args, info)
         if isinstance(resolved, connection_type):
             return resolved
+        return self.from_list(connection_type, resolved, args, info)
+
+    def from_list(self, connection_type, resolved, args, info):
         return connection_type.from_list(resolved, args, info)
 
     def get_connection_type(self, node):

From e1145b88fb8ed574591ecf7b3d6293048fa108fd Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 2 Jan 2016 21:13:54 +0100
Subject: [PATCH 156/173] Improved resolvers in Django

---
 graphene/contrib/django/fields.py             | 34 ++++++--
 graphene/contrib/django/filter/fields.py      | 49 ++++++-----
 graphene/contrib/django/filter/resolvers.py   | 64 ---------------
 .../django/filter/tests/test_fields.py        | 16 ++--
 .../django/filter/tests/test_resolvers.py     | 82 -------------------
 graphene/contrib/django/filter/utils.py       | 31 +++++++
 graphene/contrib/django/resolvers.py          | 43 ----------
 graphene/contrib/django/types.py              | 10 +--
 graphene/contrib/django/utils.py              | 22 -----
 9 files changed, 96 insertions(+), 255 deletions(-)
 delete mode 100644 graphene/contrib/django/filter/resolvers.py
 delete mode 100644 graphene/contrib/django/filter/tests/test_resolvers.py
 create mode 100644 graphene/contrib/django/filter/utils.py
 delete mode 100644 graphene/contrib/django/resolvers.py

diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index d9d6f3da..5c4f034e 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -1,28 +1,44 @@
-import warnings
-
 from ...core.exceptions import SkipField
 from ...core.fields import Field
 from ...core.types.base import FieldType
 from ...core.types.definitions import List
 from ...relay import ConnectionField
 from ...relay.utils import is_node
-from .filter.fields import DjangoFilterConnectionField
-from .utils import get_type_for_model
+from .utils import get_type_for_model, maybe_queryset
 
 
 class DjangoConnectionField(ConnectionField):
 
     def __init__(self, *args, **kwargs):
-        cls = self.__class__
-        warnings.warn("Using {} will be not longer supported."
-                      " Use relay.ConnectionField instead".format(cls.__name__),
-                      FutureWarning)
+        self.on = kwargs.pop('on', False)
         return super(DjangoConnectionField, self).__init__(*args, **kwargs)
 
+    @property
+    def model(self):
+        return self.type._meta.model
+
+    def get_manager(self):
+        if self.on:
+            return getattr(self.model, self.on)
+        else:
+            return self.model._default_manager
+
+    def get_queryset(self, resolved_qs, args, info):
+        return resolved_qs
+
+    def from_list(self, connection_type, resolved, args, info):
+        if not resolved:
+            resolved = self.get_manager()
+        resolved_qs = maybe_queryset(resolved)
+        qs = self.get_queryset(resolved_qs, args, info)
+        return super(DjangoConnectionField, self).from_list(connection_type, qs, args, info)
+
 
 class ConnectionOrListField(Field):
 
     def internal_type(self, schema):
+        from .filter.fields import DjangoFilterConnectionField
+
         model_field = self.type
         field_object_type = model_field.get_object_type(schema)
         if not field_object_type:
@@ -31,7 +47,7 @@ class ConnectionOrListField(Field):
             if field_object_type._meta.filter_fields:
                 field = DjangoFilterConnectionField(field_object_type)
             else:
-                field = ConnectionField(field_object_type)
+                field = DjangoConnectionField(field_object_type)
         else:
             field = Field(List(field_object_type))
         field.contribute_to_class(self.object_type, self.attname)
diff --git a/graphene/contrib/django/filter/fields.py b/graphene/contrib/django/filter/fields.py
index 43196f6e..f974a4ee 100644
--- a/graphene/contrib/django/filter/fields.py
+++ b/graphene/contrib/django/filter/fields.py
@@ -1,25 +1,36 @@
-from graphene.contrib.django.filter.resolvers import FilterConnectionResolver
-from graphene.contrib.django.utils import get_filtering_args_from_filterset
-from graphene.relay import ConnectionField
+from .utils import get_filterset_class, get_filtering_args_from_filterset
+from ..fields import DjangoConnectionField
 
 
-class DjangoFilterConnectionField(ConnectionField):
+class DjangoFilterConnectionField(DjangoConnectionField):
 
-    def __init__(self, type, on=None, fields=None, order_by=None,
-                 extra_filter_meta=None, filterset_class=None, resolver=None,
+    def __init__(self, type, fields=None, order_by=None,
+                 extra_filter_meta=None, filterset_class=None,
                  *args, **kwargs):
 
-        if not resolver:
-            resolver = FilterConnectionResolver(
-                node=type,
-                on=on,
-                filterset_class=filterset_class,
-                fields=fields,
-                order_by=order_by,
-                extra_filter_meta=extra_filter_meta,
-            )
-
-        filtering_args = get_filtering_args_from_filterset(resolver.get_filterset_class(), type)
+        self.order_by = order_by or type._meta.filter_order_by
+        self.fields = fields or type._meta.filter_fields
+        meta = dict(model=type._meta.model,
+                    fields=self.fields,
+                    order_by=self.order_by)
+        if extra_filter_meta:
+            meta.update(extra_filter_meta)
+        self.filterset_class = get_filterset_class(filterset_class, **meta)
+        self.filtering_args = get_filtering_args_from_filterset(self.filterset_class, type)
         kwargs.setdefault('args', {})
-        kwargs['args'].update(**filtering_args)
-        super(DjangoFilterConnectionField, self).__init__(type, resolver, *args, **kwargs)
+        kwargs['args'].update(**self.filtering_args)
+        super(DjangoFilterConnectionField, self).__init__(type, *args, **kwargs)
+
+    def get_queryset(self, qs, args, info):
+        filterset_class = self.filterset_class
+        filter_kwargs = self.get_filter_kwargs(args)
+        order = self.get_order(args)
+        if order:
+            qs = qs.order_by(order)
+        return filterset_class(data=filter_kwargs, queryset=qs)
+
+    def get_filter_kwargs(self, args):
+        return {k: v for k, v in args.items() if k in self.filtering_args}
+
+    def get_order(self, args):
+        return args.get('order_by', None)
diff --git a/graphene/contrib/django/filter/resolvers.py b/graphene/contrib/django/filter/resolvers.py
deleted file mode 100644
index 76b3e7ad..00000000
--- a/graphene/contrib/django/filter/resolvers.py
+++ /dev/null
@@ -1,64 +0,0 @@
-from django.core.exceptions import ImproperlyConfigured
-
-from graphene.contrib.django.filter.filterset import (custom_filterset_factory,
-                                                      setup_filterset)
-from graphene.contrib.django.resolvers import BaseQuerySetConnectionResolver
-
-
-class FilterConnectionResolver(BaseQuerySetConnectionResolver):
-    # Querying using django-filter
-
-    def __init__(self, node, on=None, filterset_class=None,
-                 fields=None, order_by=None, extra_filter_meta=None):
-        self.filterset_class = filterset_class
-        self.fields = fields or node._meta.filter_fields
-        self.order_by = order_by or node._meta.filter_order_by
-        self.extra_filter_meta = extra_filter_meta or {}
-        self._filterset_class = None
-        super(FilterConnectionResolver, self).__init__(node, on)
-
-    def make_query(self):
-        filterset_class = self.get_filterset_class()
-        filterset = self.get_filterset(filterset_class)
-        return filterset.qs
-
-    def get_filterset_class(self):
-        """Get the class to be used as the FilterSet"""
-        if self._filterset_class:
-            return self._filterset_class
-
-        if self.filterset_class:
-            # If were given a FilterSet class, then set it up and
-            # return it
-            self._filterset_class = setup_filterset(self.filterset_class)
-        elif self.model:
-            # If no filter class was specified then create one given the
-            # other information provided
-            meta = dict(
-                model=self.model,
-                fields=self.fields,
-                order_by=self.order_by,
-            )
-            meta.update(self.extra_filter_meta)
-            self._filterset_class = custom_filterset_factory(**meta)
-        else:
-            msg = "Neither 'filterset_class' or 'model' available in '%s'. " \
-                  "Either pass in 'filterset_class' or 'model' when " \
-                  "initialising, or extend this class and override " \
-                  "get_filterset() or get_filterset_class()"
-            raise ImproperlyConfigured(msg % self.__class__.__name__)
-
-        return self._filterset_class
-
-    def get_filterset(self, filterset_class):
-        """Get an instance of the FilterSet"""
-        kwargs = self.get_filterset_kwargs(filterset_class)
-        return filterset_class(**kwargs)
-
-    def get_filterset_kwargs(self, filterset_class):
-        """Get the kwargs to use when initialising the FilterSet class"""
-        kwargs = {
-            'data': self.args or None,
-            'queryset': self.get_manager()
-        }
-        return kwargs
diff --git a/graphene/contrib/django/filter/tests/test_fields.py b/graphene/contrib/django/filter/tests/test_fields.py
index b2591d1e..90d6b0f5 100644
--- a/graphene/contrib/django/filter/tests/test_fields.py
+++ b/graphene/contrib/django/filter/tests/test_fields.py
@@ -9,7 +9,7 @@ from graphene.contrib.django.forms import (GlobalIDFormField,
                                            GlobalIDMultipleChoiceField)
 from graphene.contrib.django.tests.models import Article, Pet, Reporter
 from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
-from graphene.relay import NodeField
+from graphene.relay import NodeField, ConnectionField
 from graphene.utils import ProxySnakeDict
 
 pytestmark = []
@@ -217,7 +217,7 @@ def test_filter_filterset_related_results():
 
 def test_global_id_field_implicit():
     field = DjangoFilterConnectionField(ArticleNode, fields=['id'])
-    filterset_class = field.resolver_fn.get_filterset_class()
+    filterset_class = field.filterset_class
     id_filter = filterset_class.base_filters['id']
     assert isinstance(id_filter, GlobalIDFilter)
     assert id_filter.field_class == GlobalIDFormField
@@ -231,7 +231,7 @@ def test_global_id_field_explicit():
             fields = ['id']
 
     field = DjangoFilterConnectionField(ArticleNode, filterset_class=ArticleIdFilter)
-    filterset_class = field.resolver_fn.get_filterset_class()
+    filterset_class = field.filterset_class
     id_filter = filterset_class.base_filters['id']
     assert isinstance(id_filter, GlobalIDFilter)
     assert id_filter.field_class == GlobalIDFormField
@@ -239,7 +239,7 @@ def test_global_id_field_explicit():
 
 def test_global_id_field_relation():
     field = DjangoFilterConnectionField(ArticleNode, fields=['reporter'])
-    filterset_class = field.resolver_fn.get_filterset_class()
+    filterset_class = field.filterset_class
     id_filter = filterset_class.base_filters['reporter']
     assert isinstance(id_filter, GlobalIDFilter)
     assert id_filter.field_class == GlobalIDFormField
@@ -247,7 +247,7 @@ def test_global_id_field_relation():
 
 def test_global_id_multiple_field_implicit():
     field = DjangoFilterConnectionField(ReporterNode, fields=['pets'])
-    filterset_class = field.resolver_fn.get_filterset_class()
+    filterset_class = field.filterset_class
     multiple_filter = filterset_class.base_filters['pets']
     assert isinstance(multiple_filter, GlobalIDMultipleChoiceFilter)
     assert multiple_filter.field_class == GlobalIDMultipleChoiceField
@@ -261,7 +261,7 @@ def test_global_id_multiple_field_explicit():
             fields = ['pets']
 
     field = DjangoFilterConnectionField(ReporterNode, filterset_class=ReporterPetsFilter)
-    filterset_class = field.resolver_fn.get_filterset_class()
+    filterset_class = field.filterset_class
     multiple_filter = filterset_class.base_filters['pets']
     assert isinstance(multiple_filter, GlobalIDMultipleChoiceFilter)
     assert multiple_filter.field_class == GlobalIDMultipleChoiceField
@@ -269,7 +269,7 @@ def test_global_id_multiple_field_explicit():
 
 def test_global_id_multiple_field_implicit_reverse():
     field = DjangoFilterConnectionField(ReporterNode, fields=['articles'])
-    filterset_class = field.resolver_fn.get_filterset_class()
+    filterset_class = field.filterset_class
     multiple_filter = filterset_class.base_filters['articles']
     assert isinstance(multiple_filter, GlobalIDMultipleChoiceFilter)
     assert multiple_filter.field_class == GlobalIDMultipleChoiceField
@@ -283,7 +283,7 @@ def test_global_id_multiple_field_explicit_reverse():
             fields = ['articles']
 
     field = DjangoFilterConnectionField(ReporterNode, filterset_class=ReporterPetsFilter)
-    filterset_class = field.resolver_fn.get_filterset_class()
+    filterset_class = field.filterset_class
     multiple_filter = filterset_class.base_filters['articles']
     assert isinstance(multiple_filter, GlobalIDMultipleChoiceFilter)
     assert multiple_filter.field_class == GlobalIDMultipleChoiceField
diff --git a/graphene/contrib/django/filter/tests/test_resolvers.py b/graphene/contrib/django/filter/tests/test_resolvers.py
deleted file mode 100644
index 670e87c8..00000000
--- a/graphene/contrib/django/filter/tests/test_resolvers.py
+++ /dev/null
@@ -1,82 +0,0 @@
-import pytest
-from django.core.exceptions import ImproperlyConfigured
-
-from graphene.contrib.django.tests.models import Article, Reporter
-from graphene.contrib.django.tests.test_resolvers import (ArticleNode,
-                                                          ReporterNode)
-from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
-
-if DJANGO_FILTER_INSTALLED:
-    from graphene.contrib.django.filter.resolvers import FilterConnectionResolver
-    from graphene.contrib.django.filter.tests.filters import ArticleFilter, ReporterFilter
-else:
-    pytestmark = pytest.mark.skipif(True, reason='django_filters not installed')
-
-
-def test_filter_get_filterset_class_explicit():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = FilterConnectionResolver(ReporterNode,
-                                        filterset_class=ReporterFilter)
-    resolver(inst=reporter, args={}, info=None)
-    assert issubclass(resolver.get_filterset_class(), ReporterFilter), \
-        'ReporterFilter not returned'
-
-
-def test_filter_get_filterset_class_implicit():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = FilterConnectionResolver(ReporterNode)
-    resolver(inst=reporter, args={}, info=None)
-    assert resolver.get_filterset_class().__name__ == 'ReporterFilterSet'
-
-
-def test_filter_get_filterset_class_error():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = FilterConnectionResolver(ReporterNode)
-    resolver.model = None
-    with pytest.raises(ImproperlyConfigured) as excinfo:
-        resolver(inst=reporter, args={}, info=None)
-    assert "Neither 'filterset_class' or 'model' available" in str(excinfo.value)
-
-
-def test_filter_filter():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = FilterConnectionResolver(ReporterNode,
-                                        filterset_class=ReporterFilter)
-    resolved = resolver(inst=reporter, args={
-        'first_name': 'Elmo'
-    }, info=None)
-    assert '"first_name" = Elmo' in str(resolved.query)
-    assert 'ORDER BY' not in str(resolved.query)
-
-
-def test_filter_filter_contains():
-    article = Article(id=1, headline='Cookie Monster eats fruit')
-    resolver = FilterConnectionResolver(ArticleNode,
-                                        filterset_class=ArticleFilter)
-    resolved = resolver(inst=article, args={
-        'headline__icontains': 'Elmo'
-    }, info=None)
-    assert '"headline" LIKE %Elmo%' in str(resolved.query)
-
-
-def test_filter_order():
-    article = Article(id=1, headline='Cookie Monster eats fruit')
-    resolver = FilterConnectionResolver(ArticleNode,
-                                        filterset_class=ArticleFilter)
-    resolved = resolver(inst=article, args={
-        'order_by': 'headline'
-    }, info=None)
-    assert 'WHERE' not in str(resolved.query)
-    assert 'ORDER BY' in str(resolved.query)
-    assert '"headline" ASC' in str(resolved.query)
-
-
-def test_filter_order_not_available():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = FilterConnectionResolver(ReporterNode,
-                                        filterset_class=ReporterFilter)
-    resolved = resolver(inst=reporter, args={
-        'order_by': 'last_name'
-    }, info=None)
-    assert 'WHERE' not in str(resolved.query)
-    assert 'ORDER BY' not in str(resolved.query)
diff --git a/graphene/contrib/django/filter/utils.py b/graphene/contrib/django/filter/utils.py
new file mode 100644
index 00000000..29aade96
--- /dev/null
+++ b/graphene/contrib/django/filter/utils.py
@@ -0,0 +1,31 @@
+import six
+
+from .filterset import custom_filterset_factory, setup_filterset
+from ....core.types import Argument, String
+
+
+def get_filtering_args_from_filterset(filterset_class, type):
+    """ Inspect a FilterSet and produce the arguments to pass to
+        a Graphene Field. These arguments will be available to
+        filter against in the GraphQL
+    """
+    from graphene.contrib.django.form_converter import convert_form_field
+
+    args = {}
+    for name, filter_field in six.iteritems(filterset_class.base_filters):
+        field_type = Argument(convert_form_field(filter_field.field))
+        args[name] = field_type
+
+    # Also add the 'order_by' field
+    if filterset_class._meta.order_by:
+        args[filterset_class.order_by_field] = Argument(String())
+    return args
+
+
+def get_filterset_class(filterset_class, **meta):
+    """Get the class to be used as the FilterSet"""
+    if filterset_class:
+        # If were given a FilterSet class, then set it up and
+        # return it
+        return setup_filterset(filterset_class)
+    return custom_filterset_factory(**meta)
diff --git a/graphene/contrib/django/resolvers.py b/graphene/contrib/django/resolvers.py
deleted file mode 100644
index a5494bfb..00000000
--- a/graphene/contrib/django/resolvers.py
+++ /dev/null
@@ -1,43 +0,0 @@
-class BaseQuerySetConnectionResolver(object):
-
-    def __init__(self, node, on=None):
-        self.node = node
-        self.model = node._meta.model
-        # The name of the field on the model which contains the
-        # manager upon which to perform the query. Optional.
-        # If omitted the model's default manager will be used.
-        self.on = on
-
-    def __call__(self, inst, args, info):
-        self.inst = inst
-        self.args = args
-        self.info = info
-        return self.make_query()
-
-    def get_manager(self):
-        if self.on:
-            return getattr(self.inst, self.on)
-        else:
-            return self.model._default_manager
-
-    def make_query(self):
-        raise NotImplemented()
-
-
-class SimpleQuerySetConnectionResolver(BaseQuerySetConnectionResolver):
-    # Simple querying without using django-filter (ported from previous gist)
-
-    def make_query(self):
-        filter_kwargs = self.get_filter_kwargs()
-        query = self.get_manager().filter(**filter_kwargs)
-        order = self.get_order()
-        if order:
-            query = query.order_by(order)
-        return query
-
-    def get_filter_kwargs(self):
-        ignore = ['first', 'last', 'before', 'after', 'order_by']
-        return {k: v for k, v in self.args.items() if k not in ignore}
-
-    def get_order(self):
-        return self.args.get('order_by', None)
diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py
index 5b68ebbb..0c3bf69f 100644
--- a/graphene/contrib/django/types.py
+++ b/graphene/contrib/django/types.py
@@ -7,7 +7,7 @@ from ...core.classtypes.objecttype import ObjectType, ObjectTypeMeta
 from ...relay.types import Connection, Node, NodeMeta
 from .converter import convert_django_field
 from .options import DjangoOptions
-from .utils import get_reverse_fields, maybe_queryset
+from .utils import get_reverse_fields
 
 
 class DjangoObjectTypeMeta(ObjectTypeMeta):
@@ -82,11 +82,7 @@ class DjangoObjectType(six.with_metaclass(
 
 
 class DjangoConnection(Connection):
-
-    @classmethod
-    def from_list(cls, iterable, *args, **kwargs):
-        iterable = maybe_queryset(iterable)
-        return super(DjangoConnection, cls).from_list(iterable, *args, **kwargs)
+    pass
 
 
 class DjangoNodeMeta(DjangoObjectTypeMeta, NodeMeta):
@@ -112,5 +108,3 @@ class DjangoNode(six.with_metaclass(
             return cls(instance)
         except cls._meta.model.DoesNotExist:
             return None
-
-    connection_type = DjangoConnection
diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index 76f4477c..b03c2fc8 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -1,9 +1,7 @@
-import six
 from django.db import models
 from django.db.models.manager import Manager
 from django.db.models.query import QuerySet
 
-from graphene import Argument, String
 from graphene.utils import LazyList
 
 from .compat import RelatedObject
@@ -56,26 +54,6 @@ def maybe_queryset(value):
     return value
 
 
-def get_filtering_args_from_filterset(filterset_class, type):
-    """ Inspect a FilterSet and produce the arguments to pass to
-        a Graphene Field. These arguments will be available to
-        filter against in the GraphQL
-    """
-    from graphene.contrib.django.form_converter import convert_form_field
-
-    args = {}
-    for name, filter_field in six.iteritems(filterset_class.base_filters):
-        field_type = Argument(convert_form_field(filter_field.field))
-        # Is this correct? I don't quite grok the 'parent' system yet
-        field_type.mount(type)
-        args[name] = field_type
-
-    # Also add the 'order_by' field
-    if filterset_class._meta.order_by:
-        args[filterset_class.order_by_field] = Argument(String())
-    return args
-
-
 def get_related_model(field):
     if hasattr(field, 'rel'):
         # Django 1.6, 1.7

From 69062aa6d13c5138611952d361c0075073d0a7b3 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 2 Jan 2016 21:19:15 +0100
Subject: [PATCH 157/173] Improved PEP8 syntax and order imports

---
 bin/autolinter                                             | 2 ++
 examples/cookbook/cookbook/ingredients/admin.py            | 2 +-
 .../cookbook/ingredients/migrations/0001_initial.py        | 2 +-
 examples/cookbook/cookbook/ingredients/schema.py           | 7 ++++---
 examples/cookbook/cookbook/schema.py                       | 3 +--
 examples/cookbook/cookbook/urls.py                         | 5 ++---
 graphene/contrib/django/filter/fields.py                   | 2 +-
 graphene/contrib/django/filter/filterset.py                | 4 ++--
 graphene/contrib/django/filter/tests/filters.py            | 1 +
 graphene/contrib/django/filter/tests/test_fields.py        | 4 +---
 graphene/contrib/django/filter/utils.py                    | 2 +-
 graphene/contrib/django/forms.py                           | 1 -
 .../contrib/django/management/commands/graphql_schema.py   | 4 ++--
 graphene/contrib/django/tests/test_schema.py               | 2 +-
 graphene/contrib/django/tests/test_types.py                | 2 +-
 graphene/core/tests/test_schema.py                         | 2 +-
 graphene/relay/types.py                                    | 1 -
 17 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/bin/autolinter b/bin/autolinter
index 7f749242..0fc3ccae 100755
--- a/bin/autolinter
+++ b/bin/autolinter
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Install the required scripts with
+# pip install autoflake autopep8 isort
 autoflake ./examples/ ./graphene/ -r --remove-unused-variables --remove-all-unused-imports --in-place
 autopep8 ./examples/ ./graphene/ -r --in-place --experimental --aggressive --max-line-length 120
 isort -rc ./examples/ ./graphene/
diff --git a/examples/cookbook/cookbook/ingredients/admin.py b/examples/cookbook/cookbook/ingredients/admin.py
index b3d92366..766b23fb 100644
--- a/examples/cookbook/cookbook/ingredients/admin.py
+++ b/examples/cookbook/cookbook/ingredients/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from cookbook.ingredients.models import Ingredient, Category
+from cookbook.ingredients.models import Category, Ingredient
 
 admin.site.register(Ingredient)
 admin.site.register(Category)
diff --git a/examples/cookbook/cookbook/ingredients/migrations/0001_initial.py b/examples/cookbook/cookbook/ingredients/migrations/0001_initial.py
index 3249c5a1..04949239 100644
--- a/examples/cookbook/cookbook/ingredients/migrations/0001_initial.py
+++ b/examples/cookbook/cookbook/ingredients/migrations/0001_initial.py
@@ -2,8 +2,8 @@
 # Generated by Django 1.9 on 2015-12-04 18:15
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/examples/cookbook/cookbook/ingredients/schema.py b/examples/cookbook/cookbook/ingredients/schema.py
index 6c640dff..13825267 100644
--- a/examples/cookbook/cookbook/ingredients/schema.py
+++ b/examples/cookbook/cookbook/ingredients/schema.py
@@ -1,13 +1,13 @@
-from graphene import relay, ObjectType
+from cookbook.ingredients.models import Category, Ingredient
+from graphene import ObjectType, relay
 from graphene.contrib.django.filter import DjangoFilterConnectionField
 from graphene.contrib.django.types import DjangoNode
 
-from cookbook.ingredients.models import Category, Ingredient
-
 
 # Graphene will automatically map the User model's fields onto the UserType.
 # This is configured in the UserType's Meta class (as you can see below)
 class CategoryNode(DjangoNode):
+
     class Meta:
         model = Category
         filter_fields = ['name', 'ingredients']
@@ -15,6 +15,7 @@ class CategoryNode(DjangoNode):
 
 
 class IngredientNode(DjangoNode):
+
     class Meta:
         model = Ingredient
         # Allow for some more advanced filtering here
diff --git a/examples/cookbook/cookbook/schema.py b/examples/cookbook/cookbook/schema.py
index d417ce8e..acb53666 100644
--- a/examples/cookbook/cookbook/schema.py
+++ b/examples/cookbook/cookbook/schema.py
@@ -1,6 +1,5 @@
-import graphene
-
 import cookbook.ingredients.schema
+import graphene
 
 
 class Query(cookbook.ingredients.schema.Query):
diff --git a/examples/cookbook/cookbook/urls.py b/examples/cookbook/cookbook/urls.py
index f0ad66f3..e8bc0aa5 100644
--- a/examples/cookbook/cookbook/urls.py
+++ b/examples/cookbook/cookbook/urls.py
@@ -1,10 +1,9 @@
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 from django.contrib import admin
 from django.views.decorators.csrf import csrf_exempt
 
-from graphene.contrib.django.views import GraphQLView
-
 from cookbook.schema import schema
+from graphene.contrib.django.views import GraphQLView
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
diff --git a/graphene/contrib/django/filter/fields.py b/graphene/contrib/django/filter/fields.py
index f974a4ee..d8457fa8 100644
--- a/graphene/contrib/django/filter/fields.py
+++ b/graphene/contrib/django/filter/fields.py
@@ -1,5 +1,5 @@
-from .utils import get_filterset_class, get_filtering_args_from_filterset
 from ..fields import DjangoConnectionField
+from .utils import get_filtering_args_from_filterset, get_filterset_class
 
 
 class DjangoFilterConnectionField(DjangoConnectionField):
diff --git a/graphene/contrib/django/filter/filterset.py b/graphene/contrib/django/filter/filterset.py
index 3ecd9680..70f776be 100644
--- a/graphene/contrib/django/filter/filterset.py
+++ b/graphene/contrib/django/filter/filterset.py
@@ -2,12 +2,12 @@ import six
 from django.conf import settings
 from django.db import models
 from django.utils.text import capfirst
-
 from django_filters import Filter, MultipleChoiceFilter
 from django_filters.filterset import FilterSet, FilterSetMetaclass
+from graphql_relay.node.node import from_global_id
+
 from graphene.contrib.django.forms import (GlobalIDFormField,
                                            GlobalIDMultipleChoiceField)
-from graphql_relay.node.node import from_global_id
 
 
 class GlobalIDFilter(Filter):
diff --git a/graphene/contrib/django/filter/tests/filters.py b/graphene/contrib/django/filter/tests/filters.py
index 94c0dffe..bccd72d5 100644
--- a/graphene/contrib/django/filter/tests/filters.py
+++ b/graphene/contrib/django/filter/tests/filters.py
@@ -1,4 +1,5 @@
 import django_filters
+
 from graphene.contrib.django.tests.models import Article, Pet, Reporter
 
 
diff --git a/graphene/contrib/django/filter/tests/test_fields.py b/graphene/contrib/django/filter/tests/test_fields.py
index 90d6b0f5..c16610aa 100644
--- a/graphene/contrib/django/filter/tests/test_fields.py
+++ b/graphene/contrib/django/filter/tests/test_fields.py
@@ -1,7 +1,6 @@
 from datetime import datetime
 
 import pytest
-from graphql.core.execution.base import ResolveInfo, ExecutionContext
 
 from graphene import ObjectType, Schema
 from graphene.contrib.django import DjangoNode
@@ -9,8 +8,7 @@ from graphene.contrib.django.forms import (GlobalIDFormField,
                                            GlobalIDMultipleChoiceField)
 from graphene.contrib.django.tests.models import Article, Pet, Reporter
 from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
-from graphene.relay import NodeField, ConnectionField
-from graphene.utils import ProxySnakeDict
+from graphene.relay import NodeField
 
 pytestmark = []
 if DJANGO_FILTER_INSTALLED:
diff --git a/graphene/contrib/django/filter/utils.py b/graphene/contrib/django/filter/utils.py
index 29aade96..5071ddc4 100644
--- a/graphene/contrib/django/filter/utils.py
+++ b/graphene/contrib/django/filter/utils.py
@@ -1,7 +1,7 @@
 import six
 
-from .filterset import custom_filterset_factory, setup_filterset
 from ....core.types import Argument, String
+from .filterset import custom_filterset_factory, setup_filterset
 
 
 def get_filtering_args_from_filterset(filterset_class, type):
diff --git a/graphene/contrib/django/forms.py b/graphene/contrib/django/forms.py
index 88f1665e..d8062e39 100644
--- a/graphene/contrib/django/forms.py
+++ b/graphene/contrib/django/forms.py
@@ -3,7 +3,6 @@ import binascii
 from django.core.exceptions import ValidationError
 from django.forms import CharField, Field, IntegerField, MultipleChoiceField
 from django.utils.translation import ugettext_lazy as _
-
 from graphql_relay import from_global_id
 
 
diff --git a/graphene/contrib/django/management/commands/graphql_schema.py b/graphene/contrib/django/management/commands/graphql_schema.py
index 35eb2772..57174e01 100644
--- a/graphene/contrib/django/management/commands/graphql_schema.py
+++ b/graphene/contrib/django/management/commands/graphql_schema.py
@@ -1,8 +1,8 @@
-from django.core.management.base import BaseCommand, CommandError
-
 import importlib
 import json
 
+from django.core.management.base import BaseCommand, CommandError
+
 
 class Command(BaseCommand):
     help = 'Dump Graphene schema JSON to file'
diff --git a/graphene/contrib/django/tests/test_schema.py b/graphene/contrib/django/tests/test_schema.py
index e474121f..07a9a84b 100644
--- a/graphene/contrib/django/tests/test_schema.py
+++ b/graphene/contrib/django/tests/test_schema.py
@@ -1,7 +1,7 @@
 from py.test import raises
+from tests.utils import assert_equal_lists
 
 from graphene.contrib.django import DjangoObjectType
-from tests.utils import assert_equal_lists
 
 from .models import Reporter
 
diff --git a/graphene/contrib/django/tests/test_types.py b/graphene/contrib/django/tests/test_types.py
index 42028a5e..c3583fe6 100644
--- a/graphene/contrib/django/tests/test_types.py
+++ b/graphene/contrib/django/tests/test_types.py
@@ -1,12 +1,12 @@
 from graphql.core.type import GraphQLObjectType
 from mock import patch
+from tests.utils import assert_equal_lists
 
 from graphene import Schema
 from graphene.contrib.django.types import DjangoNode, DjangoObjectType
 from graphene.core.fields import Field
 from graphene.core.types.scalars import Int
 from graphene.relay.fields import GlobalIDField
-from tests.utils import assert_equal_lists
 
 from .models import Article, Reporter
 
diff --git a/graphene/core/tests/test_schema.py b/graphene/core/tests/test_schema.py
index 189111a1..8fb7e836 100644
--- a/graphene/core/tests/test_schema.py
+++ b/graphene/core/tests/test_schema.py
@@ -1,10 +1,10 @@
 from graphql.core import graphql
 from py.test import raises
+from tests.utils import assert_equal_lists
 
 from graphene import Interface, List, ObjectType, Schema, String
 from graphene.core.fields import Field
 from graphene.core.types.base import LazyType
-from tests.utils import assert_equal_lists
 
 schema = Schema(name='My own schema')
 
diff --git a/graphene/relay/types.py b/graphene/relay/types.py
index 425e3038..672042e7 100644
--- a/graphene/relay/types.py
+++ b/graphene/relay/types.py
@@ -4,7 +4,6 @@ from collections import Iterable
 from functools import wraps
 
 import six
-
 from graphql_relay.connection.arrayconnection import connection_from_list
 from graphql_relay.node.node import to_global_id
 

From 328652b8200fe85158424f9a8b32b9523aa8f7af Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 2 Jan 2016 21:23:40 +0100
Subject: [PATCH 158/173] Renamed cookbook to cookbook Django

---
 examples/{cookbook => cookbook_django}/README.md                  | 0
 examples/{cookbook => cookbook_django}/cookbook/__init__.py       | 0
 .../cookbook/ingredients/__init__.py                              | 0
 .../{cookbook => cookbook_django}/cookbook/ingredients/admin.py   | 0
 .../{cookbook => cookbook_django}/cookbook/ingredients/apps.py    | 0
 .../cookbook/ingredients/fixtures/ingredients.json                | 0
 .../cookbook/ingredients/migrations/0001_initial.py               | 0
 .../cookbook/ingredients/migrations/__init__.py                   | 0
 .../{cookbook => cookbook_django}/cookbook/ingredients/models.py  | 0
 .../{cookbook => cookbook_django}/cookbook/ingredients/schema.py  | 0
 .../{cookbook => cookbook_django}/cookbook/ingredients/tests.py   | 0
 .../{cookbook => cookbook_django}/cookbook/ingredients/views.py   | 0
 .../{cookbook => cookbook_django}/cookbook/recipes/__init__.py    | 0
 examples/{cookbook => cookbook_django}/cookbook/recipes/admin.py  | 0
 examples/{cookbook => cookbook_django}/cookbook/recipes/apps.py   | 0
 .../cookbook/recipes/migrations/0001_initial.py                   | 0
 .../cookbook/recipes/migrations/__init__.py                       | 0
 examples/{cookbook => cookbook_django}/cookbook/recipes/models.py | 0
 examples/{cookbook => cookbook_django}/cookbook/recipes/tests.py  | 0
 examples/{cookbook => cookbook_django}/cookbook/recipes/views.py  | 0
 examples/{cookbook => cookbook_django}/cookbook/schema.py         | 0
 examples/{cookbook => cookbook_django}/cookbook/settings.py       | 0
 examples/{cookbook => cookbook_django}/cookbook/urls.py           | 0
 examples/{cookbook => cookbook_django}/cookbook/wsgi.py           | 0
 examples/{cookbook => cookbook_django}/manage.py                  | 0
 examples/{cookbook => cookbook_django}/requirements.txt           | 0
 26 files changed, 0 insertions(+), 0 deletions(-)
 rename examples/{cookbook => cookbook_django}/README.md (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/__init__.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/ingredients/__init__.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/ingredients/admin.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/ingredients/apps.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/ingredients/fixtures/ingredients.json (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/ingredients/migrations/0001_initial.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/ingredients/migrations/__init__.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/ingredients/models.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/ingredients/schema.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/ingredients/tests.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/ingredients/views.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/recipes/__init__.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/recipes/admin.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/recipes/apps.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/recipes/migrations/0001_initial.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/recipes/migrations/__init__.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/recipes/models.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/recipes/tests.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/recipes/views.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/schema.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/settings.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/urls.py (100%)
 rename examples/{cookbook => cookbook_django}/cookbook/wsgi.py (100%)
 rename examples/{cookbook => cookbook_django}/manage.py (100%)
 rename examples/{cookbook => cookbook_django}/requirements.txt (100%)

diff --git a/examples/cookbook/README.md b/examples/cookbook_django/README.md
similarity index 100%
rename from examples/cookbook/README.md
rename to examples/cookbook_django/README.md
diff --git a/examples/cookbook/cookbook/__init__.py b/examples/cookbook_django/cookbook/__init__.py
similarity index 100%
rename from examples/cookbook/cookbook/__init__.py
rename to examples/cookbook_django/cookbook/__init__.py
diff --git a/examples/cookbook/cookbook/ingredients/__init__.py b/examples/cookbook_django/cookbook/ingredients/__init__.py
similarity index 100%
rename from examples/cookbook/cookbook/ingredients/__init__.py
rename to examples/cookbook_django/cookbook/ingredients/__init__.py
diff --git a/examples/cookbook/cookbook/ingredients/admin.py b/examples/cookbook_django/cookbook/ingredients/admin.py
similarity index 100%
rename from examples/cookbook/cookbook/ingredients/admin.py
rename to examples/cookbook_django/cookbook/ingredients/admin.py
diff --git a/examples/cookbook/cookbook/ingredients/apps.py b/examples/cookbook_django/cookbook/ingredients/apps.py
similarity index 100%
rename from examples/cookbook/cookbook/ingredients/apps.py
rename to examples/cookbook_django/cookbook/ingredients/apps.py
diff --git a/examples/cookbook/cookbook/ingredients/fixtures/ingredients.json b/examples/cookbook_django/cookbook/ingredients/fixtures/ingredients.json
similarity index 100%
rename from examples/cookbook/cookbook/ingredients/fixtures/ingredients.json
rename to examples/cookbook_django/cookbook/ingredients/fixtures/ingredients.json
diff --git a/examples/cookbook/cookbook/ingredients/migrations/0001_initial.py b/examples/cookbook_django/cookbook/ingredients/migrations/0001_initial.py
similarity index 100%
rename from examples/cookbook/cookbook/ingredients/migrations/0001_initial.py
rename to examples/cookbook_django/cookbook/ingredients/migrations/0001_initial.py
diff --git a/examples/cookbook/cookbook/ingredients/migrations/__init__.py b/examples/cookbook_django/cookbook/ingredients/migrations/__init__.py
similarity index 100%
rename from examples/cookbook/cookbook/ingredients/migrations/__init__.py
rename to examples/cookbook_django/cookbook/ingredients/migrations/__init__.py
diff --git a/examples/cookbook/cookbook/ingredients/models.py b/examples/cookbook_django/cookbook/ingredients/models.py
similarity index 100%
rename from examples/cookbook/cookbook/ingredients/models.py
rename to examples/cookbook_django/cookbook/ingredients/models.py
diff --git a/examples/cookbook/cookbook/ingredients/schema.py b/examples/cookbook_django/cookbook/ingredients/schema.py
similarity index 100%
rename from examples/cookbook/cookbook/ingredients/schema.py
rename to examples/cookbook_django/cookbook/ingredients/schema.py
diff --git a/examples/cookbook/cookbook/ingredients/tests.py b/examples/cookbook_django/cookbook/ingredients/tests.py
similarity index 100%
rename from examples/cookbook/cookbook/ingredients/tests.py
rename to examples/cookbook_django/cookbook/ingredients/tests.py
diff --git a/examples/cookbook/cookbook/ingredients/views.py b/examples/cookbook_django/cookbook/ingredients/views.py
similarity index 100%
rename from examples/cookbook/cookbook/ingredients/views.py
rename to examples/cookbook_django/cookbook/ingredients/views.py
diff --git a/examples/cookbook/cookbook/recipes/__init__.py b/examples/cookbook_django/cookbook/recipes/__init__.py
similarity index 100%
rename from examples/cookbook/cookbook/recipes/__init__.py
rename to examples/cookbook_django/cookbook/recipes/__init__.py
diff --git a/examples/cookbook/cookbook/recipes/admin.py b/examples/cookbook_django/cookbook/recipes/admin.py
similarity index 100%
rename from examples/cookbook/cookbook/recipes/admin.py
rename to examples/cookbook_django/cookbook/recipes/admin.py
diff --git a/examples/cookbook/cookbook/recipes/apps.py b/examples/cookbook_django/cookbook/recipes/apps.py
similarity index 100%
rename from examples/cookbook/cookbook/recipes/apps.py
rename to examples/cookbook_django/cookbook/recipes/apps.py
diff --git a/examples/cookbook/cookbook/recipes/migrations/0001_initial.py b/examples/cookbook_django/cookbook/recipes/migrations/0001_initial.py
similarity index 100%
rename from examples/cookbook/cookbook/recipes/migrations/0001_initial.py
rename to examples/cookbook_django/cookbook/recipes/migrations/0001_initial.py
diff --git a/examples/cookbook/cookbook/recipes/migrations/__init__.py b/examples/cookbook_django/cookbook/recipes/migrations/__init__.py
similarity index 100%
rename from examples/cookbook/cookbook/recipes/migrations/__init__.py
rename to examples/cookbook_django/cookbook/recipes/migrations/__init__.py
diff --git a/examples/cookbook/cookbook/recipes/models.py b/examples/cookbook_django/cookbook/recipes/models.py
similarity index 100%
rename from examples/cookbook/cookbook/recipes/models.py
rename to examples/cookbook_django/cookbook/recipes/models.py
diff --git a/examples/cookbook/cookbook/recipes/tests.py b/examples/cookbook_django/cookbook/recipes/tests.py
similarity index 100%
rename from examples/cookbook/cookbook/recipes/tests.py
rename to examples/cookbook_django/cookbook/recipes/tests.py
diff --git a/examples/cookbook/cookbook/recipes/views.py b/examples/cookbook_django/cookbook/recipes/views.py
similarity index 100%
rename from examples/cookbook/cookbook/recipes/views.py
rename to examples/cookbook_django/cookbook/recipes/views.py
diff --git a/examples/cookbook/cookbook/schema.py b/examples/cookbook_django/cookbook/schema.py
similarity index 100%
rename from examples/cookbook/cookbook/schema.py
rename to examples/cookbook_django/cookbook/schema.py
diff --git a/examples/cookbook/cookbook/settings.py b/examples/cookbook_django/cookbook/settings.py
similarity index 100%
rename from examples/cookbook/cookbook/settings.py
rename to examples/cookbook_django/cookbook/settings.py
diff --git a/examples/cookbook/cookbook/urls.py b/examples/cookbook_django/cookbook/urls.py
similarity index 100%
rename from examples/cookbook/cookbook/urls.py
rename to examples/cookbook_django/cookbook/urls.py
diff --git a/examples/cookbook/cookbook/wsgi.py b/examples/cookbook_django/cookbook/wsgi.py
similarity index 100%
rename from examples/cookbook/cookbook/wsgi.py
rename to examples/cookbook_django/cookbook/wsgi.py
diff --git a/examples/cookbook/manage.py b/examples/cookbook_django/manage.py
similarity index 100%
rename from examples/cookbook/manage.py
rename to examples/cookbook_django/manage.py
diff --git a/examples/cookbook/requirements.txt b/examples/cookbook_django/requirements.txt
similarity index 100%
rename from examples/cookbook/requirements.txt
rename to examples/cookbook_django/requirements.txt

From 70a4bd13c141027396dcdde2ca46cc865c452866 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 2 Jan 2016 21:26:13 +0100
Subject: [PATCH 159/173] Fixed non-removed code from django filters and some
 PEP8 errors

---
 graphene/contrib/django/filter/__init__.py    |  4 +-
 .../django/filter/tests/test_fields.py        |  4 +-
 .../contrib/django/tests/test_resolvers.py    | 60 -------------------
 setup.cfg                                     |  2 +-
 4 files changed, 4 insertions(+), 66 deletions(-)
 delete mode 100644 graphene/contrib/django/tests/test_resolvers.py

diff --git a/graphene/contrib/django/filter/__init__.py b/graphene/contrib/django/filter/__init__.py
index 95b28aff..51a04b7e 100644
--- a/graphene/contrib/django/filter/__init__.py
+++ b/graphene/contrib/django/filter/__init__.py
@@ -8,8 +8,6 @@ if not DJANGO_FILTER_INSTALLED:
 
 from .fields import DjangoFilterConnectionField
 from .filterset import GrapheneFilterSet, GlobalIDFilter, GlobalIDMultipleChoiceFilter
-from .resolvers import FilterConnectionResolver
 
 __all__ = ['DjangoFilterConnectionField', 'GrapheneFilterSet',
-           'GlobalIDFilter', 'GlobalIDMultipleChoiceFilter',
-           'FilterConnectionResolver']
+           'GlobalIDFilter', 'GlobalIDMultipleChoiceFilter']
diff --git a/graphene/contrib/django/filter/tests/test_fields.py b/graphene/contrib/django/filter/tests/test_fields.py
index c16610aa..56d69dc8 100644
--- a/graphene/contrib/django/filter/tests/test_fields.py
+++ b/graphene/contrib/django/filter/tests/test_fields.py
@@ -185,8 +185,8 @@ def test_filter_filterset_related_results():
 
     r1 = Reporter.objects.create(first_name='r1', last_name='r1', email='r1@test.com')
     r2 = Reporter.objects.create(first_name='r2', last_name='r2', email='r2@test.com')
-    a1 = Article.objects.create(headline='a1', pub_date=datetime.now(), reporter=r1)
-    a2 = Article.objects.create(headline='a2', pub_date=datetime.now(), reporter=r2)
+    Article.objects.create(headline='a1', pub_date=datetime.now(), reporter=r1)
+    Article.objects.create(headline='a2', pub_date=datetime.now(), reporter=r2)
 
     query = '''
     query {
diff --git a/graphene/contrib/django/tests/test_resolvers.py b/graphene/contrib/django/tests/test_resolvers.py
deleted file mode 100644
index db1610c9..00000000
--- a/graphene/contrib/django/tests/test_resolvers.py
+++ /dev/null
@@ -1,60 +0,0 @@
-from django.db.models import Manager
-from django.db.models.query import QuerySet
-
-from graphene.contrib.django import DjangoNode
-from graphene.contrib.django.resolvers import SimpleQuerySetConnectionResolver
-from graphene.contrib.django.tests.models import Article, Reporter
-
-
-class ReporterNode(DjangoNode):
-
-    class Meta:
-        model = Reporter
-
-
-class ArticleNode(DjangoNode):
-
-    class Meta:
-        model = Article
-
-
-def test_simple_resolve():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = SimpleQuerySetConnectionResolver(ReporterNode, on='articles')
-    resolved = resolver(inst=reporter, args={}, info=None)
-    assert isinstance(resolved, QuerySet), 'Did not resolve to a queryset'
-
-
-def test_simple_get_manager_related():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = SimpleQuerySetConnectionResolver(ReporterNode, on='articles')
-    resolver(inst=reporter, args={}, info=None)
-    assert resolver.get_manager().instance == reporter, 'Resolver did not return a RelatedManager'
-
-
-def test_simple_get_manager_all():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = SimpleQuerySetConnectionResolver(ReporterNode)
-    resolver(inst=reporter, args={}, info=None)
-    assert isinstance(resolver.get_manager(), Manager), 'Resolver did not return a Manager'
-
-
-def test_simple_filter():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = SimpleQuerySetConnectionResolver(ReporterNode)
-    resolved = resolver(inst=reporter, args={
-        'first_name': 'Elmo'
-    }, info=None)
-    assert '"first_name" = Elmo' in str(resolved.query)
-    assert 'ORDER BY' not in str(resolved.query)
-
-
-def test_simple_order():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = SimpleQuerySetConnectionResolver(ReporterNode)
-    resolved = resolver(inst=reporter, args={
-        'order_by': 'last_name'
-    }, info=None)
-    assert 'WHERE' not in str(resolved.query)
-    assert 'ORDER BY' in str(resolved.query)
-    assert '"last_name" ASC' in str(resolved.query)
diff --git a/setup.cfg b/setup.cfg
index d9e6b06f..2cd61786 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [flake8]
-exclude = setup.py,docs/*
+exclude = setup.py,docs/*,examples/cookbook_django/*
 max-line-length = 120
 
 [coverage:run]

From 84dbc58115f678e21ccd288d763f40fec748bd44 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sun, 3 Jan 2016 17:17:56 +0100
Subject: [PATCH 160/173] Improved Django Compatibility. Added graphql_schema
 command tests #73

---
 .../management/commands/graphql_schema.py     | 46 +++++++++++++++----
 graphene/contrib/django/tests/test_command.py | 12 +++++
 tests/django_settings.py                      |  1 +
 3 files changed, 49 insertions(+), 10 deletions(-)
 create mode 100644 graphene/contrib/django/tests/test_command.py

diff --git a/graphene/contrib/django/management/commands/graphql_schema.py b/graphene/contrib/django/management/commands/graphql_schema.py
index 57174e01..d0fec7e2 100644
--- a/graphene/contrib/django/management/commands/graphql_schema.py
+++ b/graphene/contrib/django/management/commands/graphql_schema.py
@@ -1,5 +1,6 @@
 import importlib
 import json
+from optparse import make_option
 
 from django.core.management.base import BaseCommand, CommandError
 
@@ -8,6 +9,23 @@ class Command(BaseCommand):
     help = 'Dump Graphene schema JSON to file'
     can_import_settings = True
 
+    option_list = BaseCommand.option_list + (
+        make_option(
+            '--schema',
+            type=str,
+            dest='schema',
+            default='',
+            help='Django app containing schema to dump, e.g. myproject.core.schema',
+        ),
+        make_option(
+            '--out',
+            type=str,
+            dest='out',
+            default='',
+            help='Output file (default: schema.json)'
+        ),
+    )
+
     def add_arguments(self, parser):
         from django.conf import settings
         parser.add_argument(
@@ -24,15 +42,23 @@ class Command(BaseCommand):
             default=getattr(settings, 'GRAPHENE_SCHEMA_OUTPUT', 'schema.json'),
             help='Output file (default: schema.json)')
 
-    def handle(self, *args, **options):
-        schema_module = options['schema']
-        if schema_module == '':
-            raise CommandError('Specify schema on GRAPHENE_SCHEMA setting or by using --schema')
-        i = importlib.import_module(schema_module)
-
-        schema_dict = {'data': i.schema.introspect()}
-
-        with open(options['out'], 'w') as outfile:
+    def save_file(self, out, schema_dict):
+        with open(out, 'w') as outfile:
             json.dump(schema_dict, outfile)
 
-        self.stdout.write(self.style.SUCCESS('Successfully dumped GraphQL schema to %s' % options['out']))
+    def handle(self, *args, **options):
+        from django.conf import settings
+        schema = options.get('schema') or getattr(settings, 'GRAPHENE_SCHEMA', '')
+        out = options.get('out') or getattr(settings, 'GRAPHENE_SCHEMA_OUTPUT', 'schema.json')
+
+        if schema == '':
+            raise CommandError('Specify schema on GRAPHENE_SCHEMA setting or by using --schema')
+        i = importlib.import_module(schema)
+
+        schema_dict = {'data': i.schema.introspect()}
+        self.save_file(out, schema_dict)
+
+        style = getattr(self, 'style', None)
+        SUCCESS = getattr(style, 'SUCCESS', lambda x: x)
+
+        self.stdout.write(SUCCESS('Successfully dumped GraphQL schema to %s' % out))
diff --git a/graphene/contrib/django/tests/test_command.py b/graphene/contrib/django/tests/test_command.py
new file mode 100644
index 00000000..d49c707a
--- /dev/null
+++ b/graphene/contrib/django/tests/test_command.py
@@ -0,0 +1,12 @@
+from mock import patch
+from six import StringIO
+
+from django.core import management
+
+
+@patch('graphene.contrib.django.management.commands.graphql_schema.Command.save_file')
+def test_generate_file_on_call_graphql_schema(savefile_mock, settings):
+    settings.GRAPHENE_SCHEMA = 'graphene.contrib.django.tests.test_urls'
+    out = StringIO()
+    management.call_command('graphql_schema', schema='', stdout=out)
+    assert "Successfully dumped GraphQL schema to schema.json" in out.getvalue()
diff --git a/tests/django_settings.py b/tests/django_settings.py
index 998f68ab..1cf5dd38 100644
--- a/tests/django_settings.py
+++ b/tests/django_settings.py
@@ -1,6 +1,7 @@
 SECRET_KEY = 1
 
 INSTALLED_APPS = [
+    'graphene.contrib.django',
     'graphene.contrib.django.tests',
     'examples.starwars_django',
 ]

From 25022f58d8d7a72d5ee2d93eea681ee6217a021d Mon Sep 17 00:00:00 2001
From: Kevin Abiera <kevin@abiera.com>
Date: Mon, 4 Jan 2016 01:51:25 +0800
Subject: [PATCH 161/173] Add Django graphql_schema command documentation

---
 docs/pages/docs/introspection-schema.md | 50 +++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 docs/pages/docs/introspection-schema.md

diff --git a/docs/pages/docs/introspection-schema.md b/docs/pages/docs/introspection-schema.md
new file mode 100644
index 00000000..d8c8187e
--- /dev/null
+++ b/docs/pages/docs/introspection-schema.md
@@ -0,0 +1,50 @@
+---
+title: Introspection Schema
+description: A guide to instrospection schema in Django
+---
+
+# Introspection Schema
+
+Relay uses [Babel Relay Plugin](https://facebook.github.io/relay/docs/guides-babel-plugin.html)
+that requires you to provide your GraphQL schema data.
+
+Graphene comes with a management command for Django to dump your schema data to
+`schema.json` that is compatible with babel-relay-plugin.
+
+
+## Usage
+
+Include `graphene.django.contrib` to `INSTALLED_APPS` in you project settings:
+
+```python
+INSTALLED_APPS += ('graphene.django.contrib')
+```
+
+Assuming your Graphene schema is at `tutorial.quickstart.schema`, run the command:
+
+```bash
+./manage.py graphql_schema --schema tutorial.quickstart.schema --out schema.json
+```
+
+It dumps your full introspection schema to `schema.json` inside your project root
+directory. Point `babel-relay-plugin` to this file and you're ready to use Relay
+with Graphene GraphQL implementation.
+
+
+## Advanced Usage
+
+To simplify the command to `./manage.py graphql_schema`, you can specify the
+parameters in your settings.py:
+
+```python
+GRAPHENE_SCHEMA = 'tutorial.quickstart.schema'
+GRAPHENE_SCHEMA_OUTPUT = 'data/schema.json'  # defaults to schema.json
+```
+
+Running `./manage.py graphql_schema` dumps your schema to
+`<project root>/data/schema.json`.
+
+
+## Help
+
+Run `./manage.py graphql_schema -h` for command usage.

From 14b9257ef68aeef6a82da76f1ef90e58044a03dc Mon Sep 17 00:00:00 2001
From: Billy Barbaro <billy@thebarbaros.com>
Date: Fri, 8 Jan 2016 18:28:43 -0500
Subject: [PATCH 162/173] Corrected arguments in the mutate documentation.

---
 docs/pages/docs/mutations.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pages/docs/mutations.md b/docs/pages/docs/mutations.md
index 7967f62c..79c21da6 100644
--- a/docs/pages/docs/mutations.md
+++ b/docs/pages/docs/mutations.md
@@ -22,7 +22,7 @@ class CreatePerson(graphene.Mutation):
     person = graphene.Field('Person')
 
     @classmethod
-    def mutate(cls, args, info):
+    def mutate(cls, instance, args, info):
         person = Person(name=args.get('name'))
         ok = True
         return CreatePerson(person=person, ok=ok)

From f68763b8222e14eb7f4d1113a035baaed1e2d414 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Mon, 11 Jan 2016 16:50:05 +0100
Subject: [PATCH 163/173] Fixed many to many relations in Django model

---
 graphene/contrib/django/converter.py         | 1 +
 graphene/contrib/django/tests/models.py      | 5 +++++
 graphene/contrib/django/tests/test_schema.py | 2 +-
 graphene/contrib/django/utils.py             | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/graphene/contrib/django/converter.py b/graphene/contrib/django/converter.py
index ffdcfc5a..6655940a 100644
--- a/graphene/contrib/django/converter.py
+++ b/graphene/contrib/django/converter.py
@@ -58,6 +58,7 @@ def convert_field_to_float(field):
 
 @convert_django_field.register(models.ManyToManyField)
 @convert_django_field.register(models.ManyToOneRel)
+@convert_django_field.register(models.ManyToManyRel)
 def convert_field_to_list_or_connection(field):
     from .fields import DjangoModelField, ConnectionOrListField
     model_field = DjangoModelField(get_related_model(field))
diff --git a/graphene/contrib/django/tests/models.py b/graphene/contrib/django/tests/models.py
index a4ff3386..956d70af 100644
--- a/graphene/contrib/django/tests/models.py
+++ b/graphene/contrib/django/tests/models.py
@@ -7,6 +7,11 @@ class Pet(models.Model):
     name = models.CharField(max_length=30)
 
 
+class Film(models.Model):
+    reporters = models.ManyToManyField('Reporter',
+                                       related_name='films')
+
+
 class Reporter(models.Model):
     first_name = models.CharField(max_length=30)
     last_name = models.CharField(max_length=30)
diff --git a/graphene/contrib/django/tests/test_schema.py b/graphene/contrib/django/tests/test_schema.py
index 07a9a84b..b913ace9 100644
--- a/graphene/contrib/django/tests/test_schema.py
+++ b/graphene/contrib/django/tests/test_schema.py
@@ -29,7 +29,7 @@ def test_should_map_fields_correctly():
             model = Reporter
     assert_equal_lists(
         ReporterType2._meta.fields_map.keys(),
-        ['articles', 'first_name', 'last_name', 'email', 'pets', 'id']
+        ['articles', 'first_name', 'last_name', 'email', 'pets', 'id', 'films']
     )
 
 
diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index b03c2fc8..d2d17aa0 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -35,6 +35,8 @@ def get_reverse_fields(model):
             yield new_related
         elif isinstance(related, models.ManyToOneRel):
             yield related
+        elif isinstance(related, models.ManyToManyRel) and not related.symmetrical:
+            yield related
 
 
 class WrappedQueryset(LazyList):

From 20a493b9d1a40320b58b0ffa6b215ecbb7db88a1 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Mon, 11 Jan 2016 17:27:20 +0100
Subject: [PATCH 164/173] Fixed double underscore converter

---
 graphene/contrib/django/filter/tests/test_fields.py | 6 +++---
 graphene/utils/str_converters.py                    | 2 +-
 graphene/utils/tests/test_str_converter.py          | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/graphene/contrib/django/filter/tests/test_fields.py b/graphene/contrib/django/filter/tests/test_fields.py
index 56d69dc8..5b2875b2 100644
--- a/graphene/contrib/django/filter/tests/test_fields.py
+++ b/graphene/contrib/django/filter/tests/test_fields.py
@@ -69,8 +69,8 @@ def assert_not_orderable(field):
 def test_filter_explicit_filterset_arguments():
     field = DjangoFilterConnectionField(ArticleNode, filterset_class=ArticleFilter)
     assert_arguments(field,
-                     'headline', 'headlineIcontains',
-                     'pubDate', 'pubDateGt', 'pubDateLt',
+                     'headline', 'headline_Icontains',
+                     'pubDate', 'pubDate_Gt', 'pubDate_Lt',
                      'reporter',
                      )
 
@@ -89,7 +89,7 @@ def test_filter_shortcut_filterset_arguments_dict():
         'reporter': ['exact'],
     })
     assert_arguments(field,
-                     'headline', 'headlineIcontains',
+                     'headline', 'headline_Icontains',
                      'reporter',
                      )
 
diff --git a/graphene/utils/str_converters.py b/graphene/utils/str_converters.py
index c275a281..bb9b2885 100644
--- a/graphene/utils/str_converters.py
+++ b/graphene/utils/str_converters.py
@@ -7,7 +7,7 @@ def to_camel_case(snake_str):
     components = snake_str.split('_')
     # We capitalize the first letter of each component except the first one
     # with the 'title' method and join them together.
-    return components[0] + "".join(x.title() for x in components[1:])
+    return components[0] + "".join(x.title() if x else '_' for x in components[1:])
 
 
 # From this response in Stackoverflow
diff --git a/graphene/utils/tests/test_str_converter.py b/graphene/utils/tests/test_str_converter.py
index 9f2f9cdf..19f691af 100644
--- a/graphene/utils/tests/test_str_converter.py
+++ b/graphene/utils/tests/test_str_converter.py
@@ -4,11 +4,14 @@ from ..str_converters import to_camel_case, to_snake_case
 def test_snake_case():
     assert to_snake_case('snakesOnAPlane') == 'snakes_on_a_plane'
     assert to_snake_case('SnakesOnAPlane') == 'snakes_on_a_plane'
+    assert to_snake_case('SnakesOnA_Plane') == 'snakes_on_a__plane'
     assert to_snake_case('snakes_on_a_plane') == 'snakes_on_a_plane'
+    assert to_snake_case('snakes_on_a__plane') == 'snakes_on_a__plane'
     assert to_snake_case('IPhoneHysteria') == 'i_phone_hysteria'
     assert to_snake_case('iPhoneHysteria') == 'i_phone_hysteria'
 
 
 def test_camel_case():
     assert to_camel_case('snakes_on_a_plane') == 'snakesOnAPlane'
+    assert to_camel_case('snakes_on_a__plane') == 'snakesOnA_Plane'
     assert to_camel_case('i_phone_hysteria') == 'iPhoneHysteria'

From 2acd8691cf32a0e535bc0eca072ce241b011e9f5 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 13 Jan 2016 18:18:47 -0800
Subject: [PATCH 165/173] Improve imports if not django_filters installed.
 Improved Django command fixing warning in Django 1.8+

---
 graphene/contrib/django/fields.py             |  5 +-
 graphene/contrib/django/filter/__init__.py    | 15 ++--
 .../management/commands/graphql_schema.py     | 75 ++++++++++---------
 graphene/contrib/django/utils.py              |  3 +-
 4 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index 5c4f034e..66c764b1 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -4,7 +4,7 @@ from ...core.types.base import FieldType
 from ...core.types.definitions import List
 from ...relay import ConnectionField
 from ...relay.utils import is_node
-from .utils import get_type_for_model, maybe_queryset
+from .utils import get_type_for_model, maybe_queryset, DJANGO_FILTER_INSTALLED
 
 
 class DjangoConnectionField(ConnectionField):
@@ -37,7 +37,8 @@ class DjangoConnectionField(ConnectionField):
 class ConnectionOrListField(Field):
 
     def internal_type(self, schema):
-        from .filter.fields import DjangoFilterConnectionField
+        if DJANGO_FILTER_INSTALLED:
+            from .filter.fields import DjangoFilterConnectionField
 
         model_field = self.type
         field_object_type = model_field.get_object_type(schema)
diff --git a/graphene/contrib/django/filter/__init__.py b/graphene/contrib/django/filter/__init__.py
index 51a04b7e..4f8b0579 100644
--- a/graphene/contrib/django/filter/__init__.py
+++ b/graphene/contrib/django/filter/__init__.py
@@ -1,13 +1,14 @@
+import warnings
 from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
 
 if not DJANGO_FILTER_INSTALLED:
-    raise Exception(
+    warnings.warn(
         "Use of django filtering requires the django-filter package "
-        "be installed. You can do so using `pip install django-filter`"
+        "be installed. You can do so using `pip install django-filter`", ImportWarning
     )
+else:
+    from .fields import DjangoFilterConnectionField
+    from .filterset import GrapheneFilterSet, GlobalIDFilter, GlobalIDMultipleChoiceFilter
 
-from .fields import DjangoFilterConnectionField
-from .filterset import GrapheneFilterSet, GlobalIDFilter, GlobalIDMultipleChoiceFilter
-
-__all__ = ['DjangoFilterConnectionField', 'GrapheneFilterSet',
-           'GlobalIDFilter', 'GlobalIDMultipleChoiceFilter']
+    __all__ = ['DjangoFilterConnectionField', 'GrapheneFilterSet',
+               'GlobalIDFilter', 'GlobalIDMultipleChoiceFilter']
diff --git a/graphene/contrib/django/management/commands/graphql_schema.py b/graphene/contrib/django/management/commands/graphql_schema.py
index d0fec7e2..e1434616 100644
--- a/graphene/contrib/django/management/commands/graphql_schema.py
+++ b/graphene/contrib/django/management/commands/graphql_schema.py
@@ -1,47 +1,54 @@
 import importlib
 import json
 from optparse import make_option
+from distutils.version import StrictVersion
 
+from django import get_version as get_django_version
 from django.core.management.base import BaseCommand, CommandError
 
+LT_DJANGO_1_8 = StrictVersion(get_django_version()) < StrictVersion('1.8')
 
-class Command(BaseCommand):
+if LT_DJANGO_1_8:
+    class CommandArguments(BaseCommand):
+        option_list = BaseCommand.option_list + (
+            make_option(
+                '--schema',
+                type=str,
+                dest='schema',
+                default='',
+                help='Django app containing schema to dump, e.g. myproject.core.schema',
+            ),
+            make_option(
+                '--out',
+                type=str,
+                dest='out',
+                default='',
+                help='Output file (default: schema.json)'
+            ),
+        )
+else:
+    class CommandArguments(BaseCommand):
+        def add_arguments(self, parser):
+            from django.conf import settings
+            parser.add_argument(
+                '--schema',
+                type=str,
+                dest='schema',
+                default=getattr(settings, 'GRAPHENE_SCHEMA', ''),
+                help='Django app containing schema to dump, e.g. myproject.core.schema')
+
+            parser.add_argument(
+                '--out',
+                type=str,
+                dest='out',
+                default=getattr(settings, 'GRAPHENE_SCHEMA_OUTPUT', 'schema.json'),
+                help='Output file (default: schema.json)')
+
+
+class Command(CommandArguments):
     help = 'Dump Graphene schema JSON to file'
     can_import_settings = True
 
-    option_list = BaseCommand.option_list + (
-        make_option(
-            '--schema',
-            type=str,
-            dest='schema',
-            default='',
-            help='Django app containing schema to dump, e.g. myproject.core.schema',
-        ),
-        make_option(
-            '--out',
-            type=str,
-            dest='out',
-            default='',
-            help='Output file (default: schema.json)'
-        ),
-    )
-
-    def add_arguments(self, parser):
-        from django.conf import settings
-        parser.add_argument(
-            '--schema',
-            type=str,
-            dest='schema',
-            default=getattr(settings, 'GRAPHENE_SCHEMA', ''),
-            help='Django app containing schema to dump, e.g. myproject.core.schema')
-
-        parser.add_argument(
-            '--out',
-            type=str,
-            dest='out',
-            default=getattr(settings, 'GRAPHENE_SCHEMA_OUTPUT', 'schema.json'),
-            help='Output file (default: schema.json)')
-
     def save_file(self, out, schema_dict):
         with open(out, 'w') as outfile:
             json.dump(schema_dict, outfile)
diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py
index d2d17aa0..4a16702b 100644
--- a/graphene/contrib/django/utils.py
+++ b/graphene/contrib/django/utils.py
@@ -9,7 +9,8 @@ from .compat import RelatedObject
 try:
     import django_filters  # noqa
     DJANGO_FILTER_INSTALLED = True
-except ImportError:
+except (ImportError, AttributeError):
+    # AtributeError raised if DjangoFilters installed with a incompatible Django Version
     DJANGO_FILTER_INSTALLED = False
 
 

From 112006c211aaf7342a1e4f392c673bfa6c3f300f Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 13 Jan 2016 18:38:53 -0800
Subject: [PATCH 166/173] Fixed PEP8 errors

---
 graphene/contrib/django/fields.py                          | 2 +-
 graphene/contrib/django/filter/filterset.py                | 4 ++--
 graphene/contrib/django/filter/tests/filters.py            | 1 -
 .../contrib/django/management/commands/graphql_schema.py   | 3 ++-
 graphene/contrib/django/tests/test_command.py              | 3 +--
 graphene/contrib/django/tests/test_schema.py               | 2 +-
 graphene/contrib/django/tests/test_types.py                | 2 +-
 graphene/core/tests/test_schema.py                         | 2 +-
 graphene/core/types/tests/test_argument.py                 | 3 ++-
 graphene/core/types/tests/test_base.py                     | 7 +++++--
 graphene/core/types/tests/test_field.py                    | 6 ++++--
 graphene/utils/tests/test_resolve_only_args.py             | 6 +++++-
 12 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py
index 66c764b1..4b675297 100644
--- a/graphene/contrib/django/fields.py
+++ b/graphene/contrib/django/fields.py
@@ -4,7 +4,7 @@ from ...core.types.base import FieldType
 from ...core.types.definitions import List
 from ...relay import ConnectionField
 from ...relay.utils import is_node
-from .utils import get_type_for_model, maybe_queryset, DJANGO_FILTER_INSTALLED
+from .utils import DJANGO_FILTER_INSTALLED, get_type_for_model, maybe_queryset
 
 
 class DjangoConnectionField(ConnectionField):
diff --git a/graphene/contrib/django/filter/filterset.py b/graphene/contrib/django/filter/filterset.py
index 70f776be..b618893d 100644
--- a/graphene/contrib/django/filter/filterset.py
+++ b/graphene/contrib/django/filter/filterset.py
@@ -2,10 +2,10 @@ import six
 from django.conf import settings
 from django.db import models
 from django.utils.text import capfirst
-from django_filters import Filter, MultipleChoiceFilter
-from django_filters.filterset import FilterSet, FilterSetMetaclass
 from graphql_relay.node.node import from_global_id
 
+from django_filters import Filter, MultipleChoiceFilter
+from django_filters.filterset import FilterSet, FilterSetMetaclass
 from graphene.contrib.django.forms import (GlobalIDFormField,
                                            GlobalIDMultipleChoiceField)
 
diff --git a/graphene/contrib/django/filter/tests/filters.py b/graphene/contrib/django/filter/tests/filters.py
index bccd72d5..94c0dffe 100644
--- a/graphene/contrib/django/filter/tests/filters.py
+++ b/graphene/contrib/django/filter/tests/filters.py
@@ -1,5 +1,4 @@
 import django_filters
-
 from graphene.contrib.django.tests.models import Article, Pet, Reporter
 
 
diff --git a/graphene/contrib/django/management/commands/graphql_schema.py b/graphene/contrib/django/management/commands/graphql_schema.py
index e1434616..07b802d4 100644
--- a/graphene/contrib/django/management/commands/graphql_schema.py
+++ b/graphene/contrib/django/management/commands/graphql_schema.py
@@ -1,7 +1,7 @@
 import importlib
 import json
-from optparse import make_option
 from distutils.version import StrictVersion
+from optparse import make_option
 
 from django import get_version as get_django_version
 from django.core.management.base import BaseCommand, CommandError
@@ -28,6 +28,7 @@ if LT_DJANGO_1_8:
         )
 else:
     class CommandArguments(BaseCommand):
+
         def add_arguments(self, parser):
             from django.conf import settings
             parser.add_argument(
diff --git a/graphene/contrib/django/tests/test_command.py b/graphene/contrib/django/tests/test_command.py
index d49c707a..e8033f6d 100644
--- a/graphene/contrib/django/tests/test_command.py
+++ b/graphene/contrib/django/tests/test_command.py
@@ -1,8 +1,7 @@
+from django.core import management
 from mock import patch
 from six import StringIO
 
-from django.core import management
-
 
 @patch('graphene.contrib.django.management.commands.graphql_schema.Command.save_file')
 def test_generate_file_on_call_graphql_schema(savefile_mock, settings):
diff --git a/graphene/contrib/django/tests/test_schema.py b/graphene/contrib/django/tests/test_schema.py
index b913ace9..8296b3c9 100644
--- a/graphene/contrib/django/tests/test_schema.py
+++ b/graphene/contrib/django/tests/test_schema.py
@@ -1,7 +1,7 @@
 from py.test import raises
-from tests.utils import assert_equal_lists
 
 from graphene.contrib.django import DjangoObjectType
+from tests.utils import assert_equal_lists
 
 from .models import Reporter
 
diff --git a/graphene/contrib/django/tests/test_types.py b/graphene/contrib/django/tests/test_types.py
index c3583fe6..42028a5e 100644
--- a/graphene/contrib/django/tests/test_types.py
+++ b/graphene/contrib/django/tests/test_types.py
@@ -1,12 +1,12 @@
 from graphql.core.type import GraphQLObjectType
 from mock import patch
-from tests.utils import assert_equal_lists
 
 from graphene import Schema
 from graphene.contrib.django.types import DjangoNode, DjangoObjectType
 from graphene.core.fields import Field
 from graphene.core.types.scalars import Int
 from graphene.relay.fields import GlobalIDField
+from tests.utils import assert_equal_lists
 
 from .models import Article, Reporter
 
diff --git a/graphene/core/tests/test_schema.py b/graphene/core/tests/test_schema.py
index 8fb7e836..189111a1 100644
--- a/graphene/core/tests/test_schema.py
+++ b/graphene/core/tests/test_schema.py
@@ -1,10 +1,10 @@
 from graphql.core import graphql
 from py.test import raises
-from tests.utils import assert_equal_lists
 
 from graphene import Interface, List, ObjectType, Schema, String
 from graphene.core.fields import Field
 from graphene.core.types.base import LazyType
+from tests.utils import assert_equal_lists
 
 schema = Schema(name='My own schema')
 
diff --git a/graphene/core/types/tests/test_argument.py b/graphene/core/types/tests/test_argument.py
index b2f5e239..0263496c 100644
--- a/graphene/core/types/tests/test_argument.py
+++ b/graphene/core/types/tests/test_argument.py
@@ -48,6 +48,7 @@ def test_to_arguments_wrong_type():
 
 
 def test_snake_case_args():
-    resolver = lambda instance, args, info: args['my_arg']['inner_arg']
+    def resolver(instance, args, info):
+        return args['my_arg']['inner_arg']
     r = snake_case_args(resolver)
     assert r(None, {'myArg': {'innerArg': 3}}, None) == 3
diff --git a/graphene/core/types/tests/test_base.py b/graphene/core/types/tests/test_base.py
index 4af1eb65..be68e167 100644
--- a/graphene/core/types/tests/test_base.py
+++ b/graphene/core/types/tests/test_base.py
@@ -25,7 +25,9 @@ def test_orderedtype_different():
 
 @patch('graphene.core.types.field.Field')
 def test_type_as_field_called(Field):
-    resolver = lambda x: x
+    def resolver(x):
+        return x
+
     a = MountedType(2, description='A', resolver=resolver)
     a.as_field()
     Field.assert_called_with(
@@ -45,7 +47,8 @@ def test_type_as_argument_called(Argument):
 
 
 def test_type_as_field():
-    resolver = lambda x: x
+    def resolver(x):
+        return x
 
     class MyObjectType(ObjectType):
         t = MountedType(description='A', resolver=resolver)
diff --git a/graphene/core/types/tests/test_field.py b/graphene/core/types/tests/test_field.py
index 706cbc59..9d224e0d 100644
--- a/graphene/core/types/tests/test_field.py
+++ b/graphene/core/types/tests/test_field.py
@@ -11,7 +11,8 @@ from ..scalars import String
 
 
 def test_field_internal_type():
-    resolver = lambda *args: 'RESOLVED'
+    def resolver(*args):
+        return 'RESOLVED'
 
     field = Field(String(), description='My argument', resolver=resolver)
 
@@ -132,7 +133,8 @@ def test_inputfield_internal_type():
 
 
 def test_field_resolve_argument():
-    resolver = lambda instance, args, info: args.get('first_name')
+    def resolver(instance, args, info):
+        return args.get('first_name')
 
     field = Field(String(), first_name=String(), description='My argument', resolver=resolver)
 
diff --git a/graphene/utils/tests/test_resolve_only_args.py b/graphene/utils/tests/test_resolve_only_args.py
index da0e3c8b..7866f32f 100644
--- a/graphene/utils/tests/test_resolve_only_args.py
+++ b/graphene/utils/tests/test_resolve_only_args.py
@@ -2,7 +2,11 @@ from ..resolve_only_args import resolve_only_args
 
 
 def test_resolve_only_args():
+
+    def resolver(*args, **kwargs):
+        return kwargs
+
     my_data = {'one': 1, 'two': 2}
-    resolver = lambda *args, **kwargs: kwargs
+
     wrapped = resolve_only_args(resolver)
     assert wrapped(None, my_data, None) == my_data

From 33ff3c5299cbd40bd3bbfd1ffbd79f3e2d518a44 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 13 Jan 2016 19:21:52 -0800
Subject: [PATCH 167/173] Fixed build error in docs

---
 docs/package.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/package.json b/docs/package.json
index 33820334..694d0ff8 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -17,15 +17,17 @@
     "copy-webpack-plugin": "^0.2.0",
     "es6-promise": "^3.0.2",
     "extract-text-webpack-plugin": "^0.9.1",
-    "gatsby": "^0.7.3",
+    "gatsby": "^0.7.7",
     "graphiql": "^0.4.2",
     "graphql": "^0.4.13",
     "jeet": "^6.1.2",
     "lodash": "^3.10.1",
     "nib": "^1.1.0",
-    "react": "^0.14.3",
-    "react-burger-menu": "^1.4.2",
+    "react": "^0.14.6",
+    "radium": "0.14.2",
+    "react-burger-menu": "^1.4.12",
     "react-document-title": "^2.0.1",
+    "react-dom": "^0.14.6",
     "react-router": "^0.13.5",
     "rupture": "^0.6.1",
     "stylus-loader": "^1.4.2",

From bbf1392ffd3fe2a0e1c9482db83fa28ca893e342 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 13 Jan 2016 19:40:13 -0800
Subject: [PATCH 168/173] Improved Django documentation

---
 docs/config.toml                              |  9 ++-
 docs/pages/docs/{ => django}/filtering.md     | 25 ++++---
 .../tutorial.md}                              | 68 ++++++++++++++-----
 3 files changed, 75 insertions(+), 27 deletions(-)
 rename docs/pages/docs/{ => django}/filtering.md (94%)
 rename docs/pages/docs/{quickstart-django.md => django/tutorial.md} (85%)

diff --git a/docs/config.toml b/docs/config.toml
index 5e39bed6..c1a13ecd 100644
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -5,7 +5,6 @@ ga = "UA-12613282-7"
 	name = "Quickstart"
 	pages = [
 	  "/docs/quickstart/",
-	  "/docs/quickstart-django/",
 	]
 
 [docs.walkthrough]
@@ -16,5 +15,11 @@ ga = "UA-12613282-7"
 	  "/docs/mutations/",
 	  "/docs/basic-types/",
 	  "/docs/relay/",
-	  "/docs/filtering/",
+	]
+
+[docs.django]
+	name = "Django"
+	pages = [
+	  "/docs/django/tutorial/",
+	  "/docs/django/filtering/",
 	]
diff --git a/docs/pages/docs/filtering.md b/docs/pages/docs/django/filtering.md
similarity index 94%
rename from docs/pages/docs/filtering.md
rename to docs/pages/docs/django/filtering.md
index 95521dd2..40cc7f1f 100644
--- a/docs/pages/docs/filtering.md
+++ b/docs/pages/docs/django/filtering.md
@@ -1,9 +1,9 @@
 ---
-title: Filtering (Django)
-description: Details of how to perform filtering
+title: Filtering
+description: Details of how to perform filtering in Graphene Django
 ---
 
-# Filtering (Django)
+# Filtering
 
 Graphene integrates with [django-filter](https://django-filter.readthedocs.org)
 to provide filtering of results. See the
@@ -21,7 +21,7 @@ pip install django-filter
 ```
 
 **Note: The techniques below are demoed in the
-[cookbook example app](https://github.com/graphql-python/graphene/tree/feature/django/examples/cookbook).**
+[cookbook example app](https://github.com/graphql-python/graphene/tree/master/examples/cookbook_django).**
 
 ## Filterable fields
 
@@ -54,7 +54,10 @@ query {
       node {
         id,
         name
-}}}}
+      }
+    }
+  }
+}
 ```
 
 You can also make more complex lookup types available:
@@ -76,12 +79,15 @@ Which you could query as follows:
 ```graphql
 query {
   # Note that fields names become camelcased
-  allAnimals(nameIcontains: "lion") {
+  allAnimals(name_Icontains: "lion") {
     edges {
       node {
         id,
         name
-}}}}
+      }
+    }
+  }
+}
 ```
 
 ## Orderable fields
@@ -112,7 +118,10 @@ query {
       node {
         id,
         name
-}}}}
+      }
+    }
+  }
+}
 ```
 
 ## Custom Filtersets
diff --git a/docs/pages/docs/quickstart-django.md b/docs/pages/docs/django/tutorial.md
similarity index 85%
rename from docs/pages/docs/quickstart-django.md
rename to docs/pages/docs/django/tutorial.md
index 310ec95d..d09b959b 100644
--- a/docs/pages/docs/quickstart-django.md
+++ b/docs/pages/docs/django/tutorial.md
@@ -1,28 +1,54 @@
 ---
-title: Django Quickstart
+title: Quickstart
 description: A Quick guide to Graphene in Django
 ---
 
 # Django Tutorial
 
 Graphene has a number of additional features that are designed to make
-working with Django simple.
-
-If you need help getting started with django then head over to
-Django's getting started page.
-
-First let's create a few simple models...
+working with Django *really simple*.
 
 **Note: The code in this quickstart is pulled from the
-[cookbook example app](https://github.com/graphql-python/graphene/tree/feature/django/examples/cookbook)**.
+[cookbook example app](https://github.com/graphql-python/graphene/tree/master/examples/cookbook_django)**.
 
-## Defining our models
 
-Before continuing, create the following:
+## Setup the Django project
+
+We will setup the project, create the following:
 
 * A Django project called `cookbook`
 * An app within `cookbook` called `ingredients`
 
+```bash
+# Create the project directory
+mkdir cookbook
+cd cookbook
+
+# Create a virtualenv to isolate our package dependencies locally
+virtualenv env
+source env/bin/activate  # On Windows use `env\Scripts\activate`
+
+# Install Django and Graphene with Django support
+pip install django
+pip install graphene[django]
+pip install django-graphiql
+
+# Set up a new project with a single application
+django-admin.py startproject cookbook .  # Note the trailing '.' character
+django-admin.py startapp ingredients
+```
+
+Now sync your database for the first time:
+
+```bash
+python manage.py migrate
+```
+
+Let's create a few simple models...
+
+
+## Defining our models
+
 Let's get started with these models:
 
 ```python
@@ -51,9 +77,9 @@ class Ingredient(models.Model):
 GraphQL presents your objects to the world as a graph structure rather than a more
 hierarchical structure to which you may be accustomed. In order to create this
 representation, Graphene needs to know about each *type* of object which will appear in
-the graph. Below we define these as the `UserType` and `GroupType` classes.
+the graph.
 
-This graph also has a 'root' through which all access begins. This is the `Query` class below.
+This graph also has a *root type* through which all access begins. This is the `Query` class below.
 In this example, we provide the ability to list all users via `all_users`, and the
 ability to obtain a specific user via `get_user`.
 
@@ -183,7 +209,7 @@ Installed 6 object(s) from 1 fixture(s)
 ```
 
 Alternatively you can use the Django admin interface to create some data youself.
-You'll need to run the development server (see below), and probably create a login
+You'll need to run the development server (see below), and create a login
 for yourself too (`./manage.py createsuperuser`).
 
 ## Testing our GraphQL schema
@@ -235,12 +261,17 @@ query {
     edges {
       node {
         name,
-
         ingredients {
           edges {
             node {
               name
-}}}}}}}
+            }
+          }
+        }
+      }
+    }
+  }
+}
 ```
 
 Or you can get only 'meat' ingredients containing the letter 'e':
@@ -248,9 +279,12 @@ Or you can get only 'meat' ingredients containing the letter 'e':
 ```graphql
 query {
   # You can also use `category: "CATEGORY GLOBAL ID"`
-  allIngredients(nameIcontains: "e", categoryName: "Meat") {
+  allIngredients(name_Icontains: "e", categoryName: "Meat") {
     edges {
       node {
         name
-}}}}
+      }
+    }
+  }
+}
 ```

From dead95726e28b5b56b092eab5f6afeca8f5e1939 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 13 Jan 2016 20:17:59 -0800
Subject: [PATCH 169/173] Updated version

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 90388c63..b8b50fb6 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ class PyTest(TestCommand):
 
 setup(
     name='graphene',
-    version='0.5.0',
+    version='0.6.0',
 
     description='GraphQL Framework for Python',
     long_description=open('README.rst').read(),

From 2e20cd8059b503a15cfaee50f5567a31595ccdbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomek=20G=C5=82=C3=B3wka?= <tk.glowka@gmail.com>
Date: Fri, 15 Jan 2016 01:35:09 +0100
Subject: [PATCH 170/173] Fixed NodeField object_type string name argument.

---
 graphene/relay/fields.py           |  8 ++++++--
 graphene/relay/tests/test_query.py | 21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/graphene/relay/fields.py b/graphene/relay/fields.py
index aa446083..aac1f7df 100644
--- a/graphene/relay/fields.py
+++ b/graphene/relay/fields.py
@@ -1,3 +1,4 @@
+import six
 from graphql_relay.node.node import from_global_id
 
 from ..core.fields import Field
@@ -73,8 +74,11 @@ class NodeField(Field):
             return None
         _type, _id = resolved_global_id.type, resolved_global_id.id
         object_type = schema.get_type(_type)
-        if not is_node(object_type) or (self.field_object_type and
-                                        object_type != self.field_object_type):
+        if isinstance(self.field_object_type, six.string_types):
+            field_object_type = schema.get_type(self.field_object_type)
+        else:
+            field_object_type = self.field_object_type
+        if not is_node(object_type) or (self.field_object_type and object_type != field_object_type):
             return
 
         return object_type.get_node(_id, info)
diff --git a/graphene/relay/tests/test_query.py b/graphene/relay/tests/test_query.py
index cfe5502e..b49ac791 100644
--- a/graphene/relay/tests/test_query.py
+++ b/graphene/relay/tests/test_query.py
@@ -31,6 +31,7 @@ class SpecialNode(relay.Node):
 
 class Query(graphene.ObjectType):
     my_node = relay.NodeField(MyNode)
+    my_node_lazy = relay.NodeField('MyNode')
     special_node = relay.NodeField(SpecialNode)
     all_my_nodes = relay.ConnectionField(
         MyNode, connection_type=MyConnection, customArg=graphene.String())
@@ -117,3 +118,23 @@ def test_nodeidfield():
     id_field_type = schema.T(id_field)
     assert isinstance(id_field_type.type, GraphQLNonNull)
     assert id_field_type.type.of_type == GraphQLID
+
+
+def test_nodefield_lazy_query():
+    query = '''
+    query RebelsShipsQuery {
+      myNode(id:"TXlOb2RlOjE=") {
+        id
+        name
+      },
+      myNodeLazy(id:"TXlOb2RlOjE=") {
+        id
+        name
+      },
+
+    }
+    '''
+    result = schema.execute(query)
+    assert not result.errors
+    assert result.data['myNode'] == result.data['myNodeLazy'], \
+        "NodeField with object_type direct reference and with object_type string name should not differ."

From f29fe5c8fd4bc297c5559c5199bc52c21fdb2b08 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 21 Jan 2016 12:34:42 -0800
Subject: [PATCH 171/173] Fixed inheritance from abstract types. Fixed #84

---
 graphene/core/classtypes/objecttype.py        |  2 +-
 .../core/classtypes/tests/test_objecttype.py  | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/graphene/core/classtypes/objecttype.py b/graphene/core/classtypes/objecttype.py
index 32294d4e..442d78f5 100644
--- a/graphene/core/classtypes/objecttype.py
+++ b/graphene/core/classtypes/objecttype.py
@@ -12,7 +12,7 @@ from .uniontype import UnionType
 def is_objecttype(cls):
     if not issubclass(cls, ObjectType):
         return False
-    return not cls._meta.interface
+    return not(cls._meta.abstract or cls._meta.interface)
 
 
 class ObjectTypeOptions(FieldsOptions):
diff --git a/graphene/core/classtypes/tests/test_objecttype.py b/graphene/core/classtypes/tests/test_objecttype.py
index 93cabc76..5e71ab73 100644
--- a/graphene/core/classtypes/tests/test_objecttype.py
+++ b/graphene/core/classtypes/tests/test_objecttype.py
@@ -87,3 +87,30 @@ def test_object_type_union():
     assert Thing._meta.type_name == 'Thing'
     assert Thing._meta.description == 'Thing union description'
     assert Thing.my_attr
+
+
+def test_object_type_not_union_if_abstract():
+    schema = Schema()
+
+    class Query1(ObjectType):
+        field1 = String()
+
+        class Meta:
+            abstract = True
+
+    class Query2(ObjectType):
+        field2 = String()
+
+        class Meta:
+            abstract = True
+
+    class Query(Query1, Query2):
+        '''Query description'''
+        my_attr = True
+
+    object_type = schema.T(Query)
+    assert issubclass(Query, ObjectType)
+    assert Query._meta.type_name == 'Query'
+    assert Query._meta.description == 'Query description'
+    assert isinstance(object_type, GraphQLObjectType)
+    assert list(Query._meta.fields_map.keys()) == ['field1', 'field2']

From 2dbd2e89c3075c08d618673a06e878c72ccf0acf Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Thu, 21 Jan 2016 12:48:30 -0800
Subject: [PATCH 172/173] Updated version of graphene to 0.6.1

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index b8b50fb6..8163c27c 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ class PyTest(TestCommand):
 
 setup(
     name='graphene',
-    version='0.6.0',
+    version='0.6.1',
 
     description='GraphQL Framework for Python',
     long_description=open('README.rst').read(),

From a0ac884bb27f83ca9d4344432e638da70f1e7643 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 22 Jan 2016 10:42:08 -0800
Subject: [PATCH 173/173] Set clientMutationId to be camelCase as defined by
 the graphql relay specification. Fixed #86

---
 graphene/relay/tests/test_mutations.py | 2 +-
 graphene/relay/types.py                | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/graphene/relay/tests/test_mutations.py b/graphene/relay/tests/test_mutations.py
index 02287725..82329519 100644
--- a/graphene/relay/tests/test_mutations.py
+++ b/graphene/relay/tests/test_mutations.py
@@ -37,7 +37,7 @@ def test_mutation_arguments():
     assert 'input' in schema.T(ChangeNumber.arguments)
     inner_type = ChangeNumber.input_type
     client_mutation_id_field = inner_type._meta.fields_map[
-        'client_mutation_id']
+        'clientMutationId']
     assert issubclass(inner_type, graphene.InputObjectType)
     assert isinstance(client_mutation_id_field.type, graphene.NonNull)
     assert isinstance(client_mutation_id_field.type.of_type, graphene.String)
diff --git a/graphene/relay/types.py b/graphene/relay/types.py
index 672042e7..5dbae954 100644
--- a/graphene/relay/types.py
+++ b/graphene/relay/types.py
@@ -142,7 +142,7 @@ class Node(six.with_metaclass(NodeMeta, Interface)):
 
 
 class MutationInputType(InputObjectType):
-    client_mutation_id = String(required=True)
+    clientMutationId = String(required=True)
 
 
 class RelayMutationMeta(MutationMeta):
@@ -162,7 +162,7 @@ class RelayMutationMeta(MutationMeta):
 
 
 class ClientIDMutation(six.with_metaclass(RelayMutationMeta, Mutation)):
-    client_mutation_id = String(required=True)
+    clientMutationId = String(required=True)
 
     class Meta:
         abstract = True
@@ -171,6 +171,6 @@ class ClientIDMutation(six.with_metaclass(RelayMutationMeta, Mutation)):
     def mutate(cls, instance, args, info):
         input = args.get('input')
         payload = cls.mutate_and_get_payload(input, info)
-        client_mutation_id = input.get('client_mutation_id')
-        setattr(payload, 'client_mutation_id', client_mutation_id)
+        client_mutation_id = input.get('clientMutationId') or input.get('client_mutation_id')
+        setattr(payload, 'clientMutationId', client_mutation_id)
         return payload