Merge pull request #1090 from bf4/clarify_ams_dependencies

Clarify AMS dependencies
This commit is contained in:
João Moura
2015-08-31 00:39:24 -03:00
3 changed files with 64 additions and 36 deletions

View File

@@ -10,22 +10,20 @@ module ActiveModelSerializers
end
end
require 'active_model'
require 'active_model/serializer/version'
require 'action_controller'
require 'active_model/serializer'
require 'active_model/serializable_resource'
require 'active_model/serializer/version'
begin
require 'active_model/serializer/railtie'
require 'action_controller'
require 'action_controller/serialization'
ActiveSupport.on_load(:action_controller) do
include ::ActionController::Serialization
ActionDispatch::Reloader.to_prepare do
ActiveModel::Serializer.serializers_cache.clear
end
require 'action_controller/serialization'
ActiveSupport.on_load(:action_controller) do
include ::ActionController::Serialization
ActionDispatch::Reloader.to_prepare do
ActiveModel::Serializer.serializers_cache.clear
end
rescue LoadError
# rails not installed, continuing
end
require 'active_model/serializer/railtie'