From fe015d17f2218a911dac5a21c0871fb268312747 Mon Sep 17 00:00:00 2001
From: Benjamin Fleischer <github@benjaminfleischer.com>
Date: Mon, 21 Dec 2015 00:12:52 -0600
Subject: [PATCH] Fix load-order issues

---
 lib/active_model_serializers.rb | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

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