Merge pull request #1048 from bf4/cleanup_meta_in_adapter

Let FlattenJson adapter decide it doesn't include meta
This commit is contained in:
João Moura 2015-08-18 16:23:03 -03:00
commit e384b65f5d
2 changed files with 8 additions and 1 deletions

View File

@ -22,7 +22,7 @@ module ActiveModel
def as_json(options = nil) def as_json(options = nil)
hash = serializable_hash(options) hash = serializable_hash(options)
include_meta(hash) unless self.class == FlattenJson include_meta(hash)
hash hash
end end

View File

@ -6,6 +6,13 @@ module ActiveModel
super super
@result @result
end end
private
# no-op: FlattenJson adapter does not include meta data, because it does not support root.
def include_meta(json)
json
end
end end
end end
end end