refactor: complete testcase

CHANGELOG

@@ -2,6 +2,7 @@
 
 - 去掉 serialize 和 deserialize 接口
 
+#### 1.0.0a0
 
 ### 0.0.1a3 - 2017-5-24
 

README.md

@@ -65,4 +65,5 @@ artists = [
 album = AlbumModel(**album)
 artists = [ArtistModel(**artist) for artist in artists]
 song = SongModel(title=title, album=album, artists=artists)
+song.artists[0].name
 ```

april/models.py

@@ -91,14 +91,10 @@ def validate_field(cls, name, value):
         """validate the type of field value"""
         fields_dict = dict(cls._fields)
         field_type = fields_dict[name]
-        if is_nested_type(field_type):
-            field_type.is_instance(value)
-        else:
-            if not isinstance(value, field_type):
-                raise ValidationError(
-                    'the value of field:"{}" should be "{}", got {}'.format
-                    (name, field_type, value))
-
+        if not any([is_nested_type(field_type) and field_type.is_instance(value),
+                    isinstance(value, field_type)]):
+            raise ValidationError('the value of filed:"{}" should be "{}", got {}'
+                                  .format(name, field_type, type(value)))
     @classmethod
     def is_field(cls, name):
         """check if a attribute belongs to model fields"""

april/tipes.py

@@ -8,25 +8,26 @@
 
 
 class BaseContainerType(object):
-    def __new__(cls, obj_list):
-        if not isinstance(obj_list, list):
-            raise TypeError('obj_list should be a list')
+    def __new__(cls, objects):
+        if not isinstance(objects, (list, set, tuple)):
+            raise TypeError('only list set or tuple can be container type, got {}'
+                            .format(type(objects)))
 
-        for obj in obj_list:
+        for obj in objects:
             if not isinstance(obj, cls.nested_type):
                 raise TypeError('object must be a %s' % cls.nested_type.__name__)
 
-        return obj_list
+        return objects
 
     @classmethod
     def is_instance(cls, data):
         if not isinstance(data, (list, set, tuple)):
-            raise ValidationError('value should be a list set or tuple, got {}'
-                                  .format(type(data)))
+            return False
 
         for each in data:
             if not isinstance(each, cls.nested_type):
-                raise ValidationError("nested element should be '%s'" % cls.nested_type)
+                return False
+        return True
 
 
 class listof:

tests/test_model.py

@@ -89,21 +89,23 @@ class UserModel(Model):
 
         UserModel.validate({'name': 'lucy', 'strict': True})
 
-#    def test_inherit_usage(self):
-#
-#        class CarModel(Model):
-#            trade_mark = str
-#
-#        class BaseUserModel(Model):
-#            name = str
-#            car = CarModel
-#
-#        class UserModel(BaseUserModel):
-#            age = int
-#
-#        user = UserModel(name='lucy', age=11, car={'trade_mark': 'benzi'})
-#        self.assertEqual(user.name, 'lucy')
-#        self.assertEqual(user.car.trade_mark, 'benzi')
+    def test_inherit_usage(self):
+
+        class CarModel(Model):
+            trade_mark = str
+
+        class BaseUserModel(Model):
+            name = str
+            car = CarModel
+
+        class UserModel(BaseUserModel):
+            age = int
+
+        user = UserModel(name='lucy',
+                         age=11,
+                         car=CarModel(**{'trade_mark': 'benzi'}))
+        self.assertEqual(user.name, 'lucy')
+        self.assertEqual(user.car.trade_mark, 'benzi')
 
     def test_inherit_optional_feilds(self):
 

tests/test_tipes.py

@@ -27,4 +27,8 @@ def test_listof_4(self):
 
     def test_isinstance(self):
         listof_str = listof(str)
-        listof_str(['hello', 'world'])
+        self.assertFalse(listof_str.is_instance(1))
+
+    def test_validate(self):
+        listof_str = listof(str)
+        self.assertRaises(TypeError, listof_str, 1)