Autoload more ActiveSupport libs

1 files changed, 19 insertions, 22 deletions

diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 06bb5690d3..6e1cda427b 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -22,12 +22,29 @@
 #++
 
 module ActiveSupport
+  def self.load_all!
+    [Dependencies, Deprecation, Gzip, JSON, MessageVerifier, Multibyte, SecureRandom, TimeWithZone]
+  end
+
+  autoload :BacktraceCleaner, 'active_support/backtrace_cleaner'
+  autoload :Base64, 'active_support/base64'
+  autoload :BasicObject, 'active_support/basic_object'
+  autoload :BufferedLogger, 'active_support/buffered_logger'
+  autoload :Cache, 'active_support/cache'
+  autoload :Callbacks, 'active_support/callbacks'
+  autoload :Dependencies, 'active_support/dependencies'
+  autoload :Deprecation, 'active_support/deprecation'
   autoload :Duration, 'active_support/duration'
   autoload :Gzip, 'active_support/gzip'
+  autoload :Inflector, 'active_support/inflector'
+  autoload :JSON, 'active_support/json'
+  autoload :Memoizable, 'active_support/memoizable'
   autoload :MessageVerifier, 'active_support/message_verifier'
+  autoload :Multibyte, 'active_support/multibyte'
   autoload :OptionMerger, 'active_support/option_merger'
   autoload :OrderedHash, 'active_support/ordered_hash'
   autoload :OrderedOptions, 'active_support/ordered_options'
+  autoload :Rescuable, 'active_support/rescuable'
   autoload :SecureRandom, 'active_support/secure_random'
   autoload :StringInquirer, 'active_support/string_inquirer'
   autoload :TimeWithZone, 'active_support/time_with_zone'
@@ -35,28 +52,8 @@ module ActiveSupport
 end
 
 require 'active_support/vendor'
-require 'active_support/basic_object'
-require 'active_support/inflector'
-require 'active_support/callbacks'
-
 require 'active_support/core_ext'
 
-require 'active_support/buffered_logger'
-require 'active_support/backtrace_cleaner'
-
-require 'active_support/cache'
-
-require 'active_support/dependencies'
-require 'active_support/deprecation'
-
-require 'active_support/memoizable'
-
-require 'active_support/json'
-
-require 'active_support/multibyte'
-
-require 'active_support/base64'
-
-require 'active_support/rescuable'
-
 I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml"
+
+ActiveSupport.load_all!