Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions adapter/adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ def get_attribute(obj, attrs):


class BaseField(object):
def __init__(self, source=None, default=undefined):
def __init__(self, source=None, default=undefined, required=True):
self.source = source
self.default = default
self.required = required

def bind(self, field_name, adapter):
if field_name == self.source:
Expand All @@ -88,10 +89,21 @@ def bind(self, field_name, adapter):

def get_attribute(self, obj):
value = get_attribute(obj, self.lookup_attrs)
if value is not undefined:
return value
if value is undefined:
if self.default is not undefined:
return self.default
elif self.required:
raise ValueError((
"Required value not found for field "
"`{adapter_name}.{field_name}`. Provide a default value."
).format(
adapter_name=self.adapter.__class__.__name__,
field_name=self.field_name,
))
else:
return undefined
else:
return self.default
return value

def adapt(self, data):
return data
Expand Down Expand Up @@ -143,6 +155,8 @@ def adapt(self, data=None):
obj = model_cls()
for field_name, field in self.fields.iteritems():
value = field.get_attribute(data or self.data)
if value is undefined:
continue
adapted_value = field.adapt(value)
if isinstance(obj, collections.Mapping):
obj[field_name] = adapted_value
Expand Down
1 change: 1 addition & 0 deletions tests/adapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ class Meta(object):

first_name = adapter.Field(source='first')
last_name = adapter.Field(source='last')
birthday = adapter.Field(source='dob', required=False)