rails 1.1.6 → 1.2.0

data/lib/console_sandbox.rb

@@ -1,6 +1,6 @@
-ActiveRecord::Base.lock_mutex
+ActiveRecord::Base.send :increment_open_transactions
 ActiveRecord::Base.connection.begin_db_transaction
 at_exit do
   ActiveRecord::Base.connection.rollback_db_transaction
-  ActiveRecord::Base.unlock_mutex
+  ActiveRecord::Base.send :decrement_open_transactions
 end

data/lib/dispatcher.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004 David Heinemeier Hansson
+# Copyright (c) 2004-2006 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,6 +25,7 @@
 # to the appropriate controller and action. It also takes care of resetting
 # the environment (when Dependencies.load? is true) after each request.
 class Dispatcher
+  
   class << self
 
     # Dispatch the given CGI request, using the given session options, and
@@ -32,14 +33,18 @@ class Dispatcher
     # own CGI object be sure to handle the exceptions it raises on multipart
     # requests (EOFError and ArgumentError).
     def dispatch(cgi = nil, session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, output = $stdout)
+      controller = nil
       if cgi ||= new_cgi(output)
         request, response = ActionController::CgiRequest.new(cgi, session_options), ActionController::CgiResponse.new(cgi)
         prepare_application
-        ActionController::Routing::Routes.recognize!(request).process(request, response).out(output)
+        controller = ActionController::Routing::Routes.recognize(request)
+        controller.process(request, response).out(output)
       end
-    rescue Object => exception
+    rescue Exception => exception  # errors from CGI dispatch
       failsafe_response(output, '500 Internal Server Error', exception) do
-        ActionController::Base.process_with_exception(request, response, exception).out(output)
+        controller ||= ApplicationController rescue LoadError nil
+        controller ||= ActionController::Base
+        controller.process_with_exception(request, response, exception).out(output)
       end
     ensure
       # Do not give a failsafe response here.
@@ -50,12 +55,44 @@ class Dispatcher
     # mailers, and so forth. This allows them to be loaded again without having
     # to restart the server (WEBrick, FastCGI, etc.).
     def reset_application!
+      ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord)
+
       Dependencies.clear
-      ActiveRecord::Base.reset_subclasses
-      Class.remove_class(*Reloadable.reloadable_classes)
+      ActiveSupport::Deprecation.silence do # TODO: Remove after 1.2
+        Class.remove_class(*Reloadable.reloadable_classes)
+      end
+        
+      ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord)
+    end
+    
+    # Add a preparation callback. Preparation callbacks are run before every
+    # request in development mode, and before the first request in production
+    # mode.
+    # 
+    # An optional identifier may be supplied for the callback. If provided,
+    # to_prepare may be called again with the same identifier to replace the
+    # existing callback. Passing an identifier is a suggested practice if the
+    # code adding a preparation block may be reloaded.
+    def to_prepare(identifier = nil, &block)
+      unless identifier.nil?
+        callback = preparation_callbacks.detect { |ident, _| ident == identifier }
+
+        if callback # Already registered: update the existing callback
+          callback[-1] = block
+          return
+        end
+      end
+
+      preparation_callbacks << [identifier, block]
+
+      return
     end
 
     private
+
+      attr_accessor :preparation_callbacks, :preparation_callbacks_run
+      alias_method :preparation_callbacks_run?, :preparation_callbacks_run
+      
       # CGI.new plus exception handling.  CGI#read_multipart raises EOFError
       # if body.empty? or body.size != Content-Length and raises ArgumentError
       # if Content-Length is non-integer.
@@ -64,10 +101,15 @@ class Dispatcher
       end
 
       def prepare_application
-        ActionController::Routing::Routes.reload if Dependencies.load?
+        if Dependencies.load?
+          ActionController::Routing::Routes.reload
+          self.preparation_callbacks_run = false
+        end
+
         prepare_breakpoint
-        require_dependency('application.rb') unless Object.const_defined?(:ApplicationController)
-        ActiveRecord::Base.verify_active_connections!
+        require_dependency 'application' unless Object.const_defined?(:ApplicationController)
+        ActiveRecord::Base.verify_active_connections! if defined?(ActiveRecord)
+        run_preparation_callbacks
       end
 
       def reset_after_dispatch
@@ -84,10 +126,16 @@ class Dispatcher
         nil
       end
 
+      def run_preparation_callbacks
+        return if preparation_callbacks_run?
+        preparation_callbacks.each { |_, callback| callback.call }
+        self.preparation_callbacks_run = true
+      end
+
       # If the block raises, send status code as a last-ditch response.
       def failsafe_response(output, status, exception = nil)
         yield
-      rescue Object
+      rescue Exception  # errors from executed block
         begin
           output.write "Status: #{status}\r\n"
           
@@ -110,8 +158,16 @@ class Dispatcher
               output.write(message)
             end
           end
-        rescue Object
+        rescue Exception  # Logger or IO errors
         end
       end
   end
+  
+  self.preparation_callbacks = []
+  self.preparation_callbacks_run = false
+  
 end
+
+Dispatcher.to_prepare :activerecord_instantiate_observers do
+  ActiveRecord::Base.instantiate_observers
+end if defined?(ActiveRecord)

data/lib/fcgi_handler.rb

@@ -6,11 +6,13 @@ require 'rbconfig'
 class RailsFCGIHandler
   SIGNALS = {
     'HUP'     => :reload,
+    'INT'     => :exit_now,
     'TERM'    => :exit_now,
     'USR1'    => :exit,
     'USR2'    => :restart,
     'SIGTRAP' => :breakpoint
   }
+  GLOBAL_SIGNALS = SIGNALS.keys - %w(USR1)
 
   attr_reader :when_ready
 
@@ -50,25 +52,7 @@ class RailsFCGIHandler
 
     run_gc! if gc_request_period
 
-    provider.each_cgi do |cgi| 
-      process_request(cgi)
-
-      case when_ready
-        when :reload
-          reload!
-        when :restart
-          close_connection(cgi)
-          restart!
-        when :exit
-          close_connection(cgi)
-          break
-        when :breakpoint
-          close_connection(cgi)
-          breakpoint!
-      end
-
-      gc_countdown
-    end
+    process_each_request!(provider)
 
     GC.enable
     dispatcher_log :info, "terminated gracefully"
@@ -76,7 +60,7 @@ class RailsFCGIHandler
   rescue SystemExit => exit_error
     dispatcher_log :info, "terminated by explicit exit"
 
-  rescue Object => fcgi_error
+  rescue Exception => fcgi_error  # FCGI errors
     # retry on errors that would otherwise have terminated the FCGI process,
     # but only if they occur more than 10 seconds apart.
     if !(SignalException === fcgi_error) && Time.now - @last_error_on > 10
@@ -87,9 +71,9 @@ class RailsFCGIHandler
       dispatcher_error(fcgi_error, "killed by this error")
     end
   end
-  
-  
-  private
+
+
+  protected
     def logger
       @logger ||= Logger.new(@log_file_path)
     end
@@ -97,7 +81,7 @@ class RailsFCGIHandler
     def dispatcher_log(level, msg)
       time_str = Time.now.strftime("%d/%b/%Y:%H:%M:%S")
       logger.send(level, "[#{time_str} :: #{$$}] #{msg}")
-    rescue Object => log_error
+    rescue Exception => log_error  # Logger errors
       STDERR << "Couldn't write to #{@log_file_path.inspect}: #{msg}\n"
       STDERR << "  #{log_error.class}: #{log_error.message}\n"
     end
@@ -110,17 +94,23 @@ class RailsFCGIHandler
     end
 
     def install_signal_handlers
-      SIGNALS.each do |signal, handler_name|
-        install_signal_handler(signal, method("#{handler_name}_handler").to_proc)
-      end
+      GLOBAL_SIGNALS.each { |signal| install_signal_handler(signal) }
     end
 
-    def install_signal_handler(signal, handler)
+    def install_signal_handler(signal, handler = nil)
+      handler ||= method("#{SIGNALS[signal]}_handler").to_proc
       trap(signal, handler)
     rescue ArgumentError
       dispatcher_log :warn, "Ignoring unsupported signal #{signal}."
     end
 
+    def with_signal_handler(signal)
+      install_signal_handler(signal)
+      yield
+    ensure
+      install_signal_handler(signal, 'DEFAULT')
+    end
+
     def exit_now_handler(signal)
       dispatcher_log :info, "asked to terminate immediately"
       exit
@@ -146,9 +136,37 @@ class RailsFCGIHandler
       @when_ready = :breakpoint
     end
 
+    def process_each_request!(provider)
+      cgi = nil
+      provider.each_cgi do |cgi|
+        with_signal_handler 'USR1' do
+          process_request(cgi)
+        end
+
+        case when_ready
+          when :reload
+            reload!
+          when :restart
+            close_connection(cgi)
+            restart!
+          when :exit
+            close_connection(cgi)
+            break
+          when :breakpoint
+            close_connection(cgi)
+            breakpoint!
+        end
+
+        gc_countdown
+      end
+    rescue SignalException => signal
+      raise unless signal.message == 'SIGUSR1'
+      close_connection(cgi) if cgi
+    end
+
     def process_request(cgi)
       Dispatcher.dispatch(cgi)
-    rescue Object => e
+    rescue Exception => e  # errors from CGI dispatch
       raise if SignalException === e
       dispatcher_error(e)
     end
@@ -157,7 +175,7 @@ class RailsFCGIHandler
       config       = ::Config::CONFIG
       ruby         = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
       command_line = [ruby, $0, ARGV].flatten.join(' ')
-      
+
       dispatcher_log :info, "restarted"
 
       exec(command_line)
@@ -179,7 +197,7 @@ class RailsFCGIHandler
       Dispatcher.reset_application!
       ActionController::Routing::Routes.reload
     end
-    
+
     def breakpoint!
       require 'breakpoint'
       port = defined?(BREAKPOINT_SERVER_PORT) ? BREAKPOINT_SERVER_PORT : 42531
@@ -193,15 +211,15 @@ class RailsFCGIHandler
       @gc_request_countdown = gc_request_period
       GC.enable; GC.start; GC.disable
     end
-    
+
     def gc_countdown
       if gc_request_period
         @gc_request_countdown -= 1
         run_gc! if @gc_request_countdown <= 0
       end
     end
-    
+
     def close_connection(cgi)
       cgi.instance_variable_get("@request").finish
     end
-end
+end

data/lib/initializer.rb

@@ -1,6 +1,7 @@
 require 'logger'
 require 'set'
 require File.join(File.dirname(__FILE__), 'railties_path')
+require File.join(File.dirname(__FILE__), 'rails/version')
 
 RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV)
 
@@ -35,19 +36,19 @@ module Rails
     #   Rails::Initializer.run(:set_load_path)
     #
     # This is useful if you only want the load path initialized, without
-    # incuring the overhead of completely loading the entire environment. 
+    # incuring the overhead of completely loading the entire environment.
     def self.run(command = :process, configuration = Configuration.new)
       yield configuration if block_given?
       initializer = new configuration
       initializer.send(command)
       initializer
     end
-    
+
     # Create a new Initializer instance that references the given Configuration
     # instance.
     def initialize(configuration)
       @configuration = configuration
-      @loaded_plugins = Set.new
+      @loaded_plugins = []
     end
 
     # Sequentially step through all of the available initialization routines,
@@ -67,20 +68,23 @@ module Rails
     # * #initialize_framework_settings
     # * #load_environment
     # * #load_plugins
+    # * #load_observers
     # * #initialize_routing
     #
     # (Note that #load_environment is invoked twice, once at the start and
     # once at the end, to support the legacy configuration style where the
     # environment could overwrite the defaults directly, instead of via the
-    # Configuration instance. 
+    # Configuration instance.
     def process
       check_ruby_version
       set_load_path
       set_connection_adapters
 
       require_frameworks
+      set_autoload_paths
       load_environment
 
+      initialize_encoding
       initialize_database
       initialize_logger
       initialize_framework_logging
@@ -89,21 +93,23 @@ module Rails
       initialize_breakpoints
       initialize_whiny_nils
       initialize_temporary_directories
-
       initialize_framework_settings
-      
+
       # Support for legacy configuration style where the environment
       # could overwrite anything set from the defaults/global through
       # the individual base class configurations.
       load_environment
-      
+
       add_support_load_paths
 
       load_plugins
 
+      # Observers are loaded after plugins in case Observers or observed models are modified by plugins.
+      load_observers
+
       # Routing must be initialized after plugins to allow the former to extend the routes
       initialize_routing
-      
+
       # the framework is now fully initialized
       after_initialize
     end
@@ -111,17 +117,36 @@ module Rails
     # Check for valid Ruby version
     # This is done in an external file, so we can use it
     # from the `rails` program as well without duplication.
-    def check_ruby_version    
+    def check_ruby_version
       require 'ruby_version_check'
     end
 
     # Set the <tt>$LOAD_PATH</tt> based on the value of
     # Configuration#load_paths. Duplicates are removed.
     def set_load_path
-      configuration.load_paths.reverse.each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) }
+      load_paths = configuration.load_paths + configuration.framework_paths
+      load_paths.reverse_each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) }
       $LOAD_PATH.uniq!
     end
-    
+
+    # Set the paths from which Rails will automatically load source files, and
+    # the load_once paths.
+    def set_autoload_paths
+      Dependencies.load_paths = configuration.load_paths.uniq
+      Dependencies.load_once_paths = configuration.load_once_paths.uniq
+
+      extra = Dependencies.load_once_paths - Dependencies.load_paths
+      unless extra.empty?
+        abort <<-end_error
+          load_once_paths must be a subset of the load_paths.
+          Extra items in load_once_paths: #{extra * ','}
+        end_error
+      end
+
+      # Freeze the arrays so future modifications will fail rather than do nothing mysteriously
+      configuration.load_once_paths.freeze
+    end
+
     # Sets the +RAILS_CONNECTION_ADAPTERS+ constant based on the value of
     # Configuration#connection_adapters. This constant is used to determine
     # which database adapters should be loaded (by default, all adapters are
@@ -129,18 +154,16 @@ module Rails
     def set_connection_adapters
       Object.const_set("RAILS_CONNECTION_ADAPTERS", configuration.connection_adapters) if configuration.connection_adapters
     end
-    
+
     # Requires all frameworks specified by the Configuration#frameworks
     # list. By default, all frameworks (ActiveRecord, ActiveSupport,
     # ActionPack, ActionMailer, and ActionWebService) are loaded.
     def require_frameworks
       configuration.frameworks.each { |framework| require(framework.to_s) }
     end
-    
+
     # Add the load paths used by support functions such as the info controller
     def add_support_load_paths
-      builtins = File.join(File.dirname(File.dirname(__FILE__)), 'builtin', '*')
-      $LOAD_PATH.concat(Dir[builtins])
     end
 
     # Loads all plugins in <tt>config.plugin_paths</tt>.  <tt>plugin_paths</tt>
@@ -153,9 +176,22 @@ module Rails
     # * evaluate <tt>init.rb</tt> if present
     #
     # After all plugins are loaded, duplicates are removed from the load path.
-    # Plugins are loaded in alphabetical order.
+    # If an array of plugin names is specified in config.plugins, the plugins
+    # will be loaded in that order. Otherwise, plugins are loaded in alphabetical
+    # order.
     def load_plugins
-      find_plugins(configuration.plugin_paths).sort.each { |path| load_plugin path }
+      if configuration.plugins.nil?
+        # a nil value implies we don't care about plugins; load 'em all in a reliable order
+        find_plugins(configuration.plugin_paths).sort.each { |path| load_plugin path }
+      elsif !configuration.plugins.empty?
+        # we've specified a config.plugins array, so respect that order
+        plugin_paths = find_plugins(configuration.plugin_paths)
+        configuration.plugins.each do |name|
+          path = plugin_paths.find { |p| File.basename(p) == name }
+          raise(LoadError, "Cannot find the plugin '#{name}'!") if path.nil?
+          load_plugin path
+        end
+      end 
       $LOAD_PATH.uniq!
     end
 
@@ -165,13 +201,24 @@ module Rails
       silence_warnings do
         config = configuration
         constants = self.class.constants
-        eval(IO.read(configuration.environment_path), binding)
+        eval(IO.read(configuration.environment_path), binding, configuration.environment_path)
         (self.class.constants - constants).each do |const|
           Object.const_set(const, self.class.const_get(const))
         end
       end
     end
-    
+
+    def load_observers
+      ActiveRecord::Base.instantiate_observers
+    end
+
+    # This initialzation sets $KCODE to 'u' to enable the multibyte safe operations.
+    # Plugin authors supporting other encodings should override this behaviour and
+    # set the relevant +default_charset+ on ActionController::Base
+    def initialize_encoding
+      $KCODE='u'
+    end
+
     # This initialization routine does nothing unless <tt>:active_record</tt>
     # is one of the frameworks to load (Configuration#frameworks). If it is,
     # this sets the database configuration from Configuration#database_configuration
@@ -181,7 +228,7 @@ module Rails
       ActiveRecord::Base.configurations = configuration.database_configuration
       ActiveRecord::Base.establish_connection
     end
-    
+
     # If the +RAILS_DEFAULT_LOGGER+ constant is already set, this initialization
     # routine does nothing. If the constant is not set, and Configuration#logger
     # is not +nil+, this also does nothing. Otherwise, a new logger instance
@@ -207,10 +254,10 @@ module Rails
           )
         end
       end
-      
+
       silence_warnings { Object.const_set "RAILS_DEFAULT_LOGGER", logger }
     end
-    
+
     # Sets the logger for ActiveRecord, ActionController, and ActionMailer
     # (but only for those frameworks that are to be loaded). If the framework's
     # logger is already set, it is not changed, otherwise it is set to use
@@ -220,7 +267,7 @@ module Rails
         framework.to_s.camelize.constantize.const_get("Base").logger ||= RAILS_DEFAULT_LOGGER
       end
     end
-    
+
     # Sets the +template_root+ for ActionController::Base and ActionMailer::Base
     # (but only for those frameworks that are to be loaded). If the framework's
     # +template_root+ has already been set, it is not changed, otherwise it is
@@ -236,15 +283,16 @@ module Rails
     # loading module used to lazily load controllers (Configuration#controller_paths).
     def initialize_routing
       return unless configuration.frameworks.include?(:action_controller)
+      ActionController::Routing.controller_paths = configuration.controller_paths
       ActionController::Routing::Routes.reload
     end
-    
+
     # Sets the dependency loading mechanism based on the value of
     # Configuration#cache_classes.
     def initialize_dependency_mechanism
       Dependencies.mechanism = configuration.cache_classes ? :require : :load
     end
-    
+
     # Sets the +BREAKPOINT_SERVER_PORT+ if Configuration#breakpoint_server
     # is true.
     def initialize_breakpoints
@@ -261,7 +309,7 @@ module Rails
       if configuration.frameworks.include?(:action_controller)
         session_path = "#{RAILS_ROOT}/tmp/sessions/"
         ActionController::Base.session_options[:tmpdir] = File.exist?(session_path) ? session_path : Dir::tmpdir
-        
+
         cache_path = "#{RAILS_ROOT}/tmp/cache/"
         if File.exist?(cache_path)
           ActionController::Base.fragment_cache_store = :file_store, cache_path
@@ -281,12 +329,11 @@ module Rails
         end
       end
     end
-    
-    # Fires the user-supplied after_initialize block (Configuration#after_initialize) 
+
+    # Fires the user-supplied after_initialize block (Configuration#after_initialize)
     def after_initialize
       configuration.after_initialize_block.call if configuration.after_initialize_block
     end
-    
 
     protected
       # Return a list of plugin paths within base_path.  A plugin path is
@@ -297,7 +344,7 @@ module Rails
         base_paths.flatten.inject([]) do |plugins, base_path|
           Dir.glob(File.join(base_path, '*')).each do |path|
             if plugin_path?(path)
-              plugins << path
+              plugins << path if plugin_enabled?(path)
             elsif File.directory?(path)
               plugins += find_plugins(path)
             end
@@ -310,6 +357,10 @@ module Rails
         File.directory?(path) and (File.directory?(File.join(path, 'lib')) or File.file?(File.join(path, 'init.rb')))
       end
 
+      def plugin_enabled?(path)
+        configuration.plugins.nil? || configuration.plugins.include?(File.basename(path))
+      end
+
       # Load the plugin at <tt>path</tt> unless already loaded.
       #
       # Each plugin is initialized:
@@ -334,12 +385,14 @@ module Rails
         # Add lib to load path *after* the application lib, to allow
         # application libraries to override plugin libraries.
         if has_lib
-          application_lib_index = $LOAD_PATH.index(File.join(RAILS_ROOT, "lib")) || 0  
+          application_lib_index = $LOAD_PATH.index(File.join(RAILS_ROOT, "lib")) || 0
           $LOAD_PATH.insert(application_lib_index + 1, lib_path)
+          Dependencies.load_paths << lib_path
+          Dependencies.load_once_paths << lib_path
         end
 
         # Allow plugins to reference the current configuration object
-        config = configuration 
+        config = configuration
 	
         # Add to set of loaded plugins before 'name' collapsed in eval.
         loaded_plugins << name
@@ -363,31 +416,31 @@ module Rails
   class Configuration
     # A stub for setting options on ActionController::Base
     attr_accessor :action_controller
-    
+
     # A stub for setting options on ActionMailer::Base
     attr_accessor :action_mailer
-    
+
     # A stub for setting options on ActionView::Base
     attr_accessor :action_view
-    
+
     # A stub for setting options on ActionWebService::Base
     attr_accessor :action_web_service
-    
+
     # A stub for setting options on ActiveRecord::Base
     attr_accessor :active_record
-    
+
     # Whether or not to use the breakpoint server (boolean)
     attr_accessor :breakpoint_server
-    
+
     # Whether or not classes should be cached (set to false if you want
     # application classes to be reloaded on each request)
     attr_accessor :cache_classes
-    
+
     # The list of connection adapters to load. (By default, all connection
     # adapters are loaded. You can set this to be just the adapter(s) you
     # will use to reduce your application's load time.)
     attr_accessor :connection_adapters
-    
+
     # The list of paths that should be searched for controllers. (Defaults
     # to <tt>app/controllers</tt> and <tt>components</tt>.)
     attr_accessor :controller_paths
@@ -395,39 +448,48 @@ module Rails
     # The path to the database configuration file to use. (Defaults to
     # <tt>config/database.yml</tt>.)
     attr_accessor :database_configuration_file
-    
+
     # The list of rails framework components that should be loaded. (Defaults
     # to <tt>:active_record</tt>, <tt>:action_controller</tt>,
     # <tt>:action_view</tt>, <tt>:action_mailer</tt>, and
     # <tt>:action_web_service</tt>).
     attr_accessor :frameworks
-    
+
     # An array of additional paths to prepend to the load path. By default,
     # all +app+, +lib+, +vendor+ and mock paths are included in this list.
     attr_accessor :load_paths
-    
+
+    # An array of paths from which Rails will automatically load from only once.
+    # All elements of this array must also be in +load_paths+.
+    attr_accessor :load_once_paths
+
     # The log level to use for the default Rails logger. In production mode,
     # this defaults to <tt>:info</tt>. In development mode, it defaults to
     # <tt>:debug</tt>.
     attr_accessor :log_level
-    
+
     # The path to the log file to use. Defaults to log/#{environment}.log
     # (e.g. log/development.log or log/production.log).
     attr_accessor :log_path
-    
+
     # The specific logger to use. By default, a logger will be created and
     # initialized using #log_path and #log_level, but a programmer may
     # specifically set the logger to use via this accessor and it will be
     # used directly.
     attr_accessor :logger
-    
+
     # The root of the application's views. (Defaults to <tt>app/views</tt>.)
     attr_accessor :view_path
-    
+
     # Set to +true+ if you want to be warned (noisily) when you try to invoke
     # any method of +nil+. Set to +false+ for the standard Ruby behavior.
     attr_accessor :whiny_nils
-    
+
+    # The list of plugins to load. If this is set to <tt>nil</tt>, all plugins will
+    # be loaded. If this is set to <tt>[]</tt>, no plugins will be loaded. Otherwise,
+    # plugins will be loaded in the order specified.
+    attr_accessor :plugins
+
     # The path to the root of the plugins directory. By default, it is in
     # <tt>vendor/plugins</tt>.
     attr_accessor :plugin_paths
@@ -437,6 +499,7 @@ module Rails
     def initialize
       self.frameworks                   = default_frameworks
       self.load_paths                   = default_load_paths
+      self.load_once_paths              = default_load_once_paths
       self.log_path                     = default_log_path
       self.log_level                    = default_log_level
       self.view_path                    = default_view_path
@@ -444,21 +507,22 @@ module Rails
       self.cache_classes                = default_cache_classes
       self.breakpoint_server            = default_breakpoint_server
       self.whiny_nils                   = default_whiny_nils
+      self.plugins                      = default_plugins
       self.plugin_paths                 = default_plugin_paths
       self.database_configuration_file  = default_database_configuration_file
 
       for framework in default_frameworks
-        self.send("#{framework}=", OrderedOptions.new)
+        self.send("#{framework}=", Rails::OrderedOptions.new)
       end
     end
-    
+
     # Loads and returns the contents of the #database_configuration_file. The
     # contents of the file are processed via ERB before being sent through
     # YAML::load.
     def database_configuration
       YAML::load(ERB.new(IO.read(database_configuration_file)).result)
     end
-    
+
     # The path to the current environment's file (development.rb, etc.). By
     # default the file is at <tt>config/environments/#{environment}.rb</tt>.
     def environment_path
@@ -470,19 +534,45 @@ module Rails
     def environment
       ::RAILS_ENV
     end
-    
+
     # Sets a block which will be executed after rails has been fully initialized.
-    # Useful for per-environment configuration which depends on the framework being 
+    # Useful for per-environment configuration which depends on the framework being
     # fully initialized.
     def after_initialize(&after_initialize_block)
       @after_initialize_block = after_initialize_block
     end
-    
+
     # Returns the block set in Configuration#after_initialize
     def after_initialize_block
       @after_initialize_block
     end
-    
+
+    # Add a preparation callback that will run before every request in development
+    # mode, or before the first request in production.
+    #
+    # See Dispatcher#to_prepare.
+    def to_prepare(&callback)
+      Dispatcher.to_prepare(&callback)
+    end
+
+    def builtin_directories
+      # Include builtins only in the development environment.
+      (environment == 'development') ? Dir["#{RAILTIES_PATH}/builtin/*/"] : []
+    end
+
+    def framework_paths
+      # TODO: Don't include dirs for frameworks that are not used
+      %w(
+        railties
+        railties/lib
+        actionpack/lib
+        activesupport/lib
+        activerecord/lib
+        actionmailer/lib
+        actionwebservice/lib
+      ).map { |dir| "#{framework_root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
+    end
+
     private
       def root_path
         ::RAILS_ROOT
@@ -495,80 +585,80 @@ module Rails
       def default_frameworks
         [ :active_record, :action_controller, :action_view, :action_mailer, :action_web_service ]
       end
-    
+
       def default_load_paths
         paths = ["#{root_path}/test/mocks/#{environment}"]
-        
+
         # Add the app's controller directory
         paths.concat(Dir["#{root_path}/app/controllers/"])
 
-        # Then model subdirectories.
-        # TODO: Don't include .rb models as load paths
-        paths.concat(Dir["#{root_path}/app/models/[_a-z]*"])
+        # Then components subdirectories.
         paths.concat(Dir["#{root_path}/components/[_a-z]*"])
 
         # Followed by the standard includes.
         paths.concat %w(
-          app 
-          app/models 
+          app
+          app/models
           app/controllers
           app/helpers
           app/services
-          app/apis 
-          components 
-          config 
-          lib 
-          vendor 
+          app/apis
+          components
+          config
+          lib
+          vendor
         ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
 
-        # TODO: Don't include dirs for frameworks that are not used
-        paths.concat %w(
-          railties
-          railties/lib
-          actionpack/lib
-          activesupport/lib
-          activerecord/lib
-          actionmailer/lib
-          actionwebservice/lib
-        ).map { |dir| "#{framework_root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
+        paths.concat builtin_directories
+      end
+
+      # Doesn't matter since plugins aren't in load_paths yet.
+      def default_load_once_paths
+        []
       end
 
       def default_log_path
         File.join(root_path, 'log', "#{environment}.log")
       end
-      
+
       def default_log_level
         environment == 'production' ? :info : :debug
       end
-      
+
       def default_database_configuration_file
         File.join(root_path, 'config', 'database.yml')
       end
-      
+
       def default_view_path
         File.join(root_path, 'app', 'views')
       end
-      
+
       def default_controller_paths
-        [ File.join(root_path, 'app', 'controllers'), File.join(root_path, 'components'), File.join(RAILTIES_PATH, 'builtin', 'controllers') ]
+        paths = [ File.join(root_path, 'app', 'controllers'), File.join(root_path, 'components') ]
+        paths.concat builtin_directories
+        paths
       end
-      
+
       def default_dependency_mechanism
         :load
       end
-      
+
       def default_cache_classes
         false
       end
-      
+
       def default_breakpoint_server
         false
       end
-      
+
       def default_whiny_nils
         false
       end
 
+      def default_plugins
+        nil
+      end
+
       def default_plugin_paths
         ["#{root_path}/vendor/plugins"]
       end
@@ -576,9 +666,12 @@ module Rails
 end
 
 # Needs to be duplicated from Active Support since its needed before Active
-# Support is available.
-class OrderedHash < Array #:nodoc:
-  def []=(key, value)    
+# Support is available. Here both Options and Hash are namespaced to prevent
+# conflicts with other implementations AND with the classes residing in ActiveSupport.
+class Rails::OrderedOptions < Array #:nodoc:
+  def []=(key, value)
+    key = key.to_sym
+
     if pair = find_pair(key)
       pair.pop
       pair << value
@@ -586,14 +679,18 @@ class OrderedHash < Array #:nodoc:
       self << [key, value]
     end
   end
-  
+
   def [](key)
-    pair = find_pair(key)
+    pair = find_pair(key.to_sym)
     pair ? pair.last : nil
   end
 
-  def keys
-    self.collect { |i| i.first }
+  def method_missing(name, *args)
+    if name.to_s =~ /(.*)=$/
+      self[$1.to_sym] = args.first
+    else
+      self[name]
+    end
   end
 
   private
@@ -602,21 +699,3 @@ class OrderedHash < Array #:nodoc:
       return false
     end
 end
-
-class OrderedOptions < OrderedHash #:nodoc:
-  def []=(key, value)
-    super(key.to_sym, value)
-  end
-  
-  def [](key)
-    super(key.to_sym)
-  end
-
-  def method_missing(name, *args)
-    if name.to_s =~ /(.*)=$/
-      self[$1.to_sym] = args.first
-    else
-      self[name]
-    end
-  end
-end