From 1b9ad20ed1643d528528e197fb6fe3872a85df73 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 8 Nov 2011 16:33:50 -0800
Subject: [PATCH] minor builder refactor

---
 CHANGELOG                                 |  5 +++--
 lib/middleman/core_extensions/rack_map.rb | 11 +++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f7bed394..fb9c0434 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,9 @@
 2.1.pre
 ====
 Finally support Compass in Sprockets! Thanks to @xdite and @petebrowne
-Middleman::Sitemap object representing the known world
-Middleman::FileWatcher proxies file change events
+Sitemap object representing the known world
+FileWatcher proxies file change events
+Unified callback solution
 
 2.0.14
 ====
diff --git a/lib/middleman/core_extensions/rack_map.rb b/lib/middleman/core_extensions/rack_map.rb
index ddc15c4c..daea8070 100644
--- a/lib/middleman/core_extensions/rack_map.rb
+++ b/lib/middleman/core_extensions/rack_map.rb
@@ -18,17 +18,16 @@ module Middleman::CoreExtensions::RackMap
   
     # Creates a Rack::Builder instance with all the middleware set up and
     # an instance of this class as end point.
-    def build(*args, &bk)
-      builder = ::Rack::Builder.new
-      builder.use ::Sinatra::ShowExceptions       if show_exceptions?
-      builder.use ::Rack::CommonLogger   if logging?
-      builder.use ::Rack::Head
-      middleware.each { |c,a,b| builder.use(c, *a, &b) }
+    def build(builder, *args, &bk)
+      setup_default_middleware builder
+      setup_middleware builder
+      
       maps.each { |p,b| builder.map(p, &b) }
       app = self
       builder.map "/" do
         run app.new!(*args, &bk)
       end
+      
       builder
     end
   end