Version bump 0.8.5

Update changelog
Fix auth to use get_user_document #527
2013-12-04 10:02:05 +00:00 · 2013-12-04 10:01:16 +00:00 · 2013-12-04 10:00:12 +00:00 · 2013-12-02 14:14:46 +00:00 · 2013-11-29 16:24:32 +00:00 · 2013-11-29 13:19:52 +00:00
45 changed files with 3218 additions and 1782 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,16 +7,22 @@ python:
    - "3.2"
    - "3.3"
 env:
-  - PYMONGO=dev DJANGO=1.5.1
-  - PYMONGO=dev DJANGO=1.4.2
-  - PYMONGO=2.5 DJANGO=1.5.1
-  - PYMONGO=2.5 DJANGO=1.4.2
+  - PYMONGO=dev DJANGO=1.6
+  - PYMONGO=dev DJANGO=1.5.5
+  - PYMONGO=dev DJANGO=1.4.10
+  - PYMONGO=2.5 DJANGO=1.6
+  - PYMONGO=2.5 DJANGO=1.5.5
+  - PYMONGO=2.5 DJANGO=1.4.10
+  - PYMONGO=3.2 DJANGO=1.6
+  - PYMONGO=3.2 DJANGO=1.5.5
+  - PYMONGO=3.3 DJANGO=1.6
+  - PYMONGO=3.3 DJANGO=1.5.5
 install:
    - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then cp /usr/lib/*/libz.so $VIRTUAL_ENV/lib/; fi
    - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install pil --use-mirrors ; true; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install django==$DJANGO --use-mirrors ; true; fi
    - if [[ $PYMONGO == 'dev' ]]; then pip install https://github.com/mongodb/mongo-python-driver/tarball/master; true; fi
    - if [[ $PYMONGO != 'dev' ]]; then pip install pymongo==$PYMONGO --use-mirrors; true; fi
+    - pip install https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.1.tar.gz#md5=1534bb15cf311f07afaa3aacba1c028b
    - python setup.py install
 script:
    - python setup.py test
--- a/27
+++ b/27
@@ -16,8 +16,6 @@ Dervived from the git logs, inevitably incomplete but all of whom and others
 have submitted patches, reported bugs and generally helped make MongoEngine
 that much better:

- * Harry Marr
- * Ross Lawley
 * blackbrrr
 * Florian Schlachter
 * Vincent Driessen
@@ -136,7 +134,7 @@ that much better:
 * Paul Swartz
 * Sundar Raman
 * Benoit Louy
- * lraucy
+ * Loic Raucy (https://github.com/lraucy)
 * hellysmile
 * Jaepil Jeong
 * Daniil Sharou
@@ -169,4 +167,25 @@ that much better:
 * Massimo Santini (https://github.com/mapio)
 * Nigel McNie (https://github.com/nigelmcnie)
 * ygbourhis (https://github.com/ygbourhis)
- * Bob Dickinson (https://github.com/BobDickinson)
+ * Bob Dickinson (https://github.com/BobDickinson)
+ * Michael Bartnett (https://github.com/michaelbartnett)
+ * Alon Horev (https://github.com/alonho)
+ * Kelvin Hammond (https://github.com/kelvinhammond)
+ * Jatin- (https://github.com/jatin-)
+ * Paul Uithol (https://github.com/PaulUithol)
+ * Thom Knowles (https://github.com/fleat)
+ * Paul (https://github.com/squamous)
+ * Olivier Cortès (https://github.com/Karmak23)
+ * crazyzubr (https://github.com/crazyzubr)
+ * FrankSomething (https://github.com/FrankSomething)
+ * Alexandr Morozov (https://github.com/LK4D4)
+ * mishudark (https://github.com/mishudark)
+ * Joe Friedl (https://github.com/grampajoe)
+ * Daniel Ward (https://github.com/danielward)
+ * Aniket Deshpande (https://github.com/anicake)
+ * rfkrocktk (https://github.com/rfkrocktk)
+ * Gustavo Andrés Angulo (https://github.com/woakas)
+ * Dmytro Popovych (https://github.com/drudim)
+ * Tom (https://github.com/tomprimozic)
+ * j0hnsmith (https://github.com/j0hnsmith)
+ * Damien Churchill (https://github.com/damoxc)
--- a/docs/_themes/nature/static/nature.css_t
+++ b/docs/_themes/nature/static/nature.css_t
@@ -2,11 +2,15 @@
 * Sphinx stylesheet -- default theme
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
- 
+
@import url("basic.css");
- 
+
+#changelog p.first {margin-bottom: 0 !important;}
+#changelog p {margin-top: 0 !important;
+              margin-bottom: 0 !important;}
+
 /* -- page layout ----------------------------------------------------------- */
- 
+
 body {
    font-family: Arial, sans-serif;
    font-size: 100%;
@@ -28,18 +32,18 @@ div.bodywrapper {
 hr{
    border: 1px solid #B1B4B6;
 }
- 
+
 div.document {
    background-color: #eee;
 }
- 
+
 div.body {
    background-color: #ffffff;
    color: #3E4349;
    padding: 0 30px 30px 30px;
    font-size: 0.8em;
 }
- 
+
 div.footer {
    color: #555;
    width: 100%;
@@ -47,12 +51,12 @@ div.footer {
    text-align: center;
    font-size: 75%;
 }
- 
+
 div.footer a {
    color: #444;
    text-decoration: underline;
 }
- 
+
 div.related {
    background-color: #6BA81E;
    line-height: 32px;
@@ -60,11 +64,11 @@ div.related {
    text-shadow: 0px 1px 0 #444;
    font-size: 0.80em;
 }
- 
+
 div.related a {
    color: #E2F3CC;
 }
- 
+
 div.sphinxsidebar {
    font-size: 0.75em;
    line-height: 1.5em;
@@ -73,7 +77,7 @@ div.sphinxsidebar {
 div.sphinxsidebarwrapper{
    padding: 20px 0;
 }
- 
+
 div.sphinxsidebar h3,
 div.sphinxsidebar h4 {
    font-family: Arial, sans-serif;
@@ -89,30 +93,30 @@ div.sphinxsidebar h4 {
 div.sphinxsidebar h4{
    font-size: 1.1em;
 }
- 
+
 div.sphinxsidebar h3 a {
    color: #444;
 }
- 
- 
+
+
 div.sphinxsidebar p {
    color: #888;
    padding: 5px 20px;
 }
- 
+
 div.sphinxsidebar p.topless {
 }
- 
+
 div.sphinxsidebar ul {
    margin: 10px 20px;
    padding: 0;
    color: #000;
 }
- 
+
 div.sphinxsidebar a {
    color: #444;
 }
- 
+
 div.sphinxsidebar input {
    border: 1px solid #ccc;
    font-family: sans-serif;
@@ -122,19 +126,19 @@ div.sphinxsidebar input {
 div.sphinxsidebar input[type=text]{
    margin-left: 20px;
 }
- 
+
 /* -- body styles ----------------------------------------------------------- */
- 
+
 a {
    color: #005B81;
    text-decoration: none;
 }
- 
+
 a:hover {
    color: #E32E00;
    text-decoration: underline;
 }
- 
+
 div.body h1,
 div.body h2,
 div.body h3,
@@ -149,30 +153,30 @@ div.body h6 {
    padding: 5px 0 5px 10px;
    text-shadow: 0px 1px 0 white
 }
- 
+
 div.body h1 { border-top: 20px solid white; margin-top: 0; font-size: 200%; }
 div.body h2 { font-size: 150%; background-color: #C8D5E3; }
 div.body h3 { font-size: 120%; background-color: #D8DEE3; }
 div.body h4 { font-size: 110%; background-color: #D8DEE3; }
 div.body h5 { font-size: 100%; background-color: #D8DEE3; }
 div.body h6 { font-size: 100%; background-color: #D8DEE3; }
- 
+
 a.headerlink {
    color: #c60f0f;
    font-size: 0.8em;
    padding: 0 4px 0 4px;
    text-decoration: none;
 }
- 
+
 a.headerlink:hover {
    background-color: #c60f0f;
    color: white;
 }
- 
+
 div.body p, div.body dd, div.body li {
    line-height: 1.5em;
 }
- 
+
 div.admonition p.admonition-title + p {
    display: inline;
 }
@@ -185,29 +189,29 @@ div.note {
    background-color: #eee;
    border: 1px solid #ccc;
 }
- 
+
 div.seealso {
    background-color: #ffc;
    border: 1px solid #ff6;
 }
- 
+
 div.topic {
    background-color: #eee;
 }
- 
+
 div.warning {
    background-color: #ffe4e4;
    border: 1px solid #f66;
 }
- 
+
 p.admonition-title {
    display: inline;
 }
- 
+
 p.admonition-title:after {
    content: ":";
 }
- 
+
 pre {
    padding: 10px;
    background-color: White;
@@ -219,7 +223,7 @@ pre {
    -webkit-box-shadow: 1px 1px 1px #d8d8d8;
    -moz-box-shadow: 1px 1px 1px #d8d8d8;
 }
- 
+
 tt {
    background-color: #ecf0f3;
    color: #222;
--- a/docs/apireference.rst
+++ b/docs/apireference.rst
@@ -44,12 +44,21 @@ Context Managers
 Querying
 ========

-.. autoclass:: mongoengine.queryset.QuerySet
-   :members:
+.. automodule:: mongoengine.queryset
+    :synopsis: Queryset level operations

-   .. automethod:: mongoengine.queryset.QuerySet.__call__
+    .. autoclass:: mongoengine.queryset.QuerySet
+      :members:
+      :inherited-members:

-.. autofunction:: mongoengine.queryset.queryset_manager
+      .. automethod:: QuerySet.__call__
+
+    .. autoclass:: mongoengine.queryset.QuerySetNoCache
+      :members:
+
+       .. automethod:: mongoengine.queryset.QuerySetNoCache.__call__
+
+    .. autofunction:: mongoengine.queryset.queryset_manager

 Fields
 ======
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,6 +2,66 @@
 Changelog
 =========

+Changes in 0.8.5
+================
+- Fix multi level nested fields getting marked as changed (#523)
+- Django 1.6 login fix (#522) (#527)
+- Django 1.6 session fix (#509)
+- EmbeddedDocument._instance is now set when settng the attribute (#506)
+- Fixed EmbeddedDocument with ReferenceField equality issue (#502)
+- Fixed GenericReferenceField serialization order (#499)
+- Fixed count and none bug (#498)
+- Fixed bug with .only() and DictField with digit keys (#496)
+- Added user_permissions to Django User object (#491, #492)
+- Fix updating Geo Location fields (#488)
+- Fix handling invalid dict field value (#485)
+- Added app_label to MongoUser (#484)
+- Use defaults when host and port are passed as None (#483)
+- Fixed distinct casting issue with ListField of EmbeddedDocuments (#470)
+- Fixed Django 1.6 sessions (#454, #480)
+
+Changes in 0.8.4
+================
+- Remove database name necessity in uri connection schema (#452)
+- Fixed "$pull" semantics for nested ListFields (#447)
+- Allow fields to be named the same as query operators (#445)
+- Updated field filter logic - can now exclude subclass fields (#443)
+- Fixed dereference issue with embedded listfield referencefields (#439)
+- Fixed slice when using inheritance causing fields to be excluded (#437)
+- Fixed ._get_db() attribute after a Document.switch_db() (#441)
+- Dynamic Fields store and recompose Embedded Documents / Documents correctly (#449)
+- Handle dynamic fieldnames that look like digits (#434)
+- Added get_user_document and improve mongo_auth module (#423)
+- Added str representation of GridFSProxy (#424)
+- Update transform to handle docs erroneously passed to unset (#416)
+- Fixed indexing - turn off _cls (#414)
+- Fixed dereference threading issue in ComplexField.__get__ (#412)
+- Fixed QuerySetNoCache.count() caching (#410)
+- Don't follow references in _get_changed_fields (#422, #417)
+- Allow args and kwargs to be passed through to_json (#420)
+
+Changes in 0.8.3
+================
+- Fixed EmbeddedDocuments with `id` also storing `_id` (#402)
+- Added get_proxy_object helper to filefields (#391)
+- Added QuerySetNoCache and QuerySet.no_cache() for lower memory consumption (#365)
+- Fixed sum and average mapreduce dot notation support (#375, #376, #393)
+- Fixed as_pymongo to return the id (#386)
+- Document.select_related() now respects `db_alias` (#377)
+- Reload uses shard_key if applicable (#384)
+- Dynamic fields are ordered based on creation and stored in _fields_ordered (#396)
+
+  **Potential breaking change:** http://docs.mongoengine.org/en/latest/upgrade.html#to-0-8-3
+
+- Fixed pickling dynamic documents `_dynamic_fields` (#387)
+- Fixed ListField setslice and delslice dirty tracking (#390)
+- Added Django 1.5 PY3 support (#392)
+- Added match ($elemMatch) support for EmbeddedDocuments (#379)
+- Fixed weakref being valid after reload (#374)
+- Fixed queryset.get() respecting no_dereference (#373)
+- Added full_result kwarg to update (#380)
+
+

 Changes in 0.8.2
 ================
@@ -9,7 +69,7 @@ Changes in 0.8.2
 - Fixed cascading saves which weren't turned off as planned (#291)
 - Fixed Datastructures so instances are a Document or EmbeddedDocument (#363)
 - Improved cascading saves write performance (#361)
- Fixed amibiguity and differing behaviour regarding field defaults (#349)
+- Fixed ambiguity and differing behaviour regarding field defaults (#349)
 - ImageFields now include PIL error messages if invalid error (#353)
 - Added lock when calling doc.Delete() for when signals have no sender (#350)
 - Reload forces read preference to be PRIMARY (#355)
--- a/docs/django.rst
+++ b/docs/django.rst
@@ -45,7 +45,7 @@ The :mod:`~mongoengine.django.auth` module also contains a
 Custom User model
 =================
 Django 1.5 introduced `Custom user Models
-<https://docs.djangoproject.com/en/dev/topics/auth/customizing/#auth-custom-user>`
+<https://docs.djangoproject.com/en/dev/topics/auth/customizing/#auth-custom-user>`_
 which can be used as an alternative to the MongoEngine authentication backend.

 The main advantage of this option is that other components relying on
@@ -74,7 +74,7 @@ An additional ``MONGOENGINE_USER_DOCUMENT`` setting enables you to replace the
 The custom :class:`User` must be a :class:`~mongoengine.Document` class, but
 otherwise has the same requirements as a standard custom user model,
 as specified in the `Django Documentation
-<https://docs.djangoproject.com/en/dev/topics/auth/customizing/>`.
+<https://docs.djangoproject.com/en/dev/topics/auth/customizing/>`_.
 In particular, the custom class must define :attr:`USERNAME_FIELD` and
 :attr:`REQUIRED_FIELDS` attributes.

@@ -90,10 +90,15 @@ session backend, ensure that your settings module has
 into your settings module::

    SESSION_ENGINE = 'mongoengine.django.sessions'
+    SESSION_SERIALIZER = 'mongoengine.django.sessions.BSONSerializer'

 Django provides session cookie, which expires after ```SESSION_COOKIE_AGE``` seconds, but doesn't delete cookie at sessions backend, so ``'mongoengine.django.sessions'`` supports  `mongodb TTL
 <http://docs.mongodb.org/manual/tutorial/expire-data/>`_.

+.. note:: ``SESSION_SERIALIZER`` is only necessary in Django 1.6 as the default
+   serializer is based around JSON and doesn't know how to convert
+   ``bson.objectid.ObjectId`` instances to strings.
+
 .. versionadded:: 0.2.1

 Storage
@@ -128,7 +133,7 @@ appended to the filename until the generated filename doesn't exist. The
    >>> fs.listdir()
    ([], [u'hello.txt'])

-All files will be saved and retrieved in GridFS via the :class::`FileDocument`
+All files will be saved and retrieved in GridFS via the :class:`FileDocument`
 document, allowing easy access to the files without the GridFSStorage
 backend.::

@@ -137,3 +142,36 @@ backend.::
    [<FileDocument: FileDocument object>]

 .. versionadded:: 0.4
+
+Shortcuts
+=========
+Inspired by the `Django shortcut get_object_or_404
+<https://docs.djangoproject.com/en/dev/topics/http/shortcuts/#get-object-or-404>`_,
+the :func:`~mongoengine.django.shortcuts.get_document_or_404` method returns 
+a document or raises an Http404 exception if the document does not exist::
+
+    from mongoengine.django.shortcuts import get_document_or_404
+    
+    admin_user = get_document_or_404(User, username='root')
+
+The first argument may be a Document or QuerySet object. All other passed arguments
+and keyword arguments are used in the query::
+
+    foo_email = get_document_or_404(User.objects.only('email'), username='foo', is_active=True).email
+
+.. note:: Like with :func:`get`, a MultipleObjectsReturned will be raised if more than one
+    object is found.
+
+
+Also inspired by the `Django shortcut get_list_or_404
+<https://docs.djangoproject.com/en/dev/topics/http/shortcuts/#get-list-or-404>`_,
+the :func:`~mongoengine.django.shortcuts.get_list_or_404` method returns a list of
+documents or raises an Http404 exception if the list is empty::
+
+    from mongoengine.django.shortcuts import get_list_or_404
+    
+    active_users = get_list_or_404(User, is_active=True)
+
+The first argument may be a Document or QuerySet object. All other passed
+arguments and keyword arguments are used to filter the query.
+
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -23,12 +23,15 @@ arguments should be provided::

    connect('project1', username='webapp', password='pwd123')

-Uri style connections are also supported as long as you include the database
-name - just supply the uri as the :attr:`host` to
+Uri style connections are also supported - just supply the uri as
+the :attr:`host` to
 :func:`~mongoengine.connect`::

    connect('project1', host='mongodb://localhost/database_name')

+Note that database name from uri has priority over name
+in ::func:`~mongoengine.connect`
+
 ReplicaSets
 ===========

--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -54,7 +54,7 @@ be saved ::

   There is one caveat on Dynamic Documents: fields cannot start with `_`

-Dynamic fields are stored in alphabetical order *after* any declared fields.
+Dynamic fields are stored in creation order *after* any declared fields.

 Fields
 ======
@@ -290,6 +290,12 @@ instance of the object to the query::
    # Find all pages that both Bob and John have authored
    Page.objects(authors__all=[bob, john])

+    # Remove Bob from the authors for a page.
+    Page.objects(id='...').update_one(pull__authors=bob)
+
+    # Add John to the authors for a page.
+    Page.objects(id='...').update_one(push__authors=john)
+

 Dealing with deletion of referred documents
 '''''''''''''''''''''''''''''''''''''''''''
@@ -442,6 +448,8 @@ The following example shows a :class:`Log` document that will be limited to
        ip_address = StringField()
        meta = {'max_documents': 1000, 'max_size': 2000000}

+.. defining-indexes_
+
 Indexes
 =======

@@ -450,8 +458,8 @@ by creating a list of index specifications called :attr:`indexes` in the
 :attr:`~mongoengine.Document.meta` dictionary, where an index specification may
 either be a single field name, a tuple containing multiple field names, or a
 dictionary containing a full index definition. A direction may be specified on
-fields by prefixing the field name with a **+** or a **-** sign. Note that
-direction only matters on multi-field indexes. ::
+fields by prefixing the field name with a **+** (for ascending) or a **-** sign
+(for descending). Note that direction only matters on multi-field indexes. ::

    class Page(Document):
        title = StringField()
@@ -485,6 +493,35 @@ If a dictionary is passed then the following options are available:

    Inheritance adds extra fields indices see: :ref:`document-inheritance`.

+Global index default options
+----------------------------
+
+There are a few top level defaults for all indexes that can be set::
+
+    class Page(Document):
+        title = StringField()
+        rating = StringField()
+        meta = {
+            'index_options': {},
+            'index_background': True,
+            'index_drop_dups': True,
+            'index_cls': False
+        }
+
+
+:attr:`index_options` (Optional)
+    Set any default index options - see the `full options list <http://docs.mongodb.org/manual/reference/method/db.collection.ensureIndex/#db.collection.ensureIndex>`_
+
+:attr:`index_background` (Optional)
+    Set the default value for if an index should be indexed in the background
+
+:attr:`index_drop_dups` (Optional)
+    Set the default value for if an index should drop duplicates
+
+:attr:`index_cls` (Optional)
+    A way to turn off a specific index for _cls.
+
+
 Compound Indexes and Indexing sub documents
 -------------------------------------------

@@ -558,6 +595,11 @@ documentation for more information.  A common usecase might be session data::
            ]
        }

+.. warning:: TTL indexes happen on the MongoDB server and not in the application
+    code, therefore no signals will be fired on document deletion.
+    If you need signals to be fired on deletion, then you must handle the
+    deletion of Documents in your application code.
+
 Comparing Indexes
 -----------------

@@ -653,7 +695,6 @@ document.::
 .. note:: From 0.8 onwards you must declare :attr:`allow_inheritance` defaults
          to False, meaning you must set it to True to use inheritance.

-
 Working with existing data
 --------------------------
 As MongoEngine no longer defaults to needing :attr:`_cls` you can quickly and
@@ -673,3 +714,25 @@ defining all possible field types.

 If you use :class:`~mongoengine.Document` and the database contains data that
 isn't defined then that data will be stored in the `document._data` dictionary.
+
+Abstract classes
+================
+
+If you want to add some extra functionality to a group of Document classes but
+you don't need or want the overhead of inheritance you can use the
+:attr:`abstract` attribute of :attr:`-mongoengine.Document.meta`.
+This won't turn on :ref:`document-inheritance` but will allow you to keep your
+code DRY::
+
+        class BaseDocument(Document):
+            meta = {
+                'abstract': True,
+            }
+            def check_permissions(self):
+                ...
+
+        class User(BaseDocument):
+           ...
+
+Now the User class will have access to the inherited `check_permissions` method
+and won't store any of the extra `_cls` information.
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -16,7 +16,9 @@ fetch documents from the database::
 .. note::

    As of MongoEngine 0.8 the querysets utilise a local cache.  So iterating
-    it multiple times will only cause a single query.
+    it multiple times will only cause a single query.  If this is not the
+    desired behavour you can call :class:`~mongoengine.QuerySet.no_cache`
+    (version **0.8.3+**) to return a non-caching queryset.

 Filtering queries
 =================
@@ -495,7 +497,6 @@ that you may use with these methods:
 * ``unset`` -- delete a particular value (since MongoDB v1.3+)
 * ``inc`` -- increment a value by a given amount
 * ``dec`` -- decrement a value by a given amount
-* ``pop`` -- remove the last item from a list
 * ``push`` -- append a value to a list
 * ``push_all`` -- append several values to a list
 * ``pop`` -- remove the first or last element of a list
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -2,12 +2,22 @@
 Upgrading
 #########

+
+0.8.2 to 0.8.3
+**************
+
+Minor change that may impact users:
+
+DynamicDocument fields are now stored in creation order after any declared
+fields.  Previously they were stored alphabetically.
+
+
 0.7 to 0.8
 **********

 There have been numerous backwards breaking changes in 0.8.  The reasons for
-these are ensure that MongoEngine has sane defaults going forward and
-performs the best it can out the box.  Where possible there have been
+these are to ensure that MongoEngine has sane defaults going forward and that it
+performs the best it can out of the box.  Where possible there have been
 FutureWarnings to help get you ready for the change, but that hasn't been
 possible for the whole of the release.

@@ -61,7 +71,7 @@ inherited classes like so: ::
 Document Definition
 -------------------

-The default for inheritance has changed - its now off by default and
+The default for inheritance has changed - it is now off by default and
 :attr:`_cls` will not be stored automatically with the class.  So if you extend
 your :class:`~mongoengine.Document` or :class:`~mongoengine.EmbeddedDocuments`
 you will need to declare :attr:`allow_inheritance` in the meta data like so: ::
@@ -71,7 +81,7 @@ you will need to declare :attr:`allow_inheritance` in the meta data like so: ::

        meta = {'allow_inheritance': True}

-Previously, if you had data the database that wasn't defined in the Document
+Previously, if you had data in the database that wasn't defined in the Document
 definition, it would set it as an attribute on the document.  This is no longer
 the case and the data is set only in the ``document._data`` dictionary: ::

@@ -92,8 +102,8 @@ the case and the data is set only in the ``document._data`` dictionary: ::
    AttributeError: 'Animal' object has no attribute 'size'

 The Document class has introduced a reserved function `clean()`, which will be
-called before saving the document. If your document class happen to have a method
-with the same name, please try rename it.
+called before saving the document. If your document class happens to have a method
+with the same name, please try to rename it.

    def clean(self):
        pass
@@ -101,7 +111,7 @@ with the same name, please try rename it.
 ReferenceField
 --------------

-ReferenceFields now store ObjectId's by default - this is more efficient than
+ReferenceFields now store ObjectIds by default - this is more efficient than
 DBRefs as we already know what Document types they reference::

    # Old code
@@ -147,7 +157,7 @@ UUIDFields now default to storing binary values::
    class Animal(Document):
        uuid = UUIDField(binary=False)

-To migrate all the uuid's you need to touch each object and mark it as dirty
+To migrate all the uuids you need to touch each object and mark it as dirty
 eg::

    # Doc definition
@@ -165,7 +175,7 @@ eg::
 DecimalField
 ------------

-DecimalField now store floats - previous it was storing strings and that
+DecimalFields now store floats - previously it was storing strings and that
 made it impossible to do comparisons when querying correctly.::

    # Old code
@@ -176,7 +186,7 @@ made it impossible to do comparisons when querying correctly.::
    class Person(Document):
        balance = DecimalField(force_string=True)

-To migrate all the uuid's you need to touch each object and mark it as dirty
+To migrate all the DecimalFields you need to touch each object and mark it as dirty
 eg::

    # Doc definition
@@ -188,7 +198,7 @@ eg::
        p._mark_as_changed('balance')
        p.save()

-.. note:: DecimalField's have also been improved with the addition of precision
+.. note:: DecimalFields have also been improved with the addition of precision
    and rounding.  See :class:`~mongoengine.fields.DecimalField` for more information.

 `An example test migration for DecimalFields is available on github
@@ -197,7 +207,7 @@ eg::
 Cascading Saves
 ---------------
 To improve performance document saves will no longer automatically cascade.
-Any changes to a Documents references will either have to be saved manually or
+Any changes to a Document's references will either have to be saved manually or
 you will have to explicitly tell it to cascade on save::

    # At the class level:
@@ -239,7 +249,7 @@ update your code like so: ::

    # Update example a) assign queryset after a change:
    mammals = Animal.objects(type="mammal")
-    carnivores = mammals.filter(order="Carnivora") # Reassign the new queryset so fitler can be applied
+    carnivores = mammals.filter(order="Carnivora") # Reassign the new queryset so filter can be applied
    [m for m in carnivores]                        # This will return all carnivores

    # Update example b) chain the queryset:
@@ -266,7 +276,7 @@ queryset you should upgrade to use count::
 .only() now inline with .exclude()
 ----------------------------------

-The behaviour of `.only()` was highly ambious, now it works in the mirror fashion
+The behaviour of `.only()` was highly ambiguous, now it works in mirror fashion
 to `.exclude()`.  Chaining `.only()` calls will increase the fields required::

    # Old code
@@ -430,7 +440,7 @@ main areas of changed are: choices in fields, map_reduce and collection names.
 Choice options:
 ===============

-Are now expected to be an iterable of tuples, with  the first element in each
+Are now expected to be an iterable of tuples, with the first element in each
 tuple being the actual value to be stored. The second element is the
 human-readable name for the option.

@@ -452,8 +462,8 @@ such the following have been changed:
 Default collection naming
 =========================

-Previously it was just lowercase, its now much more pythonic and readable as
-its lowercase and underscores, previously ::
+Previously it was just lowercase, it's now much more pythonic and readable as
+it's lowercase and underscores, previously ::

    class MyAceDocument(Document):
        pass
@@ -520,5 +530,5 @@ Alternatively, you can rename your collections eg ::
 mongodb 1.8 > 2.0 +
 ===================

-Its been reported that indexes may need to be recreated to the newer version of indexes.
+It's been reported that indexes may need to be recreated to the newer version of indexes.
 To do this drop indexes and call ``ensure_indexes`` on each model.
--- a/mongoengine/init.py
+++ b/mongoengine/init.py
@@ -15,7 +15,7 @@ import django
 __all__ = (list(document.__all__) + fields.__all__ + connection.__all__ +
           list(queryset.__all__) + signals.__all__ + list(errors.__all__))

-VERSION = (0, 8, 2)
+VERSION = (0, 8, 5)


 def get_version():
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -108,6 +108,14 @@ class BaseList(list):
        self._mark_as_changed()
        return super(BaseList, self).__delitem__(*args, **kwargs)

+    def __setslice__(self, *args, **kwargs):
+        self._mark_as_changed()
+        return super(BaseList, self).__setslice__(*args, **kwargs)
+
+    def __delslice__(self, *args, **kwargs):
+        self._mark_as_changed()
+        return super(BaseList, self).__delslice__(*args, **kwargs)
+
    def __getstate__(self):
        self.instance = None
        self._dereferenced = False
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -1,10 +1,11 @@
 import copy
 import operator
 import numbers
+from collections import Hashable
 from functools import partial

 import pymongo
-from bson import json_util
+from bson import json_util, ObjectId
 from bson.dbref import DBRef
 from bson.son import SON

@@ -42,6 +43,9 @@ class BaseDocument(object):
            # Combine positional arguments with named arguments.
            # We only want named arguments.
            field = iter(self._fields_ordered)
+            # If its an automatic id field then skip to the first defined field
+            if self._auto_id_field:
+                next(field)
            for value in args:
                name = next(field)
                if name in values:
@@ -51,6 +55,7 @@ class BaseDocument(object):
        signals.pre_init.send(self.__class__, document=self, values=values)

        self._data = {}
+        self._dynamic_fields = SON()

        # Assign default values to instance
        for key, field in self._fields.iteritems():
@@ -61,7 +66,6 @@ class BaseDocument(object):

        # Set passed values after initialisation
        if self._dynamic:
-            self._dynamic_fields = {}
            dynamic_data = {}
            for key, value in values.iteritems():
                if key in self._fields or key == '_id':
@@ -116,6 +120,7 @@ class BaseDocument(object):
                field = DynamicField(db_field=name)
                field.name = name
                self._dynamic_fields[name] = field
+                self._fields_ordered += (name,)

            if not name.startswith('_'):
                value = self.__expand_dynamic_values(name, value)
@@ -142,7 +147,8 @@ class BaseDocument(object):

    def __getstate__(self):
        data = {}
-        for k in ('_changed_fields', '_initialised', '_created'):
+        for k in ('_changed_fields', '_initialised', '_created',
+                  '_dynamic_fields', '_fields_ordered'):
            if hasattr(self, k):
                data[k] = getattr(self, k)
        data['_data'] = self.to_mongo()
@@ -151,21 +157,22 @@ class BaseDocument(object):
    def __setstate__(self, data):
        if isinstance(data["_data"], SON):
            data["_data"] = self.__class__._from_son(data["_data"])._data
-        for k in ('_changed_fields', '_initialised', '_created', '_data'):
+        for k in ('_changed_fields', '_initialised', '_created', '_data',
+                  '_fields_ordered', '_dynamic_fields'):
            if k in data:
                setattr(self, k, data[k])
+        dynamic_fields = data.get('_dynamic_fields') or SON()
+        for k in dynamic_fields.keys():
+            setattr(self, k, data["_data"].get(k))

    def __iter__(self):
-        if 'id' in self._fields and 'id' not in self._fields_ordered:
-            return iter(('id', ) + self._fields_ordered)
-
        return iter(self._fields_ordered)

    def __getitem__(self, name):
        """Dictionary-style field access, return a field's value if present.
        """
        try:
-            if name in self._fields:
+            if name in self._fields_ordered:
                return getattr(self, name)
        except AttributeError:
            pass
@@ -241,6 +248,8 @@ class BaseDocument(object):
        for field_name in self:
            value = self._data.get(field_name, None)
            field = self._fields.get(field_name)
+            if field is None and self._dynamic:
+                field = self._dynamic_fields.get(field_name)

            if value is not None:
                value = field.to_mongo(value)
@@ -254,8 +263,10 @@ class BaseDocument(object):
                data[field.db_field] = value

        # If "_id" has not been set, then try and set it
-        if data["_id"] is None:
-            data["_id"] = self._data.get("id", None)
+        Document = _import_class("Document")
+        if isinstance(self, Document):
+            if data["_id"] is None:
+                data["_id"] = self._data.get("id", None)

        if data['_id'] is None:
            data.pop('_id')
@@ -265,15 +276,6 @@ class BaseDocument(object):
           not self._meta.get('allow_inheritance', ALLOW_INHERITANCE)):
            data.pop('_cls')

-        if not self._dynamic:
-            return data
-
-        # Sort dynamic fields by key
-        dynamic_fields = sorted(self._dynamic_fields.iteritems(),
-                                key=operator.itemgetter(0))
-        for name, field in dynamic_fields:
-            data[name] = field.to_mongo(self._data.get(name, None))
-
        return data

    def validate(self, clean=True):
@@ -289,11 +291,8 @@ class BaseDocument(object):
                errors[NON_FIELD_ERRORS] = error

        # Get a list of tuples of field names and their current values
-        fields = [(field, self._data.get(name))
-                  for name, field in self._fields.items()]
-        if self._dynamic:
-            fields += [(field, self._data.get(name))
-                       for name, field in self._dynamic_fields.items()]
+        fields = [(self._fields.get(name, self._dynamic_fields.get(name)),
+                   self._data.get(name)) for name in self._fields_ordered]

        EmbeddedDocumentField = _import_class("EmbeddedDocumentField")
        GenericEmbeddedDocumentField = _import_class("GenericEmbeddedDocumentField")
@@ -323,9 +322,9 @@ class BaseDocument(object):
            message = "ValidationError (%s:%s) " % (self._class_name, pk)
            raise ValidationError(message, errors=errors)

-    def to_json(self):
+    def to_json(self, *args, **kwargs):
        """Converts a document to JSON"""
-        return json_util.dumps(self.to_mongo())
+        return json_util.dumps(self.to_mongo(),  *args, **kwargs)

    @classmethod
    def from_json(cls, json_data):
@@ -377,70 +376,80 @@ class BaseDocument(object):
            self._changed_fields.append(key)

    def _clear_changed_fields(self):
+        """Using get_changed_fields iterate and remove any fields that are
+        marked as changed"""
+        for changed in self._get_changed_fields():
+            parts = changed.split(".")
+            data = self
+            for part in parts:
+                if isinstance(data, list):
+                    try:
+                        data = data[int(part)]
+                    except IndexError:
+                        data = None
+                elif isinstance(data, dict):
+                    data = data.get(part, None)
+                else:
+                    data = getattr(data, part, None)
+                if hasattr(data, "_changed_fields"):
+                    data._changed_fields = []
        self._changed_fields = []
-        EmbeddedDocumentField = _import_class("EmbeddedDocumentField")
-        for field_name, field in self._fields.iteritems():
-            if (isinstance(field, ComplexBaseField) and
-               isinstance(field.field, EmbeddedDocumentField)):
-                field_value = getattr(self, field_name, None)
-                if field_value:
-                    for idx in (field_value if isinstance(field_value, dict)
-                                else xrange(len(field_value))):
-                        field_value[idx]._clear_changed_fields()
-            elif isinstance(field, EmbeddedDocumentField):
-                field_value = getattr(self, field_name, None)
-                if field_value:
-                    field_value._clear_changed_fields()
+
+    def _nestable_types_changed_fields(self, changed_fields, key, data, inspected):
+        # Loop list / dict fields as they contain documents
+        # Determine the iterator to use
+        if not hasattr(data, 'items'):
+            iterator = enumerate(data)
+        else:
+            iterator = data.iteritems()
+
+        for index, value in iterator:
+            list_key = "%s%s." % (key, index)
+            if hasattr(value, '_get_changed_fields'):
+                changed = value._get_changed_fields(inspected)
+                changed_fields += ["%s%s" % (list_key, k)
+                                    for k in changed if k]
+            elif isinstance(value, (list, tuple, dict)):
+                self._nestable_types_changed_fields(changed_fields, list_key, value, inspected)

    def _get_changed_fields(self, inspected=None):
        """Returns a list of all fields that have explicitly been changed.
        """
        EmbeddedDocument = _import_class("EmbeddedDocument")
        DynamicEmbeddedDocument = _import_class("DynamicEmbeddedDocument")
-        _changed_fields = []
-        _changed_fields += getattr(self, '_changed_fields', [])
-
+        ReferenceField = _import_class("ReferenceField")
+        changed_fields = []
+        changed_fields += getattr(self, '_changed_fields', [])
        inspected = inspected or set()
-        if hasattr(self, 'id'):
+        if hasattr(self, 'id') and isinstance(self.id, Hashable):
            if self.id in inspected:
-                return _changed_fields
+                return changed_fields
            inspected.add(self.id)

-        field_list = self._fields.copy()
-        if self._dynamic:
-            field_list.update(self._dynamic_fields)
-
-        for field_name in field_list:
-
+        for field_name in self._fields_ordered:
            db_field_name = self._db_field_map.get(field_name, field_name)
            key = '%s.' % db_field_name
-            field = self._data.get(field_name, None)
-            if hasattr(field, 'id'):
-                if field.id in inspected:
-                    continue
-                inspected.add(field.id)
+            data = self._data.get(field_name, None)
+            field = self._fields.get(field_name)

-            if (isinstance(field, (EmbeddedDocument, DynamicEmbeddedDocument))
-               and db_field_name not in _changed_fields):
+            if hasattr(data, 'id'):
+                if data.id in inspected:
+                    continue
+                inspected.add(data.id)
+            if isinstance(field, ReferenceField):
+                continue
+            elif (isinstance(data, (EmbeddedDocument, DynamicEmbeddedDocument))
+               and db_field_name not in changed_fields):
                 # Find all embedded fields that have been changed
-                changed = field._get_changed_fields(inspected)
-                _changed_fields += ["%s%s" % (key, k) for k in changed if k]
-            elif (isinstance(field, (list, tuple, dict)) and
-                    db_field_name not in _changed_fields):
-                # Loop list / dict fields as they contain documents
-                # Determine the iterator to use
-                if not hasattr(field, 'items'):
-                    iterator = enumerate(field)
-                else:
-                    iterator = field.iteritems()
-                for index, value in iterator:
-                    if not hasattr(value, '_get_changed_fields'):
-                        continue
-                    list_key = "%s%s." % (key, index)
-                    changed = value._get_changed_fields(inspected)
-                    _changed_fields += ["%s%s" % (list_key, k)
-                                        for k in changed if k]
-        return _changed_fields
+                changed = data._get_changed_fields(inspected)
+                changed_fields += ["%s%s" % (key, k) for k in changed if k]
+            elif (isinstance(data, (list, tuple, dict)) and
+                    db_field_name not in changed_fields):
+                if (hasattr(field, 'field') and
+                    isinstance(field.field, ReferenceField)):
+                    continue
+                self._nestable_types_changed_fields(changed_fields, key, data, inspected)
+        return changed_fields

    def _delta(self):
        """Returns the delta (set, unset) of the changes for a document.
@@ -450,7 +459,6 @@ class BaseDocument(object):
        doc = self.to_mongo()

        set_fields = self._get_changed_fields()
-        set_data = {}
        unset_data = {}
        parts = []
        if hasattr(self, '_changed_fields'):
@@ -461,7 +469,7 @@ class BaseDocument(object):
                d = doc
                new_path = []
                for p in parts:
-                    if isinstance(d, DBRef):
+                    if isinstance(d, (ObjectId, DBRef)):
                        break
                    elif isinstance(d, list) and p.isdigit():
                        d = d[int(p)]
@@ -630,8 +638,10 @@ class BaseDocument(object):
        # Check to see if we need to include _cls
        allow_inheritance = cls._meta.get('allow_inheritance',
                                          ALLOW_INHERITANCE)
-        include_cls = allow_inheritance and not spec.get('sparse', False)
-
+        include_cls = (allow_inheritance and not spec.get('sparse', False) and
+                       spec.get('cls',  True))
+        if "cls" in spec:
+            spec.pop('cls')
        for key in spec['fields']:
            # If inherited spec continue
            if isinstance(key, (list, tuple)):
@@ -754,6 +764,9 @@ class BaseDocument(object):
        """Lookup a field based on its attribute and return a list containing
        the field's parents and the field.
        """
+
+        ListField = _import_class("ListField")
+
        if not isinstance(parts, (list, tuple)):
            parts = [parts]
        fields = []
@@ -761,7 +774,7 @@ class BaseDocument(object):

        for field_name in parts:
            # Handle ListField indexing:
-            if field_name.isdigit():
+            if field_name.isdigit() and isinstance(field, ListField):
                new_field = field.field
                fields.append(field_name)
                continue
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -89,12 +89,7 @@ class BaseField(object):
            return self

        # Get value from document instance if available
-        value = instance._data.get(self.name)
-
-        EmbeddedDocument = _import_class('EmbeddedDocument')
-        if isinstance(value, EmbeddedDocument) and value._instance is None:
-            value._instance = weakref.proxy(instance)
-        return value
+        return instance._data.get(self.name)

    def __set__(self, instance, value):
        """Descriptor for assigning a value to a field in a document.
@@ -116,6 +111,10 @@ class BaseField(object):
                # Values cant be compared eg: naive and tz datetimes
                # So mark it as changed
                instance._mark_as_changed(self.name)
+
+        EmbeddedDocument = _import_class('EmbeddedDocument')
+        if isinstance(value, EmbeddedDocument) and value._instance is None:
+            value._instance = weakref.proxy(instance)
        instance._data[self.name] = value

    def error(self, message="", errors=None, field_name=None):
@@ -186,7 +185,6 @@ class ComplexBaseField(BaseField):
    """

    field = None
-    __dereference = False

    def __get__(self, instance, owner):
        """Descriptor to automatically dereference references.
@@ -201,9 +199,11 @@ class ComplexBaseField(BaseField):
                       (self.field is None or isinstance(self.field,
                        (GenericReferenceField, ReferenceField))))

+        _dereference = _import_class("DeReference")()
+
        self._auto_dereference = instance._fields[self.name]._auto_dereference
-        if not self.__dereference and instance._initialised and dereference:
-            instance._data[self.name] = self._dereference(
+        if instance._initialised and dereference and instance._data.get(self.name):
+            instance._data[self.name] = _dereference(
                instance._data.get(self.name), max_depth=1, instance=instance,
                name=self.name
            )
@@ -222,7 +222,7 @@ class ComplexBaseField(BaseField):
        if (self._auto_dereference and instance._initialised and
           isinstance(value, (BaseList, BaseDict))
           and not value._dereferenced):
-            value = self._dereference(
+            value = _dereference(
                value, max_depth=1, instance=instance, name=self.name
            )
            value._dereferenced = True
@@ -382,13 +382,6 @@ class ComplexBaseField(BaseField):

    owner_document = property(_get_owner_document, _set_owner_document)

-    @property
-    def _dereference(self,):
-        if not self.__dereference:
-            DeReference = _import_class("DeReference")
-            self.__dereference = DeReference()  # Cached
-        return self.__dereference
-

 class ObjectIdField(BaseField):
    """A field wrapper around MongoDB's ObjectIds.
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -91,11 +91,12 @@ class DocumentMetaclass(type):
        attrs['_fields'] = doc_fields
        attrs['_db_field_map'] = dict([(k, getattr(v, 'db_field', k))
                                      for k, v in doc_fields.iteritems()])
+        attrs['_reverse_db_field_map'] = dict(
+            (v, k) for k, v in attrs['_db_field_map'].iteritems())
+
        attrs['_fields_ordered'] = tuple(i[1] for i in sorted(
                                         (v.creation_counter, v.name)
                                         for v in doc_fields.itervalues()))
-        attrs['_reverse_db_field_map'] = dict(
-            (v, k) for k, v in attrs['_db_field_map'].iteritems())

        #
        # Set document hierarchy
@@ -358,12 +359,18 @@ class TopLevelDocumentMetaclass(DocumentMetaclass):
                    new_class.id = field

        # Set primary key if not defined by the document
+        new_class._auto_id_field = False
        if not new_class._meta.get('id_field'):
+            new_class._auto_id_field = True
            new_class._meta['id_field'] = 'id'
            new_class._fields['id'] = ObjectIdField(db_field='_id')
            new_class._fields['id'].name = 'id'
            new_class.id = new_class._fields['id']

+        # Prepend id field to _fields_ordered
+        if 'id' in new_class._fields and 'id' not in new_class._fields_ordered:
+            new_class._fields_ordered = ('id', ) + new_class._fields_ordered
+
        # Merge in exceptions with parent hierarchy
        exceptions_to_merge = (DoesNotExist, MultipleObjectsReturned)
        module = attrs.get('__module__')
--- a/mongoengine/common.py
+++ b/mongoengine/common.py
@@ -23,8 +23,9 @@ def _import_class(cls_name):
    field_classes = ('DictField', 'DynamicField', 'EmbeddedDocumentField',
                     'FileField', 'GenericReferenceField',
                     'GenericEmbeddedDocumentField', 'GeoPointField',
-                     'PointField', 'LineStringField', 'PolygonField',
-                     'ReferenceField', 'StringField', 'ComplexBaseField')
+                     'PointField', 'LineStringField', 'ListField',
+                     'PolygonField', 'ReferenceField', 'StringField',
+                     'ComplexBaseField', 'GeoJsonBaseField')
    queryset_classes = ('OperationError',)
    deref_classes = ('DeReference',)

--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -18,7 +18,7 @@ _connections = {}
 _dbs = {}


-def register_connection(alias, name, host='localhost', port=27017,
+def register_connection(alias, name, host=None, port=None,
                        is_slave=False, read_preference=False, slaves=None,
                        username=None, password=None, **kwargs):
    """Add a connection.
@@ -43,8 +43,8 @@ def register_connection(alias, name, host='localhost', port=27017,

    conn_settings = {
        'name': name,
-        'host': host,
-        'port': port,
+        'host': host or 'localhost',
+        'port': port or 27017,
        'is_slave': is_slave,
        'slaves': slaves or [],
        'username': username,
@@ -53,19 +53,15 @@ def register_connection(alias, name, host='localhost', port=27017,
    }

    # Handle uri style connections
-    if "://" in host:
-        uri_dict = uri_parser.parse_uri(host)
-        if uri_dict.get('database') is None:
-            raise ConnectionError("If using URI style connection include "\
-                                  "database name in string")
+    if "://" in conn_settings['host']:
+        uri_dict = uri_parser.parse_uri(conn_settings['host'])
        conn_settings.update({
-            'host': host,
-            'name': uri_dict.get('database'),
+            'name': uri_dict.get('database') or name,
            'username': uri_dict.get('username'),
            'password': uri_dict.get('password'),
            'read_preference': read_preference,
        })
-        if "replicaSet" in host:
+        if "replicaSet" in conn_settings['host']:
            conn_settings['replicaSet'] = True

    conn_settings.update(kwargs)
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -4,7 +4,7 @@ from base import (BaseDict, BaseList, TopLevelDocumentMetaclass, get_document)
 from fields import (ReferenceField, ListField, DictField, MapField)
 from connection import get_db
 from queryset import QuerySet
-from document import Document
+from document import Document, EmbeddedDocument


 class DeReference(object):
@@ -33,7 +33,8 @@ class DeReference(object):
        self.max_depth = max_depth
        doc_type = None

-        if instance and isinstance(instance, (Document, TopLevelDocumentMetaclass)):
+        if instance and isinstance(instance, (Document, EmbeddedDocument,
+                                              TopLevelDocumentMetaclass)):
            doc_type = instance._fields.get(name)
            if hasattr(doc_type, 'field'):
                doc_type = doc_type.field
--- a/mongoengine/django/auth.py
+++ b/mongoengine/django/auth.py
@@ -8,6 +8,11 @@ from django.contrib import auth
 from django.contrib.auth.models import AnonymousUser
 from django.utils.translation import ugettext_lazy as _

+from .utils import datetime_now
+from .mongo_auth import get_user_document
+
+REDIRECT_FIELD_NAME = 'next'
+
 try:
    from django.contrib.auth.hashers import check_password, make_password
 except ImportError:
@@ -33,10 +38,6 @@ except ImportError:
        hash = get_hexdigest(algo, salt, raw_password)
        return '%s$%s$%s' % (algo, salt, hash)

-from .utils import datetime_now
-
-REDIRECT_FIELD_NAME = 'next'
-

 class ContentType(Document):
    name = StringField(max_length=100)
@@ -230,6 +231,9 @@ class User(Document):
    date_joined = DateTimeField(default=datetime_now,
                                verbose_name=_('date joined'))

+    user_permissions = ListField(ReferenceField(Permission), verbose_name=_('user permissions'),
+                                                help_text=_('Permissions for the user.'))
+
    USERNAME_FIELD = 'username'
    REQUIRED_FIELDS = ['email']

@@ -380,7 +384,7 @@ class MongoEngineBackend(object):
    supports_inactive_user = False

    def authenticate(self, username=None, password=None):
-        user = User.objects(username=username).first()
+        user = get_user_document().objects(username=username).first()
        if user:
            if password and user.check_password(password):
                backend = auth.get_backends()[0]
@@ -389,7 +393,7 @@ class MongoEngineBackend(object):
        return None

    def get_user(self, user_id):
-        return User.objects.with_id(user_id)
+        return get_user_document().objects.with_id(user_id)


 def get_user(userid):
--- a/mongoengine/django/mongo_auth/models.py
+++ b/mongoengine/django/mongo_auth/models.py
@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.contrib.auth.hashers import make_password
 from django.contrib.auth.models import UserManager
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
@@ -6,10 +7,29 @@ from django.utils.importlib import import_module
 from django.utils.translation import ugettext_lazy as _


+__all__ = (
+    'get_user_document',
+)
+
+
 MONGOENGINE_USER_DOCUMENT = getattr(
    settings, 'MONGOENGINE_USER_DOCUMENT', 'mongoengine.django.auth.User')


+def get_user_document():
+    """Get the user document class used for authentication.
+
+    This is the class defined in settings.MONGOENGINE_USER_DOCUMENT, which
+    defaults to `mongoengine.django.auth.User`.
+
+    """
+
+    name = MONGOENGINE_USER_DOCUMENT
+    dot = name.rindex('.')
+    module = import_module(name[:dot])
+    return getattr(module, name[dot + 1:])
+
+
 class MongoUserManager(UserManager):
    """A User manager wich allows the use of MongoEngine documents in Django.

@@ -44,7 +64,7 @@ class MongoUserManager(UserManager):
    def contribute_to_class(self, model, name):
        super(MongoUserManager, self).contribute_to_class(model, name)
        self.dj_model = self.model
-        self.model = self._get_user_document()
+        self.model = get_user_document()

        self.dj_model.USERNAME_FIELD = self.model.USERNAME_FIELD
        username = models.CharField(_('username'), max_length=30, unique=True)
@@ -55,16 +75,6 @@ class MongoUserManager(UserManager):
            field = models.CharField(_(name), max_length=30)
            field.contribute_to_class(self.dj_model, name)

-    def _get_user_document(self):
-        try:
-            name = MONGOENGINE_USER_DOCUMENT
-            dot = name.rindex('.')
-            module = import_module(name[:dot])
-            return getattr(module, name[dot + 1:])
-        except ImportError:
-            raise ImproperlyConfigured("Error importing %s, please check "
-                                       "settings.MONGOENGINE_USER_DOCUMENT"
-                                       % name)

    def get(self, *args, **kwargs):
        try:
@@ -85,5 +95,21 @@ class MongoUserManager(UserManager):


 class MongoUser(models.Model):
+    """"Dummy user model for Django.
+
+    MongoUser is used to replace Django's UserManager with MongoUserManager.
+    The actual user document class is mongoengine.django.auth.User or any
+    other document class specified in MONGOENGINE_USER_DOCUMENT.
+
+    To get the user document class, use `get_user_document()`.
+
+    """
+
    objects = MongoUserManager()

+    class Meta:
+        app_label = 'mongo_auth'
+
+    def set_password(self, password):
+        """Doesn't do anything, but works around the issue with Django 1.6."""
+        make_password(password)
--- a/mongoengine/django/sessions.py
+++ b/mongoengine/django/sessions.py
@@ -1,7 +1,11 @@
+from bson import json_util
 from django.conf import settings
 from django.contrib.sessions.backends.base import SessionBase, CreateError
 from django.core.exceptions import SuspiciousOperation
-from django.utils.encoding import force_unicode
+try:
+    from django.utils.encoding import force_unicode
+except ImportError:
+    from django.utils.encoding import force_text as force_unicode

 from mongoengine.document import Document
 from mongoengine import fields
@@ -52,6 +56,12 @@ class SessionStore(SessionBase):
    """A MongoEngine-based session store for Django.
    """

+    def _get_session(self, *args, **kwargs):
+        sess = super(SessionStore, self)._get_session(*args, **kwargs)
+        if sess.get('_auth_user_id', None):
+            sess['_auth_user_id'] = str(sess.get('_auth_user_id'))
+        return sess
+
    def load(self):
        try:
            s = MongoSession.objects(session_key=self.session_key,
@@ -100,3 +110,15 @@ class SessionStore(SessionBase):
                return
            session_key = self.session_key
        MongoSession.objects(session_key=session_key).delete()
+
+
+class BSONSerializer(object):
+    """
+    Serializer that can handle BSON types (eg ObjectId).
+    """
+    def dumps(self, obj):
+        return json_util.dumps(obj, separators=(',', ':')).encode('ascii')
+
+    def loads(self, data):
+        return json_util.loads(data.decode('ascii'))
+
--- a/mongoengine/django/storage.py
+++ b/mongoengine/django/storage.py
@@ -76,7 +76,7 @@ class GridFSStorage(Storage):
        """Find the documents in the store with the given name
        """
        docs = self.document.objects
-        doc = [d for d in docs if getattr(d, self.field).name == name]
+        doc = [d for d in docs if hasattr(getattr(d, self.field), 'name') and getattr(d, self.field).name == name]
        if doc:
            return doc[0]
        else:
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -66,7 +66,7 @@ class EmbeddedDocument(BaseDocument):

    def __eq__(self, other):
        if isinstance(other, self.__class__):
-            return self._data == other._data
+            return self.to_mongo() == other.to_mongo()
        return False

    def __ne__(self, other):
@@ -266,7 +266,6 @@ class Document(BaseDocument):
                                                   upsert=True, **write_concern)
                    created = is_new_object(last_error)

-
            if cascade is None:
                cascade = self._meta.get('cascade', False) or cascade_kwargs is not None

@@ -353,7 +352,13 @@ class Document(BaseDocument):
        been saved.
        """
        if not self.pk:
-            raise OperationError('attempt to update a document not yet saved')
+            if kwargs.get('upsert', False):
+                query = self.to_mongo()
+                if "_cls" in query:
+                    del(query["_cls"])
+                return self._qs.filter(**query).update_one(**kwargs)
+            else:
+                raise OperationError('attempt to update a document not yet saved')

        # Need to add shard key to query, or you get an error
        return self._qs.filter(**self._object_key).update_one(**kwargs)
@@ -395,7 +400,7 @@ class Document(BaseDocument):
        """
        with switch_db(self.__class__, db_alias) as cls:
            collection = cls._get_collection()
-            db = cls._get_db
+            db = cls._get_db()
        self._get_collection = lambda: collection
        self._get_db = lambda: db
        self._collection = collection
@@ -435,8 +440,8 @@ class Document(BaseDocument):

        .. versionadded:: 0.5
        """
-        import dereference
-        self._data = dereference.DeReference()(self._data, max_depth)
+        DeReference = _import_class('DeReference')
+        DeReference()([self], max_depth + 1)
        return self

    def reload(self, max_depth=1):
@@ -445,20 +450,16 @@ class Document(BaseDocument):
        .. versionadded:: 0.1.2
        .. versionchanged:: 0.6  Now chainable
        """
-        id_field = self._meta['id_field']
        obj = self._qs.read_preference(ReadPreference.PRIMARY).filter(
-                **{id_field: self[id_field]}).limit(1).select_related(max_depth=max_depth)
+                **self._object_key).limit(1).select_related(max_depth=max_depth)

        if obj:
            obj = obj[0]
        else:
            msg = "Reloaded document has been deleted"
            raise OperationError(msg)
-        for field in self._fields:
+        for field in self._fields_ordered:
            setattr(self, field, self._reload(field, obj[field]))
-        if self._dynamic:
-            for name in self._dynamic_fields.keys():
-                setattr(self, name, self._reload(name, obj._data[name]))
        self._changed_fields = obj._changed_fields
        self._created = False
        return obj
@@ -474,6 +475,7 @@ class Document(BaseDocument):
            value = [self._reload(key, v) for v in value]
            value = BaseList(value, self, key)
        elif isinstance(value, (EmbeddedDocument, DynamicEmbeddedDocument)):
+            value._instance = None
            value._changed_fields = []
        return value

@@ -534,6 +536,8 @@ class Document(BaseDocument):
    def ensure_indexes(cls):
        """Checks the document meta data and ensures all the indexes exist.

+        Global defaults can be set in the meta - see :doc:`guide/defining-documents`
+
        .. note:: You can disable automatic index creation by setting
                  `auto_create_index` to False in the documents meta data
        """
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -42,7 +42,8 @@ __all__ = ['StringField',  'URLField',  'EmailField',  'IntField',  'LongField',
           'GenericReferenceField',  'BinaryField',  'GridFSError',
           'GridFSProxy',  'FileField',  'ImageGridFsProxy',
           'ImproperlyConfigured',  'ImageField',  'GeoPointField', 'PointField',
-           'LineStringField', 'PolygonField', 'SequenceField',  'UUIDField']
+           'LineStringField', 'PolygonField', 'SequenceField',  'UUIDField',
+           'GeoJsonBaseField']


 RECURSIVE_REFERENCE_CONSTANT = 'self'
@@ -279,14 +280,14 @@ class DecimalField(BaseField):
        :param precision: Number of decimal places to store.
        :param rounding: The rounding rule from the python decimal libary:

-            - decimial.ROUND_CEILING (towards Infinity)
-            - decimial.ROUND_DOWN (towards zero)
-            - decimial.ROUND_FLOOR (towards -Infinity)
-            - decimial.ROUND_HALF_DOWN (to nearest with ties going towards zero)
-            - decimial.ROUND_HALF_EVEN (to nearest with ties going to nearest even integer)
-            - decimial.ROUND_HALF_UP (to nearest with ties going away from zero)
-            - decimial.ROUND_UP (away from zero)
-            - decimial.ROUND_05UP (away from zero if last digit after rounding towards zero would have been 0 or 5; otherwise towards zero)
+            - decimal.ROUND_CEILING (towards Infinity)
+            - decimal.ROUND_DOWN (towards zero)
+            - decimal.ROUND_FLOOR (towards -Infinity)
+            - decimal.ROUND_HALF_DOWN (to nearest with ties going towards zero)
+            - decimal.ROUND_HALF_EVEN (to nearest with ties going to nearest even integer)
+            - decimal.ROUND_HALF_UP (to nearest with ties going away from zero)
+            - decimal.ROUND_UP (away from zero)
+            - decimal.ROUND_05UP (away from zero if last digit after rounding towards zero would have been 0 or 5; otherwise towards zero)

            Defaults to: ``decimal.ROUND_HALF_UP``

@@ -304,7 +305,10 @@ class DecimalField(BaseField):
            return value

        # Convert to string for python 2.6 before casting to Decimal
-        value = decimal.Decimal("%s" % value)
+        try:
+            value = decimal.Decimal("%s" % value)
+        except decimal.InvalidOperation:
+            return value
        return value.quantize(self.precision, rounding=self.rounding)

    def to_mongo(self, value):
@@ -624,7 +628,9 @@ class DynamicField(BaseField):
            cls = value.__class__
            val = value.to_mongo()
            # If we its a document thats not inherited add _cls
-            if (isinstance(value, (Document, EmbeddedDocument))):
+            if (isinstance(value, Document)):
+                val = {"_ref": value.to_dbref(), "_cls": cls.__name__}
+            if (isinstance(value, EmbeddedDocument)):
                val['_cls'] = cls.__name__
            return val

@@ -645,6 +651,15 @@ class DynamicField(BaseField):
            value = [v for k, v in sorted(data.iteritems(), key=itemgetter(0))]
        return value

+    def to_python(self, value):
+        if isinstance(value, dict) and '_cls' in value:
+            doc_cls = get_document(value['_cls'])
+            if '_ref' in value:
+                value = doc_cls._get_db().dereference(value['_ref'])
+            return doc_cls._from_son(value)
+
+        return super(DynamicField, self).to_python(value)
+
    def lookup_member(self, member_name):
        return member_name

@@ -724,6 +739,21 @@ class SortedListField(ListField):
                          reverse=self._order_reverse)
        return sorted(value, reverse=self._order_reverse)

+def key_not_string(d):
+    """ Helper function to recursively determine if any key in a dictionary is
+    not a string.
+    """
+    for k, v in d.items():
+        if not isinstance(k, basestring) or (isinstance(v, dict) and key_not_string(v)):
+            return True
+
+def key_has_dot_or_dollar(d):
+    """ Helper function to recursively determine if any key in a dictionary
+    contains a dot or a dollar sign.
+    """
+    for k, v in d.items():
+        if ('.' in k or '$' in k) or (isinstance(v, dict) and key_has_dot_or_dollar(v)):
+            return True

 class DictField(ComplexBaseField):
    """A dictionary field that wraps a standard Python dictionary. This is
@@ -750,11 +780,11 @@ class DictField(ComplexBaseField):
        if not isinstance(value, dict):
            self.error('Only dictionaries may be used in a DictField')

-        if any(k for k in value.keys() if not isinstance(k, basestring)):
+        if key_not_string(value):
            msg = ("Invalid dictionary key - documents must "
                   "have only string keys")
            self.error(msg)
-        if any(('.' in k or '$' in k) for k in value.keys()):
+        if key_has_dot_or_dollar(value):
            self.error('Invalid dictionary key name - keys may not contain "."'
                       ' or "$" characters')
        super(DictField, self).validate(value)
@@ -769,6 +799,10 @@ class DictField(ComplexBaseField):

        if op in match_operators and isinstance(value, basestring):
            return StringField().prepare_query_value(op, value)
+
+        if hasattr(self.field, 'field'):
+            return self.field.prepare_query_value(op, value)
+
        return super(DictField, self).prepare_query_value(op, value)


@@ -989,7 +1023,10 @@ class GenericReferenceField(BaseField):
        id_ = id_field.to_mongo(id_)
        collection = document._get_collection_name()
        ref = DBRef(collection, id_)
-        return {'_cls': document._class_name, '_ref': ref}
+        return SON((
+            ('_cls', document._class_name),
+            ('_ref', ref)
+        ))

    def prepare_query_value(self, op, value):
        if value is None:
@@ -1083,6 +1120,10 @@ class GridFSProxy(object):
    def __repr__(self):
        return '<%s: %s>' % (self.__class__.__name__, self.grid_id)

+    def __str__(self):
+        name = getattr(self.get(), 'filename', self.grid_id) if self.get() else '(no file)'
+        return '<%s: %s>' % (self.__class__.__name__, name)
+
    def __eq__(self, other):
        if isinstance(other, GridFSProxy):
            return ((self.grid_id == other.grid_id) and
@@ -1190,9 +1231,7 @@ class FileField(BaseField):
        # Check if a file already exists for this model
        grid_file = instance._data.get(self.name)
        if not isinstance(grid_file, self.proxy_class):
-            grid_file = self.proxy_class(key=self.name, instance=instance,
-                                         db_alias=self.db_alias,
-                                         collection_name=self.collection_name)
+            grid_file = self.get_proxy_obj(key=self.name, instance=instance)
            instance._data[self.name] = grid_file

        if not grid_file.key:
@@ -1214,15 +1253,23 @@ class FileField(BaseField):
                    pass

            # Create a new proxy object as we don't already have one
-            instance._data[key] = self.proxy_class(key=key, instance=instance,
-                                                   db_alias=self.db_alias,
-                                                   collection_name=self.collection_name)
+            instance._data[key] = self.get_proxy_obj(key=key, instance=instance)
            instance._data[key].put(value)
        else:
            instance._data[key] = value

        instance._mark_as_changed(key)

+    def get_proxy_obj(self, key, instance, db_alias=None, collection_name=None):
+        if db_alias is None:
+            db_alias = self.db_alias
+        if collection_name is None:
+            collection_name = self.collection_name
+
+        return self.proxy_class(key=key, instance=instance,
+                                db_alias=db_alias,
+                                collection_name=collection_name)
+
    def to_mongo(self, value):
        # Store the GridFS file id in MongoDB
        if isinstance(value, self.proxy_class) and value.grid_id is not None:
@@ -1255,6 +1302,9 @@ class ImageGridFsProxy(GridFSProxy):
        applying field properties (size, thumbnail_size)
        """
        field = self.instance._fields[self.key]
+        # Handle nested fields
+        if hasattr(field, 'field') and isinstance(field.field, FileField):
+            field = field.field

        try:
            img = Image.open(file_obj)
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
--- a/mongoengine/queryset/field_list.py
+++ b/mongoengine/queryset/field_list.py
@@ -55,7 +55,8 @@ class QueryFieldList(object):

        if self.always_include:
            if self.value is self.ONLY and self.fields:
-                self.fields = self.fields.union(self.always_include)
+                if sorted(self.slice.keys()) != sorted(self.fields):
+                    self.fields = self.fields.union(self.always_include)
            else:
                self.fields -= self.always_include

--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -43,11 +43,11 @@ def query(_doc_cls=None, _field_operation=False, **query):
        parts = [part for part in parts if not part.isdigit()]
        # Check for an operator and transform to mongo-style if there is
        op = None
-        if parts[-1] in MATCH_OPERATORS:
+        if len(parts) > 1 and parts[-1] in MATCH_OPERATORS:
            op = parts.pop()

        negate = False
-        if parts[-1] == 'not':
+        if len(parts) > 1 and parts[-1] == 'not':
            parts.pop()
            negate = True

@@ -95,6 +95,7 @@ def query(_doc_cls=None, _field_operation=False, **query):
                value = _geo_operator(field, op, value)
            elif op in CUSTOM_OPERATORS:
                if op == 'match':
+                    value = field.prepare_query_value(op, value)
                    value = {"$elemMatch": value}
                else:
                    NotImplementedError("Custom method '%s' has not "
@@ -181,6 +182,7 @@ def update(_doc_cls=None, **update):
            parts = []

            cleaned_fields = []
+            appended_sub_field = False
            for field in fields:
                append_field = True
                if isinstance(field, basestring):
@@ -192,21 +194,34 @@ def update(_doc_cls=None, **update):
                else:
                    parts.append(field.db_field)
                if append_field:
+                    appended_sub_field = False
                    cleaned_fields.append(field)
+                    if hasattr(field, 'field'):
+                        cleaned_fields.append(field.field)
+                        appended_sub_field = True

            # Convert value to proper value
-            field = cleaned_fields[-1]
+            if appended_sub_field:
+                field = cleaned_fields[-2]
+            else:
+                field = cleaned_fields[-1]
+
+            GeoJsonBaseField = _import_class("GeoJsonBaseField")
+            if isinstance(field, GeoJsonBaseField):
+                value = field.to_mongo(value)

            if op in (None, 'set', 'push', 'pull'):
                if field.required or value is not None:
                    value = field.prepare_query_value(op, value)
            elif op in ('pushAll', 'pullAll'):
                value = [field.prepare_query_value(op, v) for v in value]
-            elif op == 'addToSet':
+            elif op in ('addToSet', 'setOnInsert'):
                if isinstance(value, (list, tuple, set)):
                    value = [field.prepare_query_value(op, v) for v in value]
                elif field.required or value is not None:
                    value = field.prepare_query_value(op, value)
+            elif op == "unset":
+                value = 1

        if match:
            match = '$' + match
@@ -220,11 +235,24 @@ def update(_doc_cls=None, **update):

        if 'pull' in op and '.' in key:
            # Dot operators don't work on pull operations
-            # it uses nested dict syntax
+            # unless they point to a list field
+            # Otherwise it uses nested dict syntax
            if op == 'pullAll':
                raise InvalidQueryError("pullAll operations only support "
                                        "a single field depth")

+            # Look for the last list field and use dot notation until there
+            field_classes = [c.__class__ for c in cleaned_fields]
+            field_classes.reverse()
+            ListField = _import_class('ListField')
+            if ListField in field_classes:
+                # Join all fields via dot notation to the last ListField
+                # Then process as normal
+                last_listField = len(cleaned_fields) - field_classes.index(ListField)
+                key = ".".join(parts[:last_listField])
+                parts = parts[last_listField:]
+                parts.insert(0, key)
+
            parts.reverse()
            for key in parts:
                value = {key: value}
--- a/python-mongoengine.spec
+++ b/python-mongoengine.spec
@@ -5,7 +5,7 @@
 %define srcname mongoengine

 Name:           python-%{srcname}
-Version:        0.8.2
+Version:        0.8.5
 Release:        1%{?dist}
 Summary:        A Python Document-Object Mapper for working with MongoDB

--- a/setup.py
+++ b/setup.py
@@ -48,17 +48,15 @@ CLASSIFIERS = [
    'Topic :: Software Development :: Libraries :: Python Modules',
 ]

-extra_opts = {}
+extra_opts = {"packages": find_packages(exclude=["tests", "tests.*"])}
 if sys.version_info[0] == 3:
    extra_opts['use_2to3'] = True
-    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'jinja2==2.6']
-    extra_opts['packages'] = find_packages(exclude=('tests',))
+    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'jinja2==2.6', 'django>=1.5.1']
    if "test" in sys.argv or "nosetests" in sys.argv:
-        extra_opts['packages'].append("tests")
+        extra_opts['packages'] = find_packages()
        extra_opts['package_data'] = {"tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]}
 else:
-    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'django>=1.4.2', 'PIL', 'jinja2==2.6', 'python-dateutil']
-    extra_opts['packages'] = find_packages(exclude=('tests',))
+    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'django>=1.4.2', 'PIL', 'jinja2>=2.6', 'python-dateutil']

 setup(name='mongoengine',
      version=VERSION,
--- a/tests/document/delta.py
+++ b/tests/document/delta.py
@@ -3,6 +3,7 @@ import sys
 sys.path[0:0] = [""]
 import unittest

+from bson import SON
 from mongoengine import *
 from mongoengine.connection import get_db

@@ -312,29 +313,24 @@ class DeltaTest(unittest.TestCase):
        self.circular_reference_deltas_2(DynamicDocument, Document)
        self.circular_reference_deltas_2(DynamicDocument, DynamicDocument)

-    def circular_reference_deltas_2(self, DocClass1, DocClass2):
+    def circular_reference_deltas_2(self, DocClass1, DocClass2, dbref=True):

        class Person(DocClass1):
            name = StringField()
-            owns = ListField(ReferenceField('Organization'))
-            employer = ReferenceField('Organization')
+            owns = ListField(ReferenceField('Organization', dbref=dbref))
+            employer = ReferenceField('Organization', dbref=dbref)

        class Organization(DocClass2):
            name = StringField()
-            owner = ReferenceField('Person')
-            employees = ListField(ReferenceField('Person'))
+            owner = ReferenceField('Person', dbref=dbref)
+            employees = ListField(ReferenceField('Person', dbref=dbref))

        Person.drop_collection()
        Organization.drop_collection()

-        person = Person(name="owner")
-        person.save()
-
-        employee = Person(name="employee")
-        employee.save()
-
-        organization = Organization(name="company")
-        organization.save()
+        person = Person(name="owner").save()
+        employee = Person(name="employee").save()
+        organization = Organization(name="company").save()

        person.owns.append(organization)
        organization.owner = person
@@ -354,6 +350,8 @@ class DeltaTest(unittest.TestCase):
        self.assertEqual(o.owner, p)
        self.assertEqual(e.employer, o)

+        return person, organization, employee
+
    def test_delta_db_field(self):
        self.delta_db_field(Document)
        self.delta_db_field(DynamicDocument)
@@ -613,13 +611,13 @@ class DeltaTest(unittest.TestCase):
        Person.drop_collection()

        p = Person(name="James", age=34)
-        self.assertEqual(p._delta(), ({'age': 34, 'name': 'James',
-                                       '_cls': 'Person'}, {}))
+        self.assertEqual(p._delta(), (
+            SON([('_cls', 'Person'), ('name', 'James'), ('age', 34)]), {}))

        p.doc = 123
        del(p.doc)
-        self.assertEqual(p._delta(), ({'age': 34, 'name': 'James',
-                                       '_cls': 'Person'}, {'doc': 1}))
+        self.assertEqual(p._delta(), (
+            SON([('_cls', 'Person'), ('name', 'James'), ('age', 34)]), {}))

        p = Person()
        p.name = "Dean"
@@ -631,14 +629,14 @@ class DeltaTest(unittest.TestCase):
        self.assertEqual(p._get_changed_fields(), ['age'])
        self.assertEqual(p._delta(), ({'age': 24}, {}))

-        p = self.Person.objects(age=22).get()
+        p = Person.objects(age=22).get()
        p.age = 24
        self.assertEqual(p.age, 24)
        self.assertEqual(p._get_changed_fields(), ['age'])
        self.assertEqual(p._delta(), ({'age': 24}, {}))

        p.save()
-        self.assertEqual(1, self.Person.objects(age=24).count())
+        self.assertEqual(1, Person.objects(age=24).count())

    def test_dynamic_delta(self):

@@ -685,6 +683,57 @@ class DeltaTest(unittest.TestCase):
        self.assertEqual(doc._get_changed_fields(), ['list_field'])
        self.assertEqual(doc._delta(), ({}, {'list_field': 1}))

+    def test_delta_with_dbref_true(self):
+        person, organization, employee = self.circular_reference_deltas_2(Document, Document, True)
+        employee.name = 'test'
+
+        self.assertEqual(organization._get_changed_fields(), [])
+
+        updates, removals = organization._delta()
+        self.assertEqual({}, removals)
+        self.assertEqual({}, updates)
+
+        organization.employees.append(person)
+        updates, removals = organization._delta()
+        self.assertEqual({}, removals)
+        self.assertTrue('employees' in updates)
+
+    def test_delta_with_dbref_false(self):
+        person, organization, employee = self.circular_reference_deltas_2(Document, Document, False)
+        employee.name = 'test'
+
+        self.assertEqual(organization._get_changed_fields(), [])
+
+        updates, removals = organization._delta()
+        self.assertEqual({}, removals)
+        self.assertEqual({}, updates)
+
+        organization.employees.append(person)
+        updates, removals = organization._delta()
+        self.assertEqual({}, removals)
+        self.assertTrue('employees' in updates)
+
+    def test_nested_nested_fields_mark_as_changed(self):
+        class EmbeddedDoc(EmbeddedDocument):
+            name = StringField()
+
+        class MyDoc(Document):
+            subs = MapField(MapField(EmbeddedDocumentField(EmbeddedDoc)))
+            name = StringField()
+
+        MyDoc.drop_collection()
+
+        mydoc = MyDoc(name='testcase1', subs={'a': {'b': EmbeddedDoc(name='foo')}}).save()
+
+        mydoc = MyDoc.objects.first()
+        subdoc = mydoc.subs['a']['b']
+        subdoc.name = 'bar'
+
+        self.assertEqual(["name"], subdoc._get_changed_fields())
+        self.assertEqual(["subs.a.b.name"], mydoc._get_changed_fields())
+
+        mydoc._clear_changed_fields()
+        self.assertEqual([], mydoc._get_changed_fields())

 if __name__ == '__main__':
    unittest.main()
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -156,6 +156,25 @@ class IndexesTest(unittest.TestCase):
        self.assertEqual([{'fields': [('_cls', 1), ('title', 1)]}],
                         A._meta['index_specs'])

+    def test_index_no_cls(self):
+        """Ensure index specs are inhertited correctly"""
+
+        class A(Document):
+            title = StringField()
+            meta = {
+                'indexes': [
+                        {'fields': ('title',), 'cls': False},
+                ],
+                'allow_inheritance': True,
+                'index_cls': False
+                }
+
+        self.assertEqual([('title', 1)], A._meta['index_specs'][0]['fields'])
+        A._get_collection().drop_indexes()
+        A.ensure_indexes()
+        info = A._get_collection().index_information()
+        self.assertEqual(len(info.keys()), 2)
+
    def test_build_index_spec_is_not_destructive(self):

        class MyDoc(Document):
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -10,7 +10,8 @@ import uuid

 from datetime import datetime
 from bson import DBRef
-from tests.fixtures import PickleEmbedded, PickleTest, PickleSignalsTest
+from tests.fixtures import (PickleEmbedded, PickleTest, PickleSignalsTest,
+                            PickleDyanmicEmbedded, PickleDynamicTest)

 from mongoengine import *
 from mongoengine.errors import (NotRegistered, InvalidDocumentError,
@@ -443,6 +444,13 @@ class InstanceTest(unittest.TestCase):
        self.assertEqual(Employee(name="Bob", age=35, salary=0).to_mongo().keys(),
                         ['_cls', 'name', 'age', 'salary'])

+    def test_embedded_document_to_mongo_id(self):
+        class SubDoc(EmbeddedDocument):
+            id = StringField(required=True)
+
+        sub_doc = SubDoc(id="abc")
+        self.assertEqual(sub_doc.to_mongo().keys(), ['id'])
+
    def test_embedded_document(self):
        """Ensure that embedded documents are set up correctly.
        """
@@ -482,6 +490,26 @@ class InstanceTest(unittest.TestCase):
        doc = Doc.objects.get()
        self.assertEqual(doc, doc.embedded_field[0]._instance)

+    def test_instance_is_set_on_setattr(self):
+
+        class Email(EmbeddedDocument):
+            email = EmailField()
+            def clean(self):
+                print "instance:"
+                print self._instance
+
+        class Account(Document):
+            email = EmbeddedDocumentField(Email)
+
+        Account.drop_collection()
+        acc = Account()
+        acc.email = Email(email='test@example.com')
+        self.assertTrue(hasattr(acc._data["email"], "_instance"))
+        acc.save()
+
+        acc1 = Account.objects.first()
+        self.assertTrue(hasattr(acc1._data["email"], "_instance"))
+
    def test_document_clean(self):
        class TestDocument(Document):
            status = StringField()
@@ -1827,6 +1855,29 @@ class InstanceTest(unittest.TestCase):
        self.assertEqual(pickle_doc.string, "Two")
        self.assertEqual(pickle_doc.lists, ["1", "2", "3"])

+    def test_dynamic_document_pickle(self):
+
+        pickle_doc = PickleDynamicTest(name="test", number=1, string="One", lists=['1', '2'])
+        pickle_doc.embedded = PickleDyanmicEmbedded(foo="Bar")
+        pickled_doc = pickle.dumps(pickle_doc)  # make sure pickling works even before the doc is saved
+
+        pickle_doc.save()
+
+        pickled_doc = pickle.dumps(pickle_doc)
+        resurrected = pickle.loads(pickled_doc)
+
+        self.assertEqual(resurrected, pickle_doc)
+        self.assertEqual(resurrected._fields_ordered,
+                         pickle_doc._fields_ordered)
+        self.assertEqual(resurrected._dynamic_fields.keys(),
+                         pickle_doc._dynamic_fields.keys())
+
+        self.assertEqual(resurrected.embedded, pickle_doc.embedded)
+        self.assertEqual(resurrected.embedded._fields_ordered,
+                         pickle_doc.embedded._fields_ordered)
+        self.assertEqual(resurrected.embedded._dynamic_fields.keys(),
+                         pickle_doc.embedded._dynamic_fields.keys())
+
    def test_picklable_on_signals(self):
        pickle_doc = PickleSignalsTest(number=1, string="One", lists=['1', '2'])
        pickle_doc.embedded = PickleEmbedded()
@@ -2289,6 +2340,16 @@ class InstanceTest(unittest.TestCase):
        self.assertEqual(person.name, "Test User")
        self.assertEqual(person.age, 42)

+    def test_mixed_creation_dynamic(self):
+        """Ensure that document may be created using mixed arguments.
+        """
+        class Person(DynamicDocument):
+            name = StringField()
+
+        person = Person("Test User", age=42)
+        self.assertEqual(person.name, "Test User")
+        self.assertEqual(person.age, 42)
+
    def test_bad_mixed_creation(self):
        """Ensure that document gives correct error when duplicating arguments
        """
@@ -2351,6 +2412,24 @@ class InstanceTest(unittest.TestCase):
        system = System.objects.first()
        self.assertEqual("UNDEFINED", system.nodes["node"].parameters["param"].macros["test"].value)

+    def test_embedded_document_equality(self):
+
+        class Test(Document):
+            field = StringField(required=True)
+
+        class Embedded(EmbeddedDocument):
+            ref = ReferenceField(Test)
+
+        Test.drop_collection()
+        test = Test(field='123').save()      # has id
+
+        e = Embedded(ref=test)
+        f1 = Embedded._from_son(e.to_mongo())
+        f2 = Embedded._from_son(e.to_mongo())
+
+        self.assertEqual(f1, f2)
+        f1.ref  # Dereferences lazily
+        self.assertEqual(f1, f2)

 if __name__ == '__main__':
    unittest.main()
--- a/tests/document/json_serialisation.py
+++ b/tests/document/json_serialisation.py
@@ -31,6 +31,10 @@ class TestJson(unittest.TestCase):

        doc = Doc(string="Hi", embedded_field=Embedded(string="Hi"))

+        doc_json = doc.to_json(sort_keys=True, separators=(',', ':'))
+        expected_json = """{"embedded_field":{"string":"Hi"},"string":"Hi"}"""
+        self.assertEqual(doc_json, expected_json)
+
        self.assertEqual(doc, Doc.from_json(doc.to_json()))

    def test_json_complex(self):
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -384,6 +384,9 @@ class FieldTest(unittest.TestCase):
        person.height = 4.0
        self.assertRaises(ValidationError, person.validate)

+        person_2 = Person(height='something invalid')
+        self.assertRaises(ValidationError, person_2.validate)
+
    def test_decimal_validation(self):
        """Ensure that invalid values cannot be assigned to decimal fields.
        """
@@ -405,6 +408,11 @@ class FieldTest(unittest.TestCase):
        self.assertRaises(ValidationError, person.validate)
        person.height = Decimal('4.0')
        self.assertRaises(ValidationError, person.validate)
+        person.height = 'something invalid'
+        self.assertRaises(ValidationError, person.validate)
+
+        person_2 = Person(height='something invalid')
+        self.assertRaises(ValidationError, person_2.validate)

        Person.drop_collection()

@@ -1018,6 +1026,32 @@ class FieldTest(unittest.TestCase):
        e.mapping = {}
        self.assertEqual([], e._changed_fields)

+    def test_slice_marks_field_as_changed(self):
+
+        class Simple(Document):
+            widgets = ListField()
+
+        simple = Simple(widgets=[1, 2, 3, 4]).save()
+        simple.widgets[:3] = []
+        self.assertEqual(['widgets'], simple._changed_fields)
+        simple.save()
+
+        simple = simple.reload()
+        self.assertEqual(simple.widgets, [4])
+
+    def test_del_slice_marks_field_as_changed(self):
+
+        class Simple(Document):
+            widgets = ListField()
+
+        simple = Simple(widgets=[1, 2, 3, 4]).save()
+        del simple.widgets[:3]
+        self.assertEqual(['widgets'], simple._changed_fields)
+        simple.save()
+
+        simple = simple.reload()
+        self.assertEqual(simple.widgets, [4])
+
    def test_list_field_complex(self):
        """Ensure that the list fields can handle the complex types."""

@@ -1083,9 +1117,15 @@ class FieldTest(unittest.TestCase):
        post.info = {'$title': 'test'}
        self.assertRaises(ValidationError, post.validate)

+        post.info = {'nested': {'$title': 'test'}}
+        self.assertRaises(ValidationError, post.validate)
+
        post.info = {'the.title': 'test'}
        self.assertRaises(ValidationError, post.validate)

+        post.info = {'nested': {'the.title': 'test'}}
+        self.assertRaises(ValidationError, post.validate)
+
        post.info = {1: 'test'}
        self.assertRaises(ValidationError, post.validate)

@@ -1864,6 +1904,37 @@ class FieldTest(unittest.TestCase):
        Post.drop_collection()
        User.drop_collection()

+    def test_generic_reference_list_item_modification(self):
+        """Ensure that modifications of related documents (through generic reference) don't influence on querying
+        """
+        class Post(Document):
+            title = StringField()
+
+        class User(Document):
+            username = StringField()
+            bookmarks = ListField(GenericReferenceField())
+
+        Post.drop_collection()
+        User.drop_collection()
+
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
+
+        user = User(bookmarks=[post_1])
+        user.save()
+
+        post_1.title = "Title was modified"
+        user.username = "New username"
+        user.save()
+
+        user = User.objects(bookmarks__all=[post_1]).first()
+
+        self.assertNotEqual(user, None)
+        self.assertEqual(user.bookmarks[0], post_1)
+
+        Post.drop_collection()
+        User.drop_collection()
+
    def test_binary_fields(self):
        """Ensure that binary fields can be stored and retrieved.
        """
@@ -2448,6 +2519,92 @@ class FieldTest(unittest.TestCase):
        user = User(email='me@example.com')
        self.assertTrue(user.validate() is None)

+    def test_tuples_as_tuples(self):
+        """
+        Ensure that tuples remain tuples when they are
+        inside a ComplexBaseField
+        """
+        from mongoengine.base import BaseField
+
+        class EnumField(BaseField):
+
+            def __init__(self, **kwargs):
+                super(EnumField, self).__init__(**kwargs)
+
+            def to_mongo(self, value):
+                return value
+
+            def to_python(self, value):
+                return tuple(value)
+
+        class TestDoc(Document):
+            items = ListField(EnumField())
+
+        TestDoc.drop_collection()
+        tuples = [(100, 'Testing')]
+        doc = TestDoc()
+        doc.items = tuples
+        doc.save()
+        x = TestDoc.objects().get()
+        self.assertTrue(x is not None)
+        self.assertTrue(len(x.items) == 1)
+        self.assertTrue(tuple(x.items[0]) in tuples)
+        self.assertTrue(x.items[0] in tuples)
+
+    def test_dynamic_fields_class(self):
+
+        class Doc2(Document):
+            field_1 = StringField(db_field='f')
+
+        class Doc(Document):
+            my_id = IntField(required=True, unique=True, primary_key=True)
+            embed_me = DynamicField(db_field='e')
+            field_x = StringField(db_field='x')
+
+        Doc.drop_collection()
+        Doc2.drop_collection()
+
+        doc2 = Doc2(field_1="hello")
+        doc = Doc(my_id=1, embed_me=doc2, field_x="x")
+        self.assertRaises(OperationError, doc.save)
+
+        doc2.save()
+        doc.save()
+
+        doc = Doc.objects.get()
+        self.assertEqual(doc.embed_me.field_1, "hello")
+
+    def test_dynamic_fields_embedded_class(self):
+
+        class Embed(EmbeddedDocument):
+            field_1 = StringField(db_field='f')
+
+        class Doc(Document):
+            my_id = IntField(required=True, unique=True, primary_key=True)
+            embed_me = DynamicField(db_field='e')
+            field_x = StringField(db_field='x')
+
+        Doc.drop_collection()
+
+        Doc(my_id=1, embed_me=Embed(field_1="hello"), field_x="x").save()
+
+        doc = Doc.objects.get()
+        self.assertEqual(doc.embed_me.field_1, "hello")
+
+    def test_invalid_dict_value(self):
+        class DictFieldTest(Document):
+            dictionary = DictField(required=True)
+        
+        DictFieldTest.drop_collection()
+
+        test = DictFieldTest(dictionary=None)
+        test.dictionary # Just access to test getter
+        self.assertRaises(ValidationError, test.validate)
+        
+        test = DictFieldTest(dictionary=False)
+        test.dictionary # Just access to test getter
+        self.assertRaises(ValidationError, test.validate)
+

 if __name__ == '__main__':
    unittest.main()
--- a/tests/fields/file_tests.py
+++ b/tests/fields/file_tests.py
@@ -53,11 +53,12 @@ class FileTest(unittest.TestCase):
        content_type = 'text/plain'

        putfile = PutFile()
-        putfile.the_file.put(text, content_type=content_type)
+        putfile.the_file.put(text, content_type=content_type, filename="hello")
        putfile.save()

        result = PutFile.objects.first()
        self.assertTrue(putfile == result)
+        self.assertEqual("%s" % result.the_file, "<GridFSProxy: hello>")
        self.assertEqual(result.the_file.read(), text)
        self.assertEqual(result.the_file.content_type, content_type)
        result.the_file.delete()  # Remove file from GridFS
@@ -278,7 +279,7 @@ class FileTest(unittest.TestCase):
                t.image.put(f)
                self.fail("Should have raised an invalidation error")
            except ValidationError, e:
-                self.assertEquals("%s" % e, "Invalid image: cannot identify image file")
+                self.assertEqual("%s" % e, "Invalid image: cannot identify image file")

        t = TestImage()
        t.image.put(open(TEST_IMAGE_PATH, 'rb'))
@@ -455,5 +456,31 @@ class FileTest(unittest.TestCase):
        self.assertEqual(1, TestImage.objects(Q(image1=grid_id)
                                              or Q(image2=grid_id)).count())

+    def test_complex_field_filefield(self):
+        """Ensure you can add meta data to file"""
+
+        class Animal(Document):
+            genus = StringField()
+            family = StringField()
+            photos = ListField(FileField())
+
+        Animal.drop_collection()
+        marmot = Animal(genus='Marmota', family='Sciuridae')
+
+        marmot_photo = open(TEST_IMAGE_PATH, 'rb')  # Retrieve a photo from disk
+
+        photos_field = marmot._fields['photos'].field
+        new_proxy = photos_field.get_proxy_obj('photos', marmot)
+        new_proxy.put(marmot_photo, content_type='image/jpeg', foo='bar')
+        marmot_photo.close()
+
+        marmot.photos.append(new_proxy)
+        marmot.save()
+
+        marmot = Animal.objects.get()
+        self.assertEqual(marmot.photos[0].content_type, 'image/jpeg')
+        self.assertEqual(marmot.photos[0].foo, 'bar')
+        self.assertEqual(marmot.photos[0].get().length, 8313)
+
 if __name__ == '__main__':
    unittest.main()
--- a/tests/fields/geo.py
+++ b/tests/fields/geo.py
@@ -75,6 +75,12 @@ class GeoFieldTest(unittest.TestCase):
            self._test_for_expected_error(Location, coord, expected)

        Location(loc=[1, 2]).validate()
+        Location(loc={
+            "type": "Point",
+            "coordinates": [
+              81.4471435546875,
+              23.61432859499169
+            ]}).validate()

    def test_linestring_validation(self):
        class Location(Document):
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -17,6 +17,14 @@ class PickleTest(Document):
    photo = FileField()


+class PickleDyanmicEmbedded(DynamicEmbeddedDocument):
+    date = DateTimeField(default=datetime.now)
+
+
+class PickleDynamicTest(DynamicDocument):
+    number = IntField()
+
+
 class PickleSignalsTest(Document):
    number = IntField()
    string = StringField(choices=(('One', '1'), ('Two', '2')))
--- a/tests/queryset/field_list.py
+++ b/tests/queryset/field_list.py
@@ -162,6 +162,10 @@ class OnlyExcludeAllTest(unittest.TestCase):
        self.assertEqual(obj.name, person.name)
        self.assertEqual(obj.age, person.age)

+        obj = self.Person.objects.only(*('id', 'name',)).get()
+        self.assertEqual(obj.name, person.name)
+        self.assertEqual(obj.age, None)
+
        # Check polymorphism still works
        class Employee(self.Person):
            salary = IntField(db_field='wage')
@@ -395,5 +399,28 @@ class OnlyExcludeAllTest(unittest.TestCase):
        numbers = Numbers.objects.fields(embedded__n={"$slice": [-5, 10]}).get()
        self.assertEqual(numbers.embedded.n, [-5, -4, -3, -2, -1])

+
+    def test_exclude_from_subclasses_docs(self):
+
+        class Base(Document):
+            username = StringField()
+
+            meta = {'allow_inheritance': True}
+
+        class Anon(Base):
+            anon = BooleanField()
+
+        class User(Base):
+            password = StringField()
+            wibble = StringField()
+
+        Base.drop_collection()
+        User(username="mongodb", password="secret").save()
+
+        user = Base.objects().exclude("password", "wibble").first()
+        self.assertEqual(user.password, None)
+
+        self.assertRaises(LookUpError, Base.objects.exclude, "made_up")
+
 if __name__ == '__main__':
    unittest.main()
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -414,5 +414,47 @@ class GeoQueriesTest(unittest.TestCase):
        roads = Road.objects.filter(poly__geo_intersects={"$geometry": polygon}).count()
        self.assertEqual(1, roads)

+    def test_2dsphere_point_sets_correctly(self):
+        class Location(Document):
+            loc = PointField()
+
+        Location.drop_collection()
+
+        Location(loc=[1,2]).save()
+        loc = Location.objects.as_pymongo()[0]
+        self.assertEqual(loc["loc"], {"type": "Point", "coordinates": [1, 2]})
+
+        Location.objects.update(set__loc=[2,1])
+        loc = Location.objects.as_pymongo()[0]
+        self.assertEqual(loc["loc"], {"type": "Point", "coordinates": [2, 1]})
+
+    def test_2dsphere_linestring_sets_correctly(self):
+        class Location(Document):
+            line = LineStringField()
+
+        Location.drop_collection()
+
+        Location(line=[[1, 2], [2, 2]]).save()
+        loc = Location.objects.as_pymongo()[0]
+        self.assertEqual(loc["line"], {"type": "LineString", "coordinates": [[1, 2], [2, 2]]})
+
+        Location.objects.update(set__line=[[2, 1], [1, 2]])
+        loc = Location.objects.as_pymongo()[0]
+        self.assertEqual(loc["line"], {"type": "LineString", "coordinates": [[2, 1], [1, 2]]})
+
+    def test_geojson_PolygonField(self):
+        class Location(Document):
+            poly = PolygonField()
+
+        Location.drop_collection()
+
+        Location(poly=[[[40, 5], [40, 6], [41, 6], [40, 5]]]).save()
+        loc = Location.objects.as_pymongo()[0]
+        self.assertEqual(loc["poly"], {"type": "Polygon", "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]]})
+
+        Location.objects.update(set__poly=[[[40, 4], [40, 6], [41, 6], [40, 4]]])
+        loc = Location.objects.as_pymongo()[0]
+        self.assertEqual(loc["poly"], {"type": "Polygon", "coordinates": [[[40, 4], [40, 6], [41, 6], [40, 4]]]})
+
 if __name__ == '__main__':
    unittest.main()
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -30,12 +30,17 @@ class QuerySetTest(unittest.TestCase):
    def setUp(self):
        connect(db='mongoenginetest')

+        class PersonMeta(EmbeddedDocument):
+            weight = IntField()
+
        class Person(Document):
            name = StringField()
            age = IntField()
+            person_meta = EmbeddedDocumentField(PersonMeta)
            meta = {'allow_inheritance': True}

        Person.drop_collection()
+        self.PersonMeta = PersonMeta
        self.Person = Person

    def test_initialisation(self):
@@ -536,6 +541,23 @@ class QuerySetTest(unittest.TestCase):
        self.assertEqual(club.members['John']['gender'], "F")
        self.assertEqual(club.members['John']['age'], 14)

+    def test_update_results(self):
+        self.Person.drop_collection()
+
+        result = self.Person(name="Bob", age=25).update(upsert=True, full_result=True)
+        self.assertTrue(isinstance(result, dict))
+        self.assertTrue("upserted" in result)
+        self.assertFalse(result["updatedExisting"])
+
+        bob = self.Person.objects.first()
+        result = bob.update(set__age=30, full_result=True)
+        self.assertTrue(isinstance(result, dict))
+        self.assertTrue(result["updatedExisting"])
+
+        self.Person(name="Bob", age=20).save()
+        result = self.Person.objects(name="Bob").update(set__name="bobby", multi=True)
+        self.assertEqual(result, 2)
+
    def test_upsert(self):
        self.Person.drop_collection()

@@ -1475,9 +1497,6 @@ class QuerySetTest(unittest.TestCase):

    def test_pull_nested(self):

-        class User(Document):
-            name = StringField()
-
        class Collaborator(EmbeddedDocument):
            user = StringField()

@@ -1492,8 +1511,7 @@ class QuerySetTest(unittest.TestCase):
        Site.drop_collection()

        c = Collaborator(user='Esteban')
-        s = Site(name="test", collaborators=[c])
-        s.save()
+        s = Site(name="test", collaborators=[c]).save()

        Site.objects(id=s.id).update_one(pull__collaborators__user='Esteban')
        self.assertEqual(Site.objects.first().collaborators, [])
@@ -1503,6 +1521,71 @@ class QuerySetTest(unittest.TestCase):

        self.assertRaises(InvalidQueryError, pull_all)

+    def test_pull_from_nested_embedded(self):
+
+        class User(EmbeddedDocument):
+            name = StringField()
+
+            def __unicode__(self):
+                return '%s' % self.name
+
+        class Collaborator(EmbeddedDocument):
+            helpful = ListField(EmbeddedDocumentField(User))
+            unhelpful = ListField(EmbeddedDocumentField(User))
+
+        class Site(Document):
+            name = StringField(max_length=75, unique=True, required=True)
+            collaborators = EmbeddedDocumentField(Collaborator)
+
+
+        Site.drop_collection()
+
+        c = User(name='Esteban')
+        f = User(name='Frank')
+        s = Site(name="test", collaborators=Collaborator(helpful=[c], unhelpful=[f])).save()
+
+        Site.objects(id=s.id).update_one(pull__collaborators__helpful=c)
+        self.assertEqual(Site.objects.first().collaborators['helpful'], [])
+
+        Site.objects(id=s.id).update_one(pull__collaborators__unhelpful={'name': 'Frank'})
+        self.assertEqual(Site.objects.first().collaborators['unhelpful'], [])
+
+        def pull_all():
+            Site.objects(id=s.id).update_one(pull_all__collaborators__helpful__name=['Ross'])
+
+        self.assertRaises(InvalidQueryError, pull_all)
+
+    def test_pull_from_nested_mapfield(self):
+
+        class Collaborator(EmbeddedDocument):
+            user = StringField()
+
+            def __unicode__(self):
+                return '%s' % self.user
+
+        class Site(Document):
+            name = StringField(max_length=75, unique=True, required=True)
+            collaborators = MapField(ListField(EmbeddedDocumentField(Collaborator)))
+
+
+        Site.drop_collection()
+
+        c = Collaborator(user='Esteban')
+        f = Collaborator(user='Frank')
+        s = Site(name="test", collaborators={'helpful':[c],'unhelpful':[f]})
+        s.save()
+
+        Site.objects(id=s.id).update_one(pull__collaborators__helpful__user='Esteban')
+        self.assertEqual(Site.objects.first().collaborators['helpful'], [])
+
+        Site.objects(id=s.id).update_one(pull__collaborators__unhelpful={'user':'Frank'})
+        self.assertEqual(Site.objects.first().collaborators['unhelpful'], [])
+
+        def pull_all():
+            Site.objects(id=s.id).update_one(pull_all__collaborators__helpful__user=['Ross'])
+
+        self.assertRaises(InvalidQueryError, pull_all)
+
    def test_update_one_pop_generic_reference(self):

        class BlogTag(Document):
@@ -1596,6 +1679,32 @@ class QuerySetTest(unittest.TestCase):
        self.assertEqual(message.authors[1].name, "Ross")
        self.assertEqual(message.authors[2].name, "Adam")

+    def test_reload_embedded_docs_instance(self):
+
+        class SubDoc(EmbeddedDocument):
+            val = IntField()
+
+        class Doc(Document):
+            embedded = EmbeddedDocumentField(SubDoc)
+
+        doc = Doc(embedded=SubDoc(val=0)).save()
+        doc.reload()
+
+        self.assertEqual(doc.pk, doc.embedded._instance.pk)
+
+    def test_reload_list_embedded_docs_instance(self):
+
+        class SubDoc(EmbeddedDocument):
+            val = IntField()
+
+        class Doc(Document):
+            embedded = ListField(EmbeddedDocumentField(SubDoc))
+
+        doc = Doc(embedded=[SubDoc(val=0)]).save()
+        doc.reload()
+
+        self.assertEqual(doc.pk, doc.embedded[0]._instance.pk)
+
    def test_order_by(self):
        """Ensure that QuerySets may be ordered.
        """
@@ -2165,6 +2274,19 @@ class QuerySetTest(unittest.TestCase):
        self.Person(name='ageless person').save()
        self.assertEqual(int(self.Person.objects.average('age')), avg)

+        # dot notation
+        self.Person(name='person meta', person_meta=self.PersonMeta(weight=0)).save()
+        self.assertAlmostEqual(int(self.Person.objects.average('person_meta.weight')), 0)
+
+        for i, weight in enumerate(ages):
+            self.Person(name='test meta%i', person_meta=self.PersonMeta(weight=weight)).save()
+
+        self.assertAlmostEqual(int(self.Person.objects.average('person_meta.weight')), avg)
+
+        self.Person(name='test meta none').save()
+        self.assertEqual(int(self.Person.objects.average('person_meta.weight')), avg)
+
+
    def test_sum(self):
        """Ensure that field can be summed over correctly.
        """
@@ -2177,6 +2299,153 @@ class QuerySetTest(unittest.TestCase):
        self.Person(name='ageless person').save()
        self.assertEqual(int(self.Person.objects.sum('age')), sum(ages))

+        for i, age in enumerate(ages):
+            self.Person(name='test meta%s' % i, person_meta=self.PersonMeta(weight=age)).save()
+
+        self.assertEqual(int(self.Person.objects.sum('person_meta.weight')), sum(ages))
+
+        self.Person(name='weightless person').save()
+        self.assertEqual(int(self.Person.objects.sum('age')), sum(ages))
+
+    def test_embedded_average(self):
+        class Pay(EmbeddedDocument):
+            value = DecimalField()
+
+        class Doc(Document):
+            name = StringField()
+            pay = EmbeddedDocumentField(
+                Pay)
+
+        Doc.drop_collection()
+
+        Doc(name=u"Wilson Junior",
+            pay=Pay(value=150)).save()
+
+        Doc(name=u"Isabella Luanna",
+            pay=Pay(value=530)).save()
+
+        Doc(name=u"Tayza mariana",
+            pay=Pay(value=165)).save()
+
+        Doc(name=u"Eliana Costa",
+            pay=Pay(value=115)).save()
+
+        self.assertEqual(
+            Doc.objects.average('pay.value'),
+            240)
+
+    def test_embedded_array_average(self):
+        class Pay(EmbeddedDocument):
+            values = ListField(DecimalField())
+
+        class Doc(Document):
+            name = StringField()
+            pay = EmbeddedDocumentField(
+                Pay)
+
+        Doc.drop_collection()
+
+        Doc(name=u"Wilson Junior",
+            pay=Pay(values=[150, 100])).save()
+
+        Doc(name=u"Isabella Luanna",
+            pay=Pay(values=[530, 100])).save()
+
+        Doc(name=u"Tayza mariana",
+            pay=Pay(values=[165, 100])).save()
+
+        Doc(name=u"Eliana Costa",
+            pay=Pay(values=[115, 100])).save()
+
+        self.assertEqual(
+            Doc.objects.average('pay.values'),
+            170)
+
+    def test_array_average(self):
+        class Doc(Document):
+            values = ListField(DecimalField())
+
+        Doc.drop_collection()
+
+        Doc(values=[150, 100]).save()
+        Doc(values=[530, 100]).save()
+        Doc(values=[165, 100]).save()
+        Doc(values=[115, 100]).save()
+
+        self.assertEqual(
+            Doc.objects.average('values'),
+            170)
+
+    def test_embedded_sum(self):
+        class Pay(EmbeddedDocument):
+            value = DecimalField()
+
+        class Doc(Document):
+            name = StringField()
+            pay = EmbeddedDocumentField(
+                Pay)
+
+        Doc.drop_collection()
+
+        Doc(name=u"Wilson Junior",
+            pay=Pay(value=150)).save()
+
+        Doc(name=u"Isabella Luanna",
+            pay=Pay(value=530)).save()
+
+        Doc(name=u"Tayza mariana",
+            pay=Pay(value=165)).save()
+
+        Doc(name=u"Eliana Costa",
+            pay=Pay(value=115)).save()
+
+        self.assertEqual(
+            Doc.objects.sum('pay.value'),
+            960)
+
+
+    def test_embedded_array_sum(self):
+        class Pay(EmbeddedDocument):
+            values = ListField(DecimalField())
+
+        class Doc(Document):
+            name = StringField()
+            pay = EmbeddedDocumentField(
+                Pay)
+
+        Doc.drop_collection()
+
+        Doc(name=u"Wilson Junior",
+            pay=Pay(values=[150, 100])).save()
+
+        Doc(name=u"Isabella Luanna",
+            pay=Pay(values=[530, 100])).save()
+
+        Doc(name=u"Tayza mariana",
+            pay=Pay(values=[165, 100])).save()
+
+        Doc(name=u"Eliana Costa",
+            pay=Pay(values=[115, 100])).save()
+
+        self.assertEqual(
+            Doc.objects.sum('pay.values'),
+            1360)
+
+    def test_array_sum(self):
+        class Doc(Document):
+            values = ListField(DecimalField())
+
+        Doc.drop_collection()
+
+        Doc(values=[150, 100]).save()
+        Doc(values=[530, 100]).save()
+        Doc(values=[165, 100]).save()
+        Doc(values=[115, 100]).save()
+
+        self.assertEqual(
+            Doc.objects.sum('values'),
+            1360)
+
    def test_distinct(self):
        """Ensure that the QuerySet.distinct method works.
        """
@@ -2250,6 +2519,27 @@ class QuerySetTest(unittest.TestCase):

        Product.drop_collection()

+    def test_distinct_ListField_EmbeddedDocumentField(self):
+
+        class Author(EmbeddedDocument):
+            name = StringField()
+
+        class Book(Document):
+            title = StringField()
+            authors = ListField(EmbeddedDocumentField(Author))
+
+        Book.drop_collection()
+
+        mark_twain = Author(name="Mark Twain")
+        john_tolkien = Author(name="John Ronald Reuel Tolkien")
+
+        book = Book(title="Tom Sawyer", authors=[mark_twain]).save()
+        book = Book(title="The Lord of the Rings", authors=[john_tolkien]).save()
+        book = Book(title="The Stories", authors=[mark_twain, john_tolkien]).save()
+        authors = Book.objects.distinct("authors")
+
+        self.assertEqual(authors, [mark_twain, john_tolkien])
+
    def test_custom_manager(self):
        """Ensure that custom QuerySetManager instances work as expected.
        """
@@ -2592,6 +2882,19 @@ class QuerySetTest(unittest.TestCase):

        self.assertEqual(10, Post.objects.limit(5).skip(5).count(with_limit_and_skip=False))

+    def test_count_and_none(self):
+        """Test count works with None()"""
+
+        class MyDoc(Document):
+            pass
+
+        MyDoc.drop_collection()
+        for i in xrange(0, 10):
+            MyDoc().save()
+
+        self.assertEqual(MyDoc.objects.count(), 10)
+        self.assertEqual(MyDoc.objects.none().count(), 0)
+
    def test_call_after_limits_set(self):
        """Ensure that re-filtering after slicing works
        """
@@ -3048,7 +3351,7 @@ class QuerySetTest(unittest.TestCase):
        class Foo(EmbeddedDocument):
            shape = StringField()
            color = StringField()
-            trick = BooleanField()
+            thick = BooleanField()
            meta = {'allow_inheritance': False}

        class Bar(Document):
@@ -3057,17 +3360,20 @@ class QuerySetTest(unittest.TestCase):

        Bar.drop_collection()

-        b1 = Bar(foo=[Foo(shape= "square", color ="purple", thick = False),
-                      Foo(shape= "circle", color ="red", thick = True)])
+        b1 = Bar(foo=[Foo(shape="square", color="purple", thick=False),
+                      Foo(shape="circle", color="red", thick=True)])
        b1.save()

-        b2 = Bar(foo=[Foo(shape= "square", color ="red", thick = True),
-                      Foo(shape= "circle", color ="purple", thick = False)])
+        b2 = Bar(foo=[Foo(shape="square", color="red", thick=True),
+                      Foo(shape="circle", color="purple", thick=False)])
        b2.save()

        ak = list(Bar.objects(foo__match={'shape': "square", "color": "purple"}))
        self.assertEqual([b1], ak)

+        ak = list(Bar.objects(foo__match=Foo(shape="square", color="purple")))
+        self.assertEqual([b1], ak)
+
    def test_upsert_includes_cls(self):
        """Upserts should include _cls information for inheritable classes
        """
@@ -3088,6 +3394,24 @@ class QuerySetTest(unittest.TestCase):
        Test.objects(test='foo').update_one(upsert=True, set__test='foo')
        self.assertTrue('_cls' in Test._collection.find_one())

+    def test_update_upsert_looks_like_a_digit(self):
+        class MyDoc(DynamicDocument):
+            pass
+        MyDoc.drop_collection()
+        self.assertEqual(1, MyDoc.objects.update_one(upsert=True, inc__47=1))
+        self.assertEqual(MyDoc.objects.get()['47'], 1)
+
+    def test_dictfield_key_looks_like_a_digit(self):
+        """Only should work with DictField even if they have numeric keys."""
+
+        class MyDoc(Document):
+            test = DictField()
+
+        MyDoc.drop_collection()
+        doc = MyDoc(test={'47': 1})
+        doc.save()
+        self.assertEqual(MyDoc.objects.only('test__47').get().test['47'], 1)
+
    def test_read_preference(self):
        class Bar(Document):
            pass
@@ -3116,7 +3440,7 @@ class QuerySetTest(unittest.TestCase):
        Doc(string="Bye", embedded_field=Embedded(string="Bye")).save()

        Doc().save()
-        json_data = Doc.objects.to_json()
+        json_data = Doc.objects.to_json(sort_keys=True, separators=(',', ':'))
        doc_objects = list(Doc.objects)

        self.assertEqual(doc_objects, Doc.objects.from_json(json_data))
@@ -3181,6 +3505,9 @@ class QuerySetTest(unittest.TestCase):
        User(name="Bob Dole", age=89, price=Decimal('1.11')).save()
        User(name="Barack Obama", age=51, price=Decimal('2.22')).save()

+        results = User.objects.only('id', 'name').as_pymongo()
+        self.assertEqual(sorted(results[0].keys()), sorted(['_id', 'name']))
+
        users = User.objects.only('name', 'price').as_pymongo()
        results = list(users)
        self.assertTrue(isinstance(results[0], dict))
@@ -3241,6 +3568,8 @@ class QuerySetTest(unittest.TestCase):
        self.assertTrue(isinstance(qs.first().organization, Organization))
        self.assertFalse(isinstance(qs.no_dereference().first().organization,
                                    Organization))
+        self.assertFalse(isinstance(qs.no_dereference().get().organization,
+                                    Organization))
        self.assertTrue(isinstance(qs.first().organization, Organization))

    def test_cached_queryset(self):
@@ -3267,6 +3596,27 @@ class QuerySetTest(unittest.TestCase):
            people.count()  # count is cached
            self.assertEqual(q, 1)

+    def test_no_cached_queryset(self):
+        class Person(Document):
+            name = StringField()
+
+        Person.drop_collection()
+        for i in xrange(100):
+            Person(name="No: %s" % i).save()
+
+        with query_counter() as q:
+            self.assertEqual(q, 0)
+            people = Person.objects.no_cache()
+
+            [x for x in people]
+            self.assertEqual(q, 1)
+
+            list(people)
+            self.assertEqual(q, 2)
+
+            people.count()
+            self.assertEqual(q, 3)
+
    def test_cache_not_cloned(self):

        class User(Document):
@@ -3288,6 +3638,34 @@ class QuerySetTest(unittest.TestCase):
        self.assertEqual("%s" % users, "[<User: Bob>]")
        self.assertEqual(1, len(users._result_cache))

+    def test_no_cache(self):
+        """Ensure you can add meta data to file"""
+
+        class Noddy(Document):
+            fields = DictField()
+
+        Noddy.drop_collection()
+        for i in xrange(100):
+            noddy = Noddy()
+            for j in range(20):
+                noddy.fields["key"+str(j)] = "value "+str(j)
+            noddy.save()
+
+        docs = Noddy.objects.no_cache()
+
+        counter = len([1 for i in docs])
+        self.assertEqual(counter, 100)
+
+        self.assertEqual(len(list(docs)), 100)
+        self.assertRaises(TypeError, lambda: len(docs))
+
+        with query_counter() as q:
+            self.assertEqual(q, 0)
+            list(docs)
+            self.assertEqual(q, 1)
+            list(docs)
+            self.assertEqual(q, 2)
+
    def test_nested_queryset_iterator(self):
        # Try iterating the same queryset twice, nested.
        names = ['Alice', 'Bob', 'Chuck', 'David', 'Eric', 'Francis', 'George']
@@ -3419,6 +3797,23 @@ class QuerySetTest(unittest.TestCase):
            '_cls': 'Animal.Cat'
        })

+    def test_can_have_field_same_name_as_query_operator(self):
+
+        class Size(Document):
+            name = StringField()
+
+        class Example(Document):
+            size = ReferenceField(Size)
+
+        Size.drop_collection()
+        Example.drop_collection()
+
+        instance_size = Size(name="Large").save()
+        Example(size=instance_size).save()
+
+        self.assertEqual(Example.objects(size=instance_size).count(), 1)
+        self.assertEqual(Example.objects(size__in=[instance_size]).count(), 1)
+

 if __name__ == '__main__':
    unittest.main()
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -31,6 +31,31 @@ class TransformTest(unittest.TestCase):
        self.assertEqual(transform.query(name__exists=True),
                         {'name': {'$exists': True}})

+    def test_transform_update(self):
+        class DicDoc(Document):
+            dictField = DictField()
+
+        class Doc(Document):
+            pass
+
+        DicDoc.drop_collection()
+        Doc.drop_collection()
+
+        doc = Doc().save()
+        dic_doc = DicDoc().save()
+
+        for k, v in (("set", "$set"), ("set_on_insert", "$setOnInsert"), ("push", "$push")):
+            update = transform.update(DicDoc, **{"%s__dictField__test" % k: doc})
+            self.assertTrue(isinstance(update[v]["dictField.test"], dict))
+
+        # Update special cases
+        update = transform.update(DicDoc, unset__dictField__test=doc)
+        self.assertEqual(update["$unset"]["dictField.test"], 1)
+
+        update = transform.update(DicDoc, pull__dictField__test=doc)
+        self.assertTrue(isinstance(update["$pull"]["dictField"]["test"], dict))
+
+
    def test_query_field_name(self):
        """Ensure that the correct field name is used when querying.
        """
@@ -142,6 +167,35 @@ class TransformTest(unittest.TestCase):
                             {'attachments.views.extracted': 'no'}]}
        self.assertEqual(expected, raw_query)

+    def test_geojson_PointField(self):
+        class Location(Document):
+            loc = PointField()
+
+        update = transform.update(Location, set__loc=[1, 2])
+        self.assertEqual(update, {'$set': {'loc': {"type": "Point", "coordinates": [1,2]}}})
+
+        update = transform.update(Location, set__loc={"type": "Point", "coordinates": [1,2]})
+        self.assertEqual(update, {'$set': {'loc': {"type": "Point", "coordinates": [1,2]}}})
+
+    def test_geojson_LineStringField(self):
+        class Location(Document):
+            line = LineStringField()
+
+        update = transform.update(Location, set__line=[[1, 2], [2, 2]])
+        self.assertEqual(update, {'$set': {'line': {"type": "LineString", "coordinates": [[1, 2], [2, 2]]}}})
+
+        update = transform.update(Location, set__line={"type": "LineString", "coordinates": [[1, 2], [2, 2]]})
+        self.assertEqual(update, {'$set': {'line': {"type": "LineString", "coordinates": [[1, 2], [2, 2]]}}})
+
+    def test_geojson_PolygonField(self):
+        class Location(Document):
+            poly = PolygonField()
+
+        update = transform.update(Location, set__poly=[[[40, 5], [40, 6], [41, 6], [40, 5]]])
+        self.assertEqual(update, {'$set': {'poly': {"type": "Polygon", "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]]}}})
+
+        update = transform.update(Location, set__poly={"type": "Polygon", "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]]})
+        self.assertEqual(update, {'$set': {'poly': {"type": "Polygon", "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]]}}})

 if __name__ == '__main__':
    unittest.main()
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -56,6 +56,35 @@ class ConnectionTest(unittest.TestCase):
        self.assertTrue(isinstance(db, pymongo.database.Database))
        self.assertEqual(db.name, 'mongoenginetest')

+        c.admin.system.users.remove({})
+        c.mongoenginetest.system.users.remove({})
+
+    def test_connect_uri_without_db(self):
+        """Ensure that the connect() method works properly with uri's
+        without database_name
+        """
+        c = connect(db='mongoenginetest', alias='admin')
+        c.admin.system.users.remove({})
+        c.mongoenginetest.system.users.remove({})
+
+        c.admin.add_user("admin", "password")
+        c.admin.authenticate("admin", "password")
+        c.mongoenginetest.add_user("username", "password")
+
+        self.assertRaises(ConnectionError, connect, "testdb_uri_bad", host='mongodb://test:password@localhost')
+
+        connect("mongoenginetest", host='mongodb://localhost/')
+
+        conn = get_connection()
+        self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
+
+        db = get_db()
+        self.assertTrue(isinstance(db, pymongo.database.Database))
+        self.assertEqual(db.name, 'mongoenginetest')
+
+        c.admin.system.users.remove({})
+        c.mongoenginetest.system.users.remove({})
+
    def test_register_connection(self):
        """Ensure that connections with different aliases may be registered.
        """
@@ -69,6 +98,14 @@ class ConnectionTest(unittest.TestCase):
        self.assertTrue(isinstance(db, pymongo.database.Database))
        self.assertEqual(db.name, 'mongoenginetest2')

+    def test_register_connection_defaults(self):
+        """Ensure that defaults are used when the host and port are None.
+        """
+        register_connection('testdb', 'mongoenginetest', host=None, port=None)
+
+        conn = get_connection('testdb')
+        self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
+
    def test_connection_kwargs(self):
        """Ensure that connection kwargs get passed to pymongo.
        """
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -1121,37 +1121,32 @@ class FieldTest(unittest.TestCase):

            self.assertEqual(q, 2)

-    def test_tuples_as_tuples(self):
-        """
-        Ensure that tuples remain tuples when they are
-        inside a ComplexBaseField
-        """
-        from mongoengine.base import BaseField
+    def test_objectid_reference_across_databases(self):
+        # mongoenginetest - Is default connection alias from setUp()
+        # Register Aliases
+        register_connection('testdb-1', 'mongoenginetest2')

-        class EnumField(BaseField):
+        class User(Document):
+            name = StringField()
+            meta = {"db_alias": "testdb-1"}

-            def __init__(self, **kwargs):
-                super(EnumField, self).__init__(**kwargs)
+        class Book(Document):
+            name = StringField()
+            author = ReferenceField(User)

-            def to_mongo(self, value):
-                return value
+        # Drops
+        User.drop_collection()
+        Book.drop_collection()

-            def to_python(self, value):
-                return tuple(value)
+        user = User(name="Ross").save()
+        Book(name="MongoEngine for pros", author=user).save()

-        class TestDoc(Document):
-            items = ListField(EnumField())
+        # Can't use query_counter across databases - so test the _data object
+        book = Book.objects.first()
+        self.assertFalse(isinstance(book._data['author'], User))

-        TestDoc.drop_collection()
-        tuples = [(100, 'Testing')]
-        doc = TestDoc()
-        doc.items = tuples
-        doc.save()
-        x = TestDoc.objects().get()
-        self.assertTrue(x is not None)
-        self.assertTrue(len(x.items) == 1)
-        self.assertTrue(tuple(x.items[0]) in tuples)
-        self.assertTrue(x.items[0] in tuples)
+        book.select_related()
+        self.assertTrue(isinstance(book._data['author'], User))

    def test_non_ascii_pk(self):
        """
@@ -1176,6 +1171,30 @@ class FieldTest(unittest.TestCase):

        self.assertEqual(2, len([brand for bg in brand_groups for brand in bg.brands]))

+    def test_dereferencing_embedded_listfield_referencefield(self):
+        class Tag(Document):
+            meta = {'collection': 'tags'}
+            name = StringField()
+
+        class Post(EmbeddedDocument):
+            body = StringField()
+            tags = ListField(ReferenceField("Tag", dbref=True))
+
+        class Page(Document):
+            meta = {'collection': 'pages'}
+            tags = ListField(ReferenceField("Tag", dbref=True))
+            posts = ListField(EmbeddedDocumentField(Post))
+
+        Tag.drop_collection()
+        Page.drop_collection()
+
+        tag = Tag(name='test').save()
+        post = Post(body='test body', tags=[tag])
+        Page(tags=[tag], posts=[post]).save()
+
+        page = Page.objects.first()
+        self.assertEqual(page.tags[0], page.posts[0].tags[0])
+
 if __name__ == '__main__':
    unittest.main()

--- a/tests/test_django.py
+++ b/tests/test_django.py
@@ -2,48 +2,44 @@ import sys
 sys.path[0:0] = [""]
 import unittest
 from nose.plugins.skip import SkipTest
-from mongoengine.python_support import PY3
 from mongoengine import *

+
+from mongoengine.django.shortcuts import get_document_or_404
+
+from django.http import Http404
+from django.template import Context, Template
+from django.conf import settings
+from django.core.paginator import Paginator
+
+settings.configure(
+    USE_TZ=True,
+    INSTALLED_APPS=('django.contrib.auth', 'mongoengine.django.mongo_auth'),
+    AUTH_USER_MODEL=('mongo_auth.MongoUser'),
+)
+
 try:
-    from mongoengine.django.shortcuts import get_document_or_404
-
-    from django.http import Http404
-    from django.template import Context, Template
-    from django.conf import settings
-    from django.core.paginator import Paginator
-
-    settings.configure(
-        USE_TZ=True,
-        INSTALLED_APPS=('django.contrib.auth', 'mongoengine.django.mongo_auth'),
-        AUTH_USER_MODEL=('mongo_auth.MongoUser'),
+    from django.contrib.auth import authenticate, get_user_model
+    from mongoengine.django.auth import User
+    from mongoengine.django.mongo_auth.models import (
+        MongoUser,
+        MongoUserManager,
+        get_user_document,
    )
-
-    try:
-        from django.contrib.auth import authenticate, get_user_model
-        from mongoengine.django.auth import User
-        from mongoengine.django.mongo_auth.models import MongoUser, MongoUserManager
-        DJ15 = True
-    except Exception:
-        DJ15 = False
-    from django.contrib.sessions.tests import SessionTestsMixin
-    from mongoengine.django.sessions import SessionStore, MongoSession
-except Exception, err:
-    if PY3:
-        SessionTestsMixin = type  # dummy value so no error
-        SessionStore = None  # dummy value so no error
-    else:
-        raise err
-
-
+    DJ15 = True
+except Exception:
+    DJ15 = False
+from django.contrib.sessions.tests import SessionTestsMixin
+from mongoengine.django.sessions import SessionStore, MongoSession
 from datetime import tzinfo, timedelta
 ZERO = timedelta(0)

+
 class FixedOffset(tzinfo):
    """Fixed offset in minutes east from UTC."""

    def __init__(self, offset, name):
-        self.__offset = timedelta(minutes = offset)
+        self.__offset = timedelta(minutes=offset)
        self.__name = name

    def utcoffset(self, dt):
@@ -70,8 +66,6 @@ def activate_timezone(tz):
 class QuerySetTest(unittest.TestCase):

    def setUp(self):
-        if PY3:
-            raise SkipTest('django does not have Python 3 support')
        connect(db='mongoenginetest')

        class Person(Document):
@@ -173,6 +167,8 @@ class QuerySetTest(unittest.TestCase):
        class Note(Document):
            text = StringField()

+        Note.drop_collection()
+
        for i in xrange(1, 101):
            Note(name="Note: %s" % i).save()

@@ -223,8 +219,6 @@ class MongoDBSessionTest(SessionTestsMixin, unittest.TestCase):
    backend = SessionStore

    def setUp(self):
-        if PY3:
-            raise SkipTest('django does not have Python 3 support')
        connect(db='mongoenginetest')
        MongoSession.drop_collection()
        super(MongoDBSessionTest, self).setUp()
@@ -262,17 +256,18 @@ class MongoAuthTest(unittest.TestCase):
    }

    def setUp(self):
-        if PY3:
-            raise SkipTest('django does not have Python 3 support')
        if not DJ15:
            raise SkipTest('mongo_auth requires Django 1.5')
        connect(db='mongoenginetest')
        User.drop_collection()
        super(MongoAuthTest, self).setUp()

-    def test_user_model(self):
+    def test_get_user_model(self):
        self.assertEqual(get_user_model(), MongoUser)

+    def test_get_user_document(self):
+        self.assertEqual(get_user_document(), User)
+
    def test_user_manager(self):
        manager = get_user_model()._default_manager
        self.assertTrue(isinstance(manager, MongoUserManager))
Author	SHA1	Message	Date
Ross Lawley	57ac38ddca	Version bump 0.8.5	2013-12-04 10:02:05 +00:00
Ross Lawley	7a73a92074	Update changelog	2013-12-04 10:01:16 +00:00
Ross Lawley	d1b30f4792	Fix auth to use `get_user_document` #527	2013-12-04 10:00:12 +00:00
Ross Lawley	16dcf78cab	Ensure id is Hashable	2013-12-02 14:14:46 +00:00
Ross Lawley	d868cfdeb0	Fix multi level nested fields getting marked as changed (#523 )	2013-11-29 16:24:32 +00:00
Ross Lawley	c074f4d925	Django 1.6 login fix (#522 )	2013-11-29 13:19:52 +00:00
Ross Lawley	453024c58d	Django 1.6 session fix (#509 )	2013-11-29 13:11:56 +00:00
Ross Lawley	fe8340617a	Merge pull request #509 from j0hnsmith/bson_serializer django 1.6 session problem	2013-11-29 05:10:02 -08:00
Ross Lawley	b024dd913d	EmbeddedDocument._instance is now set when settng the attribute (#506 )	2013-11-29 13:09:11 +00:00
Ross Lawley	a2a698ab0e	Fixed EmbeddedDocument with ReferenceField equality issue (#502 )	2013-11-29 12:46:18 +00:00
Ross Lawley	bb56f92213	Updated changelog and AUTHORS (#499 )	2013-11-29 12:07:33 +00:00
Ross Lawley	8dcd998945	Merge pull request #499 from drudim/master Error in GenericReferenceField serialization was fixed	2013-11-29 04:06:04 -08:00
Ross Lawley	bcbbbe4046	Added test, updated AUTHORS and changelog (#498 )	2013-11-29 12:04:30 +00:00
Ross Lawley	7200a8cb84	Merge pull request #498 from woakas/patch-1 Fixed bug for count method when _none is True	2013-11-29 04:01:45 -08:00
Ross Lawley	6925344807	Test updates	2013-11-29 12:01:14 +00:00
Ross Lawley	60ceeb0ddd	Update change log and Authors (#496 )	2013-11-29 11:55:03 +00:00
Ross Lawley	06caabf333	Import fix	2013-11-29 11:53:24 +00:00
Ross Lawley	954131bd51	Merge remote-tracking branch 'origin/pr/496'	2013-11-29 11:49:54 +00:00
Ross Lawley	855efe7fe8	Added user_permissions to Django User object (#491 , #492 )	2013-11-29 11:48:14 +00:00
Ross Lawley	d902a74ab0	Merge remote-tracking branch 'origin/pr/492'	2013-11-29 11:45:06 +00:00
Ross Lawley	499e11f730	Updated AUTHORS (#488 )	2013-11-29 11:42:30 +00:00
Ross Lawley	6db59a9c31	Fix setting Geo Location fields (#488 )	2013-11-29 11:41:54 +00:00
Ross Lawley	6465726008	Fix handling invalid dict field value (#485 )	2013-11-29 10:33:36 +00:00
Ross Lawley	3a3b96e0be	Merge remote-tracking branch 'origin/pr/485'	2013-11-29 10:32:49 +00:00
Ross Lawley	992c91dc0c	Merge remote-tracking branch 'origin/pr/484' Conflicts: AUTHORS	2013-11-29 10:17:15 +00:00
Ross Lawley	809473c15c	Merge branch 'master' of github.com:MongoEngine/mongoengine	2013-11-29 10:14:54 +00:00
Ross Lawley	d79a5ec3d6	Updated Authors and changelog (#483 )	2013-11-29 10:12:02 +00:00
Ross Lawley	237469ceaf	Merge pull request #483 from grampajoe/connection-defaults Use defaults when host and port are passed as None	2013-11-29 02:10:05 -08:00
Ross Lawley	c28d9135d9	Fixed distinct casting issue with ListField of EmbeddedDocuments (#470 )	2013-11-29 09:48:53 +00:00
Ross Lawley	48a5679087	Added Django 1.6 to travis Refs: #480 , #454	2013-11-29 09:13:37 +00:00
Ross Lawley	7c938712f2	Updates to docs ref: #454 , #480	2013-11-29 09:11:08 +00:00
Ross Lawley	4df12bebc2	Merge branch 'master' of github.com:MongoEngine/mongoengine	2013-11-29 09:09:44 +00:00
Ross Lawley	dfe8987aaa	Updated geo tests	2013-11-29 09:09:16 +00:00
Ross Lawley	02dbe401d8	Merge pull request #480 from mishudark/master fix(session Issue #454): session serializer to json	2013-11-29 01:08:30 -08:00
j0hnsmith	c18f8c92e7	added BSONSerializer	2013-11-11 15:13:41 +00:00
Dmytro Popovych	11d4f6499a	Python 2.5-2.6 compatibility fix	2013-10-20 20:21:57 +03:00
Dmytro Popovych	f2c25b4744	Error in GenericReferenceField serialization was fixed	2013-10-20 20:08:00 +03:00
Gustavo Andrés Angulo	27b846717f	Fixed bug for count method when _none is True If my queryset have elements example: qs.all().count() => 10 q = qs.all().none() the count in queryset "q" must be 0 q.count() => 0	2013-10-17 16:37:31 -05:00
Loic Raucy	9ed138f896	Fixed bug with numeric valuedict keys and BaseDocument._lookup_field().	2013-10-17 16:32:47 +02:00
Loic Raucy	1978dc80eb	Added regression test for bug with DictField and numeric keys. When a DictField has numeric fields, BaseDocument._lookup_field doesn't work correclty.	2013-10-17 16:26:19 +02:00
rfkrocktk	fc4b247f4f	Patch for #491 Fix for issue #491, a bug in the permissions system.	2013-10-14 13:13:34 -07:00
Mitar	ebf7056f4a	Test for testing invalid dict field value.	2013-10-06 02:55:02 -07:00
Dan Ward	eb975d7e13	Added entry to AUTHORS	2013-10-05 20:46:51 +01:00
Dan Ward	a2dd8cb6b9	Added app_label Meta attribute to MongoUser class	2013-10-05 20:39:41 +01:00
Joe Friedl	7c254c6136	Use defaults when host and port are passed as None	2013-10-04 14:18:36 -04:00
mishudark	c8a33b83f1	fix(session): session serializer to json	2013-09-29 20:25:26 +02:00
Ross Lawley	1145c72b01	Merge pull request #462 from bool-dev/master Fixes #458, DecimalField now ignores incorrect values until validate is called just like FloatField	2013-09-27 08:41:32 -07:00
Ross Lawley	7fc45fb711	Merge pull request #468 from elasticsales/fix-dict-validation Fix validation for a nested DictField	2013-09-27 08:33:02 -07:00
Ross Lawley	e146262c38	Merge pull request #467 from adamsc64/doc_foreignkey_push_pull_example Expanded example of using ListFields for one-to-many relationships.	2013-09-27 08:31:59 -07:00
Ross Lawley	6f808bd06e	Merge pull request #469 from jyapayne/master Fixes AttributeError when using storage.exists() on a non-existing file.	2013-09-27 08:21:49 -07:00
Ross Lawley	0b6ab49325	Merge pull request #472 from swistakm/fix/docs-map-reduce-mongodb.org-link fix broken external docs link on map_reduce	2013-09-27 07:58:49 -07:00
swistakm	66d9182e50	fix broken external docs link	2013-09-20 12:43:26 +02:00
Joey Payne	654cca82a9	Fixes AttributeError when using storage.exists() on a non-existing file.	2013-09-18 11:38:38 -06:00
Stefan Wojcik	89785da1c5	fix validation for a nested DictField	2013-09-16 23:50:13 -07:00
Christopher Adams	2f9964e46e	Expanded example of using ListFields for one-to-many relationships. - Added an example of how to use the atomic update operations to pull and push to a ListField containing ReferenceFields.	2013-09-17 00:02:38 -04:00
bool.dev	168ecd67b0	Fixes #458 , DecimalField now ignores incorrect values until validate is called, just like FloatField.	2013-09-06 22:05:31 +05:30
Ross Lawley	bcbe740598	Updated setup.py	2013-08-23 13:41:15 +00:00
Ross Lawley	86c8929d77	0.8.4 is a go	2013-08-23 10:03:10 +00:00
Ross Lawley	6738a9433b	Updated travis	2013-08-23 09:36:33 +00:00
Ross Lawley	23843ec86e	Updated travis config	2013-08-23 09:06:57 +00:00
Ross Lawley	f4db0da585	Update changelog add LK4D4 to authors (#452 )	2013-08-23 09:03:51 +00:00
Ross Lawley	9ee3b796cd	Merge pull request #452 from LK4D4/master Remove database name necessity in uri connection schema	2013-08-23 02:02:12 -07:00
Alexandr Morozov	f57569f553	Remove database name necessity in uri connection schema	2013-08-21 13:52:24 +04:00
Ross Lawley	fffd0e8990	Fixed error raise	2013-08-20 18:54:14 +00:00
Ross Lawley	200e52bab5	Added documentation about abstract meta Refs #438	2013-08-20 18:44:12 +00:00
Ross Lawley	a0ef649dd8	Update travis.yml	2013-08-20 18:31:33 +00:00
Ross Lawley	0dd01bda01	Fixed "$pull" semantics for nested ListFields (#447 )	2013-08-20 15:54:42 +00:00
Ross Lawley	a707598042	Allow fields to be named the same as query operators (#445 )	2013-08-20 13:13:17 +00:00
Ross Lawley	8a3171308a	Merge remote-tracking branch 'origin/pr/445'	2013-08-20 13:04:20 +00:00
Ross Lawley	29c887f30b	Updated field filter logic - can now exclude subclass fields (#443 )	2013-08-20 12:21:20 +00:00
Ross Lawley	661398d891	Fixed dereference issue with embedded listfield referencefields (#439 )	2013-08-20 10:22:06 +00:00
Ross Lawley	2cd722d751	Updated setup.py	2013-08-20 10:20:05 +00:00
Ross Lawley	49f5b4fa5c	Fix Queryset docs (#448 )	2013-08-20 09:45:00 +00:00
Ross Lawley	67baf465f4	Fixed slice when using inheritance causing fields to be excluded (#437 )	2013-08-20 09:14:58 +00:00
Ross Lawley	ee7666ddea	Update AUTHORS and Changelog (#441 )	2013-08-20 08:31:56 +00:00
Ross Lawley	02fc41ff1c	Merge branch 'master' of github.com:MongoEngine/mongoengine	2013-08-20 08:30:33 +00:00
Ross Lawley	d07a9d2ef8	Dynamic Fields store and recompose Embedded Documents / Documents correctly (#449 )	2013-08-20 08:30:20 +00:00
Ross Lawley	3622ebfabd	Merge pull request #441 from Karmak23/patch-1 Fix the ._get_db() attribute after a Document.switch_db()	2013-08-20 01:19:26 -07:00
crazyzubr	70b320633f	permit the establishment of a field with the name of size or other Example: # model class Example(Document): size = ReferenceField(Size, verbose_name='Size') # query examples = Example.objects(size=instance_size) # caused an error """ File ".../mongoengine/queryset/transform.py", line 50, in query if parts[-1] == 'not': IndexError: list index out of range """	2013-08-15 19:32:13 +08:00
Olivier Cortès	f30208f345	Fix the ._get_db() attribute after a Document.switch_db() Without this patch, I've got: ``` myobj._get_db() <bound method TopLevelDocumentMetaclass._get_db of <class 'oneflow.core.models.nonrel.Article'>> ``` I need to `myobj._get_db()()` to get the database. I felt this like a bug. regards,	2013-08-12 19:12:53 +02:00
Ross Lawley	5bcc454678	Handle dynamic fieldnames that look like digits (#434 )	2013-08-07 09:07:57 +00:00
Ross Lawley	473110568f	Merge branch 'master' of github.com:MongoEngine/mongoengine	2013-08-06 11:07:25 +00:00
Ross Lawley	88ca0f8196	Merge remote-tracking branch 'origin/pr/432' Conflicts: tests/test_django.py	2013-08-06 11:05:52 +00:00
Ross Lawley	a171005010	Merge pull request #428 from devoto13/patch-1 Removed duplicated line for 'pop' method in documentation	2013-08-06 03:20:50 -07:00
Ross Lawley	f56ad2fa58	Merge pull request #426 from laurentpayot/Django_shortcuts_docs updated docs for django shortcuts get_object_or_404 and get_list_or_404	2013-08-06 03:17:56 -07:00
Nicolas Cortot	a0d255369a	Add a test case for get_user_document	2013-08-04 11:29:16 +02:00
Nicolas Cortot	40b0a15b35	Fixing typos	2013-08-04 11:03:34 +02:00
Nicolas Cortot	b98b06ff79	Fix an error in get_user_document	2013-08-04 11:01:09 +02:00
devoto13	a448c9aebf	removed duplicated method	2013-08-01 17:54:41 +03:00
Laurent Payot	b3f462a39d	updated docs for django shortcuts get_object_or_404 and get_list_or_404	2013-08-01 03:51:10 +02:00
Ross Lawley	7ce34ca019	Merge branch 'master' of github.com:MongoEngine/mongoengine	2013-07-31 09:44:50 +00:00
Ross Lawley	719bb53c3a	Updated changelog (#423 )	2013-07-31 09:44:15 +00:00
Ross Lawley	214415969f	Merge pull request #423 from ncortot/get_user_document Add get_user_document and improve mongo_auth module	2013-07-31 02:43:19 -07:00
Ross Lawley	7431b1f123	Updated AUTHORS (#424 )	2013-07-31 09:31:04 +00:00
Ross Lawley	d8ffa843a9	Added str representation of GridFSProxy (#424 )	2013-07-31 09:29:41 +00:00
Paul	a69db231cc	Pretty-print GridFSProxy objects	2013-07-31 11:26:23 +10:00
Nicolas Cortot	c17f94422f	Add get_user_document and improve mongo_auth module * Added a get_user_document() methot to access the actual Document class used for authentication. * Clarified the docstring on MongoUser to prevent its use when the user Document class should be used. * Removed the masking of exceptions when loading the user document class.	2013-07-30 20:48:25 +02:00
Ross Lawley	b4777f7f4f	Fix test	2013-07-30 15:04:52 +00:00
Ross Lawley	a57d9a9303	Added regression test (#418 )	2013-07-30 13:28:05 +00:00
Ross Lawley	5e70e1bcb2	Update transform to handle docs erroneously passed to unset (#416 )	2013-07-30 13:17:38 +00:00
Ross Lawley	0c43787996	Fixed indexing - turn off _cls (#414 )	2013-07-30 11:43:52 +00:00
Ross Lawley	dc310b99f9	Updated docs about TTL indexes and signals (#413 )	2013-07-30 10:54:04 +00:00
Ross Lawley	e98c5e10bc	Fixed dereference threading issue in ComplexField.__get__ (#412 )	2013-07-30 10:49:08 +00:00
Ross Lawley	f1b1090263	Merge remote-tracking branch 'origin/pr/412' into 412 Conflicts: AUTHORS	2013-07-30 10:32:07 +00:00
Ross Lawley	6efd6faa3f	Fixed QuerySetNoCache.count() caching (#410 )	2013-07-30 10:30:16 +00:00
Ross Lawley	1e4d48d371	Don't follow references in _get_changed_fields (#422 , #417 ) A better fix so we dont follow down a references rabbit hole.	2013-07-29 17:22:24 +00:00
Ross Lawley	93a2adb3e6	Updating changelog and authors #417	2013-07-29 15:43:54 +00:00
Ross Lawley	a66d516777	Merge pull request #417 from ProgressiveCompany/delta-dbref-false-bug BaseDocument._delta doesn't properly end it's path at Documents when using `dbref=False`	2013-07-29 08:41:09 -07:00
Ross Lawley	7a97d42338	to_json test updates #420	2013-07-29 15:38:08 +00:00
Ross Lawley	b66cdc8fa0	Merge branch 'master' of github.com:MongoEngine/mongoengine	2013-07-29 15:30:21 +00:00
Ross Lawley	67f43b2aad	Allow args and kwargs to be passed through to_json (#420 )	2013-07-29 15:29:48 +00:00
Paul Uithol	d143e50238	Replace `assertIn` with an `assertTrue`; apparently missing in Python 2.6	2013-07-25 15:34:58 +02:00
Paul Uithol	e27439be6a	Fix `BaseDocument._delta` when working with plain ObjectIds instead of DBRefs	2013-07-25 14:52:03 +02:00
Paul Uithol	2ad5ffbda2	Add asserts to `test_delta_with_dbref_*`, instead of relying on exceptions	2013-07-25 14:51:09 +02:00
Paul Uithol	dae9e662a5	Create test case for failing saves (wrong delta) with dbref=False	2013-07-25 14:30:20 +02:00
Ross Lawley	f22737d6a4	Merge pull request #409 from bool-dev/master Corrected mistakes in upgrade.rst documentation	2013-07-23 01:19:36 -07:00
Ross Lawley	a458d5a176	Docs update #406	2013-07-23 08:16:06 +00:00
Ross Lawley	d92ed04538	Docs update #406	2013-07-23 08:13:52 +00:00
Thom Knowles	80b3df8953	dereference instance not thread-safe	2013-07-22 20:07:57 -04:00
bool-dev	bcf83ec761	Corrected spelling mistakes, some grammar, and UUID/DecimalField error in upgrade.rst	2013-07-18 09:17:28 +05:30
bool.dev	e44e72bce3	Merge remote-tracking branch 'upstream/master'	2013-07-18 08:49:02 +05:30
Ross Lawley	35f2781518	Update changelog	2013-07-12 09:11:27 +00:00
Ross Lawley	dc5512e403	Upgrade warning for 0.8.3	2013-07-12 09:01:11 +00:00
Ross Lawley	48ef176e28	0.8.3 is a go	2013-07-12 08:41:56 +00:00
Ross Lawley	1aa2b86df3	travis install python-dateutil direct	2013-07-11 09:38:59 +00:00
Ross Lawley	73026047e9	Trying to fix dateutil	2013-07-11 09:29:06 +00:00
Ross Lawley	6c2c33cac8	Add Jatin- to Authors, changelog update	2013-07-11 08:12:27 +00:00
Ross Lawley	d593f7e04b	Fixed EmbeddedDocuments with `id` also storing `_id` (#402 )	2013-07-11 08:11:00 +00:00
Ross Lawley	6c599ef506	Fix edge case where _dynamic_keys stored as None (#387 , #401 )	2013-07-11 07:15:34 +00:00
Ross Lawley	f48a0b7b7d	Trying to fix travis	2013-07-10 21:30:29 +00:00
Ross Lawley	d9f538170b	Added get_proxy_object helper to filefields (#391 )	2013-07-10 21:19:11 +00:00
Ross Lawley	1785ced655	Merge branch 'master' into 391	2013-07-10 20:35:21 +00:00
Ross Lawley	e155e1fa86	Add a default for previously pickled versions	2013-07-10 20:10:01 +00:00
Ross Lawley	e28fab0550	Merge remote-tracking branch 'origin/pr/400'	2013-07-10 19:56:15 +00:00
Ross Lawley	fb0dd2c1ca	Updated changelog	2013-07-10 19:54:30 +00:00
Ross Lawley	6e89e736b7	Merge remote-tracking branch 'origin/pr/393' into 393 Conflicts: mongoengine/queryset/queryset.py tests/queryset/queryset.py	2013-07-10 19:53:13 +00:00
Ross Lawley	634b874c46	Added QuerySetNoCache and QuerySet.no_cache() for lower memory consumption (#365 )	2013-07-10 19:40:57 +00:00
Ross Lawley	9d16364394	Merge remote-tracking branch 'origin/pr/391' into 391	2013-07-10 14:10:09 +00:00
Wilson Júnior	daeecef59e	Update fields.py Typo in documentation for DecimalField	2013-07-10 10:59:41 -03:00
Ross Lawley	8131f0a752	Fixed sum and average mapreduce dot notation support (#375 , #376 )	2013-07-10 13:53:18 +00:00
Ross Lawley	f4ea1ad517	Merge remote-tracking branch 'origin/pr/376' Conflicts: AUTHORS	2013-07-10 13:50:52 +00:00
Ross Lawley	f34e8a0ff6	Fixed as_pymongo to return the id (#386 )	2013-07-10 13:38:53 +00:00
Ross Lawley	4209d61b13	Document.select_related() now respects `db_alias` (#377 )	2013-07-10 12:49:19 +00:00
Ross Lawley	fa83fba637	Reload uses shard_key if applicable (#384 )	2013-07-10 11:18:49 +00:00
Ross Lawley	af86aee970	_dynamic field updates - fixed pickling and creation order Dynamic fields are ordered based on creation and stored in _fields_ordered (#396) Fixed pickling dynamic documents `_dynamic_fields` (#387)	2013-07-10 10:57:24 +00:00
Ross Lawley	f26f1a526c	Merge branch 'master' of github.com:MongoEngine/mongoengine	2013-07-10 09:12:36 +00:00
Ross Lawley	7cb46d0761	Fixed ListField setslice and delslice dirty tracking (#390 )	2013-07-10 09:11:50 +00:00
Ross Lawley	0cb4070364	Added Django 1.5 PY3 support (#392 )	2013-07-10 08:53:56 +00:00
Ross Lawley	bc008c2597	Merge remote-tracking branch 'origin/pr/392' into 392	2013-07-10 08:44:10 +00:00
Ross Lawley	a1d142d3a4	Prep for django and py3 support	2013-07-10 08:38:13 +00:00
Ross Lawley	aa00dc1031	Merge pull request #392 from lig/patch-1 Fix crash on Python 3.x and Django >= 1.5	2013-07-10 01:37:40 -07:00
Wilson Júnior	592c654916	extending support for queryset.sum and queryset.average methods	2013-07-05 10:36:11 -03:00
Serge Matveenko	5021b10535	Fix crash on Python 3.x and Django >= 1.5	2013-07-03 01:17:40 +04:00
Jan Schrewe	43d6e64cfa	Added a get_proxy_obj method to FileField and handle FileFields in container fields properly in ImageGridFsProxy.	2013-07-02 17:04:15 +02:00
Ross Lawley	8d21e5f3c1	Fix tests for py2.6	2013-07-02 09:47:54 +00:00
Ross Lawley	fbe5df84c0	Remove users post uri test	2013-06-25 09:30:28 +00:00
kelvinhammond	caff44c663	Fixed sum and average queryset function * Fixed sum and average map reduce functions for sum and average so that it works with mongo dot notation. * Added unittest cases / updated them for the new changes	2013-06-21 09:39:11 -04:00
Ross Lawley	d6edef98c6	Added match ($elemMatch) support for EmbeddedDocuments (#379 )	2013-06-21 11:29:23 +00:00
kelvinhammond	e0d2fab3c3	Merge branch 'master' of https://github.com/MongoEngine/mongoengine Conflicts: AUTHORS	2013-06-21 07:26:40 -04:00
Ross Lawley	9867e918fa	Fixed weakref being valid after reload (#374 )	2013-06-21 11:04:29 +00:00
Ross Lawley	e6374ab425	Added Michael Bartnett to Authors (#373 )	2013-06-21 10:40:15 +00:00
Ross Lawley	e116bb9227	Fixed queryset.get() respecting no_dereference (#373 )	2013-06-21 10:39:10 +00:00
Ross Lawley	f1a1aa54d8	Added full_result kwarg to update (#380 )	2013-06-21 10:19:40 +00:00
Ross Lawley	574f3c23d3	get should clone before calling	2013-06-21 09:35:22 +00:00
kelvinhammond	c31d6a6898	Fixed sum and average mapreduce function for issue #375	2013-06-19 10:34:33 -04:00
Ross Lawley	44a2a164c0	Doc updates	2013-06-13 10:54:39 +00:00
bool.dev	5cfd8909a8	Merge remote-tracking branch 'upstream/master'	2013-04-28 13:40:58 +05:30
bool.dev	d92f992c01	Removed merge trackers in code, merged correctly now.	2013-04-14 13:48:11 +05:30
bool.dev	20a5d9051d	Merge conflicts resolved.	2013-04-14 13:39:54 +05:30
bool.dev	782d48594a	Fixes resolving to db_field from class field name, in distinct() query.	2013-04-04 09:02:30 +05:30