Closes #80: Revised default deserializer logic for datetime.timedelta and datetime.datetime values.

Author: insightindustry

CHANGES.rst

@@ -1,5 +1,36 @@
 -----------
 
+Release 0.5.1
+=========================================
+
+.. image:: https://travis-ci.org/insightindustry/sqlathanor.svg?branch=v.0.5.1
+  :target: https://travis-ci.org/insightindustry/sqlathanor
+  :alt: Build Status (Travis CI)
+
+.. image:: https://codecov.io/gh/insightindustry/sqlathanor/branch/v.0.5.1/graph/badge.svg
+  :target: https://codecov.io/gh/insightindustry/sqlathanor
+  :alt: Code Coverage Status (Codecov)
+
+.. image:: https://readthedocs.org/projects/sqlathanor/badge/?version=v.0.5.1
+  :target: http://sqlathanor.readthedocs.io/en/latest/?badge=v.0.5.1
+  :alt: Documentation Status (ReadTheDocs)
+
+Bug Fixes
+-----------------
+
+* #80: Revised how the default deserializer functions for ``datetime.timedelta``
+  and ``datetime.datetime`` objects functions. When deserializing either, the
+  default deserializer now starts by attempting to coerce the value to a
+  ``datetime.timedelta`` using the Validator Collection ``timedelta()`` validator
+  function, which supports the expression of amounts of time as both integers (e.g.
+  ``23 seconds``) and strings (e.g. ``00:00:23``). If the object cannot be
+  converted to a ``timedelta`` (if it is a complete / proper datetime with both
+  a time and date value), the default deserializer will then revert to returning
+  a ``datetime.datetime`` object.
+
+
+-----------
+
 Release 0.5.0
 =========================================
 

sqlathanor/default_deserializers.py

@@ -85,8 +85,11 @@ def from_date(value):
     return validators.date(value, allow_empty = True)
 
 def from_datetime(value):
-    if checkers.is_numeric(value):
-        return from_timedelta(value)
+    try:
+        value = validators.timedelta(value, allow_empty = True)
+        return value
+    except (ValueError, TypeError):
+        pass
 
     return validators.datetime(value, allow_empty = True)
 
@@ -108,11 +111,9 @@ def from_iterable(value):
     return validators.iterable(value, allow_empty = True)
 
 def from_timedelta(value):
-    value = validators.integer(value, allow_empty = True)
-    if value is None:
-        return value
+    value = validators.timedelta(value, allow_empty = True)
 
-    return datetime.timedelta(seconds = value)
+    return value
 
 def from_mac_address(value):
     return validators.mac_address(value, allow_empty = True)

tests/test_interval_deserialization.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+
+"""
+******************************************
+tests.test_interval_deserialization
+******************************************
+
+Tests for how SQLAthanor deserializes Interval columns.
+
+"""
+
+import pytest
+import datetime
+
+from tests.fixtures import db_engine, tables, base_model, db_session, \
+    model_complex_postgresql, instance_postgresql
+
+from sqlathanor.errors import InvalidFormatError, ValueDeserializationError, \
+    UnsupportedDeserializationError
+
+
+
+@pytest.mark.parametrize('attribute, format, input_value, expected_result, error', [
+    ('name', 'csv', 'serialized', 'deserialized', None),
+    ('id', 'csv', '1', 1, None),
+    ('hybrid', 'csv', 1, 1, None),
+    ('smallint_column', 'csv', '2', 2, None),
+    ('addresses', 'json', [], [], None),
+    ('time_delta', 'csv', 86400.0, datetime.timedelta(1), None),
+    ('time_delta', 'csv', '00:35:00', datetime.timedelta(minutes = 35), None),
+    ('time_delta', 'csv', '00:35:00.456', datetime.timedelta(minutes = 35, milliseconds = 456), None),
+    ('name', 'invalid', None, None, InvalidFormatError),
+    ('missing', 'csv', None, None, UnsupportedDeserializationError),
+    ('hidden', 'csv', None, None, UnsupportedDeserializationError),
+    ('id', 'csv', 'invalid', None, ValueDeserializationError),
+    ('time_delta', 'csv', 'not-numeric', None, ValueDeserializationError),
+    ('time_delta', 'json', 86400.0, None, UnsupportedDeserializationError),
+    ('time_delta', 'json', '00:35:00', None, UnsupportedDeserializationError),
+
+])
+def test__get_deserialized_value(request,
+                                 instance_postgresql,
+                                 attribute,
+                                 format,
+                                 input_value,
+                                 expected_result,
+                                 error):
+    target = instance_postgresql[0][0]
+
+    if not error:
+        result = target._get_deserialized_value(input_value, format, attribute)
+        assert result == expected_result
+    else:
+        with pytest.raises(error):
+            result = target._get_deserialized_value(input_value, format, attribute)