0
@@ -1,5 +1,6 @@
0
 #!/usr/bin/env ruby
0
 
0
+trap("INT") { exit }
0
 require 'optparse'
0
 require 'ostruct'
0
 require 'stringio'
0
@@ -86,7 +87,6 @@ paths = ARGV.dup
0
 if conf.server.nil? || conf.server == "mongrel"
0
     begin
0
         require 'mongrel'
0
-        require 'mongrel/camping'
0
         conf.server = "mongrel"
0
     rescue LoadError 
0
         puts "!! could not load mongrel. Falling back to webrick."
0
@@ -94,7 +94,5 @@ if conf.server.nil? || conf.server == "mongrel"
0
     end
0
 end
0
 
0
-require "camping/server/#{conf.server}"
0
-
0
-server = Camping::Server.const_get(conf.server.capitalize).new(conf, paths)
0
+server = Camping::Server::Base.new(conf, paths)
0
 server.start

0
@@ -112,10 +112,10 @@ class Reloader
0
 
0
     # Conditionally reloads (using reload_app.)  Then passes the request through
0
     # to the wrapped Camping app.
0
-    def run(*a)
0
+    def call(*a) 
0
         reload_app
0
         if @klass
0
-            @klass.run(*a) 
0
+            @klass.call(*a) 
0
         else
0
             Camping.run(*a)
0
         end

0
@@ -1,3 +1,5 @@
0
+require 'irb'
0
+require 'rack'
0
 require 'camping/reloader'
0
 
0
 module Camping::Server
0
@@ -91,11 +93,65 @@ class Base < Hash
0
       self.values
0
   end
0
   
0
+  def start
0
+    handler, conf = case @conf.server
0
+    when "console"
0
+      ARGV.clear
0
+      IRB.start
0
+      exit
0
+    when "mongrel"
0
+      puts "** Starting Mongrel on #{@conf.host}:#{@conf.port}"
0
+      [Rack::Handler::Mongrel, {:Port => @conf.port, :Host => @conf.host}]
0
+    when "webrick"
0
+      [Rack::Handler::WEBrick, {:Port => @conf.port, :BindAddress => @conf.host}]
0
+    end
0
+    
0
+    rapp = if apps.length > 1
0
+      hash = {
0
+        "/" => proc {|env|[200,{'Content-Type'=>'text/html'},index_page]}
0
+      }
0
+      apps.each do |app|
0
+        hash["/#{app.mount}"] = app
0
+        hash["/code/#{app.mount}"] = proc do |env|
0
+          [200,{'Content-Type'=>'text/plain'},app.view_source]
0
+        end
0
+      end
0
+      Rack::URLMap.new(hash)
0
+    else
0
+      apps.first
0
+    end
0
+    rapp = XSendfile.new(rapp)
0
+    rapp = Rack::ShowExceptions.new(rapp)
0
+    handler.run(rapp, conf) 
0
+  end
0
+  
0
   private
0
   
0
   def insert_app(script)
0
     self[script] = Camping::Reloader.new(script)
0
   end
0
 end
0
-end
0
 
0
+# A Rack middleware for reading X-Sendfile. Should only be used in
0
+# development.
0
+class XSendfile
0
+  
0
+  HEADERS = [
0
+    "X-Sendfile",
0
+    "X-Accel-Redirect",
0
+    "X-LIGHTTPD-send-file"
0
+  ]
0
+  
0
+  def initialize(app)
0
+    @app = app
0
+  end
0
+
0
+  def call(env)
0
+    status, headers, body = @app.call(env)
0
+    if path = headers.values_at(*HEADERS).compact.first
0
+      body = File.read(path)
0
+    end
0
+    [status, headers, body]
0
+  end
0
+end
0
+end
0
\ No newline at end of file