Added new date directive: "time ago 2d".

Updated graphene-django requirements.
Replaced dateutils dependency with python-dateutil.
Fixed minor bug on "time ago" date directive.

Author: [email protected]

graphene_django_extras/__init__.py

@@ -9,7 +9,7 @@
 from .paginations import LimitOffsetGraphqlPagination, PageGraphqlPagination, CursorGraphqlPagination
 from .types import DjangoObjectType, DjangoInputObjectType, DjangoListObjectType, DjangoSerializerType
 
-VERSION = (0, 3, 8, 'alpha', '8')
+VERSION = (0, 3, 8, 'alpha', '10')
 
 __version__ = get_version(VERSION)
 

graphene_django_extras/directives/date.py

@@ -14,7 +14,7 @@
 __all__ = ('DateGraphQLDirective', )
 
 
-DEFAULT_DATE_FORMAT = '%d %b %Y %H:%M:%S';
+DEFAULT_DATE_FORMAT = '%d %b %Y %H:%M:%S'
 FORMATS_MAP = {
         # Year
         'YYYY': '%Y',
@@ -80,22 +80,26 @@ def _combine_date_time(d, t):
     return None
 
 
-def _parse(dt):
+def _parse(partial_dt):
     """
-    parse input to datetime
+    parse a partial datetime object to a complete datetime object
     """
+    dt = None
     try:
-        if isinstance(dt, datetime):
-            return dt
-        if isinstance(dt, date):
-            return _combine_date_time(dt, time(0, 0, 0))
-        if isinstance(dt, time):
-            return _combine_date_time(date.today(), dt)
-        if isinstance(dt, (int, float)):
-            return datetime.fromtimestamp(dt)
-        if isinstance(dt, (str, bytes)):
-            return parser.parse(dt, default=datetime.now())
-        return None
+        if isinstance(partial_dt, datetime):
+            dt = partial_dt
+        if isinstance(partial_dt, date):
+            dt = _combine_date_time(partial_dt, time(0, 0, 0))
+        if isinstance(partial_dt, time):
+            dt = _combine_date_time(date.today(), partial_dt)
+        if isinstance(partial_dt, (int, float)):
+            dt = datetime.fromtimestamp(partial_dt)
+        if isinstance(partial_dt, (str, bytes)):
+            dt = parser.parse(partial_dt, default=timezone.now())
+
+        if dt is not None and timezone.is_naive(dt):
+            dt = timezone.make_aware(dt)
+        return dt
     except ValueError:
         return None
 

graphene_django_extras/types.py

@@ -154,32 +154,26 @@ def __init_subclass_with_meta__(cls, model=None, container=None, registry=None,
         if not DJANGO_FILTER_INSTALLED and filter_fields:
             raise Exception("Can only set filter_fields if Django-Filter is installed")
 
-        django_fields = yank_fields_from_attrs(
-            construct_fields(model, registry, only_fields, exclude_fields, None, nested_fields),
-            _as=Field, sort=False
-        )
-
         django_input_fields = yank_fields_from_attrs(
             construct_fields(model, registry, only_fields, exclude_fields, input_for, nested_fields),
             _as=InputField, sort=False
         )
 
-        if container is None:
-            container = type(cls.__name__, (InputObjectTypeContainer, cls), {})
-
         _meta = DjangoObjectOptions(cls)
         _meta.by_polar = True
         _meta.model = model
         _meta.registry = registry
         _meta.filter_fields = filter_fields
-        # _meta.fields = django_fields
         _meta.fields = django_input_fields
         _meta.input_fields = django_input_fields
-        _meta.container = container
         _meta.connection = connection
         _meta.input_for = input_for
 
-        super(DjangoInputObjectType, cls).__init_subclass_with_meta__(_meta=_meta, **options)
+        super(DjangoInputObjectType, cls).__init_subclass_with_meta__(
+            container=container,
+            _meta=_meta,
+            **options
+        )
 
         if not skip_registry:
             registry.register(cls, for_input=input_for)

setup.py

@@ -55,8 +55,8 @@ def get_packages():
     packages=get_packages(),
 
     install_requires=[
-        'graphene-django>=2.0',
-        'django-filter<2',
+        'graphene-django>=2.1.0',
+        'django-filter==1.1.0',
         'djangorestframework>=3.6.0'
     ],
     extras_require={