activesupport 2.1.0 → 2.1.1

data/CHANGELOG

@@ -1,3 +1,16 @@
+*2.1.1 (September 4th, 2008)*
+
+* Fix Ruby's Time marshaling bug in pre-1.9 versions of Ruby: utc instances are now correctly unmarshaled with a utc zone instead of the system local zone [#900 state:resolved]:activesupport/CHANGELOG
+
+* TimeWithZone: when crossing DST boundary, treat Durations of days, months or years as variable-length, and all other values as absolute length. A time + 24.hours will advance exactly 24 hours, but a time + 1.day will advance 23-25 hours, depending on the day. Ensure consistent behavior across all advancing methods [Geoff Buesing]
+
+* Fix TimeWithZone unmarshaling: coerce unmarshaled Time instances to utc, because Ruby's marshaling of Time instances doesn't respect the zone [Geoff Buesing]
+
+* Added StringQuestioneer for doing things like StringQuestioneer.new("production").production? # => true and StringQuestioneer.new("production").development? # => false [DHH]
+
+* Fixed Date#end_of_quarter to not blow up on May 31st [#289 state:resolved] (Danger)
+
+
 *2.1.0 (May 31st, 2008)*
 
 * TimeZone#to_s shows offset as GMT instead of UTC, because GMT will be more familiar to end users (see time zone selects used by Windows OS, google.com and yahoo.com.) Reverts [8370] [Geoff Buesing]
@@ -166,7 +179,6 @@
 
 * Introduce ActiveSupport::TimeWithZone, for wrapping Time instances with a TimeZone. Introduce instance methods to Time for creating TimeWithZone instances, and class methods for managing a global time zone. [Geoff Buesing]
 
->>>>>>> .r8815
 * Replace non-dst-aware TimeZone class with dst-aware class from tzinfo_timezone plugin. TimeZone#adjust and #unadjust are no longer available; tzinfo gem must now be present in order to perform time zone calculations, via #local_to_utc and #utc_to_local methods. [Geoff Buesing]
 
 * Extract ActiveSupport::Callbacks from Active Record, test case setup and teardown, and ActionController::Dispatcher.  #10727 [Josh Peek]

data/lib/active_support.rb

@@ -43,6 +43,8 @@ require 'active_support/ordered_hash'
 require 'active_support/ordered_options'
 require 'active_support/option_merger'
 
+require 'active_support/string_inquirer'
+
 require 'active_support/values/time_zone'
 require 'active_support/duration'
 
@@ -53,3 +55,7 @@ require 'active_support/multibyte'
 require 'active_support/base64'
 
 require 'active_support/time_with_zone'
+
+Inflector = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Inflector', 'ActiveSupport::Inflector')
+Dependencies = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Dependencies', 'ActiveSupport::Dependencies')
+TimeZone = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('TimeZone', 'ActiveSupport::TimeZone')

data/lib/active_support/cache.rb

@@ -19,7 +19,7 @@ module ActiveSupport
 
     def self.expand_cache_key(key, namespace = nil)
       expanded_cache_key = namespace ? "#{namespace}/" : ""
-      
+
       if ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]
         expanded_cache_key << "#{ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]}/" 
       end
@@ -31,6 +31,8 @@ module ActiveSupport
         key.collect { |element| expand_cache_key(element) }.to_param
       when key.respond_to?(:to_param)
         key.to_param
+      else
+        key.to_s
       end
 
       expanded_cache_key

data/lib/active_support/cache/compressed_mem_cache_store.rb

@@ -1,14 +1,14 @@
 module ActiveSupport
   module Cache
     class CompressedMemCacheStore < MemCacheStore
-      def read(name, options = {})
-        if value = super(name, options.merge(:raw => true))
+      def read(name, options = nil)
+        if value = super(name, (options || {}).merge(:raw => true))
           Marshal.load(ActiveSupport::Gzip.decompress(value))
         end
       end
 
-      def write(name, value, options = {})
-        super(name, ActiveSupport::Gzip.compress(Marshal.dump(value)), options.merge(:raw => true))
+      def write(name, value, options = nil)
+        super(name, ActiveSupport::Gzip.compress(Marshal.dump(value)), (options || {}).merge(:raw => true))
       end
     end
   end

data/lib/active_support/core_ext/date/behavior.rb

@@ -7,6 +7,32 @@ module ActiveSupport #:nodoc:
         def acts_like_date?
           true
         end
+
+        # Date memoizes some instance methods using metaprogramming to wrap
+        # the methods with one that caches the result in an instance variable.
+        # If a Date is frozen but the memoized method hasn't been called, the
+        # first call will result in a frozen object error since the memo
+        # instance variable is uninitialized.
+        #
+        # Work around by eagerly memoizing before freezing.
+        #
+        # Ruby 1.9 uses a preinitialized instance variable so it's unaffected.
+        # This hack is as close as we can get to feature detection:
+        begin
+          ::Date.today.freeze.jd
+        rescue => frozen_object_error
+          if frozen_object_error.message =~ /frozen/
+            def freeze #:nodoc:
+              self.class.private_instance_methods(false).each do |m|
+                if m.to_s =~ /\A__\d+__\Z/
+                  instance_variable_set(:"@#{m}", [send(m)])
+                end
+              end
+
+              super
+            end
+          end
+        end
       end
     end
   end

data/lib/active_support/core_ext/date/calculations.rb

@@ -184,7 +184,7 @@ module ActiveSupport #:nodoc:
 
         # Returns a new Date/DateTime representing the end of the quarter (last day of march, june, september, december; DateTime objects will have time set to 23:59:59)
         def end_of_quarter
-          change(:month => [3, 6, 9, 12].detect { |m| m >= self.month }).end_of_month
+          beginning_of_month.change(:month => [3, 6, 9, 12].detect { |m| m >= self.month }).end_of_month
         end
         alias :at_end_of_quarter :end_of_quarter
 

data/lib/active_support/core_ext/hash/except.rb

@@ -10,13 +10,14 @@ module ActiveSupport #:nodoc:
       module Except
         # Returns a new hash without the given keys.
         def except(*keys)
-          rejected = Set.new(respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
-          reject { |key,| rejected.include?(key) }
+          clone.except!(*keys)
         end
 
         # Replaces the hash without only the given keys.
         def except!(*keys)
-          replace(except(*keys))
+          keys.map! { |key| convert_key(key) } if respond_to?(:convert_key)
+          keys.each { |key| delete(key) }
+          self
         end
       end
     end

data/lib/active_support/core_ext/hash/slice.rb

@@ -15,7 +15,9 @@ module ActiveSupport #:nodoc:
         # Returns a new hash with only the given keys.
         def slice(*keys)
           allowed = Set.new(respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
-          reject { |key,| !allowed.include?(key) }
+          hash = {}
+          allowed.each { |k| hash[k] = self[k] if has_key?(k) }
+          hash
         end
 
         # Replaces the hash with only the given keys.

data/lib/active_support/core_ext/module.rb

@@ -6,3 +6,8 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/introspection'
 require 'active_support/core_ext/module/loading'
 require 'active_support/core_ext/module/aliasing'
+require 'active_support/core_ext/module/model_naming'
+
+class Module
+  include ActiveSupport::CoreExt::Module::ModelNaming
+end

data/lib/active_support/core_ext/module/model_naming.rb

@@ -0,0 +1,22 @@
+module ActiveSupport
+  class ModelName < String
+    attr_reader :singular, :plural, :partial_path
+
+    def initialize(name)
+      super
+      @singular = underscore.tr('/', '_').freeze
+      @plural = @singular.pluralize.freeze
+      @partial_path = "#{tableize}/#{demodulize.underscore}".freeze
+    end
+  end
+
+  module CoreExt
+    module Module
+      module ModelNaming
+        def model_name
+          @model_name ||= ModelName.new(name)
+        end
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/object/extending.rb

@@ -3,17 +3,18 @@ class Object
     Class.remove_class(*subclasses_of(*superclasses))
   end
 
+  # Exclude this class unless it's a subclass of our supers and is defined.
+  # We check defined? in case we find a removed class that has yet to be
+  # garbage collected. This also fails for anonymous classes -- please
+  # submit a patch if you have a workaround.
   def subclasses_of(*superclasses) #:nodoc:
     subclasses = []
 
-    # Exclude this class unless it's a subclass of our supers and is defined.
-    # We check defined? in case we find a removed class that has yet to be
-    # garbage collected. This also fails for anonymous classes -- please
-    # submit a patch if you have a workaround.
-    ObjectSpace.each_object(Class) do |k|
-      if superclasses.any? { |superclass| k < superclass } &&
-        (k.name.blank? || eval("defined?(::#{k}) && ::#{k}.object_id == k.object_id"))
-        subclasses << k
+    superclasses.each do |sup|
+      ObjectSpace.each_object(class << sup; self; end) do |k|
+        if k != sup && (k.name.blank? || eval("defined?(::#{k}) && ::#{k}.object_id == k.object_id"))
+          subclasses << k
+        end
       end
     end
 

data/lib/active_support/core_ext/range/blockless_step.rb

@@ -8,7 +8,7 @@ module ActiveSupport #:nodoc:
         end
 
         if RUBY_VERSION < '1.9'
-          def step_with_blockless(value, &block)
+          def step_with_blockless(value = 1, &block)
             if block_given?
               step_without_blockless(value, &block)
             else
@@ -18,7 +18,7 @@ module ActiveSupport #:nodoc:
             end
           end
         else
-          def step_with_blockless(value, &block)
+          def step_with_blockless(value = 1, &block)
             if block_given?
               step_without_blockless(value, &block)
             else

data/lib/active_support/core_ext/rexml.rb

@@ -0,0 +1,35 @@
+require 'rexml/document'
+require 'rexml/entity'
+
+# Fixes the rexml vulnerability disclosed at:
+# http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
+# This fix is identical to rexml-expansion-fix version 1.0.1
+
+unless REXML::VERSION > "3.1.7.2"
+  module REXML
+    class Entity < Child
+      undef_method :unnormalized
+      def unnormalized
+        document.record_entity_expansion! if document
+        v = value()
+        return nil if v.nil?
+        @unnormalized = Text::unnormalize(v, parent)
+        @unnormalized
+      end
+    end
+    class Document < Element
+      @@entity_expansion_limit = 10_000
+      def self.entity_expansion_limit= val
+        @@entity_expansion_limit = val
+      end
+
+      def record_entity_expansion!
+        @number_of_expansions ||= 0
+        @number_of_expansions += 1
+        if @number_of_expansions > @@entity_expansion_limit
+          raise "Number of entity expansions exceeded, processing aborted."
+        end
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/string/unicode.rb

@@ -1,16 +1,16 @@
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module String #:nodoc:
-      unless '1.9'.respond_to?(:force_encoding)
-        # Define methods for handling unicode data.
-        module Unicode
-          def self.append_features(base)
-            if '1.8.7'.respond_to?(:chars)
-              base.class_eval { remove_method :chars }
-            end
-            super
+      # Define methods for handling unicode data.
+      module Unicode
+        def self.append_features(base)
+          if '1.8.7 and later'.respond_to?(:chars)
+            base.class_eval { remove_method :chars }
           end
+          super
+        end
 
+        unless '1.9'.respond_to?(:force_encoding)
           # +chars+ is a Unicode safe proxy for string methods. It creates and returns an instance of the
           # ActiveSupport::Multibyte::Chars class which encapsulates the original string. A Unicode safe version of all
           # the String methods are defined on this proxy class. Undefined methods are forwarded to String, so all of the
@@ -44,14 +44,12 @@ module ActiveSupport #:nodoc:
           def is_utf8?
             ActiveSupport::Multibyte::Handlers::UTF8Handler.consumes?(self)
           end
-        end
-      else
-        module Unicode #:nodoc:
-          def chars
+        else
+          def chars #:nodoc:
             self
           end
 
-          def is_utf8?
+          def is_utf8? #:nodoc:
             case encoding
               when Encoding::UTF_8
                 valid_encoding?

data/lib/active_support/core_ext/time.rb

@@ -1,11 +1,32 @@
 require 'date'
 require 'time'
 
-# Ruby 1.8-cvs and 1.9 define private Time#to_date
 class Time
+  # Ruby 1.8-cvs and 1.9 define private Time#to_date
   %w(to_date to_datetime).each do |method|
     public method if private_instance_methods.include?(method)
   end
+
+  # Pre-1.9 versions of Ruby have a bug with marshaling Time instances, where utc instances are
+  # unmarshaled in the local zone, instead of utc. We're layering behavior on the _dump and _load
+  # methods so that utc instances can be flagged on dump, and coerced back to utc on load.
+  if RUBY_VERSION < '1.9'
+    class << self
+      alias_method :_original_load, :_load
+      def _load(marshaled_time)
+        time = _original_load(marshaled_time)
+        utc = time.instance_variable_get('@marshal_with_utc_coercion')
+        utc ? time.utc : time
+      end
+    end
+    
+    alias_method :_original_dump, :_dump
+    def _dump(*args)
+      obj = self.frozen? ? self.dup : self
+      obj.instance_variable_set('@marshal_with_utc_coercion', utc?)
+      obj._original_dump(*args)
+    end
+  end
 end
 
 require 'active_support/core_ext/time/behavior'

data/lib/active_support/dependencies.rb

@@ -3,458 +3,459 @@ require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/load_error'
 require 'active_support/core_ext/kernel'
 
-module Dependencies #:nodoc:
-  extend self
-
-  # Should we turn on Ruby warnings on the first load of dependent files?
-  mattr_accessor :warnings_on_first_load
-  self.warnings_on_first_load = false
-
-  # All files ever loaded.
-  mattr_accessor :history
-  self.history = Set.new
-
-  # All files currently loaded.
-  mattr_accessor :loaded
-  self.loaded = Set.new
-
-  # Should we load files or require them?
-  mattr_accessor :mechanism
-  self.mechanism = :load
-
-  # The set of directories from which we may automatically load files. Files
-  # under these directories will be reloaded on each request in development mode,
-  # unless the directory also appears in load_once_paths.
-  mattr_accessor :load_paths
-  self.load_paths = []
-
-  # The set of directories from which automatically loaded constants are loaded
-  # only once. All directories in this set must also be present in +load_paths+.
-  mattr_accessor :load_once_paths
-  self.load_once_paths = []
-
-  # An array of qualified constant names that have been loaded. Adding a name to
-  # this array will cause it to be unloaded the next time Dependencies are cleared.
-  mattr_accessor :autoloaded_constants
-  self.autoloaded_constants = []
-
-  # An array of constant names that need to be unloaded on every request. Used
-  # to allow arbitrary constants to be marked for unloading.
-  mattr_accessor :explicitly_unloadable_constants
-  self.explicitly_unloadable_constants = []
-
-  # Set to true to enable logging of const_missing and file loads
-  mattr_accessor :log_activity
-  self.log_activity = false
-
-  # An internal stack used to record which constants are loaded by any block.
-  mattr_accessor :constant_watch_stack
-  self.constant_watch_stack = []
-
-  def load?
-    mechanism == :load
-  end
-
-  def depend_on(file_name, swallow_load_errors = false)
-    path = search_for_file(file_name)
-    require_or_load(path || file_name)
-  rescue LoadError
-    raise unless swallow_load_errors
-  end
-
-  def associate_with(file_name)
-    depend_on(file_name, true)
-  end
+module ActiveSupport #:nodoc:
+  module Dependencies #:nodoc:
+    extend self
+
+    # Should we turn on Ruby warnings on the first load of dependent files?
+    mattr_accessor :warnings_on_first_load
+    self.warnings_on_first_load = false
+
+    # All files ever loaded.
+    mattr_accessor :history
+    self.history = Set.new
+
+    # All files currently loaded.
+    mattr_accessor :loaded
+    self.loaded = Set.new
+
+    # Should we load files or require them?
+    mattr_accessor :mechanism
+    self.mechanism = :load
+
+    # The set of directories from which we may automatically load files. Files
+    # under these directories will be reloaded on each request in development mode,
+    # unless the directory also appears in load_once_paths.
+    mattr_accessor :load_paths
+    self.load_paths = []
+
+    # The set of directories from which automatically loaded constants are loaded
+    # only once. All directories in this set must also be present in +load_paths+.
+    mattr_accessor :load_once_paths
+    self.load_once_paths = []
+
+    # An array of qualified constant names that have been loaded. Adding a name to
+    # this array will cause it to be unloaded the next time Dependencies are cleared.
+    mattr_accessor :autoloaded_constants
+    self.autoloaded_constants = []
+
+    # An array of constant names that need to be unloaded on every request. Used
+    # to allow arbitrary constants to be marked for unloading.
+    mattr_accessor :explicitly_unloadable_constants
+    self.explicitly_unloadable_constants = []
+
+    # Set to true to enable logging of const_missing and file loads
+    mattr_accessor :log_activity
+    self.log_activity = false
+
+    # An internal stack used to record which constants are loaded by any block.
+    mattr_accessor :constant_watch_stack
+    self.constant_watch_stack = []
+
+    def load?
+      mechanism == :load
+    end
 
-  def clear
-    log_call
-    loaded.clear
-    remove_unloadable_constants!
-  end
+    def depend_on(file_name, swallow_load_errors = false)
+      path = search_for_file(file_name)
+      require_or_load(path || file_name)
+    rescue LoadError
+      raise unless swallow_load_errors
+    end
 
-  def require_or_load(file_name, const_path = nil)
-    log_call file_name, const_path
-    file_name = $1 if file_name =~ /^(.*)\.rb$/
-    expanded = File.expand_path(file_name)
-    return if loaded.include?(expanded)
+    def associate_with(file_name)
+      depend_on(file_name, true)
+    end
 
-    # Record that we've seen this file *before* loading it to avoid an
-    # infinite loop with mutual dependencies.
-    loaded << expanded
+    def clear
+      log_call
+      loaded.clear
+      remove_unloadable_constants!
+    end
 
-    begin
-      if load?
-        log "loading #{file_name}"
+    def require_or_load(file_name, const_path = nil)
+      log_call file_name, const_path
+      file_name = $1 if file_name =~ /^(.*)\.rb$/
+      expanded = File.expand_path(file_name)
+      return if loaded.include?(expanded)
 
-        # Enable warnings iff this file has not been loaded before and
-        # warnings_on_first_load is set.
-        load_args = ["#{file_name}.rb"]
-        load_args << const_path unless const_path.nil?
+      # Record that we've seen this file *before* loading it to avoid an
+      # infinite loop with mutual dependencies.
+      loaded << expanded
 
-        if !warnings_on_first_load or history.include?(expanded)
-          result = load_file(*load_args)
+      begin
+        if load?
+          log "loading #{file_name}"
+
+          # Enable warnings iff this file has not been loaded before and
+          # warnings_on_first_load is set.
+          load_args = ["#{file_name}.rb"]
+          load_args << const_path unless const_path.nil?
+
+          if !warnings_on_first_load or history.include?(expanded)
+            result = load_file(*load_args)
+          else
+            enable_warnings { result = load_file(*load_args) }
+          end
         else
-          enable_warnings { result = load_file(*load_args) }
+          log "requiring #{file_name}"
+          result = require file_name
         end
-      else
-        log "requiring #{file_name}"
-        result = require file_name
+      rescue Exception
+        loaded.delete expanded
+        raise
       end
-    rescue Exception
-      loaded.delete expanded
-      raise
-    end
 
-    # Record history *after* loading so first load gets warnings.
-    history << expanded
-    return result
-  end
+      # Record history *after* loading so first load gets warnings.
+      history << expanded
+      return result
+    end
 
-  # Is the provided constant path defined?
-  def qualified_const_defined?(path)
-    raise NameError, "#{path.inspect} is not a valid constant name!" unless
-      /^(::)?([A-Z]\w*)(::[A-Z]\w*)*$/ =~ path
+    # Is the provided constant path defined?
+    def qualified_const_defined?(path)
+      raise NameError, "#{path.inspect} is not a valid constant name!" unless
+        /^(::)?([A-Z]\w*)(::[A-Z]\w*)*$/ =~ path
 
-    names = path.to_s.split('::')
-    names.shift if names.first.empty?
+      names = path.to_s.split('::')
+      names.shift if names.first.empty?
 
-    # We can't use defined? because it will invoke const_missing for the parent
-    # of the name we are checking.
-    names.inject(Object) do |mod, name|
-      return false unless uninherited_const_defined?(mod, name)
-      mod.const_get name
+      # We can't use defined? because it will invoke const_missing for the parent
+      # of the name we are checking.
+      names.inject(Object) do |mod, name|
+        return false unless uninherited_const_defined?(mod, name)
+        mod.const_get name
+      end
+      return true
     end
-    return true
-  end
 
-  if Module.method(:const_defined?).arity == 1
-    # Does this module define this constant?
-    # Wrapper to accomodate changing Module#const_defined? in Ruby 1.9
-    def uninherited_const_defined?(mod, const)
-      mod.const_defined?(const)
-    end
-  else
-    def uninherited_const_defined?(mod, const) #:nodoc:
-      mod.const_defined?(const, false)
+    if Module.method(:const_defined?).arity == 1
+      # Does this module define this constant?
+      # Wrapper to accomodate changing Module#const_defined? in Ruby 1.9
+      def uninherited_const_defined?(mod, const)
+        mod.const_defined?(const)
+      end
+    else
+      def uninherited_const_defined?(mod, const) #:nodoc:
+        mod.const_defined?(const, false)
+      end
     end
-  end
-
-  # Given +path+, a filesystem path to a ruby file, return an array of constant
-  # paths which would cause Dependencies to attempt to load this file.
-  def loadable_constants_for_path(path, bases = load_paths)
-    path = $1 if path =~ /\A(.*)\.rb\Z/
-    expanded_path = File.expand_path(path)
-
-    bases.collect do |root|
-      expanded_root = File.expand_path(root)
-      next unless %r{\A#{Regexp.escape(expanded_root)}(/|\\)} =~ expanded_path
-
-      nesting = expanded_path[(expanded_root.size)..-1]
-      nesting = nesting[1..-1] if nesting && nesting[0] == ?/
-      next if nesting.blank?
-
-      [
-        nesting.camelize,
-        # Special case: application.rb might define ApplicationControlller.
-        ('ApplicationController' if nesting == 'application')
-      ]
-    end.flatten.compact.uniq
-  end
 
-  # Search for a file in load_paths matching the provided suffix.
-  def search_for_file(path_suffix)
-    path_suffix = path_suffix + '.rb' unless path_suffix.ends_with? '.rb'
-    load_paths.each do |root|
-      path = File.join(root, path_suffix)
-      return path if File.file? path
+    # Given +path+, a filesystem path to a ruby file, return an array of constant
+    # paths which would cause Dependencies to attempt to load this file.
+    def loadable_constants_for_path(path, bases = load_paths)
+      path = $1 if path =~ /\A(.*)\.rb\Z/
+      expanded_path = File.expand_path(path)
+
+      bases.collect do |root|
+        expanded_root = File.expand_path(root)
+        next unless %r{\A#{Regexp.escape(expanded_root)}(/|\\)} =~ expanded_path
+
+        nesting = expanded_path[(expanded_root.size)..-1]
+        nesting = nesting[1..-1] if nesting && nesting[0] == ?/
+        next if nesting.blank?
+
+        [
+          nesting.camelize,
+          # Special case: application.rb might define ApplicationControlller.
+          ('ApplicationController' if nesting == 'application')
+        ]
+      end.flatten.compact.uniq
     end
-    nil # Gee, I sure wish we had first_match ;-)
-  end
 
-  # Does the provided path_suffix correspond to an autoloadable module?
-  # Instead of returning a boolean, the autoload base for this module is returned.
-  def autoloadable_module?(path_suffix)
-    load_paths.each do |load_path|
-      return load_path if File.directory? File.join(load_path, path_suffix)
+    # Search for a file in load_paths matching the provided suffix.
+    def search_for_file(path_suffix)
+      path_suffix = path_suffix + '.rb' unless path_suffix.ends_with? '.rb'
+      load_paths.each do |root|
+        path = File.join(root, path_suffix)
+        return path if File.file? path
+      end
+      nil # Gee, I sure wish we had first_match ;-)
     end
-    nil
-  end
-
-  def load_once_path?(path)
-    load_once_paths.any? { |base| path.starts_with? base }
-  end
 
-  # Attempt to autoload the provided module name by searching for a directory
-  # matching the expect path suffix. If found, the module is created and assigned
-  # to +into+'s constants with the name +const_name+. Provided that the directory
-  # was loaded from a reloadable base path, it is added to the set of constants
-  # that are to be unloaded.
-  def autoload_module!(into, const_name, qualified_name, path_suffix)
-    return nil unless base_path = autoloadable_module?(path_suffix)
-    mod = Module.new
-    into.const_set const_name, mod
-    autoloaded_constants << qualified_name unless load_once_paths.include?(base_path)
-    return mod
-  end
-
-  # Load the file at the provided path. +const_paths+ is a set of qualified
-  # constant names. When loading the file, Dependencies will watch for the
-  # addition of these constants. Each that is defined will be marked as
-  # autoloaded, and will be removed when Dependencies.clear is next called.
-  #
-  # If the second parameter is left off, then Dependencies will construct a set
-  # of names that the file at +path+ may define. See
-  # +loadable_constants_for_path+ for more details.
-  def load_file(path, const_paths = loadable_constants_for_path(path))
-    log_call path, const_paths
-    const_paths = [const_paths].compact unless const_paths.is_a? Array
-    parent_paths = const_paths.collect { |const_path| /(.*)::[^:]+\Z/ =~ const_path ? $1 : :Object }
-
-    result = nil
-    newly_defined_paths = new_constants_in(*parent_paths) do
-      result = load_without_new_constant_marking path
+    # Does the provided path_suffix correspond to an autoloadable module?
+    # Instead of returning a boolean, the autoload base for this module is returned.
+    def autoloadable_module?(path_suffix)
+      load_paths.each do |load_path|
+        return load_path if File.directory? File.join(load_path, path_suffix)
+      end
+      nil
     end
 
-    autoloaded_constants.concat newly_defined_paths unless load_once_path?(path)
-    autoloaded_constants.uniq!
-    log "loading #{path} defined #{newly_defined_paths * ', '}" unless newly_defined_paths.empty?
-    return result
-  end
+    def load_once_path?(path)
+      load_once_paths.any? { |base| path.starts_with? base }
+    end
 
-  # Return the constant path for the provided parent and constant name.
-  def qualified_name_for(mod, name)
-    mod_name = to_constant_name mod
-    (%w(Object Kernel).include? mod_name) ? name.to_s : "#{mod_name}::#{name}"
-  end
+    # Attempt to autoload the provided module name by searching for a directory
+    # matching the expect path suffix. If found, the module is created and assigned
+    # to +into+'s constants with the name +const_name+. Provided that the directory
+    # was loaded from a reloadable base path, it is added to the set of constants
+    # that are to be unloaded.
+    def autoload_module!(into, const_name, qualified_name, path_suffix)
+      return nil unless base_path = autoloadable_module?(path_suffix)
+      mod = Module.new
+      into.const_set const_name, mod
+      autoloaded_constants << qualified_name unless load_once_paths.include?(base_path)
+      return mod
+    end
 
-  # Load the constant named +const_name+ which is missing from +from_mod+. If
-  # it is not possible to load the constant into from_mod, try its parent module
-  # using const_missing.
-  def load_missing_constant(from_mod, const_name)
-    log_call from_mod, const_name
-    if from_mod == Kernel
-      if ::Object.const_defined?(const_name)
-        log "Returning Object::#{const_name} for Kernel::#{const_name}"
-        return ::Object.const_get(const_name)
-      else
-        log "Substituting Object for Kernel"
-        from_mod = Object
+    # Load the file at the provided path. +const_paths+ is a set of qualified
+    # constant names. When loading the file, Dependencies will watch for the
+    # addition of these constants. Each that is defined will be marked as
+    # autoloaded, and will be removed when Dependencies.clear is next called.
+    #
+    # If the second parameter is left off, then Dependencies will construct a set
+    # of names that the file at +path+ may define. See
+    # +loadable_constants_for_path+ for more details.
+    def load_file(path, const_paths = loadable_constants_for_path(path))
+      log_call path, const_paths
+      const_paths = [const_paths].compact unless const_paths.is_a? Array
+      parent_paths = const_paths.collect { |const_path| /(.*)::[^:]+\Z/ =~ const_path ? $1 : :Object }
+
+      result = nil
+      newly_defined_paths = new_constants_in(*parent_paths) do
+        result = load_without_new_constant_marking path
       end
-    end
 
-    # If we have an anonymous module, all we can do is attempt to load from Object.
-    from_mod = Object if from_mod.name.blank?
+      autoloaded_constants.concat newly_defined_paths unless load_once_path?(path)
+      autoloaded_constants.uniq!
+      log "loading #{path} defined #{newly_defined_paths * ', '}" unless newly_defined_paths.empty?
+      return result
+    end
 
-    unless qualified_const_defined?(from_mod.name) && from_mod.name.constantize.object_id == from_mod.object_id
-      raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!"
+    # Return the constant path for the provided parent and constant name.
+    def qualified_name_for(mod, name)
+      mod_name = to_constant_name mod
+      (%w(Object Kernel).include? mod_name) ? name.to_s : "#{mod_name}::#{name}"
     end
 
-    raise ArgumentError, "#{from_mod} is not missing constant #{const_name}!" if uninherited_const_defined?(from_mod, const_name)
+    # Load the constant named +const_name+ which is missing from +from_mod+. If
+    # it is not possible to load the constant into from_mod, try its parent module
+    # using const_missing.
+    def load_missing_constant(from_mod, const_name)
+      log_call from_mod, const_name
+      if from_mod == Kernel
+        if ::Object.const_defined?(const_name)
+          log "Returning Object::#{const_name} for Kernel::#{const_name}"
+          return ::Object.const_get(const_name)
+        else
+          log "Substituting Object for Kernel"
+          from_mod = Object
+        end
+      end
 
-    qualified_name = qualified_name_for from_mod, const_name
-    path_suffix = qualified_name.underscore
-    name_error = NameError.new("uninitialized constant #{qualified_name}")
+      # If we have an anonymous module, all we can do is attempt to load from Object.
+      from_mod = Object if from_mod.name.blank?
 
-    file_path = search_for_file(path_suffix)
-    if file_path && ! loaded.include?(File.expand_path(file_path)) # We found a matching file to load
-      require_or_load file_path
-      raise LoadError, "Expected #{file_path} to define #{qualified_name}" unless uninherited_const_defined?(from_mod, const_name)
-      return from_mod.const_get(const_name)
-    elsif mod = autoload_module!(from_mod, const_name, qualified_name, path_suffix)
-      return mod
-    elsif (parent = from_mod.parent) && parent != from_mod &&
-          ! from_mod.parents.any? { |p| uninherited_const_defined?(p, const_name) }
-      # If our parents do not have a constant named +const_name+ then we are free
-      # to attempt to load upwards. If they do have such a constant, then this
-      # const_missing must be due to from_mod::const_name, which should not
-      # return constants from from_mod's parents.
-      begin
-        return parent.const_missing(const_name)
-      rescue NameError => e
-        raise unless e.missing_name? qualified_name_for(parent, const_name)
+      unless qualified_const_defined?(from_mod.name) && from_mod.name.constantize.object_id == from_mod.object_id
+        raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!"
+      end
+
+      raise ArgumentError, "#{from_mod} is not missing constant #{const_name}!" if uninherited_const_defined?(from_mod, const_name)
+
+      qualified_name = qualified_name_for from_mod, const_name
+      path_suffix = qualified_name.underscore
+      name_error = NameError.new("uninitialized constant #{qualified_name}")
+
+      file_path = search_for_file(path_suffix)
+      if file_path && ! loaded.include?(File.expand_path(file_path)) # We found a matching file to load
+        require_or_load file_path
+        raise LoadError, "Expected #{file_path} to define #{qualified_name}" unless uninherited_const_defined?(from_mod, const_name)
+        return from_mod.const_get(const_name)
+      elsif mod = autoload_module!(from_mod, const_name, qualified_name, path_suffix)
+        return mod
+      elsif (parent = from_mod.parent) && parent != from_mod &&
+            ! from_mod.parents.any? { |p| uninherited_const_defined?(p, const_name) }
+        # If our parents do not have a constant named +const_name+ then we are free
+        # to attempt to load upwards. If they do have such a constant, then this
+        # const_missing must be due to from_mod::const_name, which should not
+        # return constants from from_mod's parents.
+        begin
+          return parent.const_missing(const_name)
+        rescue NameError => e
+          raise unless e.missing_name? qualified_name_for(parent, const_name)
+          raise name_error
+        end
+      else
         raise name_error
       end
-    else
-      raise name_error
     end
-  end
 
-  # Remove the constants that have been autoloaded, and those that have been
-  # marked for unloading.
-  def remove_unloadable_constants!
-    autoloaded_constants.each { |const| remove_constant const }
-    autoloaded_constants.clear
-    explicitly_unloadable_constants.each { |const| remove_constant const }
-  end
+    # Remove the constants that have been autoloaded, and those that have been
+    # marked for unloading.
+    def remove_unloadable_constants!
+      autoloaded_constants.each { |const| remove_constant const }
+      autoloaded_constants.clear
+      explicitly_unloadable_constants.each { |const| remove_constant const }
+    end
 
-  # Determine if the given constant has been automatically loaded.
-  def autoloaded?(desc)
-    # No name => anonymous module.
-    return false if desc.is_a?(Module) && desc.name.blank?
-    name = to_constant_name desc
-    return false unless qualified_const_defined? name
-    return autoloaded_constants.include?(name)
-  end
+    # Determine if the given constant has been automatically loaded.
+    def autoloaded?(desc)
+      # No name => anonymous module.
+      return false if desc.is_a?(Module) && desc.name.blank?
+      name = to_constant_name desc
+      return false unless qualified_const_defined? name
+      return autoloaded_constants.include?(name)
+    end
 
-  # Will the provided constant descriptor be unloaded?
-  def will_unload?(const_desc)
-    autoloaded?(desc) ||
-      explicitly_unloadable_constants.include?(to_constant_name(const_desc))
-  end
+    # Will the provided constant descriptor be unloaded?
+    def will_unload?(const_desc)
+      autoloaded?(const_desc) ||
+        explicitly_unloadable_constants.include?(to_constant_name(const_desc))
+    end
 
-  # Mark the provided constant name for unloading. This constant will be
-  # unloaded on each request, not just the next one.
-  def mark_for_unload(const_desc)
-    name = to_constant_name const_desc
-    if explicitly_unloadable_constants.include? name
-      return false
-    else
-      explicitly_unloadable_constants << name
-      return true
+    # Mark the provided constant name for unloading. This constant will be
+    # unloaded on each request, not just the next one.
+    def mark_for_unload(const_desc)
+      name = to_constant_name const_desc
+      if explicitly_unloadable_constants.include? name
+        return false
+      else
+        explicitly_unloadable_constants << name
+        return true
+      end
     end
-  end
 
-  # Run the provided block and detect the new constants that were loaded during
-  # its execution. Constants may only be regarded as 'new' once -- so if the
-  # block calls +new_constants_in+ again, then the constants defined within the
-  # inner call will not be reported in this one.
-  #
-  # If the provided block does not run to completion, and instead raises an
-  # exception, any new constants are regarded as being only partially defined
-  # and will be removed immediately.
-  def new_constants_in(*descs)
-    log_call(*descs)
-
-    # Build the watch frames. Each frame is a tuple of
-    #   [module_name_as_string, constants_defined_elsewhere]
-    watch_frames = descs.collect do |desc|
-      if desc.is_a? Module
-        mod_name = desc.name
-        initial_constants = desc.local_constant_names
-      elsif desc.is_a?(String) || desc.is_a?(Symbol)
-        mod_name = desc.to_s
-
-        # Handle the case where the module has yet to be defined.
-        initial_constants = if qualified_const_defined?(mod_name)
-          mod_name.constantize.local_constant_names
+    # Run the provided block and detect the new constants that were loaded during
+    # its execution. Constants may only be regarded as 'new' once -- so if the
+    # block calls +new_constants_in+ again, then the constants defined within the
+    # inner call will not be reported in this one.
+    #
+    # If the provided block does not run to completion, and instead raises an
+    # exception, any new constants are regarded as being only partially defined
+    # and will be removed immediately.
+    def new_constants_in(*descs)
+      log_call(*descs)
+
+      # Build the watch frames. Each frame is a tuple of
+      #   [module_name_as_string, constants_defined_elsewhere]
+      watch_frames = descs.collect do |desc|
+        if desc.is_a? Module
+          mod_name = desc.name
+          initial_constants = desc.local_constant_names
+        elsif desc.is_a?(String) || desc.is_a?(Symbol)
+          mod_name = desc.to_s
+
+          # Handle the case where the module has yet to be defined.
+          initial_constants = if qualified_const_defined?(mod_name)
+            mod_name.constantize.local_constant_names
+          else
+           []
+          end
         else
-         []
+          raise Argument, "#{desc.inspect} does not describe a module!"
         end
-      else
-        raise Argument, "#{desc.inspect} does not describe a module!"
-      end
 
-      [mod_name, initial_constants]
-    end
+        [mod_name, initial_constants]
+      end
 
-    constant_watch_stack.concat watch_frames
+      constant_watch_stack.concat watch_frames
 
-    aborting = true
-    begin
-      yield # Now yield to the code that is to define new constants.
-      aborting = false
-    ensure
-      # Find the new constants.
-      new_constants = watch_frames.collect do |mod_name, prior_constants|
-        # Module still doesn't exist? Treat it as if it has no constants.
-        next [] unless qualified_const_defined?(mod_name)
-
-        mod = mod_name.constantize
-        next [] unless mod.is_a? Module
-        new_constants = mod.local_constant_names - prior_constants
-
-        # Make sure no other frames takes credit for these constants.
-        constant_watch_stack.each do |frame_name, constants|
-          constants.concat new_constants if frame_name == mod_name
+      aborting = true
+      begin
+        yield # Now yield to the code that is to define new constants.
+        aborting = false
+      ensure
+        # Find the new constants.
+        new_constants = watch_frames.collect do |mod_name, prior_constants|
+          # Module still doesn't exist? Treat it as if it has no constants.
+          next [] unless qualified_const_defined?(mod_name)
+
+          mod = mod_name.constantize
+          next [] unless mod.is_a? Module
+          new_constants = mod.local_constant_names - prior_constants
+
+          # Make sure no other frames takes credit for these constants.
+          constant_watch_stack.each do |frame_name, constants|
+            constants.concat new_constants if frame_name == mod_name
+          end
+
+          new_constants.collect do |suffix|
+            mod_name == "Object" ? suffix : "#{mod_name}::#{suffix}"
+          end
+        end.flatten
+
+        log "New constants: #{new_constants * ', '}"
+
+        if aborting
+          log "Error during loading, removing partially loaded constants "
+          new_constants.each { |name| remove_constant name }
+          new_constants.clear
         end
+      end
 
-        new_constants.collect do |suffix|
-          mod_name == "Object" ? suffix : "#{mod_name}::#{suffix}"
+      return new_constants
+    ensure
+      # Remove the stack frames that we added.
+      if defined?(watch_frames) && ! watch_frames.blank?
+        frame_ids = watch_frames.collect(&:object_id)
+        constant_watch_stack.delete_if do |watch_frame|
+          frame_ids.include? watch_frame.object_id
         end
-      end.flatten
-
-      log "New constants: #{new_constants * ', '}"
-
-      if aborting
-        log "Error during loading, removing partially loaded constants "
-        new_constants.each { |name| remove_constant name }
-        new_constants.clear
       end
     end
 
-    return new_constants
-  ensure
-    # Remove the stack frames that we added.
-    if defined?(watch_frames) && ! watch_frames.blank?
-      frame_ids = watch_frames.collect(&:object_id)
-      constant_watch_stack.delete_if do |watch_frame|
-        frame_ids.include? watch_frame.object_id
+    class LoadingModule #:nodoc:
+      # Old style environment.rb referenced this method directly.  Please note, it doesn't
+      # actually *do* anything any more.
+      def self.root(*args)
+        if defined?(RAILS_DEFAULT_LOGGER)
+          RAILS_DEFAULT_LOGGER.warn "Your environment.rb uses the old syntax, it may not continue to work in future releases."
+          RAILS_DEFAULT_LOGGER.warn "For upgrade instructions please see: http://manuals.rubyonrails.com/read/book/19"
+        end
       end
     end
-  end
 
-  class LoadingModule #:nodoc:
-    # Old style environment.rb referenced this method directly.  Please note, it doesn't
-    # actually *do* anything any more.
-    def self.root(*args)
-      if defined?(RAILS_DEFAULT_LOGGER)
-        RAILS_DEFAULT_LOGGER.warn "Your environment.rb uses the old syntax, it may not continue to work in future releases."
-        RAILS_DEFAULT_LOGGER.warn "For upgrade instructions please see: http://manuals.rubyonrails.com/read/book/19"
+    # Convert the provided const desc to a qualified constant name (as a string).
+    # A module, class, symbol, or string may be provided.
+    def to_constant_name(desc) #:nodoc:
+      name = case desc
+        when String then desc.starts_with?('::') ? desc[2..-1] : desc
+        when Symbol then desc.to_s
+        when Module
+          raise ArgumentError, "Anonymous modules have no name to be referenced by" if desc.name.blank?
+          desc.name
+        else raise TypeError, "Not a valid constant descriptor: #{desc.inspect}"
       end
     end
-  end
 
-  # Convert the provided const desc to a qualified constant name (as a string).
-  # A module, class, symbol, or string may be provided.
-  def to_constant_name(desc) #:nodoc:
-    name = case desc
-      when String then desc.starts_with?('::') ? desc[2..-1] : desc
-      when Symbol then desc.to_s
-      when Module
-        raise ArgumentError, "Anonymous modules have no name to be referenced by" if desc.name.blank?
-        desc.name
-      else raise TypeError, "Not a valid constant descriptor: #{desc.inspect}"
-    end
-  end
+    def remove_constant(const) #:nodoc:
+      return false unless qualified_const_defined? const
 
-  def remove_constant(const) #:nodoc:
-    return false unless qualified_const_defined? const
+      const = $1 if /\A::(.*)\Z/ =~ const.to_s
+      names = const.to_s.split('::')
+      if names.size == 1 # It's under Object
+        parent = Object
+      else
+        parent = (names[0..-2] * '::').constantize
+      end
 
-    const = $1 if /\A::(.*)\Z/ =~ const.to_s
-    names = const.to_s.split('::')
-    if names.size == 1 # It's under Object
-      parent = Object
-    else
-      parent = (names[0..-2] * '::').constantize
+      log "removing constant #{const}"
+      parent.instance_eval { remove_const names.last }
+      return true
     end
 
-    log "removing constant #{const}"
-    parent.instance_eval { remove_const names.last }
-    return true
-  end
-
-protected
-  def log_call(*args)
-    if defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER && log_activity
-      arg_str = args.collect(&:inspect) * ', '
-      /in `([a-z_\?\!]+)'/ =~ caller(1).first
-      selector = $1 || '<unknown>'
-      log "called #{selector}(#{arg_str})"
-    end
-  end
+    protected
+      def log_call(*args)
+        if defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER && log_activity
+          arg_str = args.collect(&:inspect) * ', '
+          /in `([a-z_\?\!]+)'/ =~ caller(1).first
+          selector = $1 || '<unknown>'
+          log "called #{selector}(#{arg_str})"
+        end
+      end
 
-  def log(msg)
-    if defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER && log_activity
-      RAILS_DEFAULT_LOGGER.debug "Dependencies: #{msg}"
-    end
+      def log(msg)
+        if defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER && log_activity
+          RAILS_DEFAULT_LOGGER.debug "Dependencies: #{msg}"
+        end
+      end
   end
-
 end
 
 Object.instance_eval do
-  define_method(:require_or_load)     { |file_name| Dependencies.require_or_load(file_name) } unless Object.respond_to?(:require_or_load)
-  define_method(:require_dependency)  { |file_name| Dependencies.depend_on(file_name) }       unless Object.respond_to?(:require_dependency)
-  define_method(:require_association) { |file_name| Dependencies.associate_with(file_name) }  unless Object.respond_to?(:require_association)
+  define_method(:require_or_load)     { |file_name| ActiveSupport::Dependencies.require_or_load(file_name) } unless Object.respond_to?(:require_or_load)
+  define_method(:require_dependency)  { |file_name| ActiveSupport::Dependencies.depend_on(file_name) }       unless Object.respond_to?(:require_dependency)
+  define_method(:require_association) { |file_name| ActiveSupport::Dependencies.associate_with(file_name) }  unless Object.respond_to?(:require_association)
 end
 
 class Module #:nodoc:
@@ -464,7 +465,7 @@ class Module #:nodoc:
   # Use const_missing to autoload associations so we don't have to
   # require_association when using single-table inheritance.
   def const_missing(class_id)
-    Dependencies.load_missing_constant self, class_id
+    ActiveSupport::Dependencies.load_missing_constant self, class_id
   end
 
   def unloadable(const_desc = self)
@@ -480,15 +481,15 @@ class Class
     else
       begin
         begin
-          Dependencies.load_missing_constant self, const_name
+          ActiveSupport::Dependencies.load_missing_constant self, const_name
         rescue NameError
           parent.send :const_missing, const_name
         end
       rescue NameError => e
         # Make sure that the name we are missing is the one that caused the error
-        parent_qualified_name = Dependencies.qualified_name_for parent, const_name
+        parent_qualified_name = ActiveSupport::Dependencies.qualified_name_for parent, const_name
         raise unless e.missing_name? parent_qualified_name
-        qualified_name = Dependencies.qualified_name_for self, const_name
+        qualified_name = ActiveSupport::Dependencies.qualified_name_for self, const_name
         raise NameError.new("uninitialized constant #{qualified_name}").copy_blame!(e)
       end
     end
@@ -499,14 +500,14 @@ class Object
   alias_method :load_without_new_constant_marking, :load
 
   def load(file, *extras) #:nodoc:
-    Dependencies.new_constants_in(Object) { super }
+    ActiveSupport::Dependencies.new_constants_in(Object) { super }
   rescue Exception => exception  # errors from loading file
     exception.blame_file! file
     raise
   end
 
   def require(file, *extras) #:nodoc:
-    Dependencies.new_constants_in(Object) { super }
+    ActiveSupport::Dependencies.new_constants_in(Object) { super }
   rescue Exception => exception  # errors from required file
     exception.blame_file! file
     raise
@@ -526,7 +527,7 @@ class Object
   # Returns true if the constant was not previously marked for unloading, false
   # otherwise.
   def unloadable(const_desc)
-    Dependencies.mark_for_unload const_desc
+    ActiveSupport::Dependencies.mark_for_unload const_desc
   end
 end