Ensure the adapters honor a custom root option and include meta when required

This commit is contained in:
Chris Branson
2015-06-03 09:01:51 +01:00
parent 35fb9de310
commit d34bba07b9
4 changed files with 75 additions and 8 deletions

View File

@@ -75,7 +75,7 @@ module ActiveModel
end
def root
serializer.json_key
@options.fetch(:root) { serializer.json_key }
end
def include_meta(json)

View File

@@ -37,10 +37,11 @@ module ActiveModel
@result = @core.merge @hash
end
if root = options.fetch(:root, serializer.json_key)
if root
@result = { root => @result }
else
@result
end
@result
end
end
@@ -49,4 +50,4 @@ module ActiveModel
end
end
end
end
end