Added basic querying - find and find_one

tests/collection.py

@@ -2,6 +2,7 @@ import unittest
 import pymongo
 
 from mongomap.collection import CollectionManager
+from mongomap.connection import _get_db
 from mongomap import *
 
 
@@ -15,19 +16,79 @@ class CollectionManagerTest(unittest.TestCase):
             age = IntField()
         self.Person = Person
 
+        self.db = _get_db()
+        self.db.drop_collection(self.Person._meta['collection'])
+
     def test_initialisation(self):
         """Ensure that CollectionManager is correctly initialised.
         """
-        class Person(Document):
-            name = StringField()
-            age = IntField()
-
-        self.assertTrue(isinstance(Person.collection, CollectionManager))
-        self.assertEqual(Person.collection._collection_name, 
-                         Person._meta['collection'])
-        self.assertTrue(isinstance(Person.collection._collection,
+        self.assertTrue(isinstance(self.Person.objects, CollectionManager))
+        self.assertEqual(self.Person.objects._collection_name, 
+                         self.Person._meta['collection'])
+        self.assertTrue(isinstance(self.Person.objects._collection,
                                    pymongo.collection.Collection))
 
+    def test_find(self):
+        """Ensure that a query returns a valid set of results.
+        """
+        person1 = self.Person(name="User A", age=20)
+        person1.save()
+        person2 = self.Person(name="User B", age=30)
+        person2.save()
+
+        # Find all people in the collection
+        people = self.Person.objects.find()
+        self.assertEqual(people.count(), 2)
+        results = list(people)
+        self.assertTrue(isinstance(results[0], self.Person))
+        self.assertEqual(results[0].name, "User A")
+        self.assertEqual(results[0].age, 20)
+        self.assertEqual(results[1].name, "User B")
+        self.assertEqual(results[1].age, 30)
+
+        # Use a query to filter the people found to just person1
+        people = self.Person.objects.find({'age': 20})
+        self.assertEqual(people.count(), 1)
+        person = people.next()
+        self.assertEqual(person.name, "User A")
+        self.assertEqual(person.age, 20)
+
+    def test_find_one(self):
+        """Ensure that a query using find_one returns a valid result.
+        """
+        person1 = self.Person(name="User A", age=20)
+        person1.save()
+        person2 = self.Person(name="User B", age=30)
+        person2.save()
+
+        # Retrieve the first person from the database
+        person = self.Person.objects.find_one()
+        self.assertTrue(isinstance(person, self.Person))
+        self.assertEqual(person.name, "User A")
+        self.assertEqual(person.age, 20)
+
+        # Use a query to filter the people found to just person2
+        person = self.Person.objects.find_one({'age': 30})
+        self.assertEqual(person.name, "User B")
+
+    def test_find_embedded(self):
+        """Ensure that an embedded document is properly returned from a query.
+        """
+        class User(EmbeddedDocument):
+            name = StringField()
+
+        class BlogPost(Document):
+            content = StringField()
+            author = EmbeddedDocumentField(User)
+
+        post = BlogPost(content='Had a good coffee today...')
+        post.author = User(name='Test User')
+        post.save()
+
+        result = BlogPost.objects.find_one()
+        self.assertTrue(isinstance(result.author, User))
+        self.assertEqual(result.author.name, 'Test User')
+
 
 if __name__ == '__main__':
     unittest.main()

tests/document.py

@@ -97,6 +97,7 @@ class DocumentTest(unittest.TestCase):
         person_obj = collection.find_one({'name': 'Test User'})
         self.assertEqual(person_obj['name'], 'Test User')
         self.assertEqual(person_obj['age'], 30)
+        self.assertEqual(str(person_obj['_id']), person._id)
 
     def test_save_custom_id(self):
         """Ensure that a document may be saved with a custom _id.

tests/fields.py

@@ -103,6 +103,24 @@ class FieldTest(unittest.TestCase):
         person.preferences = PersonPreferences(food='Cheese', number=47)
         self.assertEqual(person.preferences.food, 'Cheese')
 
+    def test_embedded_document_inheritance(self):
+        """Ensure that subclasses of embedded documents may be provided to 
+        EmbeddedDocumentFields of the superclass' type.
+        """
+        class User(EmbeddedDocument):
+            name = StringField()
+
+        class PowerUser(User):
+            power = IntField()
+
+        class BlogPost(Document):
+            content = StringField()
+            author = EmbeddedDocumentField(User)
+        
+        post = BlogPost(content='What I did today...')
+        post.author = User(name='Test User')
+        post.author = PowerUser(name='Test User', power=47)
+
 
 if __name__ == '__main__':
     unittest.main()