Support Rails 4.2.0

This patch is the same fixes as #655 and #663 .
This commit is contained in:
Ryunosuke SATO 2014-10-10 00:52:59 +09:00
parent c5294086ea
commit 4fe9790bfa

View File

@ -6,17 +6,19 @@ module ActionController
include ActionController::Renderers include ActionController::Renderers
def _render_option_json(resource, options) [:_render_option_json, :_render_with_renderer_json].each do |renderer_method|
serializer = ActiveModel::Serializer.serializer_for(resource) define_method renderer_method do |resource, options|
serializer = ActiveModel::Serializer.serializer_for(resource)
if serializer if serializer
# omg hax # omg hax
object = serializer.new(resource) object = serializer.new(resource)
adapter = ActiveModel::Serializer.adapter.new(object) adapter = ActiveModel::Serializer.adapter.new(object)
super(adapter, options) super(adapter, options)
else else
super super(resource, options)
end
end end
end end
end end