From cc8e386d08d83ca1ad0c5da863f588b4c4fbe62c Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Sun, 10 Oct 2010 16:11:04 -0700
Subject: Always pull in version for frameworks (standardize autoload / require
 / none)

---
 actionmailer/lib/action_mailer.rb     | 1 +
 activemodel/lib/active_model.rb       | 3 +--
 activerecord/lib/active_record.rb     | 4 ++--
 activeresource/lib/active_resource.rb | 1 +
 activesupport/lib/active_support.rb   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 05ba12197a..02a9916703 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -26,6 +26,7 @@ $:.unshift(actionpack_path) if File.directory?(actionpack_path) && !$:.include?(
 
 require 'abstract_controller'
 require 'action_view'
+require 'action_mailer/version'
 
 # Common Active Support usage in Action Mailer
 require 'active_support/core_ext/class'
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index 9b8f843432..be0f24ff92 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -24,7 +24,7 @@
 activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
 $:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
 require 'active_support'
-
+require 'active_model/version'
 
 module ActiveModel
   extend ActiveSupport::Autoload
@@ -45,7 +45,6 @@ module ActiveModel
   autoload :Serialization
   autoload :TestCase
   autoload :Translation
-  autoload :VERSION
   autoload :Validations
   autoload :Validator
 
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index f692e5ac89..c80bce2849 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -33,12 +33,12 @@ require 'active_support/i18n'
 require 'active_model'
 require 'arel'
 
+require 'active_record/version'
+
 module ActiveRecord
   extend ActiveSupport::Autoload
 
   eager_autoload do
-    autoload :VERSION
-
     autoload :ActiveRecordError, 'active_record/errors'
     autoload :ConnectionNotEstablished, 'active_record/errors'
 
diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb
index 3e4a1dd4a1..186865f811 100644
--- a/activeresource/lib/active_resource.rb
+++ b/activeresource/lib/active_resource.rb
@@ -29,6 +29,7 @@ $:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include
 
 require 'active_support'
 require 'active_model'
+require 'active_resource/version'
 
 module ActiveResource
   extend ActiveSupport::Autoload
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index d2a845db3a..6b87774978 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -35,6 +35,7 @@ module ActiveSupport
 end
 
 require "active_support/dependencies/autoload"
+require "active_support/version"
 
 module ActiveSupport
   extend ActiveSupport::Autoload
@@ -43,7 +44,6 @@ module ActiveSupport
   autoload :FileUpdateChecker
   autoload :LogSubscriber
   autoload :Notifications
-  autoload :VERSION
 
   # TODO: Narrow this list down
   eager_autoload do
-- 
cgit v1.2.3