Merge branch 'master' of github.com:thomwiggers/django-mongoengine-forms into thomwiggers-master

asiebert · asiebert · commit ebaa8828524d · 2017-08-30T18:54:52.000-07:00
* Upgrade mongoengine requirement to 0.10.0
diff --git a/mongodbforms/documentoptions.py b/mongodbforms/documentoptions.py
@@ -73,16 +73,21 @@ def __init__(self, document):
         super(LazyDocumentMetaWrapper, self).__init__()
 
     def _setup(self):
-        self._wrapped = DocumentMetaWrapper(self._document, self._meta)
+        self.__dict__['_wrapped'] = DocumentMetaWrapper(
+            self._document, self._meta)
 
     def __setattr__(self, name, value):
-        if name in ["_document", "_meta", ]:
-            object.__setattr__(self, name, value)
+        if name in ["_document", "_meta"]:
+            self.__dict__[name] = value
         else:
             super(LazyDocumentMetaWrapper, self).__setattr__(name, value)
 
     __len__ = new_method_proxy(len)
 
+    @property
+    def __class__(self):
+        return type(self)
+
     @new_method_proxy
     def __contains__(self, key):
         return key in self
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 from subprocess import check_call, CalledProcessError
 
-from setuptools import setup, find_packages
+from setuptools import setup
 
 
 def convert_readme():
@@ -17,11 +17,11 @@ def convert_readme():
 
 setup(
     name='django-mongoengine-forms',
-    version='0.4.3.1',
+    version='0.4.3',
     description="An implementation of django forms using mongoengine.",
     author='Thom Wiggers',
     author_email='thom@thomwiggers.nl',
-    packages=find_packages(),
+    packages=['mongodbforms', 'tests'],
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Environment :: Web Environment',
@@ -34,13 +34,11 @@ def convert_readme():
     license='New BSD License',
     long_description=convert_readme(),
     include_package_data=True,
-    package_data={
-        "mongodbforms": ['templates/mongodbforms/*', 'static/mongodbforms/*']
-    },
     provides=['mongodbforms'],
     obsoletes=['mongodbforms'],
     url='https://github.com/thomwiggers/django-mongoengine-forms/',
     zip_safe=False,
-    install_requires=['setuptools', 'django>=1.8', 'mongoengine>=0.8.8'],
-    test_suite="tests",
+    install_requires=['setuptools', 'django>=1.8', 'mongoengine>=0.10.0'],
+    tests_require=['mongomock'],
+    test_suite="tests.suite",
 )
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -0,0 +1,11 @@
+import unittest
+
+from . import test_document, test_lazywrapper, test_recursive_reference
+
+
+def suite():
+    loader = unittest.TestLoader()
+    suite = unittest.TestSuite()
+    for test in [test_document, test_lazywrapper, test_recursive_reference]:
+        suite.addTest(loader.loadTestsFromModule(test))
+    return suite
diff --git a/tests/fixtures/__init__.py b/tests/fixtures/__init__.py
diff --git a/tests/fixtures/recursive_definition.py b/tests/fixtures/recursive_definition.py
@@ -0,0 +1,22 @@
+# Author: @lucashowell in
+# https://github.com/thomwiggers/django-mongoengine-forms/issues/10#issuecomment-321387694
+from mongoengine import Document
+from mongoengine import StringField, ReferenceField
+
+from mongodbforms import DocumentForm
+
+
+class Group(Document):
+    name = StringField(required=True, unique=True)
+    parent_group = ReferenceField("Group")
+
+
+class User(Document):
+    name = StringField(required=True, unique=True)
+    default_group = ReferenceField("Group")
+
+
+class UserForm(DocumentForm):
+    class Meta:
+        document = User
+        fields = ["name", "default_group", ]
diff --git a/tests/test_document.py b/tests/test_document.py
@@ -1,3 +1,4 @@
+from django.conf import settings
 from mongoengine import Document, fields
 from mongodbforms import DocumentForm
 import unittest
@@ -16,6 +17,10 @@ class Meta:
 
 class SimpleDocumentTest(unittest.TestCase):
 
+    @classmethod
+    def setUpClass(cls):
+        settings.configure()
+
     def test_form(self):
         form = MyForm()
         self.assertEquals(len(form.fields), 3)
diff --git a/tests/test_recursive_reference.py b/tests/test_recursive_reference.py
@@ -0,0 +1,20 @@
+from mongoengine import Document, fields, connect
+import unittest
+
+
+class MyDocument(Document):
+    parent = fields.ReferenceField("MyDocument")
+
+
+class SimpleDocumentTest(unittest.TestCase):
+
+    def test_document(self):
+        MyDocument()
+
+
+class MoreComplexRecursiveDocument(unittest.TestCase):
+
+    def test_import(self):
+        connect('test', host='mongomock://test')
+        from .fixtures.recursive_definition import UserForm
+        UserForm()
