Merge branch ‘pr/78’ from (@Bahus) and close jschrewe#78

Jan Schrewe · Jan Schrewe · commit 3759a4841fa3 · 2015-07-06T14:45:09.000+02:00
diff --git a/mongodbforms/documentoptions.py b/mongodbforms/documentoptions.py
@@ -4,7 +4,7 @@
 
 from django.db.models.fields import FieldDoesNotExist
 from django.utils.text import capfirst
-from django.utils.functional import LazyObject
+from django.utils.functional import LazyObject, new_method_proxy
 from django.conf import settings
 try:
     from django.db.models.options import get_verbose_name
@@ -50,7 +50,7 @@ def to(self, value):
 class PkWrapper(object):
     editable = False
     fake = False
-    
+
     def __init__(self, wrapped):
         self.obj = wrapped
 
@@ -68,39 +68,27 @@ def __setattr__(self, attr, value):
 class LazyDocumentMetaWrapper(LazyObject):
     _document = None
     _meta = None
-    
+
     def __init__(self, document):
         self._document = document
         self._meta = document._meta
         super(LazyDocumentMetaWrapper, self).__init__()
-        
+
     def _setup(self):
         self._wrapped = DocumentMetaWrapper(self._document, self._meta)
-        
+
     def __setattr__(self, name, value):
-        if name in ["_document", "_meta",]:
+        if name in ["_document", "_meta", ]:
             object.__setattr__(self, name, value)
         else:
             super(LazyDocumentMetaWrapper, self).__setattr__(name, value)
-    
-    def __dir__(self):
-        return self._wrapped.__dir__()
-    
-    def __getitem__(self, key):
-        return self._wrapped.__getitem__(key)
-    
-    def __setitem__(self, key, value):
-        return self._wrapped.__getitem__(key, value)
-        
-    def __delitem__(self, key):
-        return self._wrapped.__delitem__(key)
-        
-    def __len__(self):
-        return self._wrapped.__len__()
-        
+
+    __len__ = new_method_proxy(len)
+
+    @new_method_proxy
     def __contains__(self, key):
-        return self._wrapped.__contains__(key)
-        
+        return key in self
+
 
 class DocumentMetaWrapper(MutableMapping):
     """
@@ -153,7 +141,7 @@ def __init__(self, document, meta=None):
         self._setup_document_fields()
         # Setup self.pk if the document has an id_field in it's meta
         # if it doesn't have one it's an embedded document
-        #if 'id_field' in self._meta:
+        # if 'id_field' in self._meta:
         #    self.pk_name = self._meta['id_field']
         self._init_pk()
 
@@ -202,7 +190,7 @@ def _init_pk(self):
 
         def _get_pk_val(self):
             return self._pk_val
-        
+
         if pk_field is not None:
             self.pk.name = self.pk_name
             self.pk.attname = self.pk_name
@@ -214,35 +202,35 @@ def _get_pk_val(self):
             # needs to add a hidden pk field. It does not for embedded fields.
             # So we pretend to have an editable pk field and just ignore it otherwise
             self.pk.editable = True
-    
+
     @property
     def app_label(self):
         if self._app_label is None:
             model_module = sys.modules[self.document.__module__]
             self._app_label = model_module.__name__.split('.')[-2]
         return self._app_label
-            
+
     @property
     def verbose_name(self):
         """
         Returns the verbose name of the document.
-        
+
         Checks the original meta dict first. If it is not found
         then generates a verbose name from the object name.
         """
         if self._verbose_name is None:
             verbose_name = self._meta.get('verbose_name', self.object_name)
             self._verbose_name = capfirst(create_verbose_name(verbose_name))
         return self._verbose_name
-    
+
     @property
     def verbose_name_raw(self):
         return self.verbose_name
-    
+
     @property
     def verbose_name_plural(self):
         return "%ss" % self.verbose_name
-                
+
     def get_add_permission(self):
         return 'add_%s' % self.object_name.lower()
 
@@ -251,10 +239,10 @@ def get_change_permission(self):
 
     def get_delete_permission(self):
         return 'delete_%s' % self.object_name.lower()
-    
+
     def get_ordered_objects(self):
         return []
-    
+
     def get_field_by_name(self, name):
         """
         Returns the (field_object, model, direct, m2m), where field_object is
@@ -274,13 +262,13 @@ def get_field_by_name(self, name):
         else:
             raise FieldDoesNotExist('%s has no field named %r' %
                                     (self.object_name, name))
-         
+
     def get_field(self, name, many_to_many=True):
         """
         Returns the requested field by name. Raises FieldDoesNotExist on error.
         """
         return self.get_field_by_name(name)[0]
-    
+
     @property
     def swapped(self):
         """
@@ -289,7 +277,7 @@ def swapped(self):
 
         For historical reasons, model name lookups using get_model() are
         case insensitive, so we make sure we are case insensitive here.
-        
+
         NOTE: Not sure this is actually usefull for documents. So at the
         moment it's really only here because the admin wants it. It might
         prove usefull for someone though, so it's more then just a dummy.
@@ -311,28 +299,28 @@ def swapped(self):
                         not in (None, model_label):
                     return swapped_for
         return None
-    
+
     def __getattr__(self, name):
         if name in self._deprecated_attrs:
             return getattr(self, self._deprecated_attrs.get(name))
-            
+
         try:
             return self._meta[name]
         except KeyError:
             raise AttributeError
-                    
+
     def __setattr__(self, name, value):
         if not hasattr(self, name):
             self._meta[name] = value
         else:
             super(DocumentMetaWrapper, self).__setattr__(name, value)
-    
+
     def __contains__(self, key):
         return key in self._meta
-    
+
     def __getitem__(self, key):
         return self._meta[key]
-    
+
     def __setitem__(self, key, value):
         self._meta[key] = value
 
@@ -350,10 +338,10 @@ def get(self, key, default=None):
             return self.__getitem__(key)
         except KeyError:
             return default
-    
+
     def get_parent_list(self):
         return []
-    
+
     def get_all_related_objects(self, *args, **kwargs):
         return []
 
diff --git a/mongodbforms/tests.py b/mongodbforms/tests.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+from django.conf import settings
+
+settings.configure(
+    DEBUG=True,
+    DATABASES={
+        'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+        }
+    },
+    ROOT_URLCONF='',
+    INSTALLED_APPS=(
+        'django.contrib.auth',
+        'django.contrib.contenttypes',
+        'django.contrib.sessions',
+        'django.contrib.admin',
+        'mongodbforms',
+    )
+)
+
+
+import mongoengine
+from django.test import SimpleTestCase
+from mongodbforms.documentoptions import LazyDocumentMetaWrapper
+
+
+class TestDocument(mongoengine.Document):
+    meta = {'abstract': True}
+
+    name = mongoengine.StringField()
+
+
+class LazyWrapperTest(SimpleTestCase):
+
+    def test_lazy_getitem(self):
+        meta = LazyDocumentMetaWrapper(TestDocument)
+        self.assertTrue(meta['abstract'])
+
+        meta = LazyDocumentMetaWrapper(TestDocument)
+        self.assertTrue(meta.get('abstract'))
+
+        meta = LazyDocumentMetaWrapper(TestDocument)
+        self.assertTrue('abstract' in meta)
+
+        meta = LazyDocumentMetaWrapper(TestDocument)
+        self.assertEqual(len(meta), 1)
+
+        meta = LazyDocumentMetaWrapper(TestDocument)
+        meta.custom = 'yes'
+        self.assertEqual(meta.custom, 'yes')
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@ def convert_readme():
     return open('README.txt').read()
 
 setup(name='mongodbforms',
-    version='0.3',
+    version='0.3.1',
     description="An implementation of django forms using mongoengine.",
     author='Jan Schrewe',
     author_email='jan@schafproductions.com',
