ditkrg/active_model_serializers
5
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 07:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85 from pushcx/master

Browse Source 
Allow setting :each_serializer in 'render :json' calls
This commit is contained in:
José Valim
2012-07-14 04:05:40 -07:00
parent b91e63c4ec 1c820a9ba7
commit d6a68ed14f
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/active_model/serializer.rb
View File

@@ -40,7 +40,13 @@ module ActiveModel
def serializable_array
@object.map do |item|
if item.respond_to?(:active_model_serializer) && (serializer = item.active_model_serializer)
if @options.has_key? :each_serializer
serializer = @options[:each_serializer]
elsif item.respond_to?(:active_model_serializer)
serializer = item.active_model_serializer
end
if serializer
serializer.new(item, @options)
else
item
@@ -522,4 +528,4 @@ module ActiveModel
ActiveSupport::Notifications.instrument("#{name}.serializer", payload, &block)
end
end
end
end