Flip deferrable autoload convention

1 files changed, 23 insertions, 19 deletions

diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index e0de27b96d..46caa53219 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -29,29 +29,33 @@ require 'active_support'
 module ActiveModel
   extend ActiveSupport::Autoload
 
-  autoload :AttributeMethods
-  autoload :Conversion
-  autoload :DeprecatedErrorMethods
-  autoload :Dirty
-  autoload :Errors
-  autoload :Lint
-  autoload :Name,         'active_model/naming'
-  autoload :Naming
-  autoload :Observer,     'active_model/observing'
-  autoload :Observing
-  autoload :Serialization
-  autoload :StateMachine
-  autoload :Translation
-  autoload :Validations
-  autoload :ValidationsRepairHelper
-  autoload :Validator
-  autoload :VERSION
+  eager_autoload do
+    autoload :AttributeMethods
+    autoload :Conversion
+    autoload :DeprecatedErrorMethods
+    autoload :Dirty
+    autoload :Errors
+    autoload :Lint
+    autoload :Name,         'active_model/naming'
+    autoload :Naming
+    autoload :Observer,     'active_model/observing'
+    autoload :Observing
+    autoload :Serialization
+    autoload :StateMachine
+    autoload :Translation
+    autoload :Validations
+    autoload :ValidationsRepairHelper
+    autoload :Validator
+    autoload :VERSION
+  end
 
   module Serializers
     extend ActiveSupport::Autoload
 
-    autoload :JSON
-    autoload :Xml
+    eager_autoload do
+      autoload :JSON
+      autoload :Xml
+    end
   end
 end