Implement DateTimeField; close #9

Author: alexei

adapters/fields.py

@@ -13,6 +13,7 @@
     'BooleanField',
     'CharField',
     'DateField',
+    'DateTimeField',
     'DecimalField',
     'Field',
     'FloatField',
@@ -41,6 +42,16 @@ def adapt(self, data):
             raise ValueError("Invalid date argument")
 
 
+class DateTimeField(BaseField):
+    def adapt(self, data):
+        if isinstance(data, datetime.datetime):
+            return data
+        elif isinstance(data, (str, unicode)):
+            return dateutil.parser.parse(data)
+        else:
+            raise ValueError("Invalid date argument")
+
+
 class DecimalField(BaseField):
     def adapt(self, data):
         return Decimal(data)

tests/test_fields.py

@@ -99,3 +99,33 @@ def test_date_field_from_string(self):
         actual = adapters.DateField().adapt(date.strftime('%Y-%m-%d'))
         expected = date
         self.assertEqual(actual, expected)
+
+    def test_datetime_field(self):
+        now = datetime.datetime.today()
+        actual = adapters.DateTimeField().adapt(now)
+        expected = now
+        self.assertEqual(actual, expected)
+
+    def test_datetime_field_from_string(self):
+        tzoffset = dateutil.tz.tzoffset(None, 7200)
+        time = datetime.datetime(1986, 7, 25, 13, 14, 15, 16, tzinfo=tzoffset)
+
+        data = '1986-07-25 13:14:15.000016+02:00'
+        actual = adapters.DateTimeField().adapt(data)
+        expected = time
+        self.assertEqual(actual, expected)
+
+        data = '1986-07-25 13:14:15.000016'
+        actual = adapters.DateTimeField().adapt(data)
+        expected = datetime.datetime(1986, 7, 25, 13, 14, 15, 16)
+        self.assertEqual(actual, expected)
+
+        data = '1986-07-25 13:14:15'
+        actual = adapters.DateTimeField().adapt(data)
+        expected = datetime.datetime(1986, 7, 25, 13, 14, 15)
+        self.assertEqual(actual, expected)
+
+        data = '1986-07-25 13:14'
+        actual = adapters.DateTimeField().adapt(data)
+        expected = datetime.datetime(1986, 7, 25, 13, 14)
+        self.assertEqual(actual, expected)