merb 0.3.4 → 0.3.7

data/lib/merb/merb_dispatcher.rb

@@ -11,31 +11,36 @@ module Merb
       
       @@mutex = Mutex.new
       @@use_mutex = ::Merb::Server.use_mutex
-      # This is where we grab the incoming request REQUEST_URI
-      # and use that in the merb routematcher to determine
-      # which controller and method to run. 
-      # returns a 2 element tuple of:
-      # [controller, action]
+      # This is where we grab the incoming request REQUEST_URI and use that in
+      # the merb RouteMatcher to determine which controller and method to run.
+      # Returns a 2 element tuple of: [controller, action]
       def handle(request, response)
-        request_uri = request.params[Mongrel::Const::REQUEST_URI]
+        start = Time.now
+        
+        request_uri = request.params[Merb::Const::REQUEST_URI]
         request_uri.sub!(path_prefix, '') if path_prefix
         route = route_path(request_uri)
       
         allowed = route.delete(:allowed)
         rest = route.delete(:rest)
-      
-        controller = instantiate_controller(route[:controller], request.body, request.params, route, response)
+        namespace = route.delete(:namespace)
+        
+        cont = namespace ? "#{namespace}/#{route[:controller]}" : route[:controller]
+        
+        klass = resolve_controller(cont)
+        controller = klass.build(request.body, request.params, route, response)
       
         if rest
           method = controller.request.method
           if allowed.keys.include?(method) && action = allowed[method]
             controller.params[:action] = action
           else
-            raise Merb::RestfulMethodNotAllowed.new(method, allowed)
+            raise Merb::HTTPMethodNotAllowed.new(method, allowed)
           end  
         else  
           action = route[:action]
         end
+        controller._benchmarks[:setup_time] = Time.now - start
         if @@use_mutex
           @@mutex.synchronize {
             controller.dispatch(action)
@@ -52,20 +57,23 @@ module Merb
         Merb::Router.match(path)
       end
       
-      # take a controller class name string and reload or require
-      # the right controller file then CamelCase it and turn it 
-      # into a new object passing in the request and response.
-      # this is where your Merb::Controller is instantiated.
-      def instantiate_controller(controller_name, req, env, params, res) 
-        if !File.exist?(DIST_ROOT+"/app/controllers/#{controller_name.snake_case}.rb")
-          raise "Bad controller! #{controller_name.snake_case}"
+      # Take a controller class name string and reload or require the right
+      # controller file then CamelCase it and return the class object.
+      def resolve_controller(controller_name)
+        segments = controller_name.split('/').map{|s| s.snake_case}
+        path = "#{DIST_ROOT}/app/controllers/#{controller_name}.rb"
+        cnt = segments.map{|s| s.camel_case }.join('::')
+        
+        if !File.exist?(path)
+          raise "Bad controller! #{cnt}"
         end unless $TESTING
+        
         begin
-          unless MERB_ENV == 'production'
-            Object.send(:remove_const, controller_name.camel_case.intern) rescue nil
-            load(controller_name.snake_case + '.rb')
+          if MERB_ENV == 'development'
+            Object.send(:remove_const, cnt) rescue nil
+            load(path)
           end
-          return Object.const_get( controller_name.camel_case ).new(req, env, params, res)
+          return Object.full_const_get(cnt)
         rescue RuntimeError
           warn "Error getting instance of '#{controller_name.camel_case}': #{$!}"
           raise $!

data/lib/merb/merb_drb_server.rb

@@ -14,7 +14,6 @@ module Merb
       
     end
     
-  end    
+  end
   
-  
-end  
+end

data/lib/merb/merb_exceptions.rb

@@ -4,19 +4,170 @@ rescue LoadError => ex
 end
 
 module Merb
+  
+  module ControllerExceptions
+    # ControllerExceptions are a way of simplifying controller code by placing
+    # exceptional logic elsewhere. ControllerExceptions are like 
+    # mini-controllers which have one action. The exception action is called 
+    # to render a web page when the exception is raised. Additionally all
+    # ControllerExceptions have an HTTP status code associated with them
+    # which is given to the browser when it's action is rendered.
+    #
+    # ControllerExceptions::Base is an abstract base class, it cannot be
+    # raised. Derived from Base are many exceptions, one for each HTTP status
+    # code. EG Unauthorized (401), PaymentRequired (402), and Forbidden (403).
+    #
+    # These exceptions can be raised by your controller without any further
+    # work. For example
+    #
+    #   def show
+    #     product = Product.find(params[:id])
+    #     raise NotFound if product.nil?
+    #     [...]
+    #   end
+    #
+    # By default the NotFound exception will look in for a template at
+    #   app/views/exceptions/not_found.{rhtml, haml, whatevs}
+    # If the template is not found then a simple message will be sent.
+    #
+    # To extend the use of the ControllerExceptions one may derive a new
+    # exception from one of the already defined ones. Then one must add a
+    # special method called error_response which is like a controller action
+    # preparing the context for rendering a template at 
+    #   app/views/exceptions/my_exception_snake_cased.whatevs
+    #
+    # As an example we will create an exception called AdminAccessRequired.
+    # First we decide on what HTTP status code such an error might have.
+    # 401, Unauthorized seems to fit. 
+    #
+    #   class AdminAccessRequired < Merb::ControllerExceptions::Unauthorized
+    #     def error_response
+    #       @tried_to_access request.uri
+    #       render :layout => 'error_page'
+    #     end
+    #   end
+    #
+    # At app/views/exceptions/admin_access_required.rhtml we write
+    # 
+    #   <h1>You're not an administrator!</h1>
+    #   <p>You tried to access <%= @tried_to_access %> but that URL is 
+    #   restricted to administrators.</p>
+    #
+    # The layout 'error_page' works like any other controller, it would be
+    # looked for at app/views/layouts
+    #
+    # TODO: if you need to pass data to your exception use a constructor.
+    class Base < StandardError
+      include Merb::RenderMixin
+      include Merb::ControllerMixin
+      include Merb::ResponderMixin
+      
+      def _template_root
+        @controller._template_root
+      end
+      
+      # The filename of the exception template. usually something like
+      # views/exceptions/not_found.rhtml
+      def template_path
+        _template_root / 'exceptions' / self.class.name.snake_case.split('::').last
+      end
+      
+      def set_controller(controller)
+        @controller = controller
+      end
+      
+      def request;  @controller.request;  end      
+      def params;   @controller.params;   end
+      def cookies;  @controller.cookies;  end
+      def headers;  @controller.headers;  end
+      def session;  @controller.session;  end
+      def response; @controller.response; end      
+      
+      def status
+        self.class.const_get(:STATUS)
+      end
+      
+      def call_action
+        # TODO: this method is meaningless at the moment but it could call
+        # filters
+        # before filters?
+        error_response
+        # after filters?
+      end
+      
+      def error_response
+        if File.exists?(template_path)
+          render
+        else
+          "Error #{status} #{self.class.name.split('::').last}!"
+        end
+      end
+    end
+    module HTTPErrors
+      # created with: 
+      # ruby -r rubygems -e "require 'mongrel'; puts Mongrel::HTTP_STATUS_CODES.keys.sort.map {|code| %Q{class #{Mongrel::HTTP_STATUS_CODES[code].gsub /[^\w]/,''} < Merb::ControllerExceptions::Base; STATUS = #{code}; end} }.join(%Q{\n})"
+      # we could do some magic here, but i think it's more instructive to just
+      # have these values copied
+      class Continue < Merb::ControllerExceptions::Base; STATUS = 100; end
+      class SwitchingProtocols < Merb::ControllerExceptions::Base; STATUS = 101; end
+      class OK < Merb::ControllerExceptions::Base; STATUS = 200; end
+      class Created < Merb::ControllerExceptions::Base; STATUS = 201; end
+      class Accepted < Merb::ControllerExceptions::Base; STATUS = 202; end
+      class NonAuthoritativeInformation < Merb::ControllerExceptions::Base; STATUS = 203; end
+      class NoContent < Merb::ControllerExceptions::Base; STATUS = 204; end
+      class ResetContent < Merb::ControllerExceptions::Base; STATUS = 205; end
+      class PartialContent < Merb::ControllerExceptions::Base; STATUS = 206; end
+      class MultipleChoices < Merb::ControllerExceptions::Base; STATUS = 300; end
+      class MovedPermanently < Merb::ControllerExceptions::Base; STATUS = 301; end
+      class MovedTemporarily < Merb::ControllerExceptions::Base; STATUS = 302; end
+      class SeeOther < Merb::ControllerExceptions::Base; STATUS = 303; end
+      class NotModified < Merb::ControllerExceptions::Base; STATUS = 304; end
+      class UseProxy < Merb::ControllerExceptions::Base; STATUS = 305; end
+      class BadRequest < Merb::ControllerExceptions::Base; STATUS = 400; end
+      class Unauthorized < Merb::ControllerExceptions::Base; STATUS = 401; end
+      class PaymentRequired < Merb::ControllerExceptions::Base; STATUS = 402; end
+      class Forbidden < Merb::ControllerExceptions::Base; STATUS = 403; end
+      class NotFound < Merb::ControllerExceptions::Base; STATUS = 404; end
+      class MethodNotAllowed < Merb::ControllerExceptions::Base; STATUS = 405; end
+      class NotAcceptable < Merb::ControllerExceptions::Base; STATUS = 406; end
+      class ProxyAuthenticationRequired < Merb::ControllerExceptions::Base; STATUS = 407; end
+      class RequestTimeout < Merb::ControllerExceptions::Base; STATUS = 408; end
+      class Conflict < Merb::ControllerExceptions::Base; STATUS = 409; end
+      class Gone < Merb::ControllerExceptions::Base; STATUS = 410; end
+      class LengthRequired < Merb::ControllerExceptions::Base; STATUS = 411; end
+      class PreconditionFailed < Merb::ControllerExceptions::Base; STATUS = 412; end
+      class RequestEntityTooLarge < Merb::ControllerExceptions::Base; STATUS = 413; end
+      class RequestURITooLarge < Merb::ControllerExceptions::Base; STATUS = 414; end
+      class UnsupportedMediaType < Merb::ControllerExceptions::Base; STATUS = 415; end
+      class InternalServerError < Merb::ControllerExceptions::Base; STATUS = 500; end
+      class NotImplemented < Merb::ControllerExceptions::Base; STATUS = 501; end
+      class BadGateway < Merb::ControllerExceptions::Base; STATUS = 502; end
+      class ServiceUnavailable < Merb::ControllerExceptions::Base; STATUS = 503; end
+      class GatewayTimeout < Merb::ControllerExceptions::Base; STATUS = 504; end
+      class HTTPVersionNotSupported < Merb::ControllerExceptions::Base; STATUS = 505; end
+    end
+    
+    include HTTPErrors
+  end
+  
   class MerbError < StandardError; end  
   class Noroutefound < MerbError; end  
   class MissingControllerFile < MerbError; end
   class MerbControllerError < MerbError; end
-  class RestfulMethodNotAllowed < MerbError
+  class HTTPMethodNotAllowed < MerbError
     def initialize(method, allowed)
-      super("RestfulMethodNotAllowed: #{method}\n"+ "Allowed: #{allowed.keys.join(' ')})")
+      super("HTTPMethodNotAllowed: #{method}\n"+ "Allowed: #{allowed.keys.join(' ')})")
     end
     
   end
-  # format exception message for browser display  
+  
+  # Format exception message for browser display.
   def self.html_exception(e)
-    ::Merb::Server.show_error ? ErrorResponse.new(e).out : "500 Internal Server Error!"
+    if ::Merb::Server.show_error
+      ErrorResponse.new(e).out 
+    else
+      IO.read(DIST_ROOT / 'public/500.html') rescue "500 Internal Server Error!"
+    end
   end  
   
   def self.exception(e)
@@ -34,7 +185,7 @@ module Merb
       backtrace = @error.backtrace
     
       colors = []
-      min = 104
+      min = 200
       max = 255
       step = -((max - min) / backtrace.size).abs
       max.step(min, step) do |color|
@@ -55,8 +206,8 @@ module Merb
       error_page(colors, error, *backtrace)
     end
     
-    # this method offers highlighting for the sourcecode-chunks from the
-    # traceback, just gem install coderay
+    # This method offers highlighting for the sourcecode-chunks from the
+    # traceback. Just 'gem install coderay'.
     def error_page(colors, title, *backtrace)
       @backtrace = backtrace
       @colors = colors
@@ -71,39 +222,26 @@ module Merb
     <title><%= @title %></title>
     <style type="text/css">
       <!--
-      h1.main {
-        text-align: center;
-        }
-      table.main {
-        background: #000;
-        }
-      table.main tr.head {
-        background: #fee;
-        width:      100%;
-        }
-      table.main tr.source_container {
-        display:    none;
-        }
-      tr.source_container div {
-        width:      100%;
-        overflow:   auto;
-        }
-      tr.source_container div table {
-        background: #ddd;
-        width:      100%;
-        }
-      tr.source_container div table tr {
-        text-align:center;
-        }
-      tr.source_container div table tr.source {
-        text-align:left;
-        }
-      tr a {
-        color: black;
-      }  
-      div.source {
-        background: #fff;
-        }
+      table {border:0px}
+      tr {line-height:1.3}
+      td {font-size:.8em; padding:4px}
+      h1 {font-size:2em}
+      h1, td {font-family:'courier new', 'courier', monospace}
+      td.line {color:#000;  text-align:center}
+      td.method {font-weight:bold; text-align:right}
+      td.file a {color:#000}
+      td.file a:hover {color:#F00}
+      tr.clickable:hover {background:#FFA}
+      .clickable {cursor: help }
+      #title {float: left;}
+      .source 
+      {
+        border:1px #000 solid;
+        margin:2px;
+        padding:8px;
+        background:#F0F0F0;
+      }
+      
       -->
       <% if @coderay %>
         <%= CodeRay::Encoders[:html]::CSS.new.stylesheet %>
@@ -132,17 +270,24 @@ module Merb
     </script>
   </head>
   <body>
-    <span style="float:left;">
-      <img src="data:image/jpg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAJQAA/+4ADkFk\nb2JlAGTAAAAAAf/bAIQADQkJCQoJDQoKDRMMCwwTFhENDREWGhUVFhUVGhkU\nFhUVFhQZGR0fIB8dGScnKionJzk4ODg5QEBAQEBAQEBAQAEODAwOEA4RDw8R\nFA4RDhQVERISERUgFRUXFRUgKB0ZGRkZHSgjJiAgICYjLCwoKCwsNzc1NzdA\nQEBAQEBAQEBA/8AAEQgAJgAtAwEiAAIRAQMRAf/EAT8AAAEFAQEBAQEBAAAA\nAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcICQoL\nEAABBAEDAgQCBQcGCAUDDDMBAAIRAwQhEjEFQVFhEyJxgTIGFJGhsUIjJBVS\nwWIzNHKC0UMHJZJT8OHxY3M1FqKygyZEk1RkRcKjdDYX0lXiZfKzhMPTdePz\nRieUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9jdHV2d3h5ent8fX5/cRAAIC\nAQIEBAMEBQYHBwYFNQEAAhEDITESBEFRYXEiEwUygZEUobFCI8FS0fAzJGLh\ncoKSQ1MVY3M08SUGFqKygwcmNcLSRJNUoxdkRVU2dGXi8rOEw9N14/NGlKSF\ntJXE1OT0pbXF1eX1VmZ2hpamtsbW5vYnN0dXZ3eHl6e3x//aAAwDAQACEQMR\nAD8A9OVDK6xRQYa02axuEBvnB7x8Fm/W36x19HqoxmAvyswkMraHFwY2N7va\nCe/5Vy/Seu29RvdXaI2CW6EBw4OhGnZAk9Einrbuvn03Oaw1lvmCCP8ANXPW\n9Zz7shlrM9zKBLnN3Fmg1gnj8An61m14eCbAN9j4ZVWJJc5x2gQPivO3ZnUM\nXLtfY8by73sDmuHw9pPCZRPVNgdH13F+teJU51WbZpX9O4xpPEho4juug9Wr\n0vW3t9Lbv9SRt2xO7dxEL5+blW5I2W2FrdsSJJgdj4r0P1W/+Nf6Un1p9PZJ\nnf8AaPU2+P0fwThdVaLF3TlfXZvUsr63ZIpZY4Y9VDKTWwuIY5vqEe3uXFx+\nSn0XBupy9t+loqDXy1zTJLST7tefJbVDLsjLycwO9Sy/09ANQafUJP8A4IrG\nQGufXltEAjZYPA900kkeCRoXA+sHSeoTXn41xJxnB9bY3e4HRcTbVsfB2h7j\ntDWkkAT7jrPjC9FzCMfpJZU5wDGgN7wNI4HZcJdiNrvP2t+62SNg9vedxnRO\nj2WyQfZy2oOA5kbfGedF0jb8w/Uq2ra/25NcGD9F1dk6/BqrYNODY5rrve4+\n2rGpBcR3Mr0j9iVf83vscD1J3bZMep/NelM+Hsn5oqa3RG0uuf6b9j9dsCRI\n+lx4haGT9g1FgZ6nc0n/AKrSEkko/Kg7vO9XtsxzV+y6a8xjtxu+hWWwPY0f\npBMnv2XN52ZmbyLunYocCZNl1bpdENmS0wOdUkkPsT9rL6rfbf8AnJiPzvT+\nzfpPVrZ6ezb6Ttv0e26OTzC9U3uk+z88ACRu+hz8YSSR6q6P/9k=\n"/>
-    </span>
-    <h1><%= @title %></h1>
+    <div>
+      <h1><img src="data:image/jpg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAJQAA/+4ADkFk\nb2JlAGTAAAAAAf/bAIQADQkJCQoJDQoKDRMMCwwTFhENDREWGhUVFhUVGhkU\nFhUVFhQZGR0fIB8dGScnKionJzk4ODg5QEBAQEBAQEBAQAEODAwOEA4RDw8R\nFA4RDhQVERISERUgFRUXFRUgKB0ZGRkZHSgjJiAgICYjLCwoKCwsNzc1NzdA\nQEBAQEBAQEBA/8AAEQgAJgAtAwEiAAIRAQMRAf/EAT8AAAEFAQEBAQEBAAAA\nAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcICQoL\nEAABBAEDAgQCBQcGCAUDDDMBAAIRAwQhEjEFQVFhEyJxgTIGFJGhsUIjJBVS\nwWIzNHKC0UMHJZJT8OHxY3M1FqKygyZEk1RkRcKjdDYX0lXiZfKzhMPTdePz\nRieUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9jdHV2d3h5ent8fX5/cRAAIC\nAQIEBAMEBQYHBwYFNQEAAhEDITESBEFRYXEiEwUygZEUobFCI8FS0fAzJGLh\ncoKSQ1MVY3M08SUGFqKygwcmNcLSRJNUoxdkRVU2dGXi8rOEw9N14/NGlKSF\ntJXE1OT0pbXF1eX1VmZ2hpamtsbW5vYnN0dXZ3eHl6e3x//aAAwDAQACEQMR\nAD8A9OVDK6xRQYa02axuEBvnB7x8Fm/W36x19HqoxmAvyswkMraHFwY2N7va\nCe/5Vy/Seu29RvdXaI2CW6EBw4OhGnZAk9Einrbuvn03Oaw1lvmCCP8ANXPW\n9Zz7shlrM9zKBLnN3Fmg1gnj8An61m14eCbAN9j4ZVWJJc5x2gQPivO3ZnUM\nXLtfY8by73sDmuHw9pPCZRPVNgdH13F+teJU51WbZpX9O4xpPEho4juug9Wr\n0vW3t9Lbv9SRt2xO7dxEL5+blW5I2W2FrdsSJJgdj4r0P1W/+Nf6Un1p9PZJ\nnf8AaPU2+P0fwThdVaLF3TlfXZvUsr63ZIpZY4Y9VDKTWwuIY5vqEe3uXFx+\nSn0XBupy9t+loqDXy1zTJLST7tefJbVDLsjLycwO9Sy/09ANQafUJP8A4IrG\nQGufXltEAjZYPA900kkeCRoXA+sHSeoTXn41xJxnB9bY3e4HRcTbVsfB2h7j\ntDWkkAT7jrPjC9FzCMfpJZU5wDGgN7wNI4HZcJdiNrvP2t+62SNg9vedxnRO\nj2WyQfZy2oOA5kbfGedF0jb8w/Uq2ra/25NcGD9F1dk6/BqrYNODY5rrve4+\n2rGpBcR3Mr0j9iVf83vscD1J3bZMep/NelM+Hsn5oqa3RG0uuf6b9j9dsCRI\n+lx4haGT9g1FgZ6nc0n/AKrSEkko/Kg7vO9XtsxzV+y6a8xjtxu+hWWwPY0f\npBMnv2XN52ZmbyLunYocCZNl1bpdENmS0wOdUkkPsT9rL6rfbf8AnJiPzvT+\nzfpPVrZ6ezb6Ttv0e26OTzC9U3uk+z88ACRu+hz8YSSR6q6P/9k=\n"/>
+    <%= @title %></h1>
+    </div>
+    
     <table class="main">
-      <tr class="head">
-        <td>File</td><td>Line</td><td>Method</td>
-      </tr>
+      <thead>
+        <tr>
+          <td class="method">Method</td>
+          <td class="line">Line</td>        
+          <td class="file">File</td>
+        </tr>
+      </thead>
       <% @backtrace.each do |lines, hash, file, lineno, meth| %>
-        <tr id="line_<%= hash %>" style="background:rgb(104,104,<%= @colors.shift %>);">
-          <td><a href='#' onclick="toggle('source_<%= hash %>'); return false"><%= file %></a></td><td><%= lineno %></td><td><%= meth %></td>
+        <tr id="line_<%= hash %>" onclick="toggle('source_<%= hash %>'); return false"; class="clickable" style="background:rgb(250,250,<%= @colors.shift %>);">
+          <td class="method"><%= meth %></td>          
+          <td class="line"><%= lineno %></td>
+          <td class="file"><%= file %></td>          
         </tr>
         <tr id="source_<%= hash %>" <%= @coderay? " class='CodeRay' " : ''%> style="display:none;">
           <td colspan="3">

data/lib/merb/merb_handler.rb

@@ -9,12 +9,10 @@ class Mongrel::HttpResponse
   end
 end  
 
-
-
 class MerbHandler < Mongrel::HttpHandler
   @@file_only_methods = ["GET","HEAD"]
   
-  # take the name of a directory and use that as the doc root or public
+  # Take the name of a directory and use that as the doc root or public
   # directory of your site. This is set to the root of your merb app + '/public'
   # by default.
   def initialize(dir, opts = {})
@@ -22,21 +20,21 @@ class MerbHandler < Mongrel::HttpHandler
   end
   
   # process incoming http requests and do a number of things
-  # 1. check for rails style cached pages. add .html to the
-  # url and see if there is a static file in public that matches.
-  # serve that file directly without invoking Merb and be done with it.
-  # 2. Serve static asset and html files directly from public/ if
-  # they exist.
-  # 3. If none of the above apply, we take apart the request url
-  # and feed it into Merb::RouteMatcher to let it decide which 
-  # controller and method will serve the request.
-  # 4. after the controller has done its thing, we check for the
-  # X-SENDFILE header. if you set this header to the path to a file
-  # in your controller then mongrel will serve the file directly
-  # and your controller can go on processing other requests.
+  # 1. Check for rails style cached pages. add .html to the url and see if
+  # there is a static file in public that matches. serve that file directly
+  # without invoking Merb and be done with it.
+  # 2. Serve static asset and html files directly from public/ if they exist.
+  # 3. If none of the above apply, we take apart the request url and feed it
+  # into Merb::RouteMatcher to let it decide which controller and method will
+  # serve the request.
+  # 4. After the controller has done its thing, we check for the X-SENDFILE
+  # header. if you set this header to the path to a file in your controller
+  # then mongrel will serve the file directly and your controller can go on
+  # processing other requests.
   def process(request, response)
     
     start = Time.now
+    benchmarks = {}
     
     if response.socket.closed?
       return
@@ -44,9 +42,9 @@ class MerbHandler < Mongrel::HttpHandler
     
     MERB_LOGGER.info("\nRequest: REQUEST_URI: #{request.params[Mongrel::Const::REQUEST_URI]}  (#{Time.now.strftime("%Y-%m-%d %H:%M:%S")})")
     
-    # Rails style page caching. Check the public dir first for
-    # .html pages and serve directly. Otherwise fall back to Merb 
-    # routing and request dispatching. 
+    # Rails style page caching. Check the public dir first for .html pages and
+    # serve directly. Otherwise fall back to Merb routing and request
+    # dispatching.
     path_info = request.params[Mongrel::Const::PATH_INFO]
     page_cached = path_info + ".html"
     get_or_head = @@file_only_methods.include? request.params[Mongrel::Const::REQUEST_METHOD]
@@ -65,8 +63,12 @@ class MerbHandler < Mongrel::HttpHandler
         # Let Merb:Dispatcher find the route and call the filter chain and action
         controller = nil
         controller, action = Merb::Dispatcher.handle(request, response)
-        
-        MERB_LOGGER.info("Routing to controller: #{controller.class} action: #{action}\nRoute Recognition & Parsing HTTP Input took: #{Time.now - start} seconds")
+
+        benchmarks.merge!(controller._benchmarks)
+        benchmarks[:controller] = controller.class.to_s
+        benchmarks[:action] = action
+
+        MERB_LOGGER.info("Routing to controller: #{controller.class} action: #{action}\nRoute Recognition & Parsing HTTP Input took: #{benchmarks[:setup_time]} seconds")
       rescue Object => e
         response.start(500) do |head,out|
           head["Content-Type"] = "text/html"
@@ -78,8 +80,8 @@ class MerbHandler < Mongrel::HttpHandler
       
       sendfile, clength = nil
       response.status = controller.status
-      # check for the X-SENDFILE header from your Merb::Controller
-      # and serve the file directly instead of buffering.
+      # Check for the X-SENDFILE header from your Merb::Controller and serve
+      # the file directly instead of buffering.
       controller.headers.each do |k, v|
         if k =~ /^X-SENDFILE$/i
           sendfile = v
@@ -93,14 +95,15 @@ class MerbHandler < Mongrel::HttpHandler
       end
       
       if sendfile
-        MERB_LOGGER.info("X-SENDFILE: #{sendfile}\nComplete Request took: #{Time.now - start} seconds")
+        benchmarks[:sendfile_time] = Time.now - start        
+        MERB_LOGGER.info("X-SENDFILE: #{sendfile}\nComplete Request took: #{benchmarks[:sendfile_time]} seconds")
         file_status = File.stat(sendfile)
         response.status = 200
         # Set the last modified times as well and etag for all files
         response.header[Mongrel::Const::LAST_MODIFIED] = file_status.mtime.httpdate
         # Calculated the same as apache, not sure how well the works on win32
         response.header[Mongrel::Const::ETAG] = Mongrel::Const::ETAG_FORMAT % [file_status.mtime.to_i, file_status.size, file_status.ino]
-        # send a status with out content length
+        # Send a status with out content length
         response.send_status(file_status.size)
         response.send_header
         response.send_file(sendfile)
@@ -116,13 +119,18 @@ class MerbHandler < Mongrel::HttpHandler
       elsif Proc === controller.body
         controller.body.call
       else
-        MERB_LOGGER.info("Response status: #{response.status}\nComplete Request took: #{Time.now - start} seconds\n\n")
-        # render response from successful controller
+        # Render response from successful controller
         body = (controller.body.to_s rescue '') 
         response.send_status(body.length)
         response.send_header
         response.write(body)
       end
+
+      total_request_time = Time.now - start
+      benchmarks[:total_request_time] = total_request_time
+        
+      MERB_LOGGER.info("Request Times: #{benchmarks.inspect}")
+      MERB_LOGGER.info("Response status: #{response.status}\nComplete Request took: #{total_request_time} seconds, #{1.0/total_request_time} Requests/Second\n\n")
     end
   end