0
@@ -563,6 +563,7 @@
0
   # the context of a Rack::Builder.new { } block. Allows for mounting
0
   # additional apps or middleware.
0
   def self.run
0
+    require 'rack'
0
     if File.exists?(Merb.dir_for(:config) / "rack.rb")
0
       Merb::Config[:rackup] ||= Merb.dir_for(:config) / "rack.rb"
0
     end
0
@@ -571,7 +572,13 @@
0
       rackup_code = File.read(Merb::Config[:rackup])
0
       Merb::Config[:app] = eval("::Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, Merb::Config[:rackup])
0
     else
0
-      Merb::Config[:app] = ::Merb::Rack::Application.new
0
+      Merb::Config[:app] = ::Rack::Builder.new {
0
+         if prefix = ::Merb::Config[:path_prefix]
0
+           use Merb::Rack::PathPrefix, prefix
0
+         end
0
+         use Merb::Rack::Static, Merb.dir_for(:public)
0
+         run Merb::Rack::Application.new
0
+       }.to_app
0
     end
0
   end
0
 end

0
@@ -7,15 +7,13 @@
0
     autoload :EventedMongrel, "merb-core/rack/adapter/evented_mongrel"    
0
     autoload :FastCGI,        "merb-core/rack/adapter/fcgi"
0
     autoload :Irb,            "merb-core/rack/adapter/irb"
0
+    autoload :Middleware,     "merb-core/rack/middleware"
0
     autoload :Mongrel,        "merb-core/rack/adapter/mongrel"
0
     autoload :Runner,         "merb-core/rack/adapter/runner"    
0
     autoload :Thin,           "merb-core/rack/adapter/thin"
0
     autoload :WEBrick,        "merb-core/rack/adapter/webrick"
0
-    
0
-    autoload :Deferral,         "merb-core/rack/apps/deferral"
0
-    autoload :MerbApplication,    "merb-core/rack/apps/merb_application"
0
-    autoload :PathPrefix,      "merb-core/rack/apps/path_prefix"
0
-    autoload :Static,          "merb-core/rack/apps/static"
0
+    autoload :PathPrefix,     "merb-core/rack/apps/path_prefix"
0
+    autoload :Static,         "merb-core/rack/apps/static"
0
   end # Rack
0
 end # Merb

0
@@ -1,42 +1,18 @@
0
-module Merb
0
-   module Rack
0
-     class AbstractMiddleware
0
-       
0
-       def initialize(app)
0
-         @app = app
0
-       end
0
-       
0
-       def deferred?(env)
0
-         @app.deferred?(env)  
0
-       end
0
-
0
-       def call(env)
0
-         @app.call(env)
0
-       end
0
-       
0
-     end
0
-   end
0
-end
0
-
0
-
0
-module Merb
0
-  
0
+module Merb  
0
   module Rack
0
-
0
-    class Application < Merb::Rack::AbstractMiddleware
0
-      # ==== Parameters
0
-      # options<Hash>::
0
-      #   Options for creating a new application. Currently ignored.
0
-      def initialize(options={})
0
-        @app = ::Rack::Builder.new {
0
-           if prefix = ::Merb::Config[:path_prefix]
0
-             use Merb::Rack::PathPrefix, prefix
0
-           end
0
-           use Merb::Rack::Deferral 
0
-           use Merb::Rack::Static, Merb.dir_for(:public)
0
-           run Merb::Rack::MerbApplication.new
0
-         }.to_app
0
-      end      
0
+    class Application
0
+      
0
+      def call(env) 
0
+        begin
0
+          controller = ::Merb::Dispatcher.handle(env)
0
+        rescue Object => e
0
+          return [500, {"Content-Type"=>"text/html"}, e.message + "<br/>" + e.backtrace.join("<br/>")]
0
+        end
0
+        Merb.logger.info "\n\n"
0
+        Merb.logger.flush
0
+        [controller.status, controller.headers, controller.body]
0
+      end
0
+      
0
     end
0
   end  
0
 end

0
@@ -1,18 +1 @@
0
-module Merb
0
-  module Rack
0
-    class Deferral < Merb::Rack::AbstractMiddleware
0
-      
0
-     def deferred?(env)
0
-       path = env['PATH_INFO'] ? env['PATH_INFO'].chomp('/') : ""
0
-       if path =~ Merb.deferred_actions
0
-         Merb.logger.info! "Deferring Request: #{path}"
0
-         true
0
-       else
0
-         false
0
-       end
0
-     end
0
-     
0
-    end
0
-  end
0
-end

0
@@ -1,19 +1 @@
0
-module Merb
0
-  module Rack
0
-    class MerbApplication
0
-      
0
-      def call(env) 
0
-        begin
0
-          controller = ::Merb::Dispatcher.handle(env)
0
-        rescue Object => e
0
-          return [500, {"Content-Type"=>"text/html"}, e.message + "<br/>" + e.backtrace.join("<br/>")]
0
-        end
0
-        Merb.logger.info "\n\n"
0
-        Merb.logger.flush
0
-        [controller.status, controller.headers, controller.body]
0
-      end
0
-      
0
-    end
0
-  end
0
-end

0
@@ -1,6 +1,6 @@
0
 module Merb
0
   module Rack
0
-    class PathPrefix < Merb::Rack::AbstractMiddleware
0
+    class PathPrefix < Merb::Rack::Middleware
0
 
0
       def initialize(app, path_prefix = nil)
0
         super(app)

0
@@ -1,10 +1,10 @@
0
 module Merb
0
   module Rack
0
-    class Static < Merb::Rack::AbstractMiddleware
0
+    class Static < Merb::Rack::Middleware
0
 
0
       def initialize(app,directory)
0
         super(app)
0
-        @static_server = ::Rack::File.new directory
0
+        @static_server = ::Rack::File.new(directory)
0
       end
0
       
0
       def call(env)        

0
@@ -1 +1,26 @@
0
+module Merb
0
+  module Rack
0
+    class Middleware
0
+      
0
+      def initialize(app)
0
+        @app = app
0
+      end
0
+      
0
+      def deferred?(env)
0
+        path = env['PATH_INFO'] ? env['PATH_INFO'].chomp('/') : ""
0
+        if path =~ Merb.deferred_actions
0
+          Merb.logger.info! "Deferring Request: #{path}"
0
+          true
0
+        else
0
+          false
0
+        end
0
+      end
0
+  
0
+      def call(env)
0
+        @app.call(env)
0
+      end
0
+      
0
+    end
0
+  end
0
+end

0
@@ -6,7 +6,7 @@
0
     options = {:merb_root => File.dirname(__FILE__) / 'fixture'}
0
     Merb::Config.setup(options)
0
     app = Merb::BootLoader::RackUpApplication.run
0
-    app.class.should == Merb::Rack::Application
0
+    app.class.should == Merb::Rack::Static
0
   end
0
 
0
   it "should use rackup config that we specified" do

0
@@ -1,2 +1,12 @@
0
+# use PathPrefix Middleware if :path_prefix is set in Merb::Config
0
+if prefix = ::Merb::Config[:path_prefix]
0
+  use Merb::Rack::PathPrefix, prefix
0
+end
0
+
0
+# comment this out if you are running merb behind a load balancer
0
+# that serves static files
0
+use Merb::Rack::Static, Merb.dir_for(:public)
0
+
0
+# this is our main merb application
0
 run Merb::Rack::Application.new

0
@@ -20,7 +20,13 @@
0
 
0
   before do 
0
     Merb::Config[:path_prefix] = "/quux"
0
-    @app = Merb::Rack::Application.new
0
+    @app = ::Rack::Builder.new {
0
+       if prefix = ::Merb::Config[:path_prefix]
0
+         use Merb::Rack::PathPrefix, prefix
0
+       end
0
+       use Merb::Rack::Static, Merb.dir_for(:public)
0
+       run Merb::Rack::Application.new
0
+     }.to_app
0
     @nullobj = mock('controller', :null_object => true)
0
   end
0