merb-core 0.9.13 → 1.0

data/Rakefile

@@ -56,6 +56,8 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc         = true
   s.extra_rdoc_files = %w( README LICENSE TODO )
 
+  s.required_rubygems_version = ">= 1.3.0"
+  
   # Dependencies
   s.add_dependency "extlib", ">= 0.9.8"
   s.add_dependency "erubis", ">= 2.6.2"
@@ -64,12 +66,12 @@ spec = Gem::Specification.new do |s|
   s.add_dependency "rspec"
   s.add_dependency "rack"
   s.add_dependency "mime-types"
-  s.add_dependency "hpricot"
   s.add_dependency "thor", ">= 0.9.7"
   # this escalates to "regular" dependencies, comment it out
   # for now. RubyGems need some love.
   #s.add_development_dependency "libxml-ruby"
   #s.add_development_dependency "memcache-client"
+  s.add_development_dependency "webrat", ">= 0.3.1"
   # Requirements
   s.requirements << "install the json gem to get faster json parsing"
   s.required_ruby_version = ">= 1.8.6"
@@ -101,7 +103,7 @@ task :gemspec do
   end
 end
 
-CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "lib/*.so", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "spec/**/*.log"]
+CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "lib/*.so", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "spec/**/*.log", "**/gems/*"]
 
 desc "Run the specs."
 task :default => :specs
@@ -184,7 +186,7 @@ def setup_specs(name, spec_cmd='spec', run_opts = "-c")
   except = []
   except += Dir["spec/**/memcache*_spec.rb"] if ENV['MEMCACHED'] == 'no'
 
-  public_globs = Dir["#{Dir.pwd}/spec/public/**/*_spec.rb"]
+  public_globs = Dir["#{Dir.pwd}/spec/public/**/*_spec.rb"].reject{|file| file.include?('/gems/')}
 
   private_globs = Dir["#{Dir.pwd}/spec/private/**/*_spec.rb"]
 

data/lib/merb-core.rb

@@ -42,12 +42,47 @@ module Merb
   class << self
     attr_reader :exiting
 
+    # The list of procs that have been registered with Merb to run when
+    # Merb exits gracefully.
+    #
+    # ==== Returns
+    # Array:: The current list of procs
+    #
+    # :api: private
+    def at_exit_procs
+      @at_exit_procs ||= []
+    end
+    
+    # Set the current exiting state of Merb. Setting this state to true
+    # also alerts Extlib to exit and clean up its state.
+    #
+    # ==== Returns
+    # Boolean:: The current exiting state of Merb
+    #
+    # :api: private
     def exiting=(bool)
       Extlib.exiting = bool
-      if bool && Extlib.const_defined?("Pooling") && Extlib::Pooling.scavenger
-        Extlib::Pooling.scavenger.wakeup
-      end
       @exiting = bool
+      if bool
+        if Extlib.const_defined?("Pooling") && Extlib::Pooling.scavenger
+          Extlib::Pooling.scavenger.wakeup
+        end
+        while prc = self.at_exit_procs.pop
+          prc.call
+        end unless Merb::Config[:reap_workers_quickly]
+      end
+      @exiting
+    end
+    
+    # Register a proc to run when Merb is exiting gracefully. It will *not*
+    # be run when Merb exits quickly.
+    #
+    # ==== Returns
+    # Array:: The current list of procs to run when Merb exits gracefully
+    #
+    # :api: plugin
+    def at_exit(&blk)
+      self.at_exit_procs << blk
     end
 
     # Merge environment settings
@@ -71,7 +106,7 @@ module Merb
     # use_db<~Boolean>:: Should Merb use the merged environments DB connection
     #     Defaults to +false+
     #
-    # @api public
+    # :api: public
     def merge_env(env,use_db=false)
       if Merb.environment_info.nil?
         Merb.environment_info = {
@@ -108,7 +143,7 @@ module Merb
     # argv<String, Hash>::
     #   The config arguments to start Merb with. Defaults to +ARGV+.
     #
-    # @api public
+    # :api: public
     def start(argv = ARGV)
       Merb::Config[:original_log_stream] = Merb::Config[:log_stream]
       Merb::Config[:log_stream] ||= STDOUT
@@ -142,7 +177,7 @@ module Merb
     # argv<String, Hash>::
     #   The config arguments to start Merb with. Defaults to +ARGV+.
     #
-    # @api public
+    # :api: public
     def start_environment(argv=ARGV)
       start(argv) unless (@started ||= false)
     end
@@ -153,15 +188,20 @@ module Merb
     # argv<String, Hash>::
     #   The config arguments to restart Merb with. Defaults to +Merb::Config+.
     #
-    # @api public
+    # :api: public
     def restart_environment(argv={})
       @started = false
       start_environment(Merb::Config.to_hash.merge(argv))
     end
 
-    attr_accessor :environment, :load_paths, :adapter, :environment_info, :started
+    # :api: public
+    attr_accessor :environment, :adapter
+    # :api: private
+    attr_accessor :load_paths, :environment_info, :started
 
+    # :api: public
     alias :env :environment
+    # :api: public
     alias :started? :started
 
     Merb.load_paths = Dictionary.new { [Merb.root] } unless Merb.load_paths.is_a?(Dictionary)
@@ -216,7 +256,7 @@ module Merb
     #   A glob that will be used to autoload files under the path. Defaults to
     #   "**/*.rb".
     #
-    # @api public
+    # :api: public
     def push_path(type, path, file_glob = "**/*.rb")
       enforce!(type => Symbol)
       load_paths[type] = [path, file_glob]
@@ -239,7 +279,7 @@ module Merb
     #
     # Will make Merb use app/models for mailers just like Ruby on Rails does.
     #
-    # @api public
+    # :api: public
     def remove_paths(*args)
       args.each {|arg| load_paths.delete(arg)}
     end
@@ -250,7 +290,7 @@ module Merb
     # ==== Returns
     # String:: The directory for the requested type.
     #
-    # @api public
+    # :api: public
     def dir_for(type)
       Merb.load_paths[type].first
     end
@@ -261,7 +301,7 @@ module Merb
     # ===== Returns
     # String:: The pattern with which to match files within the type directory.
     #
-    # @api public
+    # :api: public
     def glob_for(type)
       Merb.load_paths[type][1]
     end
@@ -269,7 +309,7 @@ module Merb
     # ==== Returns
     # String:: The Merb root path.
     #
-    # @api public
+    # :api: public
     def root
       @root || Merb::Config[:merb_root] || File.expand_path(Dir.pwd)
     end
@@ -277,7 +317,7 @@ module Merb
     # ==== Parameters
     # value<String>:: Path to the root directory.
     #
-    # @api public
+    # :api: public
     def root=(value)
       @root = value
     end
@@ -303,14 +343,14 @@ module Merb
     # Return the Merb Logger object for the current thread.
     # Set it up if it does not exist.
     # 
-    # @api public
+    # :api: public
     def logger
       Thread.current[:merb_logger] ||= Merb::Logger.new
     end
 
     # Removes the logger for the current thread (nil).
     # 
-    # @api public
+    # :api: public
     def reset_logger!
       Thread.current[:merb_logger] = nil
     end
@@ -326,7 +366,7 @@ module Merb
     # just once, thereby never taking changes into account again. Now, it will
     # be memoized as :test - and just logging to merb_test.log.
     # 
-    # @api public
+    # :api: public
     def log_stream(port = "main")
       port = :test if Merb.testing?
       @streams ||= {}
@@ -357,7 +397,7 @@ module Merb
     # ==== Returns
     # String:: Path to the log directory which contains the log file.
     # 
-    # @api public
+    # :api: public
     def log_path
       case Merb::Config[:log_file]
       when String then File.dirname(Merb::Config[:log_file])
@@ -368,7 +408,7 @@ module Merb
     # ==== Returns
     # String:: The path of root directory of the Merb framework.
     # 
-    # @api public
+    # :api: public
     def framework_root
       @framework_root ||= File.dirname(__FILE__)
     end
@@ -381,7 +421,7 @@ module Merb
     # ==== Notes
     # Concatenates :deferred_actions configuration option values.
     # 
-    # @api public
+    # :api: public
     def deferred_actions
       @deferred ||= begin
         if Merb::Config[:deferred_actions].empty?
@@ -395,7 +435,7 @@ module Merb
     # Perform a hard Exit.
     # Print a backtrace to the merb logger before exiting if verbose is enabled.
     #
-    # @api private
+    # :api: private
     def fatal!(str, e = nil)
       Merb.logger.fatal!
       Merb.logger.fatal!("\e[1;31;47mFATAL: #{str}\e[0m")
@@ -412,7 +452,7 @@ module Merb
     
     # Print a colorized backtrace to the merb logger.
     #
-    # @api private
+    # :api: private
     def print_colorized_backtrace(e)
       e.backtrace.map! do |line|
         line.gsub!(/^#{Merb.framework_root}/, "\e[34mFRAMEWORK_ROOT\e[31m")
@@ -434,7 +474,7 @@ module Merb
     # ==== Returns
     # <Symbol>:: default ORM.
     #
-    # @api public
+    # :api: public
     def orm
       @orm ||= :none
     end
@@ -451,7 +491,7 @@ module Merb
     # ==== Returns
     # <Symbol>:: default test framework.
     #
-    # @api public
+    # :api: public
     def test_framework
       @test_framework ||= :rspec
     end
@@ -467,7 +507,7 @@ module Merb
     # ==== Returns
     # <Symbol>:: default template engine.
     #
-    # @api public
+    # :api: public
     def template_engine
       @template_engine ||= :erb
     end
@@ -483,7 +523,7 @@ module Merb
     # framework and gems and is very useful when application is run in 
     # some sort of sandbox, for instance, shared hosting with preconfigured gems.
     #
-    # @api public
+    # :api: public
     def bundled?
       $BUNDLE || ENV.key?("BUNDLE")
     end
@@ -546,7 +586,7 @@ module Merb
     # application start, some of them are set in Merb init file
     # or environment-specific.
     #
-    # @api public
+    # :api: public
     def load_config(options = {})
       Merb::Config.setup(Merb::Config.defaults.merge(options))
       Merb::BootLoader::Logger.run
@@ -561,7 +601,7 @@ module Merb
     # ==== Parameters
     # options<Hash>:: Options to pass on to the Merb config.
     #
-    # @api public
+    # :api: public
     def load_dependencies(options = {})
       load_config(options)
       Merb::BootLoader::BuildFramework.run
@@ -572,7 +612,7 @@ module Merb
     # Reload application and framework classes.
     # See Merb::BootLoader::ReloadClasses for details.
     #
-    # @api public
+    # :api: public
     def reload
       Merb::BootLoader::ReloadClasses.reload
     end
@@ -581,7 +621,7 @@ module Merb
     # Boolean:: True if Merb environment is testing for instance,
     # Merb is running with RSpec, Test::Unit of other testing facility.
     #
-    # @api public
+    # :api: public
     def testing?
       $TESTING ||= env?(:test) || Merb::Config[:testing]
     end
@@ -595,7 +635,7 @@ module Merb
     # Merb.env?(:production) #=> true
     # Merb.env?(:development) #=> false
     #
-    # @api public
+    # :api: public
     def env?(env)
       Merb.env == env.to_s
     end
@@ -624,7 +664,7 @@ module Merb
     #     reload_time        0.5
     #   end
     #
-    # @api public
+    # :api: public
     def config(&block)
       Merb::Config.configure(&block) if block_given?
       Config
@@ -635,7 +675,7 @@ module Merb
     # ==== Parameters
     # *args:: One or more symbols of Merb internal components.
     #
-    # @api public
+    # :api: public
     def disable(*components)
       disabled_components.push(*components)
     end
@@ -643,7 +683,7 @@ module Merb
     # ==== Parameters
     # Array:: All components that should be disabled.
     #
-    # @api public
+    # :api: public
     def disabled_components=(components)
       disabled_components.replace components
     end
@@ -651,7 +691,7 @@ module Merb
     # ==== Returns
     # Array:: All components that have been disabled.
     #
-    # @api public
+    # :api: public
     def disabled_components
       Merb::Config[:disabled_components] ||= []
     end
@@ -659,7 +699,7 @@ module Merb
     # ==== Returns
     # Boolean:: True if all components (or just one) are disabled.
     #
-    # @api public
+    # :api: public
     def disabled?(*components)
       components.all? { |c| disabled_components.include?(c) }
     end
@@ -671,7 +711,7 @@ module Merb
     # Recommended way to find out what paths Rakefiles
     # are loaded from.
     #
-    # @api public
+    # :api: public
     def rakefiles
       @rakefiles ||= []
     end
@@ -682,7 +722,7 @@ module Merb
     # === Notes
     # Recommended way to find out what paths generators are loaded from.
     #
-    # @api public
+    # :api: public
     def generators
       @generators ||= []
     end
@@ -693,7 +733,7 @@ module Merb
     # ==== Notes
     # Recommended way to add Rakefiles load path for plugins authors.
     #
-    # @api public
+    # :api: public
     def add_rakefiles(*rakefiles)
       @rakefiles ||= []
       @rakefiles += rakefiles
@@ -705,7 +745,7 @@ module Merb
     # ==== Notes
     # Recommended way to add Generator load paths for plugin authors.
     #
-    # @api public
+    # :api: public
     def add_generators(*generators)
       @generators ||= []
       @generators += generators
@@ -717,21 +757,24 @@ module Merb
     # signal:: The name of the signal to install a handler for.
     # &block:: The block to be run when the given signal is received.
     #
-    # @api public
+    # :api: public
     def trap(signal, &block)
       if Signal.list.include?(signal)
         Kernel.trap(signal, &block) unless Merb.disabled?(:signals)
       end
     end
 
+    # :api: plugin
     def forking_environment?
       !on_windows? && !on_jruby?
     end
 
+    # :api: plugin
     def on_jruby?
       RUBY_PLATFORM =~ Merb::Const::JAVA_PLATFORM_REGEXP
     end
 
+    # :api: plugin
     def on_windows?
       RUBY_PLATFORM =~ Merb::Const::WIN_PLATFORM_REGEXP
     end

data/lib/merb-core/bootloader.rb

@@ -4,7 +4,7 @@ module Merb
 
     # def self.subclasses
     #
-    # @api plugin
+    # :api: plugin
     cattr_accessor :subclasses, :after_load_callbacks, :before_load_callbacks,
     :finished, :before_worker_shutdown_callbacks, :before_master_shutdown_callbacks
 
@@ -23,7 +23,7 @@ module Merb
       # ==== Returns
       # nil
       #
-      # @api plugin
+      # :api: plugin
       def inherited(klass)
         subclasses << klass.to_s
         super
@@ -38,7 +38,7 @@ module Merb
       # ==== Returns
       # nil
       #
-      # @api plugin
+      # :api: plugin
       def after(klass)
         move_klass(klass, 1)
         nil
@@ -53,7 +53,7 @@ module Merb
       # ==== Returns
       # nil
       #
-      # @api plugin
+      # :api: plugin
       def before(klass)
         move_klass(klass, 0)
         nil
@@ -71,7 +71,7 @@ module Merb
       # ==== Returns
       # nil
       #
-      # @api private
+      # :api: private
       def move_klass(klass, where)
         index = Merb::BootLoader.subclasses.index(klass.to_s)
         if index
@@ -86,7 +86,7 @@ module Merb
       # ==== Returns
       # nil
       #
-      # @api plugin
+      # :api: plugin
       def run
         Merb.started = true
         subklasses = subclasses.dup
@@ -114,7 +114,7 @@ module Merb
       # ==== Returns
       # Boolean:: Whether or not the bootloader has finished.
       #
-      # @api private
+      # :api: private
       def finished?(bootloader)
         self.finished.include?(bootloader.to_s)
       end
@@ -124,7 +124,7 @@ module Merb
       # ==== Returns
       # nil
       #
-      # @api plugin
+      # :api: plugin
       # @overridable
       def default_framework
         %w[view model helper controller mailer part].each do |component|
@@ -150,7 +150,7 @@ module Merb
       #   A block to be added to the callbacks that will be executed after the
       #   app loads.
       #
-      # @api public
+      # :api: public
       def after_app_loads(&block)
         after_load_callbacks << block
       end
@@ -162,7 +162,7 @@ module Merb
       #   A block to be added to the callbacks that will be executed before the
       #   app loads.
       #
-      # @api public
+      # :api: public
       def before_app_loads(&block)
         before_load_callbacks << block
       end
@@ -175,7 +175,7 @@ module Merb
       #   A block to be added to the callbacks that will be executed
       #   before master process is shut down.
       #
-      # @api public
+      # :api: public
       def before_master_shutdown(&block)
         before_master_shutdown_callbacks << block
       end
@@ -188,7 +188,7 @@ module Merb
       #   A block to be added to the callbacks that will be executed
       #   before worker process is shut down.
       #
-      # @api public
+      # :api: public
       def before_worker_shutdown(&block)
         before_worker_shutdown_callbacks << block
       end
@@ -209,7 +209,7 @@ class Merb::BootLoader::Logger < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api plugin
+  # :api: plugin
   def self.run
     Merb::Config[:log_level] ||= begin
       if Merb.environment == "production"
@@ -232,7 +232,7 @@ class Merb::BootLoader::Logger < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api private
+  # :api: private
   def self.print_warnings
     if Gem::Version.new(Gem::RubyGemsVersion) < Gem::Version.new("1.1")
       Merb.fatal! "Merb requires Rubygems 1.1 and later. " \
@@ -253,7 +253,7 @@ class Merb::BootLoader::DropPidFile < Merb::BootLoader
     # ==== Returns
     # nil
     #
-    # @api plugin
+    # :api: plugin
     def run
       Merb::Server.store_pid("main") #if Merb::Config[:daemonize] || Merb::Config[:cluster]
       nil
@@ -268,7 +268,7 @@ class Merb::BootLoader::Defaults < Merb::BootLoader
   # ==== Returns
   # nil
   # 
-  # @api plugin
+  # :api: plugin
   def self.run
     Merb::Request.http_method_overrides.concat([
       proc { |c| c.params[:_method] },
@@ -321,6 +321,8 @@ class Merb::BootLoader::BuildFramework < Merb::BootLoader
     #
     # ==== Returns
     # nil
+    #
+    # :api: plugin
     def run
       $:.push Merb.root unless Merb.root == File.expand_path(Dir.pwd)
       build_framework
@@ -335,7 +337,7 @@ class Merb::BootLoader::BuildFramework < Merb::BootLoader
     # ==== Returns
     # nil
     #
-    # @api plugin
+    # :api: plugin
     # @overridable
     def build_framework
       if File.exists?(Merb.root / "config" / "framework.rb")
@@ -359,7 +361,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
   # ==== Returns
   # Array[Gem::Dependency]:: The dependencies regiestered in init.rb.
   #
-  # @api plugin
+  # :api: plugin
   cattr_accessor :dependencies
   self.dependencies = []
 
@@ -376,7 +378,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api plugin
+  # :api: plugin
   def self.run
     set_encoding
     # this is crucial: load init file with all the preferences
@@ -398,7 +400,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api private
+  # :api: private
   def self.load_dependencies
     dependencies.each { |dependency| Kernel.load_dependency(dependency) }
     nil
@@ -408,6 +410,8 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
   #
   # ==== Returns
   # nil
+  #
+  # :api: private
   def self.enable_json_gem
     gem "json"
     require "json/ext"
@@ -422,7 +426,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api private
+  # :api: private
   def self.update_logger
     Merb.reset_logger!
 
@@ -444,7 +448,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api private
+  # :api: private
   def self.set_encoding
     $KCODE = 'UTF8' if $KCODE == 'NONE' || $KCODE.blank?
     nil
@@ -457,7 +461,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
     # ==== Returns
     # String:: The path to the config file for the environment
     #
-    # @api private
+    # :api: private
     def self.env_config
       Merb.dir_for(:config) / "environments" / (Merb.environment + ".rb")
     end
@@ -467,7 +471,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
     # ==== Returns
     # Boolean:: Whether or not the environment configuration file exists.
     #
-    # @api private
+    # :api: private
     def self.env_config?
       Merb.environment && File.exist?(env_config)
     end
@@ -477,7 +481,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
     # ==== Returns
     # nil
     #
-    # @api private
+    # :api: private
     def self.load_env_config
       if env_config?
         STDOUT.puts "Loading #{env_config}" unless Merb.testing?
@@ -492,7 +496,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
     # ==== Returns
     # nil
     #
-    # @api private
+    # :api: private
     def self.initfile
       if Merb::Config[:init_file]
         Merb::Config[:init_file].chomp(".rb") + ".rb"
@@ -506,7 +510,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
     # ==== Returns
     # nil
     #
-    # @api private
+    # :api: private
     def self.load_initfile
       if File.exists?(initfile)
         STDOUT.puts "Loading init file from #{initfile}" unless Merb.testing?
@@ -524,7 +528,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
     # ==== Returns
     # nil
     #
-    # @api private
+    # :api: private
     def self.expand_ruby_path
       # Add models, controllers, helpers and lib to the load path
       unless @ran
@@ -554,7 +558,7 @@ class Merb::BootLoader::MixinSession < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api plugin
+  # :api: plugin
   def self.run
     require 'merb-core/dispatch/session'
     Merb::Controller.send(:include, ::Merb::SessionMixin)
@@ -571,7 +575,7 @@ class Merb::BootLoader::BeforeAppLoads < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api plugin
+  # :api: plugin
   def self.run
     Merb::BootLoader.before_load_callbacks.each { |x| x.call }
     nil
@@ -604,7 +608,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
     # Returns at least once:
     #   nil
     #
-    # @api plugin
+    # :api: plugin
     def run
       # process name you see in ps output
       $0 = "merb#{" : " + Merb::Config[:name] if Merb::Config[:name]} : master"
@@ -644,7 +648,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
     # ==== Returns
     # (Does not return.)
     #
-    # @api private
+    # :api: private
     def exit_gracefully
       # wait all workers to exit
       Process.waitall
@@ -675,8 +679,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
     # Child Process returns at least once:
     #   nil
     #
-    # @api private
-
+    # :api: private
     def start_transaction
       Merb.logger.warn! "Parent pid: #{Process.pid}"
       reader, writer = nil, nil
@@ -706,7 +709,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
           Merb.trap("INT") do
             Merb.logger.warn! "Reaping Workers"
             begin
-              Process.kill("ABRT", pid)
+              Process.kill(reap_workers_signal, pid)
             rescue SystemCallError
             end
             exit_gracefully
@@ -758,12 +761,18 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
         Merb::Server.add_irb_trap
         at_exit { reap_workers }
       else
-        Merb.trap('INT') { Merb::BootLoader.before_worker_shutdown_callbacks.each { |cb| cb.call } }
+        Merb.trap('INT') do
+          Merb::BootLoader.before_worker_shutdown_callbacks.each { |cb| cb.call }
+        end
         Merb.trap('ABRT') { reap_workers }
-        Merb.trap('HUP') { reap_workers(128) }
+        Merb.trap('HUP') { reap_workers(128, "ABRT") }
       end
     end
 
+    def reap_workers_signal
+      Merb::Config[:reap_workers_quickly] ? "KILL" : "ABRT"
+    end
+
     # Reap any workers of the spawner process and
     # exit with an appropriate status code.
     #
@@ -773,14 +782,14 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
     #
     # ==== Parameters
     # status<Integer>:: The status code to exit with. Defaults to 0.
+    # sig<String>::     The signal to send to workers
     #
     # ==== Returns
     # (Does not return.)
     #
-    # @api private
-    # @param status<Integer> The status code to exit with
-    # @param sig<String>     The signal to send to workers
-    def reap_workers(status = 0, sig = "ABRT")
+    # :api: private    
+    def reap_workers(status = 0, sig = reap_workers_signal)
+      
       Merb.logger.info "Executed all before worker shutdown callbacks..."
       Merb::BootLoader.before_worker_shutdown_callbacks.each do |cb|
         begin
@@ -821,7 +830,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
     # ==== Returns
     # nil
     #
-    # @api private
+    # :api: private
     def load_file(file)
       # Don't do this expensive operation unless we need to
       unless Merb::Config[:fork_for_class_load]
@@ -857,7 +866,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
     # ==== Returns
     # nil
     #
-    # @api private
+    # :api: private
     def load_classes(*paths)
       orphaned_classes = []
       paths.flatten.each do |path|
@@ -886,7 +895,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
     # When fork-based loading is not in use:
     #   nil
     #
-    # @api private
+    # :api: private
     def reload(file)
       if Merb::Config[:fork_for_class_load]
         reap_workers(128)
@@ -908,7 +917,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
     # ==== Returns
     # nil
     #
-    # @api private
+    # :api: private
     def remove_classes_in_file(file, &block)
       Merb.klass_hashes.each { |x| x.protect_keys! }
       if klasses = LOADED_CLASSES.delete(file)
@@ -932,7 +941,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
     # ==== Returns
     # nil
     #
-    # @api private
+    # :api: private
     def remove_constant(const)
       # This is to support superclasses (like AbstractController) that track
       # their subclasses in a class variable.
@@ -968,7 +977,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
     # ==== Returns
     # nil
     #
-    # @api private
+    # :api: private
     def load_classes_with_requirements(klasses)
       klasses.uniq!
 
@@ -1024,7 +1033,7 @@ class Merb::BootLoader::Router < Merb::BootLoader
     # ==== Returns
     # nil
     #
-    # @api plugin
+    # :api: plugin
     def run
       Merb::BootLoader::LoadClasses.load_file(router_file) if router_file
 
@@ -1035,6 +1044,8 @@ class Merb::BootLoader::Router < Merb::BootLoader
     #
     # ==== Returns
     # String:: The path to the router file if it exists, nil otherwise.
+    #
+    # :api: private
     def router_file
       @router_file ||= begin
         if File.file?(router = Merb.dir_for(:router) / Merb.glob_for(:router))
@@ -1055,7 +1066,7 @@ class Merb::BootLoader::Templates < Merb::BootLoader
     # ==== Returns
     # Array[String]:: The list of template files which were loaded.
     #
-    # @api plugin
+    # :api: plugin
     def run
       template_paths.each do |path|
         Merb::Template.inline_template(File.open(path))
@@ -1067,7 +1078,7 @@ class Merb::BootLoader::Templates < Merb::BootLoader
     # ==== Returns
     # Array[String]:: All found template files whose basename does not begin with "_".
     #
-    # @api private
+    # :api: private
     def template_paths
       extension_glob = "{#{Merb::Template.template_extensions.join(',')}}"
 
@@ -1110,7 +1121,7 @@ class Merb::BootLoader::MimeTypes < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api plugin
+  # :api: plugin
   def self.run
     Merb.add_mime_type(:all,  nil,      %w[*/*])
     Merb.add_mime_type(:yaml, :to_yaml, %w[application/x-yaml text/yaml], :charset => "utf-8")
@@ -1131,7 +1142,7 @@ class Merb::BootLoader::Cookies < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api plugin
+  # :api: plugin
   def self.run
     require 'merb-core/dispatch/cookies'
     Merb::Controller.send(:include, Merb::CookiesMixin)
@@ -1149,7 +1160,7 @@ class Merb::BootLoader::SetupSession < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api plugin
+  # :api: plugin
   def self.run
     # Require all standard session containers.
     Dir[Merb.framework_root / "merb-core" / "dispatch" / "session" / "*.rb"].each do |file|
@@ -1193,7 +1204,7 @@ class Merb::BootLoader::SetupStubClasses < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api plugin
+  # :api: plugin
   def self.run
     unless defined?(Exceptions)
       Object.class_eval <<-RUBY
@@ -1217,7 +1228,7 @@ class Merb::BootLoader::AfterAppLoads < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api plugin
+  # :api: plugin
   def self.run
     Merb::BootLoader.after_load_callbacks.each {|x| x.call }
     nil
@@ -1231,7 +1242,7 @@ class Merb::BootLoader::ChooseAdapter < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api plugin
+  # :api: plugin
   def self.run
     Merb.adapter = Merb::Rack::Adapter.get(Merb::Config[:adapter])
   end
@@ -1247,7 +1258,7 @@ class Merb::BootLoader::RackUpApplication < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api plugin
+  # :api: plugin
   def self.run
     require 'rack'
     if File.exists?(Merb.dir_for(:config) / "rack.rb")
@@ -1283,7 +1294,7 @@ class Merb::BootLoader::ReloadClasses < Merb::BootLoader
     # ==== Returns
     # Thread:: The thread executing the block periodically.
     #
-    # @api private
+    # :api: private
     def self.every(seconds, &block)
       Thread.new do
         loop do
@@ -1302,7 +1313,7 @@ class Merb::BootLoader::ReloadClasses < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api plugin
+  # :api: plugin
   def self.run
     return unless Merb::Config[:reload_classes]
 
@@ -1332,7 +1343,7 @@ class Merb::BootLoader::ReloadClasses < Merb::BootLoader
   # ==== Returns
   # nil
   #
-  # @api private
+  # :api: private
   def self.reload(paths)
     paths.each do |file|
       next if LoadClasses::MTIMES[file] &&