lib/serve/handlers/dynamic_handler.rb test_project/_layout.haml test_project/test.haml test_project/test.html.erb @@ -5,7 +5,7 @@ require 'serve/webrick/extensions' require 'serve/handlers/file_type_handler' require 'serve/handlers/textile_handler' require 'serve/handlers/markdown_handler' -require 'serve/handlers/haml_handler' +require 'serve/handlers/dynamic_handler' require 'serve/handlers/sass_handler' require 'serve/handlers/email_handler' require 'serve/handlers/redirect_handler' lib/serve.rb @@ -136,7 +136,7 @@ module Serve :BindAddress => options[:address], :DocumentRoot => options[:root], :DirectoryIndex => %w(index.html index.txt index.text index.haml index.textile index.markdown index.email index.redirect), - :AppendExtensions => %w(html txt text haml textile markdown email redirect) + :AppendExtensions => %w(html txt text haml erb rhtml html.erb html.haml textile markdown email redirect) ) trap("INT") { server.shutdown } server.start lib/serve/application.rb @@ -1,21 +1,24 @@ module Serve #:nodoc: class FileTypeHandler < ::WEBrick::HTTPServlet::AbstractServlet #:nodoc: - def self.extension(extension) - ::WEBrick::HTTPServlet::FileHandler.add_handler(extension, self) + def self.extension(*extensions) + extensions.each do |extensions| + ::WEBrick::HTTPServlet::FileHandler.add_handler(extensions, self) + end end - + + def initialize(server, name) super @script_filename = name end - + def process(req, res) data = open(@script_filename){|io| io.read } res['content-type'] = content_type res.body = parse(data) end - + def do_GET(req, res) begin process(req, res) @@ -26,15 +29,15 @@ module Serve #:nodoc: raise ::WEBrick::HTTPStatus::InternalServerError, ex.message end end - + alias do_POST do_GET - + protected - + def content_type 'text/html' end - + def parse(string) string.dup end lib/serve/handlers/file_type_handler.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/spec_helper.rb' describe "Serve" do it "should register all of the file type handlers" do - handlers = ["cgi", "email", "haml", "markdown", "redirect", "rhtml", "sass", "textile"] + handlers = ["cgi", "email", "erb", "haml", "html.erb", "html.haml", "markdown", "redirect", "rhtml", "sass", "textile"] table = WEBrick::HTTPServlet::FileHandler::HandlerTable table.keys.sort.should == handlers end spec/serve_spec.rb lib/serve/handlers/haml_handler.rb e709cf1a832189de86a31857dd322b8b9e0b623f jlong jlong@bc0a7ee4-b4f2-4507-b10a-a3dd5181224c http://github.com/jlong/serve/commit/cb1dbd292687486887eaa96d6391d3185b2b7864 cb1dbd292687486887eaa96d6391d3185b2b7864 2008-05-31T19:00:39-07:00 2008-05-31T19:00:39-07:00 first pass at support for erb git-svn-id: svn+ssh://rubyforge.org/var/svn/serve/trunk/serve@25 bc0a7ee4-b4f2-4507-b10a-a3dd5181224c ff3df320e0111191d8f740a0a16a587a3af0fb79 jlong jlong@bc0a7ee4-b4f2-4507-b10a-a3dd5181224c