@@ -48,16 +48,20 @@ module Merb HTTP_X_FORWARDED_FOR = "HTTP_X_FORWARDED_FOR".freeze HTTP_IF_MODIFIED_SINCE = "HTTP_IF_MODIFIED_SINCE".freeze HTTP_IF_NONE_MATCH = "HTTP_IF_NONE_MATCH".freeze + HTTP_CONTENT_TYPE = "HTTP_CONTENT_TYPE".freeze + HTTP_CONTENT_LENGTH = "HTTP_CONTENT_LENGTH".freeze UPLOAD_ID = "upload_id".freeze PATH_INFO = "PATH_INFO".freeze SCRIPT_NAME = "SCRIPT_NAME".freeze REQUEST_URI = "REQUEST_URI".freeze REQUEST_PATH = "REQUEST_PATH".freeze + REQUEST_METHOD = "REQUEST_METHOD".freeze REMOTE_ADDR = "REMOTE_ADDR".freeze BREAK_TAG = "<br/>".freeze EMPTY_STRING = "".freeze NEWLINE = "\n".freeze DOUBLE_NEWLINE = "\n\n".freeze LOCATION = "Location".freeze + TEXT_SLASH_HTML = "text/html".freeze end end lib/merb-core/constants.rb @@ -16,7 +16,7 @@ module Merb begin rack_response = ::Merb::Dispatcher.handle(Merb::Request.new(env)) rescue Object => e - return [500, {Merb::Const::CONTENT_TYPE => "text/html"}, e.message + Merb::Const::BREAK_TAG + e.backtrace.join(Merb::Const::BREAK_TAG)] + return [500, {Merb::Const::CONTENT_TYPE => Merb::Const::TEXT_SLASH_HTML}, e.message + Merb::Const::BREAK_TAG + e.backtrace.join(Merb::Const::BREAK_TAG)] end Merb.logger.info Merb::Const::DOUBLE_NEWLINE Merb.logger.flush lib/merb-core/rack/application.rb @@ -54,10 +54,10 @@ module Merb # response<HTTPResponse>:: The response object to write response to. def process(request, response) env = {}.replace(request.params) - env.delete "HTTP_CONTENT_TYPE" - env.delete "HTTP_CONTENT_LENGTH" + env.delete Merb::Const::HTTP_CONTENT_TYPE + env.delete Merb::Const::HTTP_CONTENT_LENGTH - env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/" + env[Merb::Const::SCRIPT_NAME] = Merb::Const::EMPTY_STRING if env[Merb::Const::SCRIPT_NAME] == Merb::Const::SLASH env.update({"rack.version" => [0,1], "rack.input" => request.body || StringIO.new(""), @@ -69,8 +69,8 @@ module Merb "rack.url_scheme" => "http" }) - env["QUERY_STRING"] ||= "" - env.delete "PATH_INFO" if env["PATH_INFO"] == "" + env[Merb::Const::QUERY_STRING] ||= "" + env.delete Merb::Const::PATH_INFO if env[Merb::Const::PATH_INFO] == Merb::Const::EMPTY_STRING status, headers, body = @app.call(env) @@ -93,4 +93,4 @@ module Merb end end end -end \ No newline at end of file +end lib/merb-core/rack/handler/mongrel.rb @@ -7,7 +7,7 @@ module Merb if document_not_modified?(env, headers) status = 304 - body = "" + body = Merb::Const::EMPTY_STRING # set Date header using RFC1123 date format as specified by HTTP # RFC2616 section 3.3.1. end lib/merb-core/rack/middleware/conditional_get.rb @@ -20,12 +20,12 @@ module Merb def strip_path_prefix(env) ['PATH_INFO', 'REQUEST_URI'].each do |path_key| if env[path_key] =~ @path_prefix - env[path_key].sub!(@path_prefix, '') - env[path_key] = '/' if env[path_key].empty? + env[path_key].sub!(@path_prefix, Merb::Const::EMPTY_STRING) + env[path_key] = Merb::Const::SLASH if env[path_key].empty? end end end end end -end \ No newline at end of file +end lib/merb-core/rack/middleware/path_prefix.rb @@ -8,16 +8,20 @@ module Merb end def call(env) - path = env['PATH_INFO'] ? env['PATH_INFO'].chomp('/') : "" + path = if env[Merb::Const::PATH_INFO] + env[Merb::Const::PATH_INFO].chomp(Merb::Const::SLASH) + else + Merb::Const::EMPTY_STRING + end cached_path = (path.empty? ? 'index' : path) + '.html' - if file_exist?(path) && env['REQUEST_METHOD'] =~ /GET|HEAD/ # Serve the file if it's there and the request method is GET or HEAD + if file_exist?(path) && env[Merb::Const::REQUEST_METHOD] =~ /GET|HEAD/ # Serve the file if it's there and the request method is GET or HEAD serve_static(env) - elsif file_exist?(cached_path) && env['REQUEST_METHOD'] =~ /GET|HEAD/ # Serve the page cache if it's there and the request method is GET or HEAD - env['PATH_INFO'] = cached_path + elsif file_exist?(cached_path) && env[Merb::Const::REQUEST_METHOD] =~ /GET|HEAD/ # Serve the page cache if it's there and the request method is GET or HEAD + env[Merb::Const::PATH_INFO] = cached_path serve_static(env) elsif path =~ /favicon\.ico/ - return [404, {"Content-Type"=>"text/html"}, "404 Not Found."] + return [404, { Merb::Const::CONTENT_TYPE => Merb::Const::TEXT_SLASH_HTML }, "404 Not Found."] else @app.call(env) end @@ -36,10 +40,10 @@ module Merb # ==== Parameters # env<Hash>:: Environment variables to pass on to the server. def serve_static(env) - env["PATH_INFO"] = ::Merb::Request.unescape(env["PATH_INFO"]) + env[Merb::Const::PATH_INFO] = ::Merb::Request.unescape(env[Merb::Const::PATH_INFO]) @static_server.call(env) end end end -end \ No newline at end of file +end lib/merb-core/rack/middleware/static.rb ee43bd5f870bb9ad822bdade58cd970fc088b975 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/11d19c269a029403039b16866aaa8d6bb1a366ff 11d19c269a029403039b16866aaa8d6bb1a366ff 2008-10-12T09:23:39-07:00 2008-10-12T09:23:39-07:00 Use frozen constants on the 'hot path' if possible. 1cd2a6b3302990b1ec00d57e4becbf4db36b8422 Michael S. Klishin michael@novemberain.com