Fix load-order issues

This commit is contained in:
Benjamin Fleischer 2015-12-21 00:12:52 -06:00
parent 94db22c1e0
commit fe015d17f2

View File

@ -2,17 +2,13 @@ require 'active_model'
require 'active_support' require 'active_support'
require 'action_controller' require 'action_controller'
require 'action_controller/railtie' require 'action_controller/railtie'
require 'active_model/serializer/version'
require 'active_model/serializer'
require 'active_model_serializers/railtie'
module ActiveModelSerializers module ActiveModelSerializers
extend ActiveSupport::Autoload extend ActiveSupport::Autoload
autoload :Model autoload :Model
autoload :Callbacks autoload :Callbacks
autoload :Deserialization
autoload :Logging autoload :Logging
autoload :Test
require 'active_model/serializable_resource'
require 'action_controller/serialization'
mattr_accessor(:logger) { ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT)) } mattr_accessor(:logger) { ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT)) }
@ -20,10 +16,9 @@ module ActiveModelSerializers
ActiveModel::Serializer.config ActiveModel::Serializer.config
end end
extend ActiveSupport::Autoload require 'active_model/serializer/version'
autoload :Model require 'active_model/serializer'
autoload :Callbacks require 'active_model_serializers/railtie'
autoload :Deserialization require 'active_model/serializable_resource'
autoload :Logging require 'action_controller/serialization'
autoload :Test
end end