Merge branch 'master' into features/2.0

# Conflicts:
#	graphene_sqlalchemy/types.py

Author: syrusakbary

README.md

@@ -68,6 +68,38 @@ query = '''
 result = schema.execute(query, context_value={'session': db_session})
 ```
 
+You may also subclass SQLAlchemyObjectType by providing `abstract = True` in
+your subclasses Meta:
+```python
+from graphene_sqlalchemy import SQLAlchemyObjectType
+
+class ActiveSQLAlchemyObjectType(SQLAlchemyObjectType):
+    class Meta:
+        abstract = True
+
+    @classmethod
+    def get_node(cls, id, context, info):
+        return cls.get_query(context).\
+            filter(and_(
+                cls._meta.model.deleted_at==None,
+                cls._meta.model.id==id,
+            )).\
+            first()
+
+class User(ActiveSQLAlchemyObjectType):
+    class Meta:
+        model = UserModel
+
+class Query(graphene.ObjectType):
+    users = graphene.List(User)
+
+    def resolve_users(self, args, context, info):
+        query = User.get_query(context) # SQLAlchemy query
+        return query.all()
+
+schema = graphene.Schema(query=Query)
+```
+
 To learn more check out the following [examples](examples/):
 
 * **Full example**: [Flask SQLAlchemy example](examples/flask_sqlalchemy)

graphene_sqlalchemy/registry.py

@@ -6,10 +6,11 @@ def __init__(self):
         self._registry_composites = {}
 
     def register(self, cls):
-        from .types import SQLAlchemyObjectType
-        assert issubclass(
-            cls, SQLAlchemyObjectType), 'Only SQLAlchemyObjectType can be registered, received "{}"'.format(
-            cls.__name__)
+        from .types import SQLAlchemyObjectTypeMeta
+        assert issubclass(type(cls), SQLAlchemyObjectTypeMeta), (
+            'Only classes of type SQLAlchemyObjectTypeMeta can be registered, ',
+            'received "{}"'
+        ).format(cls.__name__)
         assert cls._meta.registry == self, 'Registry for a Model have to match.'
         # assert self.get_type_for_model(cls._meta.model) in [None, cls], (
         #     'SQLAlchemy model "{}" already associated with '

graphene_sqlalchemy/tests/test_types.py

@@ -1,9 +1,10 @@
 
 from graphene import Field, Int, Interface, ObjectType
 from graphene.relay import Node, is_node
+import six
 
 from ..registry import Registry
-from ..types import SQLAlchemyObjectType
+from ..types import SQLAlchemyObjectType, SQLAlchemyObjectTypeMeta
 from .models import Article, Reporter
 
 registry = Registry()
@@ -87,3 +88,31 @@ class Meta:
     assert issubclass(Human, ObjectType)
     assert list(Human._meta.fields.keys()) == ['id', 'headline', 'pub_date', 'reporter_id', 'reporter']
     assert is_node(Human)
+
+
+
+# Test Custom SQLAlchemyObjectType Implementation
+class CustomSQLAlchemyObjectType(SQLAlchemyObjectType):
+    class Meta:
+        abstract = True
+
+
+class CustomCharacter(CustomSQLAlchemyObjectType):
+    '''Character description'''
+    class Meta:
+        model = Reporter
+        registry = registry
+
+
+def test_custom_objecttype_registered():
+    assert issubclass(CustomCharacter, ObjectType)
+    assert CustomCharacter._meta.model == Reporter
+    assert list(
+        CustomCharacter._meta.fields.keys()) == [
+        'id',
+        'first_name',
+        'last_name',
+        'email',
+        'pets',
+        'articles',
+        'favorite_article']

setup.cfg

@@ -7,3 +7,20 @@ omit = */tests/*
 
 [isort]
 known_first_party=graphene,graphene_sqlalchemy
+
+[tool:pytest]
+testpaths = graphene_sqlalchemy/
+addopts =
+    -s
+    ; --cov graphene-sqlalchemy
+norecursedirs =
+    __pycache__
+    *.egg-info
+    .cache
+    .git
+    .tox
+    appdir
+    docs
+filterwarnings =
+    error
+    ignore::DeprecationWarning