Merge fresh develop

Author: postatum

docs/source/changelog.rst

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+* :release:`0.4.0 <2015-10-07>`
+* :feature:`-` Nested relationships are now indexed in bulk in ElasticSearch
+* :feature:`-` Added '_nesting_depth' property in models to control the level of nesting, default is 1
+
 * :release:`0.3.3 <2015-09-02>`
 * :bug:`-` Fixed a bug when using reserved query params with GET tunneling
 * :bug:`-` Fixed a bug preventing updates of floatFields via GET tunneling

nefertari_mongodb/documents.py

@@ -98,6 +98,7 @@ class BaseMixin(object):
             authenticated users.
         _public_fields: String names of fields meant to be displayed to
             non-authenticated users.
+        _hidden_fields: String names of fields meant to be hidden but editable.
         _nested_relationships: String names of reference/relationship fields
             that should be included in JSON data of an object as full
             included documents. If reference/relationship field is not
@@ -109,6 +110,7 @@ class BaseMixin(object):
     """
     _public_fields = None
     _auth_fields = None
+    _hidden_fields = None
     _nested_relationships = ()
     _backref_hooks = ()
     _nesting_depth = 1
@@ -251,7 +253,7 @@ def filter_objects(cls, objects, first=False, **params):
         params[key] = ids
 
         if first:
-            return cls.get_resource(**params)
+            return cls.get_item(**params)
         else:
             return cls.get_collection(**params)
 
@@ -358,18 +360,13 @@ def fields_to_query(cls):
         return query_fields + list(cls._fields.keys())
 
     @classmethod
-    def get_resource(cls, **params):
+    def get_item(cls, **params):
         params.setdefault('_raise_on_empty', True)
         params['_limit'] = 1
         params['_item_request'] = True
         query_set = cls.get_collection(**params)
         return query_set.first()
 
-    @classmethod
-    def get(cls, **kw):
-        return cls.get_resource(
-            _raise_on_empty=kw.pop('__raise', False), **kw)
-
     def unique_fields(self):
         pk_field = [self.pk_field()]
         uniques = [e['fields'][0][0] for e in self._unique_with_indexes()]
@@ -643,6 +640,19 @@ def _is_modified(self):
     def _is_created(self):
         return self._created
 
+    def _to_python_fields(self):
+        """ Call to_python on non-relation fields. """
+        from .utils import relationship_fields
+        for name, field in self._fields.items():
+            rel_field = isinstance(field, relationship_fields)
+            if name not in self._data or rel_field:
+                continue
+            value = self._data[name]
+            try:
+                self._data[name] = field.to_python(value)
+            except:
+                continue
+
 
 class BaseDocument(six.with_metaclass(DocumentMetaclass,
                                       BaseMixin, mongo.Document)):
@@ -720,9 +730,9 @@ def update(self, params, request=None, **kw):
         kw['request'] = request
         # request are passed to _update and then to save
         try:
-            updated_obj = self._update(params, **kw)
-            updated_obj.reload()
-            return updated_obj
+            self._update(params, **kw)
+            self._to_python_fields()
+            return self
         except (mongo.NotUniqueError, mongo.OperationError) as e:
             if (e.__class__ is mongo.OperationError
                     and 'E11000' not in e.message):

nefertari_mongodb/fields.py

@@ -638,6 +638,7 @@ def __set__(self, instance, value):
         - `value`.
         """
         super_set = super(RelationshipField, self).__set__
+
         if not self.reverse_rel_field:
             return super_set(instance, value)
 
@@ -648,15 +649,15 @@ def __set__(self, instance, value):
         if value == current_value:
             return
 
-        added_values = set(value) - set(current_value)
-        deleted_values = set(current_value) - set(value)
         is_doc = lambda x: isinstance(x, mongo.Document)
 
-        if added_values and all(is_doc(v) for v in added_values):
+        added_values = set(value) - set(current_value)
+        if added_values and is_doc(list(added_values)[0]):
             for val in added_values:
                 self._register_addition_hook(val, instance)
 
-        if deleted_values and all(is_doc(v) for v in deleted_values):
+        deleted_values = set(current_value) - set(value)
+        if deleted_values and is_doc(list(deleted_values)[0]):
             for val in deleted_values:
                 self._register_deletion_hook(val, instance)
 

setup.py

@@ -1,21 +1,19 @@
 from setuptools import setup, find_packages
 
-
 install_requires = [
+    'elasticsearch',
     'mongoengine==0.9',
+    'nefertari>=0.6.0',
     'pymongo==2.8',
-    'zope.dottedname',
-    'elasticsearch',
-    'python-dateutil',
     'pyramid_tm',
+    'python-dateutil',
     'six',
-    'nefertari>=0.5.1'
+    'zope.dottedname',
 ]
 
-
 setup(
     name='nefertari_mongodb',
-    version="0.3.3",
+    version="0.4.0",
     description='mongodb engine for nefertari',
     classifiers=[
         "Programming Language :: Python",