Added json serialisation support

- Added to_json and from_json to Document (MongoEngine/mongoengine#1)
- Added to_json and from_json to QuerySet (MongoEngine/mongoengine#131)

tests/test_queryset.py

@@ -1,7 +1,10 @@
 from __future__ import with_statement
 import sys
 sys.path[0:0] = [""]
+
 import unittest
+import uuid
+from nose.plugins.skip import SkipTest
 
 from datetime import datetime, timedelta
 
@@ -74,7 +77,6 @@ class QuerySetTest(unittest.TestCase):
         def test_generic_reference():
             list(BlogPost.objects(author2__name="test"))
 
-
     def test_find(self):
         """Ensure that a query returns a valid set of results.
         """
@@ -3672,6 +3674,72 @@ class QueryFieldListTest(unittest.TestCase):
         self.assertRaises(ConfigurationError, Bar.objects,
                             read_preference='Primary')
 
+    def test_json_simple(self):
+
+        class Embedded(EmbeddedDocument):
+            string = StringField()
+
+        class Doc(Document):
+            string = StringField()
+            embedded_field = EmbeddedDocumentField(Embedded)
+
+        Doc.drop_collection()
+        Doc(string="Hi", embedded_field=Embedded(string="Hi")).save()
+        Doc(string="Bye", embedded_field=Embedded(string="Bye")).save()
+
+        Doc().save()
+        json_data = Doc.objects.to_json()
+        doc_objects = list(Doc.objects)
+
+        self.assertEqual(doc_objects, Doc.objects.from_json(json_data))
+
+    def test_json_complex(self):
+        if pymongo.version_tuple[0] <= 2 and pymongo.version_tuple[1] <= 3:
+            raise SkipTest("Need pymongo 2.4 as has a fix for DBRefs")
+
+        class EmbeddedDoc(EmbeddedDocument):
+            pass
+
+        class Simple(Document):
+            pass
+
+        class Doc(Document):
+            string_field = StringField(default='1')
+            int_field = IntField(default=1)
+            float_field = FloatField(default=1.1)
+            boolean_field = BooleanField(default=True)
+            datetime_field = DateTimeField(default=datetime.now)
+            embedded_document_field = EmbeddedDocumentField(EmbeddedDoc,
+                                        default=lambda: EmbeddedDoc())
+            list_field = ListField(default=lambda: [1, 2, 3])
+            dict_field = DictField(default=lambda: {"hello": "world"})
+            objectid_field = ObjectIdField(default=ObjectId)
+            reference_field = ReferenceField(Simple, default=lambda:
+                                                        Simple().save())
+            map_field = MapField(IntField(), default=lambda: {"simple": 1})
+            decimal_field = DecimalField(default=1.0)
+            complex_datetime_field = ComplexDateTimeField(default=datetime.now)
+            url_field = URLField(default="http://mongoengine.org")
+            dynamic_field = DynamicField(default=1)
+            generic_reference_field = GenericReferenceField(
+                                            default=lambda: Simple().save())
+            sorted_list_field = SortedListField(IntField(),
+                                                default=lambda: [1, 2, 3])
+            email_field = EmailField(default="ross@example.com")
+            geo_point_field = GeoPointField(default=lambda: [1, 2])
+            sequence_field = SequenceField()
+            uuid_field = UUIDField(default=uuid.uuid4)
+            generic_embedded_document_field = GenericEmbeddedDocumentField(
+                                        default=lambda: EmbeddedDoc())
+
+        Simple.drop_collection()
+        Doc.drop_collection()
+
+        Doc().save()
+        json_data = Doc.objects.to_json()
+        doc_objects = list(Doc.objects)
+
+        self.assertEqual(doc_objects, Doc.objects.from_json(json_data))
 
 
 if __name__ == '__main__':