@@ -135,7 +135,7 @@ module Serve :Port => options[:port], :BindAddress => options[:address], :DocumentRoot => options[:root], - :DirectoryIndex => %w(index.html index.txt index.text index.haml index.textile index.markdown index.email index.redirect), + :DirectoryIndex => %w(index.html index.erb index.html.erb index.rhtml index.haml index.html.haml index.txt index.text index.textile index.markdown index.email index.redirect), :AppendExtensions => %w(html txt text haml erb rhtml html.erb html.haml textile markdown email redirect) ) trap("INT") { server.shutdown } lib/serve/application.rb @@ -1,14 +1,24 @@ module Serve #:nodoc: class Handler < FileTypeHandler #:nodoc: - extension 'haml', 'erb', 'rhtml', 'html.erb', 'html.haml' + extension 'erb', 'html.erb', 'rhtml', 'haml', 'html.haml' def process(req, res) + class << req + alias headers header + end res['content-type'] = content_type - res.body = parse + res.body = parse(req, res) end - def parse - context = Context.new + def parse(req, res) + context = Context.new(req, res) + view_helpers_file_path = Dir.pwd + '/view_helpers.rb' + if File.file?(view_helpers_file_path) + (class << context; self end).module_eval(File.read(view_helpers_file_path)) + class << context + include ViewHelpers + end + end parser = Parser.new(context) context.content << parser.parse_file(@script_filename) layout = find_layout_for(@script_filename) @@ -76,8 +86,10 @@ module Serve #:nodoc: class Context #:nodoc: attr_accessor :content, :parser + attr_reader :request, :response - def initialize + def initialize(req, res) + @request, @response = req, res @content = '' end lib/serve/handlers/dynamic_handler.rb @@ -3,7 +3,7 @@ module Serve #:nodoc: MAJOR = 0 MINOR = 9 TINY = 7 - + STRING = [MAJOR, MINOR, TINY].join('.') end lib/serve/version.rb @@ -1,3 +1,3 @@ = render :template => "test.html.erb" - += custom_method - @title = "Haml Template" \ No newline at end of file test_project/test.haml d78d992509c26c54f2c208f1a45b38cf9d2edee4 John W. Long me@johnwlong.com http://github.com/jlong/serve/commit/fd238d583ecb252b93e16361b458b0ff4df4b342 fd238d583ecb252b93e16361b458b0ff4df4b342 2008-07-17T06:51:15-07:00 2008-07-17T06:51:15-07:00 merged in adams changes 13732db68836f1785f61f69b56f42e1875c08015 John W. Long me@johnwlong.com