Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 9 insertions, 29 deletions

diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 21b730fa0c..a20635ba62 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -22,39 +22,19 @@
 #++
 
 module ActiveSupport
-  def self.load_all!
-    [Dependencies, Deprecation, Gzip, MessageVerifier, Multibyte, SecureRandom] + Core.load_all!
+  class << self
+    attr_accessor :load_all_hooks
+    def on_load_all(&hook) load_all_hooks << hook end
+    def load_all!; load_all_hooks.each { |hook| hook.call } end
   end
+  self.load_all_hooks = []
 
-  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 :NewCallbacks, 'active_support/new_callbacks'
-  autoload :ConcurrentHash, 'active_support/concurrent_hash'
-  autoload :Deprecation, 'active_support/deprecation'
-  autoload :Gzip, 'active_support/gzip'
-  autoload :Inflector, 'active_support/inflector'
-  autoload :Memoizable, 'active_support/memoizable'
-  autoload :MessageEncryptor, 'active_support/message_encryptor'
-  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 :XmlMini, 'active_support/xml_mini'
+  on_load_all do
+    [Dependencies, Deprecation, Gzip, MessageVerifier, Multibyte, SecureRandom]
+  end
 end
 
-require 'active_support/core/all'
-
+require 'active_support/autoload'
 require 'active_support/vendor'
-require 'active_support/core_ext'
-require 'active_support/dependencies'
-require 'active_support/json'
 
 I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml"