Merge branch 'master' of git://github.com/aparo/mongodj

mongodj/fields.py

@@ -12,19 +12,22 @@ class EmbeddedModel(models.Model):
     _embedded_in =None
 
     def save(self, *args, **kwargs):
+        if self.pk is None:
+            self.pk = ObjectId()
         if self._embedded_in  is None:
             raise RuntimeError("Invalid save")
         self._embedded_in.save()
 
     def serialize(self):
+        if self.pk is None:
+            self.pk = ObjectId()
         result = {'_app':self._meta.app_label, 
             '_model':self._meta.module_name,
-            'pk':self.pk}
+            '_id':self.pk}
         for field in self._meta.fields:
             result[field.attname] = getattr(self, field.attname)
         return result
 
-
 class ListField(Field):
     """A list field that wraps a standard field, allowing multiple instances
     of the field to be used as a list in the database.

mongodj/mongodb_serializer.py

@@ -23,6 +23,7 @@ def decode_django(data):
         del data['_type']
         del data['_app']
         del data['_model']
+        data.pop('_id', None)
         data = dict([(str(k),v) for k,v in data.items()])
         return model.model_class()(**data)
 
@@ -46,6 +47,9 @@ def transform_incoming(self, son, collection):
 
     def transform_outgoing(self, son, collection):
         if isinstance(son, dict):
+            if "_id" in son:
+                pk = son.pop('_id')
+                son['id'] = unicode(pk)
             if "_type" in son and son["_type"] in [u"django", u'emb']:
                 son = decode_django(son)
             else: