Merge branch 'master' of github.com:josevalim/active_model_serializers

This commit is contained in:
Yehuda Katz
2012-06-20 00:56:31 -04:00
4 changed files with 37 additions and 5 deletions

View File

@@ -53,9 +53,7 @@ module ActiveModel
@options[:unique_values] = {}
array = serializable_array.map do |item|
if item.is_a?(Hash)
item
elsif item.respond_to?(:serializable_hash)
if item.respond_to?(:serializable_hash)
item.serializable_hash
else
item.as_json