radiant 0.5.2 → 0.6.0

data/vendor/rails/activesupport/lib/active_support/core_ext/string/iterators.rb

@@ -0,0 +1,17 @@
+require 'strscan'
+
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module String #:nodoc:
+      # Custom string iterators
+      module Iterators
+        # Yields a single-character string for each character in the string.
+        # When $KCODE = 'UTF8', multi-byte characters are yielded appropriately.
+        def each_char
+          scanner, char = StringScanner.new(self), /./mu
+          loop { yield(scanner.scan(char) || break) }
+        end
+      end
+    end
+  end
+end

data/vendor/rails/activesupport/lib/active_support/core_ext/string/starts_ends_with.rb

@@ -0,0 +1,20 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module String #:nodoc:
+      # Additional string tests.
+      module StartsEndsWith
+        # Does the string start with the specified +prefix+?
+        def starts_with?(prefix)
+          prefix = prefix.to_s
+          self[0, prefix.length] == prefix
+        end
+
+        # Does the string end with the specified +suffix+?
+        def ends_with?(suffix)
+          suffix = suffix.to_s
+          self[-suffix.length, suffix.length] == suffix      
+        end
+      end
+    end
+  end
+end

data/vendor/rails/activesupport/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/vendor/rails/activesupport/lib/active_support/core_ext/symbol.rb

@@ -0,0 +1,12 @@
+class Symbol
+  # Turns the symbol into a simple proc, which is especially useful for enumerations. Examples:
+  #
+  #   # The same as people.collect { |p| p.name }
+  #   people.collect(&:name)
+  #
+  #   # The same as people.select { |p| p.manager? }.collect { |p| p.salary }
+  #   people.select(&:manager?).collect(&:salary)
+  def to_proc
+    Proc.new { |*args| args.shift.__send__(self, *args) }
+  end
+end

data/vendor/rails/activesupport/lib/active_support/core_ext/time.rb

@@ -0,0 +1,17 @@
+require 'date'
+require 'time'
+
+# Ruby 1.8-cvs and 1.9 define private Time#to_date
+class Time
+  %w(to_date to_datetime).each do |method|
+    public method if private_instance_methods.include?(method)
+  end
+end
+
+require File.dirname(__FILE__) + '/time/calculations'
+require File.dirname(__FILE__) + '/time/conversions'
+
+class Time#:nodoc:
+  include ActiveSupport::CoreExtensions::Time::Calculations
+  include ActiveSupport::CoreExtensions::Time::Conversions
+end

data/vendor/rails/activesupport/lib/active_support/core_ext/time/calculations.rb

@@ -0,0 +1,191 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Time #:nodoc:
+      # Enables the use of time calculations within Time itself
+      module Calculations
+        def self.included(base) #:nodoc:
+          base.extend(ClassMethods)
+        end
+
+        module ClassMethods
+          # Return the number of days in the given month. If a year is given,
+          # February will return the correct number of days for leap years.
+          # Otherwise, this method will always report February as having 28
+          # days.
+          def days_in_month(month, year=nil)
+            if month == 2
+              !year.nil? && (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0)) ?  29 : 28
+            elsif month <= 7
+              month % 2 == 0 ? 30 : 31
+            else
+              month % 2 == 0 ? 31 : 30
+            end
+          end
+        end
+
+        # Seconds since midnight: Time.now.seconds_since_midnight
+        def seconds_since_midnight
+          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
+        # (hour, minute, sec, usec) reset cascadingly, so if only the hour is passed, then minute, sec, and usec is set to 0. If the hour and 
+        # minute is passed, then sec and usec is set to 0.
+        def change(options)
+          ::Time.send(
+            self.utc? ? :utc : :local, 
+            options[:year]  || self.year, 
+            options[:month] || self.month, 
+            options[:mday]  || self.mday, 
+            options[:hour]  || self.hour, 
+            options[:min]   || (options[:hour] ? 0 : self.min),
+            options[:sec]   || ((options[:hour] || options[:min]) ? 0 : self.sec),
+            options[:usec]  || ((options[:hour] || options[:min] || options[:sec]) ? 0 : self.usec)
+          )
+        end
+        
+        # Uses Date to provide precise Time calculations for years, months, and days.  The +options+ parameter takes a hash with 
+        # any of these keys: :months, :days, :years.
+        def advance(options)
+          d = ::Date.new(year + (options.delete(:years) || 0), month, day)
+          d = d >> options.delete(:months) if options[:months]
+          d = d +  options.delete(:days)   if options[:days]
+          change(options.merge(:year => d.year, :month => d.month, :mday => d.day))
+        end
+
+        # 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)
+          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)
+          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
+
+        # Returns a new Time representing the time a number of specified months ago
+        def months_ago(months)
+          months_since(-months)
+        end
+
+        def months_since(months)
+          year, month, mday = self.year, self.month, self.mday
+
+          month += months
+
+          # in case months is negative
+          while month < 1
+            month += 12
+            year -= 1
+          end
+
+          # in case months is positive
+          while month > 12
+            month -= 12
+            year += 1
+          end
+
+          max = ::Time.days_in_month(month, year)
+          mday = max if mday > max
+
+          change(:year => year, :month => month, :mday => mday)
+        end
+
+        # Returns a new Time representing the time a number of specified years ago
+        def years_ago(years)
+          change(:year => self.year - years)
+        end
+        
+        def years_since(years)
+          change(:year => self.year + years)
+        end
+
+        # Short-hand for years_ago(1)
+        def last_year
+          years_ago(1)
+        end
+        
+        # Short-hand for years_since(1)
+        def next_year
+          years_since(1)
+        end
+
+
+        # Short-hand for months_ago(1)
+        def last_month
+          months_ago(1)
+        end
+
+        # Short-hand for months_since(1)
+        def next_month
+          months_since(1)
+        end
+        
+        # Returns a new Time representing the "start" of this week (Monday, 0:00)
+        def beginning_of_week
+          days_to_monday = self.wday!=0 ? self.wday-1 : 6
+          (self - days_to_monday.days).midnight
+        end
+        alias :monday :beginning_of_week
+        alias :at_beginning_of_week :beginning_of_week
+        
+        # Returns a new Time representing the start of the given day in next week (default is Monday).
+        def next_week(day = :monday)
+          days_into_week = { :monday => 0, :tuesday => 1, :wednesday => 2, :thursday => 3, :friday => 4, :saturday => 5, :sunday => 6}
+          since(1.week).beginning_of_week.since(days_into_week[day].day).change(:hour => 0)
+        end
+        
+        # Returns a new Time representing the start of the day (0:00)
+        def beginning_of_day
+          (self - self.seconds_since_midnight).change(:usec => 0)
+        end
+        alias :midnight :beginning_of_day
+        alias :at_midnight :beginning_of_day
+        alias :at_beginning_of_day :beginning_of_day
+        
+        # Returns a new Time representing the start of the month (1st of the month, 0:00)
+        def beginning_of_month
+          #self - ((self.mday-1).days + self.seconds_since_midnight)
+          change(:mday => 1,:hour => 0, :min => 0, :sec => 0, :usec => 0)
+        end
+        alias :at_beginning_of_month :beginning_of_month
+        
+        # Returns a new Time representing the end of the month (last day of the month, 0:00)
+        def end_of_month
+          #self - ((self.mday-1).days + self.seconds_since_midnight)
+          last_day = ::Time.days_in_month( self.month, self.year )
+          change(:mday => last_day,:hour => 0, :min => 0, :sec => 0, :usec => 0)
+        end
+        alias :at_end_of_month :end_of_month
+		  
+        # Returns  a new Time representing the start of the quarter (1st of january, april, july, october, 0:00)
+        def beginning_of_quarter
+          beginning_of_month.change(:month => [10, 7, 4, 1].detect { |m| m <= self.month })
+        end
+        alias :at_beginning_of_quarter :beginning_of_quarter
+        
+        # Returns  a new Time representing the start of the year (1st of january, 0:00)
+        def beginning_of_year
+          change(:month => 1,:mday => 1,:hour => 0, :min => 0, :sec => 0, :usec => 0)
+        end
+        alias :at_beginning_of_year :beginning_of_year
+        
+        # Convenience method which returns a new Time representing the time 1 day ago
+        def yesterday
+          self.ago(1.day)
+        end
+        
+        # Convenience method which returns a new Time representing the time 1 day since the instance time
+        def tomorrow
+          self.since(1.day)
+        end
+      end
+    end
+  end
+end

data/vendor/rails/activesupport/lib/active_support/core_ext/time/conversions.rb

@@ -0,0 +1,33 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Time #:nodoc:
+      # Getting times in different convenient string representations and other objects
+      module Conversions
+        DATE_FORMATS = {
+          :db     => "%Y-%m-%d %H:%M:%S",
+          :short  => "%d %b %H:%M",
+          :long   => "%B %d, %Y %H:%M",
+          :rfc822 => "%a, %d %b %Y %H:%M:%S %z"
+        }
+
+        def self.included(klass)
+          klass.send(:alias_method, :to_default_s, :to_s)
+          klass.send(:alias_method, :to_s, :to_formatted_s)
+        end
+        
+        def to_formatted_s(format = :default)
+          DATE_FORMATS[format] ? strftime(DATE_FORMATS[format]).strip : to_default_s          
+        end
+
+        def to_date
+          ::Date.new(year, month, day)
+        end
+
+        # To be able to keep Dates and Times interchangeable on conversions
+        def to_time
+          self
+        end
+      end
+    end
+  end
+end

data/vendor/rails/activesupport/lib/active_support/dependencies.rb

@@ -0,0 +1,539 @@
+require 'set'
+require File.dirname(__FILE__) + '/core_ext/module/attribute_accessors'
+require File.dirname(__FILE__) + '/core_ext/load_error'
+require File.dirname(__FILE__) + '/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
+
+  def clear
+    log_call
+    loaded.clear
+    remove_unloadable_constants!
+  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)
+
+    # Record that we've seen this file *before* loading it to avoid an
+    # infinite loop with mutual dependencies.
+    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.
+        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
+      rescue Exception
+        loaded.delete expanded
+        raise
+      end
+    else
+      log "requiring #{file_name}"
+      result = require file_name
+    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
+    
+    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 #:nodoc:
+    # Old style environment.rb referenced this method directly.  Please note, it doesn't
+    # actualy *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
+
+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)
+Object.send(:define_method, :require_dependency)  { |file_name| Dependencies.depend_on(file_name) }       unless Object.respond_to?(:require_dependency)
+Object.send(:define_method, :require_association) { |file_name| Dependencies.associate_with(file_name) }  unless Object.respond_to?(:require_association)
+
+class Module #:nodoc:
+  # Rename the original handler so we can chain it to the new one
+  alias :rails_original_const_missing :const_missing
+  
+  # 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
+  end
+  
+  def unloadable(const_desc = self)
+    super(const_desc)
+  end
+  
+end
+
+class Class
+  def const_missing(class_id)
+    if [Object, Kernel].include?(self) || parent == self
+      super
+    else
+      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)
+    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)
+    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
+class Exception #:nodoc:
+  def blame_file!(file)
+    (@blamed_files ||= []).unshift file
+  end
+
+  def blamed_files
+    @blamed_files ||= []
+  end
+
+  def describe_blame
+    return nil if blamed_files.empty?
+    "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