0
@@ -223,12 +223,14 @@ module Merb
0
     # If a hash is used as the first argument, a default route will be
0
     # generated based on it and rparams.
0
     def url(name, rparams={})
0
-      Merb::Router.generate(name, rparams,
0
+      uri = Merb::Router.generate(name, rparams,
0
         { :controller => controller_name,
0
           :action => action_name,
0
           :format => params[:format]
0
         }
0
-      )
0
+      ) 
0
+      uri = Merb::Config[:path_prefix] + uri if Merb::Config[:path_prefix]
0
+      uri
0
     end
0
     
0
     # Escapes the string representation of +obj+ and escapes

0
@@ -5,11 +5,15 @@ module Merb
0
     class Application
0
 
0
       def initialize(options={})
0
-        @static_server = ::Rack::File.new(::File.join(Merb.root, "public"))
0
+        @static_server = ::Rack::File.new Merb.dir_for(:public)
0
+        if prefix = ::Merb::Config[:path_prefix]
0
+          @path_prefix = /^#{Regexp.escape(prefix)}/
0
+        end
0
       end
0
 
0
-      def call(env)
0
-        path        = env['PATH_INFO'].chomp('/')
0
+      def call(env) 
0
+        strip_path_prefix(env) if @path_prefix  # Strip out the path_prefix if one was set 
0
+        path = env['PATH_INFO'].chomp('/')
0
         cached_path = (path.empty? ? 'index' : path) + '.html'
0
         Merb.logger.info "Request: #{path}"
0
         if file_exist?(path)              # Serve the file if it's there
0
@@ -31,7 +35,7 @@ module Merb
0
           [controller.status, controller.headers, controller.body]
0
         end
0
       end
0
-      
0
+
0
       # TODO refactor this in File#can_serve?(path) ??
0
       def file_exist?(path)
0
         full_path = ::File.join(@static_server.root, ::Rack::Utils.unescape(path))
0
@@ -42,6 +46,15 @@ module Merb
0
         @static_server.call(env)
0
       end
0
       
0
+      def strip_path_prefix(env)
0
+        ['PATH_INFO', 'REQUEST_URI'].each do |path_key|
0
+          if env[path_key] =~ @path_prefix
0
+            env[path_key].sub!(@path_prefix, '')
0
+            env[path_key] = '/' if env[path_key].empty?
0
+          end
0
+        end
0
+      end
0
+      
0
     end
0
   end  
0
 end    
0
\ No newline at end of file

0
@@ -15,4 +15,30 @@ describe Merb::Rack::Application do
0
     res.should be_kind_of Rack::MockResponse
0
   end
0
   
0
-end  
0
\ No newline at end of file
0
+end  
0
+
0
+describe Merb::Rack::Application, "with :path_prefix set" do
0
+
0
+  before do 
0
+    Merb::Config[:path_prefix] = "/quux"
0
+    @app = Merb::Rack::Application.new
0
+    @nullobj = mock('controller', :null_object => true)
0
+  end
0
+  
0
+  it "should strip the path_prefix from a request's REQUEST_URI and PATH_INFO" do
0
+    Merb::Dispatcher.should_receive(:handle).with(
0
+      {'REQUEST_URI' => "/foo/bar", 'PATH_INFO' => "/foo/bar"}
0
+    ).and_return @nullobj
0
+    
0
+    @app.call('REQUEST_URI' => "/quux/foo/bar", 'PATH_INFO' => "/quux/foo/bar")
0
+  end
0
+
0
+  it "should not leave REQUEST_URI or PATH_INFO empty" do
0
+    Merb::Dispatcher.should_receive(:handle).with(
0
+      {'REQUEST_URI' => "/", 'PATH_INFO' => "/"}
0
+    ).and_return @nullobj
0
+    
0
+    @app.call('REQUEST_URI' => "/quux", 'PATH_INFO' => "/quux")
0
+  end
0
+
0
+end
0
\ No newline at end of file

0
@@ -81,4 +81,11 @@ describe Merb::Controller, " url" do
0
   it "should match the delete_red route" do
0
     @controller.url(:delete_red).should == "/red/delete"
0
   end
0
+
0
+  it "should add a path_prefix to the url if :path_prefix is set" do
0
+    Merb::Config[:path_prefix] = "/jungle"
0
+    @controller.url(:monkeys).should == "/jungle/monkeys"
0
+    Merb::Config[:path_prefix] = nil
0
+  end
0
+
0
 end
0
\ No newline at end of file