diff options
| author | wycats <wycats@gmail.com> | 2010-10-10 16:11:04 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-10-10 16:12:04 -0700 |
| commit | cc8e386d08d83ca1ad0c5da863f588b4c4fbe62c (patch) | |
| tree | 2079f657bb46369940c65b47e968e436ef4d134f | |
| parent | de05e1c33ce13069025d1531e082adc5fe62e79a (diff) | |
| download | rails-cc8e386d08d83ca1ad0c5da863f588b4c4fbe62c.tar.gz rails-cc8e386d08d83ca1ad0c5da863f588b4c4fbe62c.tar.bz2 rails-cc8e386d08d83ca1ad0c5da863f588b4c4fbe62c.zip | |
Always pull in version for frameworks (standardize autoload / require / none)
| -rw-r--r-- | actionmailer/lib/action_mailer.rb | 1 | ||||
| -rw-r--r-- | activemodel/lib/active_model.rb | 3 | ||||
| -rw-r--r-- | activerecord/lib/active_record.rb | 4 | ||||
| -rw-r--r-- | activeresource/lib/active_resource.rb | 1 | ||||
| -rw-r--r-- | 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 |