Merge branch 'mapreduce' of git://github.com/blackbrrr/mongoengine

mongoengine/document.py

@@ -128,7 +128,6 @@ class MapReduceDocument(object):
     :param value: The result(s) for this key.
     
     .. versionadded:: 0.3
- 
     """
     
     def __init__(self, document, collection, key, value):
@@ -139,14 +138,19 @@ class MapReduceDocument(object):
     
     @property
     def object(self):
-        """Lazy-load the object referenced by ``self.key``. If ``self.key``
-        is not an ``ObjectId``, simply return ``self.key``.
+        """Lazy-load the object referenced by ``self.key``. ``self.key`` 
+        should be the ``primary_key``.
         """
-        if not isinstance(self.key, (pymongo.objectid.ObjectId)):
+        id_field = self._document()._meta['id_field']
+        id_field_type = type(id_field)
+        
+        if not isinstance(self.key, id_field_type):
             try:
-                self.key = pymongo.objectid.ObjectId(self.key)
+                self.key = id_field_type(self.key)
             except:
-                return self.key
+                raise Exception("Could not cast key as %s" % \
+                                id_field_type.__name__)
+
         if not hasattr(self, "_key_object"):
             self._key_object = self._document.objects.with_id(self.key)
             return self._key_object

tests/queryset.py

@@ -678,6 +678,52 @@ class QuerySetTest(unittest.TestCase):
         self.assertEqual(film.value, 3)
 
         BlogPost.drop_collection()
+        
+    def test_map_reduce_with_custom_object_ids(self):
+        """Ensure that QuerySet.map_reduce works properly with custom
+        primary keys.
+        """
+
+        class BlogPost(Document):
+            title = StringField(primary_key=True)
+            tags = ListField(StringField())
+        
+        post1 = BlogPost(title="Post #1", tags=["mongodb", "mongoengine"])
+        post2 = BlogPost(title="Post #2", tags=["django", "mongodb"])
+        post3 = BlogPost(title="Post #3", tags=["hitchcock films"])
+        
+        post1.save()
+        post2.save()
+        post3.save()
+        
+        self.assertEqual(BlogPost._fields['title'].name, '_id')
+        self.assertEqual(BlogPost._meta['id_field'], 'title')
+        
+        map_f = """
+            function() {
+                emit(this._id, 1);
+            }
+        """
+        
+        # reduce to a list of tag ids and counts
+        reduce_f = """
+            function(key, values) {
+                var total = 0;
+                for(var i=0; i<values.length; i++) {
+                    total += values[i];
+                }
+                return total;
+            }
+        """
+        
+        results = BlogPost.objects.map_reduce(map_f, reduce_f)
+        results = list(results)
+        
+        self.assertEqual(results[0].object, post1)
+        self.assertEqual(results[1].object, post2)
+        self.assertEqual(results[2].object, post3)
+
+        BlogPost.drop_collection()
 
     def test_map_reduce_finalize(self):
         """Ensure that map, reduce, and finalize run and introduce "scope"