clean up lazy loading of serialization support for ActiveRecord::Base and ActionController::Base

This commit is contained in:
Dan Gebhardt
2012-09-20 14:23:59 -04:00
parent b706244122
commit 506e2ac9ad
2 changed files with 14 additions and 2 deletions

View File

@@ -57,7 +57,7 @@ module ActiveModel::SerializerSupport
end
ActiveSupport.on_load(:active_record) do
include ActiveModel::SerializerSupport
ActiveRecord::Base.send(:include, ActiveModel::SerializerSupport)
end
module ActiveModel::ArraySerializerSupport
@@ -78,7 +78,7 @@ begin
require 'action_controller/serialization'
ActiveSupport.on_load(:action_controller) do
include ::ActionController::Serialization
ActionController::Base.send(:include, ActionController::Serialization)
end
rescue LoadError => ex
# rails on installed, continuing