Added DateTimeField and FloatField

This commit is contained in:
Harry Marr 2009-11-23 18:03:10 +00:00
parent 20b259a3e4
commit d46191159e
2 changed files with 57 additions and 2 deletions

View File

@ -4,10 +4,12 @@ from connection import _get_db
import re import re
import pymongo import pymongo
import datetime
__all__ = ['StringField', 'IntField', 'EmbeddedDocumentField', 'ListField', __all__ = ['StringField', 'IntField', 'FloatField', 'DateTimeField',
'ObjectIdField', 'ReferenceField', 'ValidationError'] 'EmbeddedDocumentField', 'ListField', 'ObjectIdField',
'ReferenceField', 'ValidationError']
class StringField(BaseField): class StringField(BaseField):
@ -54,6 +56,35 @@ class IntField(BaseField):
raise ValidationError('Integer value is too large') raise ValidationError('Integer value is too large')
class FloatField(BaseField):
"""An floating point number field.
"""
def __init__(self, min_value=None, max_value=None, **kwargs):
self.min_value, self.max_value = min_value, max_value
super(FloatField, self).__init__(**kwargs)
def to_python(self, value):
return float(value)
def validate(self, value):
assert(isinstance(value, float))
if self.min_value is not None and value < self.min_value:
raise ValidationError('Float value is too small')
if self.max_value is not None and value > self.max_value:
raise ValidationError('Float value is too large')
class DateTimeField(BaseField):
"""A datetime field.
"""
def validate(self, value):
assert(isinstance(value, datetime.datetime))
class EmbeddedDocumentField(BaseField): class EmbeddedDocumentField(BaseField):
"""An embedded document field. Only valid values are subclasses of """An embedded document field. Only valid values are subclasses of
EmbeddedDocument. EmbeddedDocument.

View File

@ -1,4 +1,5 @@
import unittest import unittest
import datetime
from mongoengine import * from mongoengine import *
from mongoengine.connection import _get_db from mongoengine.connection import _get_db
@ -84,6 +85,29 @@ class FieldTest(unittest.TestCase):
self.assertRaises(ValidationError, person.__setattr__, 'age', 120) self.assertRaises(ValidationError, person.__setattr__, 'age', 120)
self.assertRaises(ValidationError, person.__setattr__, 'age', 'ten') self.assertRaises(ValidationError, person.__setattr__, 'age', 'ten')
def test_float_validation(self):
"""Ensure that invalid values cannot be assigned to float fields.
"""
class Person(Document):
height = FloatField(min_value=0.1, max_value=3.5)
person = Person()
person.height = 1.89
self.assertRaises(ValidationError, person.__setattr__, 'height', 2)
self.assertRaises(ValidationError, person.__setattr__, 'height', 0.01)
self.assertRaises(ValidationError, person.__setattr__, 'height', 4.0)
def test_datetime_validation(self):
"""Ensure that invalid values cannot be assigned to datetime fields.
"""
class LogEntry(Document):
time = DateTimeField()
log = LogEntry()
self.assertRaises(ValidationError, log.__setattr__, 'time', -1)
self.assertRaises(ValidationError, log.__setattr__, 'time', '1pm')
log.time = datetime.datetime.now()
def test_list_validation(self): def test_list_validation(self):
"""Ensure that a list field only accepts lists with valid elements. """Ensure that a list field only accepts lists with valid elements.
""" """