Merge pull request #113 from alfred82santa/fix/multitype-creation

Fix Multitype on creation mode and fixes

README.rst

@@ -85,6 +85,16 @@ Features
 Changelog
 ---------
 
+Version 0.12.1
+--------------
+
+* Fix :class:`~dirty_models.fields.MultiFieldType` on creation mode.
+
+* Fix :class:`~dirty_models.utils.BaseModelFormatterIter` to be aware about override access modes.
+
+* Exposed all useful classes on package root.
+
+
 Version 0.12.0
 --------------
 

dirty_models/__init__.py

@@ -9,4 +9,4 @@
 from .utils import *
 from .base import *
 
-__version__ = '0.12.0'
+__version__ = '0.12.1'

dirty_models/fields.py

@@ -12,9 +12,9 @@
 from .base import AccessMode, Creating
 from .model_types import ListModel
 
-__all__ = ['IntegerField', 'FloatField', 'BooleanField', 'StringField', 'StringIdField',
+__all__ = ['IntegerField', 'FloatField', 'BooleanField', 'StringField', 'StringIdField', 'DateTimeBaseField',
            'TimeField', 'DateField', 'DateTimeField', 'TimedeltaField', 'ModelField', 'ArrayField',
-           'HashMapField', 'BlobField', 'MultiTypeField', 'EnumField']
+           'HashMapField', 'BlobField', 'MultiTypeField', 'EnumField', 'BytesField', 'BaseField']
 
 
 class BaseField:
@@ -896,6 +896,11 @@ def convert_value(self, value):
             if ft.can_use_value(value):
                 return ft.convert_value(value)
 
+    def convert_value_creating(self, value):
+        for ft in self._field_types:
+            if ft.can_use_value(value):
+                return ft.convert_value_creating(value)
+
     def check_value(self, value):
         for ft in self._field_types:
             if ft.check_value(value):

dirty_models/models.py

@@ -15,7 +15,7 @@
     StringField
 from .model_types import ListModel
 
-__all__ = ['BaseModel', 'DynamicModel', 'FastDynamicModel', 'HashMapModel']
+__all__ = ['BaseModel', 'DynamicModel', 'FastDynamicModel', 'HashMapModel', 'DirtyModelMeta', 'CamelCaseMeta']
 
 
 class DirtyModelMeta(type):

dirty_models/utils.py

@@ -92,12 +92,24 @@ class BaseModelFormatterIter(BaseModelIterator, BaseFormatterIter):
 
     def __iter__(self):
         for name, field, value in super(BaseModelFormatterIter, self).__iter__():
-            if field.access_mode == AccessMode.HIDDEN:
+            if self.must_to_skip(name, field, value):
                 continue
 
             yield name, self.format_field(field,
                                           self.model.get_field_value(name))
 
+    def must_to_skip(self, name, field, value):
+        am = field.access_mode
+        try:
+            am = self.model.__override_field_access_modes__[name]
+        except KeyError:
+            pass
+
+        if am == AccessMode.HIDDEN:
+            return True
+
+        return False
+
     def format_field(self, field, value):
         if isinstance(field, MultiTypeField):
             return self.format_field(field.get_field_type_by_value(value), value)

tests/dirty_models/tests_models.py

@@ -2300,6 +2300,8 @@ class ModelCreation(BaseModel):
     testFieldList = ArrayField(access_mode=AccessMode.WRITABLE_ONLY_ON_CREATION, field_type=IntegerField())
     testFieldModelList = ArrayField(access_mode=AccessMode.WRITABLE_ONLY_ON_CREATION,
                                     field_type=ModelField())
+    testFieldMulti = MultiTypeField(field_types=[IntegerField(), StringField()],
+                                    access_mode=AccessMode.WRITABLE_ONLY_ON_CREATION)
 
 
 class TestModelCreation(TestCase):
@@ -2313,7 +2315,8 @@ def test_ignore_read_only_on_creating_new_model(self):
             'testFieldModelList': [{'testField1': 61, 'testField2': 51, 'testField3': 41,
                                     'testFieldList': [5, 6, 3, 66, 42, 22]},
                                    {'testField1': 61, 'testField2': 51, 'testField3': 41,
-                                    'testFieldList': [5, 6, 3, 66, 42, 22]}]
+                                    'testFieldList': [5, 6, 3, 66, 42, 22]}],
+            'testFieldMulti': 1.1
         }
 
         model = ModelCreation.create_new_model(data)
@@ -2329,6 +2332,8 @@ def test_ignore_read_only_on_creating_new_model(self):
         self.assertIsNone(model.testFieldModelList[0].testField1)
         self.assertIsNone(model.testFieldModelList[0].testField3)
 
+        self.assertEquals(model.testFieldMulti, 1)
+
 
 class TestOverrideFieldModeAccessModel(TestCase):