diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 16:10:49 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 16:10:49 -0700 |
| commit | ab321268f86d9013cbd4ecd0b5f46e7b05ec55a9 (patch) | |
| tree | 94080b82630ad3312e9f29b8ce687f1d6272af34 /activesupport | |
| parent | 42a06d2d6253eed3b9f4fb4edfa251c9508a2e20 (diff) | |
| download | rails-ab321268f86d9013cbd4ecd0b5f46e7b05ec55a9.tar.gz rails-ab321268f86d9013cbd4ecd0b5f46e7b05ec55a9.tar.bz2 rails-ab321268f86d9013cbd4ecd0b5f46e7b05ec55a9.zip | |
No more free lunch
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support.rb | 3 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core/all.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/kernel/requires.rb | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index e208f56455..cd7b47d780 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *Edge* +* require 'active_support' no longer orders the whole menu of core extensions. Ask for just what you need: e.g. require 'active_support/core/time' to use timezones, durations, and stdlib date/time extensions. [Jeremy Kemper] + * Removed rarely-used DRb cache store. [Jeremy Kemper] * TimeWithZone.name returns 'Time', to further thwart type checking [Geoff Buesing] diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 21b730fa0c..84bf372163 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -50,10 +50,7 @@ module ActiveSupport autoload :XmlMini, 'active_support/xml_mini' end -require 'active_support/core/all' - require 'active_support/vendor' -require 'active_support/core_ext' require 'active_support/dependencies' require 'active_support/json' diff --git a/activesupport/lib/active_support/core/all.rb b/activesupport/lib/active_support/core/all.rb index f397f48e9c..55e8b4cfac 100644 --- a/activesupport/lib/active_support/core/all.rb +++ b/activesupport/lib/active_support/core/all.rb @@ -1,3 +1,4 @@ +require 'active_support/core_ext' require 'active_support/core' Dir["#{File.dirname(__FILE__)}/*.rb"].sort.each do |path| require "active_support/core/#{File.basename(path, '.rb')}" diff --git a/activesupport/lib/active_support/core_ext/kernel/requires.rb b/activesupport/lib/active_support/core_ext/kernel/requires.rb index 323fea49fe..d2238898d6 100644 --- a/activesupport/lib/active_support/core_ext/kernel/requires.rb +++ b/activesupport/lib/active_support/core_ext/kernel/requires.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/kernel/reporting' + module Kernel # Require a library with fallback to RubyGems. Warnings during library # loading are silenced to increase signal/noise for application warnings. @@ -21,4 +23,4 @@ module Kernel end end end -end
\ No newline at end of file +end |