merb-core 0.9.9 → 0.9.10

data/lib/merb-core/constants.rb

@@ -11,15 +11,16 @@
 # some cases. Eventually Rubinius and maybe MRI 2.0 gonna
 # improve this situation but at the moment, all commonly used
 # strings, regexp and numbers used as constants so no extra
-# objects created and VM just operate pointers.
+# objects created and VM just operates pointers.
 module Merb
   module Const
-    
+
     DEFAULT_SEND_FILE_OPTIONS = {
       :type         => 'application/octet-stream'.freeze,
       :disposition  => 'attachment'.freeze
     }.freeze
-    
+
+    RACK_INPUT               = 'rack.input'.freeze
     SET_COOKIE               = " %s=%s; path=/; expires=%s".freeze
     COOKIE_EXPIRATION_FORMAT = "%a, %d-%b-%Y %H:%M:%S GMT".freeze
     COOKIE_SPLIT             = /[;,] */n.freeze
@@ -34,24 +35,48 @@ module Merb
     JSON_MIME_TYPE_REGEXP    = %r{^application/json|^text/x-json}.freeze
     XML_MIME_TYPE_REGEXP     = %r{^application/xml|^text/xml}.freeze
     FORM_URL_ENCODED_REGEXP  = %r{^application/x-www-form-urlencoded}.freeze
+    LOCAL_IP_REGEXP          = /^unknown$|^(127|10|172\.16|192\.168)\./i.freeze
+    XML_HTTP_REQUEST_REGEXP  = /XMLHttpRequest/i.freeze
     UPCASE_CONTENT_TYPE      = 'CONTENT_TYPE'.freeze
     CONTENT_TYPE             = "Content-Type".freeze
     DATE                     = 'Date'.freeze
+    UPCASE_HTTPS             = 'HTTPS'.freeze
+    HTTPS                    = 'https'.freeze
+    HTTP                     = 'http'.freeze
     ETAG                     = 'ETag'.freeze
     LAST_MODIFIED            = "Last-Modified".freeze
-    SLASH                    = "/".freeze
     GET                      = "GET".freeze
     POST                     = "POST".freeze
     HEAD                     = "HEAD".freeze
     CONTENT_LENGTH           = "CONTENT_LENGTH".freeze
+    HTTP_CLIENT_IP           = "HTTP_CLIENT_IP".freeze
+    HTTP_X_REQUESTED_WITH    = "HTTP_X_REQUESTED_WITH".freeze
     HTTP_X_FORWARDED_FOR     = "HTTP_X_FORWARDED_FOR".freeze
+    HTTP_X_FORWARDED_PROTO   = "HTTP_X_FORWARDED_PROTO".freeze
+    HTTP_X_FORWARDED_HOST    = "HTTP_X_FORWARDED_HOST".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
+    HTTP_REFERER             = "HTTP_REFERER".freeze
+    HTTP_USER_AGENT          = "HTTP_USER_AGENT".freeze
+    HTTP_HOST                = "HTTP_HOST".freeze
+    HTTP_CONNECTION          = "HTTP_CONNECTION".freeze
+    HTTP_KEEP_ALIVE          = "HTTP_KEEP_ALIVE".freeze
+    HTTP_ACCEPT              = "HTTP_ACCEPT".freeze
+    HTTP_ACCEPT_ENCODING     = "HTTP_ACCEPT_ENCODING".freeze
+    HTTP_ACCEPT_LANGUAGE     = "HTTP_ACCEPT_LANGUAGE".freeze
+    HTTP_ACCEPT_CHARSET      = "HTTP_ACCEPT_CHARSET".freeze
+    HTTP_CACHE_CONTROL       = "HTTP_CACHE_CONTROL".freeze
     UPLOAD_ID                = "upload_id".freeze
     PATH_INFO                = "PATH_INFO".freeze
+    HTTP_VERSION             = "HTTP_VERSION".freeze
+    GATEWAY_INTERFACE        = "GATEWAY_INTERFACE".freeze
     SCRIPT_NAME              = "SCRIPT_NAME".freeze
+    SERVER_NAME              = "SERVER_NAME".freeze
+    SERVER_SOFTWARE          = "SERVER_SOFTWARE".freeze
+    SERVER_PROTOCOL          = "SERVER_PROTOCOL".freeze
+    SERVER_PORT              = "SERVER_PORT".freeze
     REQUEST_URI              = "REQUEST_URI".freeze
     REQUEST_PATH             = "REQUEST_PATH".freeze
     REQUEST_METHOD           = "REQUEST_METHOD".freeze
@@ -59,9 +84,14 @@ module Merb
     BREAK_TAG                = "<br/>".freeze
     EMPTY_STRING             = "".freeze
     NEWLINE                  = "\n".freeze
+    SLASH                    = "/".freeze
+    DOT                      = ".".freeze
+    QUESTION_MARK            = "?".freeze
     DOUBLE_NEWLINE           = "\n\n".freeze
     LOCATION                 = "Location".freeze
     TEXT_SLASH_HTML          = "text/html".freeze
-  
+
+    WIN_PLATFORM_REGEXP      = /(:?mswin|mingw)/.freeze
+    JAVA_PLATFORM_REGEXP     = /java/.freeze
   end
 end

data/lib/merb-core/controller/abstract_controller.rb

@@ -271,9 +271,9 @@ class Merb::AbstractController
   #
   # @api plugin
   def _dispatch(action)
-    self._before_dispatch_callbacks.each { |cb| cb.call(self) }
     self.action_name = action
-    
+    self._before_dispatch_callbacks.each { |cb| cb.call(self) }
+
     caught = catch(:halt) do
       start = Time.now
       result = _call_filters(_before_filters)
@@ -544,7 +544,7 @@ class Merb::AbstractController
   # of protocol and host options. 
   #
   # @api public
-  def absolute_url(name, *args)
+  def absolute_url(*args)
     # FIXME: arrgh, why request.protocol returns http://?
     # :// is not part of protocol name
     options  = extract_options_from_args!(args) || {}
@@ -556,7 +556,7 @@ class Merb::AbstractController
     
     args << options
     
-    protocol + "://" + host + url(name, *args)
+    protocol + "://" + host + url(*args)
   end
   
   # Generates a URL for a single or nested resource.

data/lib/merb-core/controller/exceptions.rb

@@ -74,7 +74,7 @@ module Merb
   # This would halt execution of your action and re-route it over to your
   # Exceptions controller which might look something like:
   #
-  # class Exceptions < Application
+  # class Exceptions < Merb::Controller
 
   #   def not_found
   #     render :layout => :none
@@ -132,7 +132,7 @@ module Merb
   #
   # Add the required action to our Exceptions controller
   #
-  #   class Exceptions < Application
+  #   class Exceptions < Merb::Controller
 
   #     def admin_access_required
   #       render

data/lib/merb-core/controller/merb_controller.rb

@@ -335,7 +335,7 @@ class Merb::Controller < Merb::AbstractController
     options[:protocol] ||= request.protocol
     options[:host] ||= request.host
     args << options
-    super(args.first, *args[1..-1])
+    super(*args)
   end
 
   # The results of the controller's render, to be returned to Rack.

data/lib/merb-core/dispatch/dispatcher.rb

@@ -13,7 +13,7 @@ module Merb
       # Queue:: the current queue of dispatch jobs.
       # 
       # @api private
-      def work_queue 
+      def work_queue
         @@work_queue
       end  
       

data/lib/merb-core/dispatch/request.rb

@@ -1,12 +1,12 @@
 require 'tempfile'
 
 module Merb
-  
+
   class Request
     # def env def exceptions def route_params
     attr_accessor :env, :exceptions, :route
     attr_reader :route_params
-    
+
     # by setting these to false, auto-parsing is disabled; this way you can
     # do your own parsing instead
     cattr_accessor :parse_multipart_params, :parse_json_params,
@@ -14,7 +14,7 @@ module Merb
     self.parse_multipart_params = true
     self.parse_json_params = true
     self.parse_xml_params = true
-    
+
     # Flash, and some older browsers can't use arbitrary
     # request methods -- i.e., are limited to GET/POST.
     # These user-agents can make POST requests in combination
@@ -23,39 +23,39 @@ module Merb
     # in the params, or an X-HTTP-Method-Override header
     cattr_accessor :http_method_overrides
     self.http_method_overrides = []
-    
+
     # Initialize the request object.
-    # 
+    #
     # ==== Parameters
-    # http_request<~params:~[], ~body:IO>:: 
+    # http_request<~params:~[], ~body:IO>::
     #   An object like an HTTP Request.
-    # 
+    #
     # @api private
     def initialize(rack_env)
       @env  = rack_env
-      @body = rack_env['rack.input']
+      @body = rack_env[Merb::Const::RACK_INPUT]
       @route_params = {}
     end
-    
+
     # Returns the controller object for initialization and dispatching the
     # request.
-    # 
+    #
     # ==== Returns
     # Class:: The controller class matching the routed request,
     #   e.g. Posts.
-    # 
+    #
     # @api private
     def controller
       unless params[:controller]
-        raise ControllerExceptions::NotFound, 
+        raise ControllerExceptions::NotFound,
           "Route matched, but route did not specify a controller.\n" +
           "Did you forgot to add :controller => \"people\" or :controller " +
-          "segment to route definition?\nHere is what's specified:\n" + 
+          "segment to route definition?\nHere is what's specified:\n" +
           route.inspect
       end
-      path = [params[:namespace], params[:controller]].compact.join("/")
+      path = [params[:namespace], params[:controller]].compact.join(Merb::Const::SLASH)
       controller = path.snake_case.to_const_string
-      
+
       begin
         Object.full_const_get(controller)
       rescue NameError => e
@@ -64,7 +64,7 @@ module Merb
         raise ControllerExceptions::NotFound, msg
       end
     end
-    
+
     METHODS = %w{get post put delete head options}
 
     # ==== Returns
@@ -75,11 +75,11 @@ module Merb
     # http_method_overrides will be checked for the masquerading method.
     # The block will get the controller yielded to it.  The first matching workaround wins.
     # To disable this behavior, set http_method_overrides = []
-    # 
+    #
     # @api public
     def method
       @method ||= begin
-        request_method = @env['REQUEST_METHOD'].downcase.to_sym
+        request_method = @env[Merb::Const::REQUEST_METHOD].downcase.to_sym
         case request_method
         when :get, :head, :put, :delete, :options
           request_method
@@ -91,33 +91,33 @@ module Merb
           m.downcase! if m
           METHODS.include?(m) ? m.to_sym : :post
         else
-          raise "Unknown REQUEST_METHOD: #{@env['REQUEST_METHOD']}"
+          raise "Unknown REQUEST_METHOD: #{@env[Merb::Const::REQUEST_METHOD]}"
         end
       end
     end
-    
+
     # create predicate methods for querying the REQUEST_METHOD
     # get? post? head? put? etc
     METHODS.each do |m|
       class_eval "def #{m}?() method == :#{m} end"
     end
-    
+
     # ==== Notes
     # Find route using requested URI and merges route
     # parameters (:action, :controller and named segments)
     # into request params hash.
-    # 
+    #
     # @api private
     def find_route!
       @route, @route_params = Merb::Router.route_for(self)
       params.merge! @route_params if @route_params.is_a?(Hash)
     end
-    
+
     # ==== Notes
     # Processes the return value of a deferred router block
     # and returns the current route params for the current
     # request evaluation
-    # 
+    #
     # @api private
     def _process_block_return(retval)
       # If the return value is an array, then it is a redirect
@@ -127,67 +127,67 @@ module Merb
       matched! if retval.is_a?(Array)
       retval
     end
-    
+
     # Sets the request as matched. This will abort evaluating any
     # further deferred procs.
-    # 
+    #
     # @api private
     def matched!
       @matched = true
     end
-    
+
     # Checks whether or not the request has been matched to a route.
-    # 
+    #
     # @api private
     def matched?
       @matched
     end
-    
+
     # ==== Returns
     # (Array, Hash):: the route params for the matched route.
-    # 
+    #
     # ==== Notes
     # If the response is an Array then it is considered a direct Rack response
     # to be sent back as a response. Otherwise, the route_params is a Hash with
     # routing data (controller, action, et al).
-    # 
+    #
     # @api private
     def rack_response
       @route_params
     end
-    
+
     # If @route_params is an Array, then it will be the rack response.
     # In this case, the request is considered handled.
-    # 
+    #
     # ==== Returns
     # Boolean:: true if @route_params is an Array, false otherwise.
-    # 
+    #
     # @api private
     def handled?
       @route_params.is_a?(Array)
     end
-    
+
     # == Params
-    # 
+    #
     # Handles processing params from raw data and merging them together to get
     # the final request params.
-    
+
     private
-    
+
     # ==== Returns
     # Hash:: Parameters passed from the URL like ?blah=hello.
-    # 
+    #
     # @api private
     def query_params
       @query_params ||= self.class.query_parse(query_string || '')
     end
-    
+
     # Parameters passed in the body of the request. Ajax calls from
     # prototype.js and other libraries pass content this way.
     #
     # ==== Returns
     # Hash:: The parameters passed in the body.
-    # 
+    #
     # @api private
     def body_params
       @body_params ||= begin
@@ -196,12 +196,12 @@ module Merb
         end
       end
     end
-    
+
     # ==== Returns
     # Mash::
     #   The parameters gathered from the query string and the request body,
     #   with parameters in the body taking precedence.
-    # 
+    #
     # @api private
     def body_and_query_params
       # ^-- FIXME a better name for this method
@@ -211,17 +211,17 @@ module Merb
         h.to_mash
       end
     end
-    
+
     # ==== Raises
     # ControllerExceptions::MultiPartParseError::
     #   Unable to parse the multipart form data.
     #
     # ==== Returns
     # Hash:: The parsed multipart parameters.
-    # 
+    #
     # @api private
     def multipart_params
-      @multipart_params ||= 
+      @multipart_params ||=
         begin
           # if the content-type is multipart
           # parse the multipart. Otherwise return {}
@@ -229,13 +229,13 @@ module Merb
             self.class.parse_multipart(@body, $1, content_length)
           else
             {}
-          end  
+          end
         rescue ControllerExceptions::MultiPartParseError => e
           @multipart_params = {}
           raise e
         end
     end
-    
+
     # ==== Returns
     # Hash:: Parameters from body if this is a JSON request.
     #
@@ -244,20 +244,25 @@ module Merb
     # parameters hash.  If it parses to anything else (such as an Array, or
     # if it inflates to an Object) it will be accessible via the inflated_object
     # parameter.
-    # 
+    #
     # @api private
     def json_params
       @json_params ||= begin
         if Merb::Const::JSON_MIME_TYPE_REGEXP.match(content_type)
-          jobj = JSON.parse(raw_post) rescue Mash.new
-          jobj.kind_of?(Hash) ? jobj : { :inflated_object => jobj }
+          begin
+            jobj = JSON.parse(raw_post)
+            jobj = jobj.to_mash if jobj.is_a?(Hash)
+          rescue JSON::ParserError
+            jobj = Mash.new
+          end
+          jobj.is_a?(Hash) ? jobj : { :inflated_object => jobj }
         end
       end
     end
-    
+
     # ==== Returns
     # Hash:: Parameters from body if this is an XML request.
-    # 
+    #
     # @api private
     def xml_params
       @xml_params ||= begin
@@ -266,30 +271,30 @@ module Merb
         end
       end
     end
-    
+
     public
-    
+
     # ==== Returns
     # Mash:: All request parameters.
     #
     # ==== Notes
     # The order of precedence for the params is XML, JSON, multipart, body and
     # request string.
-    # 
+    #
     # @api public
     def params
       @params ||= begin
-        h = body_and_query_params.merge(route_params)      
+        h = body_and_query_params.merge(route_params)
         h.merge!(multipart_params) if self.class.parse_multipart_params && multipart_params
         h.merge!(json_params) if self.class.parse_json_params && json_params
         h.merge!(xml_params) if self.class.parse_xml_params && xml_params
         h
       end
     end
-    
+
     # ==== Returns
     # String:: Returns the redirect message Base64 unencoded.
-    # 
+    #
     # @api public
     def message
       return {} unless params[:_message]
@@ -299,258 +304,260 @@ module Merb
         {}
       end
     end
-    
+
     # ==== Notes
     # Resets the params to a nil value.
-    # 
+    #
     # @api private
     def reset_params!
       @params = nil
     end
-    
+
     # ==== Returns
     # String:: The raw post.
-    # 
+    #
     # @api private
     def raw_post
       @body.rewind if @body.respond_to?(:rewind)
       @raw_post ||= @body.read
     end
-    
+
     # ==== Returns
     # Boolean:: If the request is an XML HTTP request.
-    # 
+    #
     # @api public
     def xml_http_request?
-      not /XMLHttpRequest/i.match(@env['HTTP_X_REQUESTED_WITH']).nil?
+      not Merb::Const::XML_HTTP_REQUEST_REGEXP.match(@env[Merb::Const::HTTP_X_REQUESTED_WITH]).nil?
     end
     alias xhr? :xml_http_request?
     alias ajax? :xml_http_request?
-    
+
     # ==== Returns
     # String:: The remote IP address.
-    # 
+    #
     # @api public
     def remote_ip
-      return @env['HTTP_CLIENT_IP'] if @env.include?('HTTP_CLIENT_IP')
-      
+      return @env[Merb::Const::HTTP_CLIENT_IP] if @env.include?(Merb::Const::HTTP_CLIENT_IP)
+
       if @env.include?(Merb::Const::HTTP_X_FORWARDED_FOR) then
         remote_ips = @env[Merb::Const::HTTP_X_FORWARDED_FOR].split(',').reject do |ip|
-          ip =~ /^unknown$|^(127|10|172\.16|192\.168)\./i
+          ip =~ Merb::Const::LOCAL_IP_REGEXP
         end
-        
+
         return remote_ips.first.strip unless remote_ips.empty?
       end
-      
+
       return @env[Merb::Const::REMOTE_ADDR]
     end
-    
+
     # ==== Returns
     # String::
     #   The protocol, i.e. either "https" or "http" depending on the
     #   HTTPS header.
-    # 
+    #
     # @api public
     def protocol
-      ssl? ? 'https' : 'http'
+      ssl? ? Merb::Const::HTTPS : Merb::Const::HTTP
     end
-    
+
     # ==== Returns
     # Boolean::: True if the request is an SSL request.
-    # 
+    #
     # @api public
     def ssl?
-      @env['HTTPS'] == 'on' || @env['HTTP_X_FORWARDED_PROTO'] == 'https'
+      @env[Merb::Const::UPCASE_HTTPS] == 'on' || @env[Merb::Const::HTTP_X_FORWARDED_PROTO] == Merb::Const::HTTPS
     end
-    
+
     # ==== Returns
     # String:: The HTTP referer.
-    # 
+    #
     # @api public
     def referer
-      @env['HTTP_REFERER']
+      @env[Merb::Const::HTTP_REFERER]
     end
-    
+
     # ==== Returns
     # String:: The full URI, including protocol and host
-    # 
+    #
     # @api public
     def full_uri
       protocol + "://" + host + uri
     end
-    
+
     # ==== Returns
     # String:: The request URI.
-    # 
+    #
     # @api public
     def uri
-      @env['REQUEST_PATH'] || @env['REQUEST_URI'] || path_info
+      @env[Merb::Const::REQUEST_PATH] || @env[Merb::Const::REQUEST_URI] || path_info
     end
-    
+
     # ==== Returns
     # String:: The HTTP user agent.
-    # 
+    #
     # @api public
     def user_agent
-      @env['HTTP_USER_AGENT']
+      @env[Merb::Const::HTTP_USER_AGENT]
     end
-    
+
     # ==== Returns
     # String:: The server name.
-    # 
+    #
     # @api public
     def server_name
-      @env['SERVER_NAME']
+      @env[Merb::Const::SERVER_NAME]
     end
-    
+
     # ==== Returns
     # String:: The accepted encodings.
-    # 
+    #
     # @api private
     def accept_encoding
-      @env['HTTP_ACCEPT_ENCODING']
+      @env[Merb::Const::HTTP_ACCEPT_ENCODING]
     end
-    
+
     # ==== Returns
     # String:: The script name.
-    # 
+    #
     # @api public
     def script_name
-      @env['SCRIPT_NAME']
+      @env[Merb::Const::SCRIPT_NAME]
     end
-    
+
     # ==== Returns
     # String:: HTTP cache control.
-    # 
+    #
     # @api public
     def cache_control
-      @env['HTTP_CACHE_CONTROL']
+      @env[Merb::Const::HTTP_CACHE_CONTROL]
     end
-    
+
     # ==== Returns
     # String:: The accepted language.
-    # 
+    #
     # @api public
     def accept_language
-      @env['HTTP_ACCEPT_LANGUAGE']
+      @env[Merb::Const::HTTP_ACCEPT_LANGUAGE]
     end
-    
+
     # ==== Returns
     # String:: The server software.
-    # 
+    #
     # @api public
     def server_software
-      @env['SERVER_SOFTWARE']
+      @env[Merb::Const::SERVER_SOFTWARE]
     end
-    
+
     # ==== Returns
     # String:: Value of HTTP_KEEP_ALIVE.
-    # 
+    #
     # @api public
     def keep_alive
-      @env['HTTP_KEEP_ALIVE']
+      @env[Merb::Const::HTTP_KEEP_ALIVE]
     end
-    
+
     # ==== Returns
     # String:: The accepted character sets.
-    # 
+    #
     # @api public
     def accept_charset
-      @env['HTTP_ACCEPT_CHARSET']
+      @env[Merb::Const::HTTP_ACCEPT_CHARSET]
     end
-    
+
     # ==== Returns
     # String:: The HTTP version
-    # 
+    #
     # @api private
     def version
-      @env['HTTP_VERSION']
+      @env[Merb::Const::HTTP_VERSION]
     end
-    
+
     # ==== Returns
     # String:: The gateway.
-    # 
+    #
     # @api public
     def gateway
-      @env['GATEWAY_INTERFACE']
+      @env[Merb::Const::GATEWAY_INTERFACE]
     end
-    
+
     # ==== Returns
     # String:: The accepted response types. Defaults to "*/*".
-    # 
+    #
     # @api private
     def accept
-      @env['HTTP_ACCEPT'].blank? ? "*/*" : @env['HTTP_ACCEPT']
+      @env[Merb::Const::HTTP_ACCEPT].blank? ? "*/*" : @env[Merb::Const::HTTP_ACCEPT]
     end
-    
+
     # ==== Returns
     # String:: The HTTP connection.
-    # 
+    #
     # @api private
     def connection
-      @env['HTTP_CONNECTION']
+      @env[Merb::Const::HTTP_CONNECTION]
     end
-    
+
     # ==== Returns
     # String:: The query string.
-    # 
+    #
     # @api private
     def query_string
-      @env['QUERY_STRING']  
+      @env[Merb::Const::QUERY_STRING]
     end
-    
+
     # ==== Returns
     # String:: The request content type.
-    # 
+    #
     # @api private
     def content_type
-      @env['CONTENT_TYPE']
+      @env[Merb::Const::UPCASE_CONTENT_TYPE]
     end
-    
+
     # ==== Returns
     # Fixnum:: The request content length.
-    # 
+    #
     # @api public
     def content_length
       @content_length ||= @env[Merb::Const::CONTENT_LENGTH].to_i
     end
-    
+
     # ==== Returns
     # String::
     #   The URI without the query string. Strips trailing "/" and reduces
     #   duplicate "/" to a single "/".
-    # 
+    #
     # @api public
     def path
-      path = (uri.empty? ? '/' : uri.split('?').first).squeeze("/")
+      # Merb::Const::SLASH is /
+      # Merb::Const::QUESTION_MARK is ?
+      path = (uri.empty? ? Merb::Const::SLASH : uri.split(Merb::Const::QUESTION_MARK).first).squeeze(Merb::Const::SLASH)
       path = path[0..-2] if (path[-1] == ?/) && path.size > 1
       path
     end
-    
+
     # ==== Returns
     # String:: The path info.
-    # 
+    #
     # @api public
     def path_info
-      @path_info ||= self.class.unescape(@env['PATH_INFO'])
+      @path_info ||= self.class.unescape(@env[Merb::Const::PATH_INFO])
     end
-    
+
     # ==== Returns
     # Fixnum:: The server port.
-    # 
+    #
     # @api public
     def port
-      @env['SERVER_PORT'].to_i
+      @env[Merb::Const::SERVER_PORT].to_i
     end
-    
+
     # ==== Returns
     # String:: The full hostname including the port.
-    # 
+    #
     # @api public
     def host
-      @env['HTTP_X_FORWARDED_HOST'] || @env['HTTP_HOST'] 
+      @env[Merb::Const::HTTP_X_FORWARDED_HOST] || @env[Merb::Const::HTTP_HOST]
     end
-    
+
     # ==== Parameters
     # tld_length<Fixnum>::
     #   Number of domains levels to inlclude in the top level domain. Defaults
@@ -558,13 +565,13 @@ module Merb
     #
     # ==== Returns
     # Array:: All the subdomain parts of the host.
-    # 
+    #
     # @api public
     def subdomains(tld_length = 1)
-      parts = host.split('.')
+      parts = host.split(Merb::Const::DOT)
       parts[0..-(tld_length+2)]
     end
-    
+
     # ==== Parameters
     # tld_length<Fixnum>::
     #   Number of domains levels to inlclude in the top level domain. Defaults
@@ -572,32 +579,32 @@ module Merb
     #
     # ==== Returns
     # String:: The full domain name without the port number.
-    # 
+    #
     # @api public
     def domain(tld_length = 1)
-      host.split('.').last(1 + tld_length).join('.').sub(/:\d+$/,'')
+      host.split(Merb::Const::DOT).last(1 + tld_length).join(Merb::Const::DOT).sub(/:\d+$/,'')
     end
-    
+
     # ==== Returns
     # Value of If-None-Match request header.
-    # 
+    #
     # @api private
     def if_none_match
       @env[Merb::Const::HTTP_IF_NONE_MATCH]
     end
-    
+
     # ==== Returns
     # Value of If-Modified-Since request header.
-    # 
+    #
     # @api private
     def if_modified_since
       if time = @env[Merb::Const::HTTP_IF_MODIFIED_SINCE]
         Time.rfc2822(time)
       end
     end
-    
+
     class << self
-      
+
       # ==== Parameters
       # value<Array, Hash, Dictionary ~to_s>:: The value for the query string.
       # prefix<~to_s>:: The prefix to add to the query string keys.
@@ -617,7 +624,7 @@ module Merb
       #     # => "search[page]=10&search[word]=ruby"
       #   params_to_query_string([ "ice-cream", "cake" ], "shopping_list")
       #     # => "shopping_list[]=ice-cream&shopping_list[]=cake"
-      # 
+      #
       # @api private
       def params_to_query_string(value, prefix = nil)
         case value
@@ -633,33 +640,33 @@ module Merb
           "#{prefix}=#{Merb::Request.escape(value)}"
         end
       end
-      
+
       # ==== Parameters
       # s<String>:: String to URL escape.
       #
       # ==== returns
       # String:: The escaped string.
-      # 
+      #
       # @api private
       def escape(s)
         s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
           '%'+$1.unpack('H2'*$1.size).join('%').upcase
         }.tr(' ', '+')
       end
-      
+
       # ==== Parameter
       # s<String>:: String to URL unescape.
       #
       # ==== returns
       # String:: The unescaped string.
-      # 
+      #
       # @api private
       def unescape(s)
         s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){
           [$1.delete('%')].pack('H*')
         }
       end
-      
+
       # ==== Parameters
       # query_string<String>:: The query string.
       # delimiter<String>:: The query string divider. Defaults to "&".
@@ -671,7 +678,7 @@ module Merb
       # ==== Examples
       #   query_parse("bar=nik&post[body]=heya")
       #     # => { :bar => "nik", :post => { :body => "heya" } }
-      # 
+      #
       # @api private
       def query_parse(query_string, delimiter = '&;', preserve_order = false)
         query = preserve_order ? Dictionary.new : {}
@@ -680,19 +687,19 @@ module Merb
           next if key.nil?
           if key.include?('[')
             normalize_params(query, key, value)
-          else        
+          else
             query[key] = value
           end
         end
         preserve_order ? query : query.to_mash
       end
-      
+
       NAME_REGEX = /Content-Disposition:.* name="?([^\";]*)"?/ni.freeze
       CONTENT_TYPE_REGEX = /Content-Type: (.*)\r\n/ni.freeze
       FILENAME_REGEX = /Content-Disposition:.* filename="?([^\";]*)"?/ni.freeze
       CRLF = "\r\n".freeze
       EOL = CRLF
-      
+
       # ==== Parameters
       # request<IO>:: The raw request.
       # boundary<String>:: The boundary string.
@@ -703,7 +710,7 @@ module Merb
       #
       # ==== Returns
       # Hash:: The parsed request.
-      # 
+      #
       # @api private
       def parse_multipart(request, boundary, content_length)
         boundary = "--#{boundary}"
@@ -735,19 +742,19 @@ module Merb
               filename = head[FILENAME_REGEX, 1]
               content_type = head[CONTENT_TYPE_REGEX, 1]
               name = head[NAME_REGEX, 1]
-              
+
               if filename && !filename.empty?
                 body = Tempfile.new(:Merb)
                 body.binmode if defined? body.binmode
               end
               next
             end
-            
+
             # Save the read body part.
             if head && (boundary_size+4 < buf.size)
               body << buf.slice!(0, buf.size - (boundary_size+4))
             end
-            
+
             read_size = bufsize < content_length ? bufsize : content_length
             if( read_size > 0 )
               c = input.read(read_size)
@@ -756,22 +763,22 @@ module Merb
               content_length -= c.size
             end
           end
-          
+
           # Save the rest.
           if i = buf.index(rx)
             body << buf.slice!(0, i)
             buf.slice!(0, boundary_size+2)
-            
+
             content_length = -1  if $1 == "--"
           end
-          
-          if filename && !filename.empty?   
+
+          if filename && !filename.empty?
             body.rewind
-            data = { 
-              :filename => File.basename(filename),  
-              :content_type => content_type,  
-              :tempfile => body, 
-              :size => File.size(body.path) 
+            data = {
+              :filename => File.basename(filename),
+              :content_type => content_type,
+              :tempfile => body,
+              :size => File.size(body.path)
             }
           else
             data = body
@@ -781,7 +788,7 @@ module Merb
         }
         paramhsh
       end
-      
+
       # Converts a query string snippet to a hash and adds it to existing
       # parameters.
       #
@@ -792,13 +799,13 @@ module Merb
       #
       # ==== Returns
       # Hash:: Normalized parameters
-      # 
+      #
       # @api private
       def normalize_params(parms, name, val=nil)
         name =~ %r([\[\]]*([^\[\]]+)\]*)
         key = $1 || ''
         after = $' || ''
-        
+
         if after == ""
           parms[key] = val
         elsif after == "[]"