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
26 changes: 19 additions & 7 deletions lib/contentful_model/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,32 @@ def nillable?(name, value)
self.class.return_nil_for_empty_attribute_fields.include?(name)
end

def field_getter(name)
result = filter_invalids(
self.class.coerce_value(name, fields[name])
)

return nil if nillable?(name, result)

result
end

def define_fields_methods
fields.keys.each do |name|
define_singleton_method name do
result = filter_invalids(
self.class.coerce_value(name, fields[name])
)

return nil if nillable?(name, result)

result
field_getter(name)
end
end
end

def method_missing(name, *args, &block)
if content_type_field?(name) && fields.key?(name)
field_getter(name)
else
super
end
end

def override_getters
define_sys_methods
define_fields_methods
Expand Down
26 changes: 23 additions & 3 deletions lib/contentful_model/manageable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,31 @@ def define_setters
end
end

def field_setter(name, value)
@dirty = true
@changed_fields << name
fields[name] = value
end

def define_setter(name)
define_singleton_method "#{name.to_s.underscore}=" do |value|
@dirty = true
@changed_fields << name
fields[name] = value
field_setter(name, value)
end
end

def method_missing(name, *args, &block)
if (matches = name.match(/^(?<field>.*)=$/)) && content_type_field?(matches[:field].to_sym)
field_setter(matches[:field].to_sym, args[0])
else
super
end
end

def respond_to_missing?(name, include_private = false)
if matches = name.match(/^(?<field>.*)=$/)
content_type_field?(matches[:field].to_sym) || super
else
super
end
end

Expand Down