From ace20bd25e3818b7f29c222643dd445c48b36425 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 22 Dec 2009 17:27:37 -0600
Subject: Flip deferrable autoload convention

---
 activesupport/lib/active_support.rb | 53 ++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 25 deletions(-)

(limited to 'activesupport/lib/active_support.rb')

diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 9e21b3faf3..f2baa5a56a 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -39,31 +39,34 @@ require "active_support/dependencies/autoload"
 module ActiveSupport
   extend ActiveSupport::Autoload
 
-  autoload :BacktraceCleaner
-  autoload :Base64
-  autoload :BasicObject
-  autoload :Benchmarkable
-  autoload :BufferedLogger
-  autoload :Cache
-  autoload :Callbacks
-  autoload :Concern
-  autoload :Configurable
-  autoload :DeprecatedCallbacks
-  autoload :Deprecation
-  autoload :Gzip
-  autoload :Inflector
-  autoload :Memoizable
-  autoload :MessageEncryptor
-  autoload :MessageVerifier
-  autoload :Multibyte
-  autoload :OptionMerger
-  autoload :OrderedHash
-  autoload :OrderedOptions
-  autoload :Notifications
-  autoload :Rescuable
-  autoload :SecureRandom
-  autoload :StringInquirer
-  autoload :XmlMini
+  # TODO: Narrow this list down
+  eager_autoload do
+    autoload :BacktraceCleaner
+    autoload :Base64
+    autoload :BasicObject
+    autoload :Benchmarkable
+    autoload :BufferedLogger
+    autoload :Cache
+    autoload :Callbacks
+    autoload :Concern
+    autoload :Configurable
+    autoload :DeprecatedCallbacks
+    autoload :Deprecation
+    autoload :Gzip
+    autoload :Inflector
+    autoload :Memoizable
+    autoload :MessageEncryptor
+    autoload :MessageVerifier
+    autoload :Multibyte
+    autoload :OptionMerger
+    autoload :OrderedHash
+    autoload :OrderedOptions
+    autoload :Notifications
+    autoload :Rescuable
+    autoload :SecureRandom
+    autoload :StringInquirer
+    autoload :XmlMini
+  end
 end
 
 require 'active_support/vendor'
-- 
cgit v1.2.3