Merge pull request #10 from Wiston999/development

Fixed bug with required fields, updated example.py

example.py

@@ -10,7 +10,8 @@ class User(NestedField):
     url = TextField()
     user_type = TextField(name = 'type')
     site_admin = BooleanField()
-    name = TextField(required = False)
+    email = TextField(required = False)
+    full_name = TextField(name = 'name', required = False)
 
 
 class Repo(NestedField):
@@ -37,7 +38,8 @@ class RepoList(ListField):
     my_user = User(response.json())
     print my_user.login.value, "'s stats:"
     print "id:", my_user.id.value
-    print "full_name:", my_user.name.value
+    print "email:", my_user.email.value
+    print "full_name:", my_user.full_name.value
     print "login:", my_user.login.value
     print "url:", my_user.url.value
     print "type:", my_user.user_type.value

json2py/models.py

@@ -186,10 +186,10 @@ def __init__(self, value = None, name = None, required = True):
             for key, field in lookUpKeys.items():
                 if key not in data and field.required:
                     raise LookupError('%s was not found on data dict' % key)
-                elif not field.required:
-                    field = field.__class__(None)
-                else:
+                elif key in data:
                     field = field.__class__(data[key])
+                else:
+                    field = field.__class__(None)
                 self.value[reverseLookUp[key]] = field
                 # setattr(self, reverseLookUp[key], field)