activesupport 1.3.1 → 1.4.0

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

@@ -0,0 +1,31 @@
+class Module
+  # Declare an attribute reader backed by an internally-named instance variable.
+  def attr_internal_reader(*attrs)
+    attrs.each do |attr|
+      module_eval "def #{attr}() #{attr_internal_ivar_name(attr)} end"
+    end
+  end
+
+  # Declare an attribute writer backed by an internally-named instance variable.
+  def attr_internal_writer(*attrs)
+    attrs.each do |attr|
+      module_eval "def #{attr}=(v) #{attr_internal_ivar_name(attr)} = v end"
+    end
+  end
+
+  # Declare attributes backed by 'internal' instance variables names.
+  def attr_internal_accessor(*attrs)
+    attr_internal_reader(*attrs)
+    attr_internal_writer(*attrs)
+  end
+
+  alias_method :attr_internal, :attr_internal_accessor
+
+  private
+    mattr_accessor :attr_internal_naming_format
+    self.attr_internal_naming_format = '@_%s'
+
+    def attr_internal_ivar_name(attr)
+      attr_internal_naming_format % attr
+    end
+end

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

@@ -1,8 +1,33 @@
 class Module
+  # Provides a delegate class method to easily expose contained objects' methods
+  # as your own. Pass one or more methods (specified as symbols or strings)
+  # and the name of the target object as the final :to option (also a symbol
+  # or string).  At least one method and the :to option are required.
+  #
+  # Delegation is particularly useful with Active Record associations:
+  #   class Greeter < ActiveRecord::Base
+  #     def hello()   "hello"   end
+  #     def goodbye() "goodbye" end
+  #   end
+  #
+  #   class Foo < ActiveRecord::Base
+  #     belongs_to :greeter
+  #     delegate :hello, :to => :greeter
+  #   end
+  #
+  #   Foo.new.hello   # => "hello"
+  #   Foo.new.goodbye # => NoMethodError: undefined method `goodbye' for #<Foo:0x1af30c>
+  #
+  # Multiple delegates to the same target are allowed:
+  #   class Foo < ActiveRecord::Base
+  #     delegate :hello, :goodbye, :to => :greeter
+  #   end
+  #
+  #   Foo.new.goodbye # => "goodbye"
   def delegate(*methods)
     options = methods.pop
     unless options.is_a?(Hash) && to = options[:to]
-      raise ArgumentError, "Delegation needs a target. Supply an options hash with a :to key"
+      raise ArgumentError, "Delegation needs a target. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, :to => :greeter)."
     end
 
     methods.each do |method|
@@ -13,4 +38,4 @@ class Module
       EOS
     end
   end
-end
+end

data/lib/active_support/core_ext/name_error.rb

@@ -0,0 +1,20 @@
+
+# Add a +missing_name+ method to NameError instances.
+class NameError < StandardError
+  
+  # Add a method to obtain the missing name from a NameError.
+  def missing_name
+    $1 if /((::)?([A-Z]\w*)(::[A-Z]\w*)*)$/ =~ message
+  end
+  
+  # Was this exception raised because the given name was missing?
+  def missing_name?(name)
+    if name.is_a? Symbol
+      last_name = (missing_name || '').split('::').last
+      last_name == name.to_s
+    else
+      missing_name == name.to_s
+    end
+  end
+  
+end

data/lib/active_support/core_ext/string.rb

@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/string/conversions'
 require File.dirname(__FILE__) + '/string/access'
 require File.dirname(__FILE__) + '/string/starts_ends_with'
 require File.dirname(__FILE__) + '/string/iterators'
+require File.dirname(__FILE__) + '/string/unicode'
 
 class String #:nodoc:
   include ActiveSupport::CoreExtensions::String::Access
@@ -10,4 +11,5 @@ class String #:nodoc:
   include ActiveSupport::CoreExtensions::String::Inflections
   include ActiveSupport::CoreExtensions::String::StartsEndsWith
   include ActiveSupport::CoreExtensions::String::Iterators
+  include ActiveSupport::CoreExtensions::String::Unicode
 end

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

@@ -10,7 +10,7 @@ module ActiveSupport #:nodoc:
         #   "hello".at(4)  # => "o"
         #   "hello".at(10) # => nil
         def at(position)
-          self[position, 1]
+          chars[position, 1].to_s
         end
         
         # Returns the remaining of the string from the +position+ treating the string as an array (where 0 is the first character).
@@ -20,7 +20,7 @@ module ActiveSupport #:nodoc:
         #   "hello".from(2)  # => "llo"
         #   "hello".from(10) # => nil
         def from(position)
-          self[position..-1]
+          chars[position..-1].to_s
         end
         
         # Returns the beginning of the string up to the +position+ treating the string as an array (where 0 is the first character).
@@ -30,7 +30,7 @@ module ActiveSupport #:nodoc:
         #   "hello".to(2)  # => "hel"
         #   "hello".to(10) # => "hello"
         def to(position)
-          self[0..position]
+          chars[0..position].to_s
         end
 
         # Returns the first character of the string or the first +limit+ characters.
@@ -40,7 +40,7 @@ module ActiveSupport #:nodoc:
         #   "hello".first(2)  # => "he"
         #   "hello".first(10) # => "hello"
         def first(limit = 1)
-          self[0..(limit - 1)]
+          chars[0..(limit - 1)].to_s
         end
         
         # Returns the last character of the string or the last +limit+ characters.
@@ -50,7 +50,7 @@ module ActiveSupport #:nodoc:
         #   "hello".last(2)  # => "lo"
         #   "hello".last(10) # => "hello"
         def last(limit = 1)
-          self[(-limit)..-1] || self
+          (chars[(-limit)..-1] || self).to_s
         end
       end
     end

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

@@ -1,17 +1,48 @@
-require File.dirname(__FILE__) + '/../../inflector' unless defined? Inflector
+require 'active_support/inflector'
+
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module String #:nodoc:
-      # Makes it possible to do "posts".singularize that returns "post" and "MegaCoolClass".underscore that returns "mega_cool_class".
+      # String inflections define new methods on the String class to transform names for different purposes.
+      # For instance, you can figure out the name of a database from the name of a class.
+      #   "ScaleScore".tableize => "scale_scores"
       module Inflections
+        # Returns the plural form of the word in the string.
+        #
+        # Examples
+        #   "post".pluralize #=> "posts"
+        #   "octopus".pluralize #=> "octopi"
+        #   "sheep".pluralize #=> "sheep"
+        #   "words".pluralize #=> "words"
+        #   "the blue mailman".pluralize #=> "the blue mailmen"
+        #   "CamelOctopus".pluralize #=> "CamelOctopi"
         def pluralize
           Inflector.pluralize(self)
         end
 
+        # The reverse of pluralize, returns the singular form of a word in a string.
+        #
+        # Examples
+        #   "posts".singularize #=> "post"
+        #   "octopi".singularize #=> "octopus"
+        #   "sheep".singluarize #=> "sheep"
+        #   "word".singluarize #=> "word"
+        #   "the blue mailmen".singularize #=> "the blue mailman"
+        #   "CamelOctopi".singularize #=> "CamelOctopus"
         def singularize
           Inflector.singularize(self)
         end
 
+        # By default, camelize converts strings to UpperCamelCase. If the argument to camelize
+        # is set to ":lower" then camelize produces lowerCamelCase.
+        #
+        # camelize will also convert '/' to '::' which is useful for converting paths to namespaces 
+        #
+        # Examples
+        #   "active_record".camelize #=> "ActiveRecord"
+        #   "active_record".camelize(:lower) #=> "activeRecord"
+        #   "active_record/errors".camelize #=> "ActiveRecord::Errors"
+        #   "active_record/errors".camelize(:lower) #=> "activeRecord::Errors"
         def camelize(first_letter = :upper)
           case first_letter
             when :upper then Inflector.camelize(self, true)
@@ -20,41 +51,99 @@ module ActiveSupport #:nodoc:
         end
         alias_method :camelcase, :camelize
 
+        # Capitalizes all the words and replaces some characters in the string to create
+        # a nicer looking title. Titleize is meant for creating pretty output. It is not
+        # used in the Rails internals.
+        #
+        # titleize is also aliased as as titlecase
+        #
+        # Examples
+        #   "man from the boondocks".titleize #=> "Man From The Boondocks"
+        #   "x-men: the last stand".titleize #=> "X Men: The Last Stand"
         def titleize
           Inflector.titleize(self)
         end
         alias_method :titlecase, :titleize
 
+        # The reverse of +camelize+. Makes an underscored form from the expression in the string.
+        # 
+        # Changes '::' to '/' to convert namespaces to paths.
+        #
+        # Examples
+        #   "ActiveRecord".underscore #=> "active_record"
+        #   "ActiveRecord::Errors".underscore #=> active_record/errors
         def underscore
           Inflector.underscore(self)
         end
 
+        # Replaces underscores with dashes in the string.
+        #
+        # Example
+        #   "puni_puni" #=> "puni-puni"
         def dasherize
           Inflector.dasherize(self)
         end
 
+        # Removes the module part from the expression in the string
+        #
+        # Examples
+        #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize #=> "Inflections"
+        #   "Inflections".demodulize #=> "Inflections"
         def demodulize
           Inflector.demodulize(self)
         end
 
+        # Create the name of a table like Rails does for models to table names. This method
+        # uses the pluralize method on the last word in the string.
+        #
+        # Examples
+        #   "RawScaledScorer".tableize #=> "raw_scaled_scorers"
+        #   "egg_and_ham".tableize #=> "egg_and_hams"
+        #   "fancyCategory".tableize #=> "fancy_categories"
         def tableize
           Inflector.tableize(self)
         end
 
+        # Create a class name from a table name like Rails does for table names to models.
+        # Note that this returns a string and not a Class. (To convert to an actual class
+        # follow classify with constantize.)
+        #
+        # Examples
+        #   "egg_and_hams".classify #=> "EggAndHam"
+        #   "post".classify #=> "Post"
         def classify
           Inflector.classify(self)
         end
         
-        # Capitalizes the first word and turns underscores into spaces and strips _id, so "employee_salary" becomes "Employee salary" 
-        # and "author_id" becomes "Author".
+        # Capitalizes the first word and turns underscores into spaces and strips _id.
+        # Like titleize, this is meant for creating pretty output.
+        #
+        # Examples
+        #   "employee_salary" #=> "Employee salary" 
+        #   "author_id" #=> "Author"
         def humanize
           Inflector.humanize(self)
         end
 
+        # Creates a foreign key name from a class name.
+        # +separate_class_name_and_id_with_underscore+ sets whether
+        # the method should put '_' between the name and 'id'.
+        #
+        # Examples
+        #   "Message".foreign_key #=> "message_id"
+        #   "Message".foreign_key(false) #=> "messageid"
+        #   "Admin::Post".foreign_key #=> "post_id"
         def foreign_key(separate_class_name_and_id_with_underscore = true)
           Inflector.foreign_key(self, separate_class_name_and_id_with_underscore)
         end
 
+        # Constantize tries to find a declared constant with the name specified
+        # in the string. It raises a NameError when the name is not in CamelCase
+        # or is not initialized.
+        #
+        # Examples
+        #   "Module".constantize #=> Module
+        #   "Class".constantize #=> Class
         def constantize
           Inflector.constantize(self)
         end

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

@@ -0,0 +1,42 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module String #:nodoc:
+      # Define methods for handeling unicode data.
+      module Unicode
+        # +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
+        # string overrides can also be called through the +chars+ proxy.
+        #
+        #   name = 'Claus Müller'
+        #   name.reverse #=> "rell??M sualC"
+        #   name.length #=> 13
+        #
+        #   name.chars.reverse.to_s #=> "rellüM sualC"
+        #   name.chars.length #=> 12
+        #   
+        #
+        # All the methods on the chars proxy which normally return a string will return a Chars object. This allows
+        # method chaining on the result of any of these methods.
+        #
+        #   name.chars.reverse.length #=> 12
+        #
+        # The Char object tries to be as interchangeable with String objects as possible: sorting and comparing between
+        # String and Char work like expected. The bang! methods change the internal string representation in the Chars
+        # object. Interoperability problems can be resolved easily with a +to_s+ call.
+        #
+        # For more information about the methods defined on the Chars proxy see ActiveSupport::Multibyte::Chars and
+        # ActiveSupport::Multibyte::Handlers::UTF8Handler
+        def chars
+          ActiveSupport::Multibyte::Chars.new(self)
+        end
+
+        # Returns true if the string has UTF-8 semantics (a String used for purely byte resources is unlikely to have
+        # them), returns false otherwise.
+        def is_utf8?
+          ActiveSupport::Multibyte::Handlers::UTF8Handler.consumes?(self)
+        end
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/symbol.rb

@@ -7,6 +7,6 @@ class Symbol
   #   # The same as people.select { |p| p.manager? }.collect { |p| p.salary }
   #   people.select(&:manager?).collect(&:salary)
   def to_proc
-    Proc.new { |obj, *args| obj.send(self, *args) }
+    Proc.new { |*args| args.shift.__send__(self, *args) }
   end
 end

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

@@ -3,8 +3,7 @@ module ActiveSupport #:nodoc:
     module Time #:nodoc:
       # Enables the use of time calculations within Time itself
       module Calculations
-        def self.append_features(base) #:nodoc:
-          super
+        def self.included(base) #:nodoc:
           base.extend(ClassMethods)
         end
 
@@ -26,7 +25,7 @@ module ActiveSupport #:nodoc:
 
         # Seconds since midnight: Time.now.seconds_since_midnight
         def seconds_since_midnight
-          self.hour.hours + self.min.minutes + self.sec + (self.usec/1.0e+6)
+          self.to_i - self.change(:hour => 0).to_i + (self.usec/1.0e+6)
         end
             
         # Returns a new Time where one or more of the elements have been changed according to the +options+ parameter. The time options
@@ -57,13 +56,16 @@ module ActiveSupport #:nodoc:
         # Returns a new Time representing the time a number of seconds ago, this is basically a wrapper around the Numeric extension
         # Do not use this method in combination with x.months, use months_ago instead!
         def ago(seconds)
-          seconds.until(self)
+          self.since(-seconds)
         end
 
         # Returns a new Time representing the time a number of seconds since the instance time, this is basically a wrapper around 
         #the Numeric extension. Do not use this method in combination with x.months, use months_since instead!
         def since(seconds)
-          seconds.since(self)
+          initial_dst = self.dst? ? 1 : 0
+          f = seconds.since(self)
+          final_dst   = f.dst? ? 1 : 0
+          (seconds.abs >= 86400 && initial_dst != final_dst) ? f + (initial_dst - final_dst).hours : f
         end
         alias :in :since
 

data/lib/active_support/core_ext/time/conversions.rb

@@ -13,8 +13,7 @@ module ActiveSupport #:nodoc:
           :rfc822 => "%a, %d %b %Y %H:%M:%S %z"
         }
 
-        def self.append_features(klass)
-          super
+        def self.included(klass)
           klass.send(:alias_method, :to_default_s, :to_s)
           klass.send(:alias_method, :to_s, :to_formatted_s)
         end

data/lib/active_support/dependencies.rb

@@ -21,13 +21,44 @@ module Dependencies #:nodoc:
   # 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
+  
+  # :nodoc:
+  # 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)
-    require_or_load(file_name)
+    path = search_for_file(file_name)
+    require_or_load(path || file_name)
   rescue LoadError
     raise unless swallow_load_errors
   end
@@ -37,36 +68,318 @@ module Dependencies #:nodoc:
   end
 
   def clear
+    log_call
     loaded.clear
+    remove_unloadable_constants!
   end
 
-  def require_or_load(file_name)
+  def require_or_load(file_name, const_path = nil)
+    log_call file_name, const_path
     file_name = $1 if file_name =~ /^(.*)\.rb$/
-    return if loaded.include?(file_name)
+    expanded = File.expand_path(file_name)
+    return if loaded.include?(expanded)
 
     # Record that we've seen this file *before* loading it to avoid an
     # infinite loop with mutual dependencies.
-    loaded << file_name
-
+    loaded << expanded
+    
     if load?
+      log "loading #{file_name}"
       begin
         # Enable warnings iff this file has not been loaded before and
         # warnings_on_first_load is set.
-        if !warnings_on_first_load or history.include?(file_name)
-          load "#{file_name}.rb"
+        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 { load "#{file_name}.rb" }
+          enable_warnings { result = load_file(*load_args) }
         end
-      rescue
-        loaded.delete file_name
+      rescue Exception
+        loaded.delete expanded
         raise
       end
     else
-      require file_name
+      log "requiring #{file_name}"
+      result = require file_name
     end
 
     # Record history *after* loading so first load gets warnings.
-    history << file_name
+    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
+    
+    names = path.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 mod.const_defined? name
+      mod.const_get name
+    end
+    return true
+  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
+    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)
+    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
+    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
+  
+  # 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
+  
+  # Load the constant named +const_name+ which is missing from +from_mod+. If
+  # it is not possible to laod 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
+    
+    # If we have an anonymous module, all we can do is attempt to load from Object.
+    from_mod = Object if from_mod.name.empty?
+    
+    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 from_mod.const_defined?(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 from_mod.const_defined?(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| p.const_defined?(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
+  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
+  
+  # Will the provided constant descriptor be unloaded?
+  def will_unload?(const_desc)
+    autoloaded?(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
+    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.constants
+      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.constants
+        else
+         []
+        end
+      else
+        raise Argument, "#{desc.inspect} does not describe a module!"
+      end
+      
+      [mod_name, initial_constants]
+    end
+    
+    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.constants - 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
+    
+    return new_constants
+  ensure
+    # Remove the stack frames that we added.
+    if defined?(watch_frames) && ! watch_frames.empty?
+      frame_ids = watch_frames.collect(&:object_id)
+      constant_watch_stack.delete_if do |watch_frame|
+        frame_ids.include? watch_frame.object_id
+      end
+    end
   end
   
   class LoadingModule
@@ -79,6 +392,51 @@ module Dependencies #:nodoc:
       end
     end
   end
+
+protected
+  
+  # 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)
+    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)
+    return false unless qualified_const_defined? const
+    
+    const = $1 if /\A::(.*)\Z/ =~ const.to_s
+    names = const.split('::')
+    if names.size == 1 # It's under Object
+      parent = Object
+    else
+      parent = (names[0..-2] * '::').constantize
+    end
+    
+    log "removing constant #{const}"
+    parent.send :remove_const, names.last
+    return true
+  end
+  
+  def log_call(*args)
+    arg_str = args.collect(&:inspect) * ', '
+    /in `([a-z_\?\!]+)'/ =~ caller(1).first
+    selector = $1 || '<unknown>' 
+    log "called #{selector}(#{arg_str})"
+  end
+  
+  def log(msg)
+    if defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER && log_activity
+      RAILS_DEFAULT_LOGGER.debug "Dependencies: #{msg}"
+    end
+  end
+  
 end
 
 Object.send(:define_method, :require_or_load)     { |file_name| Dependencies.require_or_load(file_name) } unless Object.respond_to?(:require_or_load)
@@ -92,37 +450,13 @@ 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)
-    file_name = class_id.to_s.demodulize.underscore
-    file_path = as_load_path.empty? ? file_name : "#{as_load_path}/#{file_name}"
-    begin
-      require_dependency(file_path)
-      brief_name = self == Object ? '' : "#{name}::"
-      raise NameError.new("uninitialized constant #{brief_name}#{class_id}") unless const_defined?(class_id)
-      return const_get(class_id)
-    rescue MissingSourceFile => e
-      # Re-raise the error if it does not concern the file we were trying to load.
-      raise unless e.is_missing? file_path
-      
-      # Look for a directory in the load path that we ought to load.
-      if $LOAD_PATH.any? { |base| File.directory? "#{base}/#{file_path}" }
-        mod = Module.new
-        const_set class_id, mod # Create the new module
-        return mod
-      end
-      
-      # Attempt to access the name from the parent, unless we don't have a valid
-      # parent, or the constant is already defined in the parent. If the latter
-      # is the case, then we are being queried via self::class_id, and we should
-      # avoid returning the constant from the parent if possible.
-      if parent && parent != self && ! parents.any? { |p| p.const_defined?(class_id) }
-        suppress(NameError) do
-          return parent.send(:const_missing, class_id)
-        end
-      end
-      
-      raise NameError.new("uninitialized constant #{class_id}").copy_blame!(e)
-    end
+    Dependencies.load_missing_constant self, class_id
   end
+  
+  def unloadable(const_desc = self)
+    super(const_desc)
+  end
+  
 end
 
 class Class
@@ -130,25 +464,58 @@ class Class
     if [Object, Kernel].include?(self) || parent == self
       super
     else
-      parent.send :const_missing, class_id
+      begin
+        begin
+          Dependencies.load_missing_constant self, class_id
+        rescue NameError
+          parent.send :const_missing, class_id
+        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, class_id
+        raise unless e.missing_name? parent_qualified_name
+        qualified_name = Dependencies.qualified_name_for self, class_id
+        raise NameError.new("uninitialized constant #{qualified_name}").copy_blame!(e)
+      end
     end
   end
 end
 
 class Object #:nodoc:
+  
+  alias_method :load_without_new_constant_marking, :load
+  
   def load(file, *extras)
-    super(file, *extras)
-  rescue Object => exception
+    Dependencies.new_constants_in(Object) { super(file, *extras) }
+  rescue Exception => exception  # errors from loading file
     exception.blame_file! file
     raise
   end
 
   def require(file, *extras)
-    super(file, *extras)
-  rescue Object => exception
+    Dependencies.new_constants_in(Object) { super(file, *extras) }
+  rescue Exception => exception  # errors from required file
     exception.blame_file! file
     raise
   end
+
+  # Mark the given constant as unloadable. Unloadable constants are removed each
+  # time dependencies are cleared.
+  # 
+  # Note that marking a constant for unloading need only be done once. Setup
+  # or init scripts may list each unloadable constant that may need unloading;
+  # each constant will be removed for every subsequent clear, as opposed to for
+  # the first clear.
+  # 
+  # The provided constant descriptor may be a (non-anonymous) module or class,
+  # or a qualified constant name as a string or symbol.
+  # 
+  # Returns true if the constant was not previously marked for unloading, false
+  # otherwise.
+  def unloadable(const_desc)
+    Dependencies.mark_for_unload const_desc
+  end
+
 end
 
 # Add file-blaming to exceptions
@@ -163,11 +530,11 @@ class Exception #:nodoc:
 
   def describe_blame
     return nil if blamed_files.empty?
-    "This error occured while loading the following files:\n   #{blamed_files.join "\n   "}"
+    "This error occurred while loading the following files:\n   #{blamed_files.join "\n   "}"
   end
 
   def copy_blame!(exc)
     @blamed_files = exc.blamed_files.clone
     self
   end
-end
+end