0
@@ -281,7 +281,7 @@ $ cd /webapps/rack_example
0
 $ some_awesome_editor config.ru
0
 ...type in some source code...
0
 $ cat config.ru
0
-app = Proc.new do |env|
0
+app = lambda do |env|
0
     return [200, { "Content-Type" => "text/html" }, "hello <b>world</b>"]
0
 end
0
 run app

0
@@ -29,6 +29,7 @@ class RackSpawner
0
         a.close
0
         channel = MessageChannel.new(b)
0
         ENV['RACK_ENV'] = environment
0
+				Dir.chdir(app_root)
0
         app = load_rack_app(app_root)
0
         
0
         reader, writer = IO.pipe

0
@@ -138,6 +138,44 @@ shared_examples_for "MyCook(tm) beta" do
0
   end
0
 end
0
 
0
+shared_examples_for "HelloWorld Rack application" do
0
+	it "is possible to fetch static assets" do
0
+		get('/rack.jpg').should == public_file('rack.jpg')
0
+	end
0
+	
0
+	it "is possible to GET a regular Rack page" do
0
+		get('/').should =~ /hello/
0
+	end
0
+	
0
+	it "supports restarting via restart.txt" do
0
+		get('/').should =~ /hello/
0
+		File.write("#{@stub.app_root}/config.ru", %q{
0
+			app = lambda do |env|
0
+				[200, { "Content-Type" => "text/html" }, "changed"]
0
+			end
0
+			run app
0
+		})
0
+		File.new("#{@stub.app_root}/tmp/restart.txt", "w").close
0
+		get('/').should == "changed"
0
+		File.exist?("#{@stub.app_root}/tmp/restart.txt").should == false
0
+	end
0
+	
0
+	if Process.uid == 0
0
+		it "runs as an unprivileged user" do
0
+			pending do
0
+				File.prepend("#{@stub.app_root}/config.ru", %q{
0
+					File.new('foo.txt', 'w').close
0
+				})
0
+				File.new("#{@stub.app_root}/tmp/restart.txt", "w").close
0
+				get('/')
0
+				stat = File.stat("#{@stub.app_root}/foo.txt")
0
+				stat.uid.should_not == 0
0
+				stat.gid.should_not == 0
0
+			end
0
+		end
0
+	end
0
+end
0
+
0
 describe "mod_passenger running in Apache 2" do
0
   include TestHelper
0
   
0
@@ -355,6 +393,21 @@ describe "mod_passenger running in Apache 2" do
0
     end
0
   end
0
   
0
+	describe "Rack support" do
0
+		before :all do
0
+			@stub = setup_stub('rack')
0
+			@apache2.add_vhost('passenger.test', File.expand_path(@stub.app_root) + "/public")
0
+			@apache2.start
0
+			@server = "http://passenger.test:#{@apache2.port}"
0
+		end
0
+		
0
+		after :all do
0
+			@stub.destroy
0
+		end
0
+		
0
+		it_should_behave_like "HelloWorld Rack application"
0
+	end
0
+	
0
   ##### Helper methods #####
0
   
0
   def get(uri)

0
@@ -2,7 +2,7 @@ require 'fileutils'
0
 
0
 module TestHelper
0
   STUB_TEMP_DIR = 'tmp.stub'
0
-
0
+	
0
   class Stub
0
     attr_reader :app_root
0
     
0
@@ -11,6 +11,27 @@ module TestHelper
0
       @app_root = app_root
0
     end
0
     
0
+		def destroy
0
+			FileUtils.rm_rf(@app_root)
0
+		end
0
+	end
0
+	
0
+	def setup_stub(name, dir = STUB_TEMP_DIR)
0
+		FileUtils.rm_rf(dir)
0
+		FileUtils.mkdir_p(dir)
0
+		FileUtils.cp_r("stub/#{name}/.", dir)
0
+		system("chmod", "-R", "a+rw", dir)
0
+		return Stub.new(name, dir)
0
+	end
0
+	
0
+	def use_stub(name, dir = STUB_TEMP_DIR)
0
+		stub = setup_stub(name, dir)
0
+		yield stub
0
+	ensure
0
+		stub.destroy
0
+	end
0
+	
0
+	class RailsStub < Stub
0
     def environment_rb
0
       return "#{@app_root}/config/environment.rb"
0
     end
0
@@ -23,10 +44,6 @@ module TestHelper
0
     def dont_use_vendor_rails
0
       FileUtils.rm_rf("#{@app_root}/vendor/rails")
0
     end
0
-		
0
-		def destroy
0
-			FileUtils.rm_rf(@app_root)
0
-		end
0
   end
0
   
0
   def setup_rails_stub(name, dir = STUB_TEMP_DIR)
0
@@ -35,7 +52,7 @@ module TestHelper
0
     FileUtils.cp_r("stub/rails_apps/#{name}/.", dir)
0
     FileUtils.mkdir_p("#{dir}/log")
0
     system("chmod", "-R", "a+rw", dir)
0
-		return Stub.new(name, dir)
0
+		return RailsStub.new(name, dir)
0
   end
0
   
0
   def teardown_rails_stub