Merge pull request #197 from seancribbs/less-object-allocations

Reduced object allocation per request

Author: Asmod4n

lib/webmachine.rb

@@ -1,4 +1,5 @@
-require 'webmachine/configuration'
+require 'webmachine/configuration'
+require 'webmachine/constants'
 require 'webmachine/cookie'
 require 'webmachine/headers'
 require 'webmachine/request'

lib/webmachine/adapters/httpkit.rb

@@ -1,15 +1,17 @@
+require 'webmachine/adapter'
+require 'webmachine/constants'
+require 'webmachine/version'
 require 'httpkit'
-
 require 'webmachine/version'
-require 'webmachine/headers'
-require 'webmachine/request'
 require 'webmachine/response'
-require 'webmachine/dispatcher'
-require 'webmachine/chunked_body'
+require 'webmachine/request'
+require 'webmachine/headers'
 
 module Webmachine
   module Adapters
     class HTTPkit < Adapter
+      VERSION_STRING = "#{Webmachine::SERVER_STRING} HTTPkit/#{::HTTPkit::VERSION}".freeze
+
       def options
         @options ||= {
           :address => application.configuration.ip,
@@ -49,8 +51,8 @@ def convert_request(request)
 
       # Converts Webmachine::Response to HTTPkit::Response
       def convert_response(response)
-        response.headers["Server"] =
-          Webmachine::SERVER_STRING + ' HTTPkit/' + ::HTTPkit::VERSION
+        response.headers[SERVER] = VERSION_STRING
+
 
         ::HTTPkit::Response.new(
           response.code.to_i,

lib/webmachine/adapters/lazy_request_body.rb

@@ -1,5 +1,4 @@
-
-module Webmachine
+module Webmachine
   module Adapters
     # Wraps a request body so that it can be passed to
     # {Request} while still lazily evaluating the body.

lib/webmachine/adapters/rack.rb

@@ -1,9 +1,10 @@
+require 'webmachine/adapter'
 require 'rack'
-require 'webmachine/version'
+require 'webmachine/constants'
 require 'webmachine/headers'
 require 'webmachine/request'
 require 'webmachine/response'
-require 'webmachine/dispatcher'
+require 'webmachine/version'
 require 'webmachine/chunked_body'
 
 module Webmachine
@@ -36,6 +37,10 @@ class Rack < Adapter
       # Used to override default Rack server options (useful in testing)
       DEFAULT_OPTIONS = {}
 
+      REQUEST_URI = 'REQUEST_URI'.freeze
+      VERSION_STRING = "#{Webmachine::SERVER_STRING} Rack/#{::Rack.version}".freeze
+      NEWLINE = "\n".freeze
+
       # Start the Rack adapter
       def run
         options = DEFAULT_OPTIONS.merge({
@@ -55,17 +60,17 @@ def call(env)
 
         rack_req = ::Rack::Request.new env
         request = Webmachine::Request.new(rack_req.request_method,
-                                          env['REQUEST_URI'],
+                                          env[REQUEST_URI],
                                           headers,
                                           RequestBody.new(rack_req))
 
         response = Webmachine::Response.new
         application.dispatcher.dispatch(request, response)
 
-        response.headers['Server'] = [Webmachine::SERVER_STRING, "Rack/#{::Rack.version}"].join(" ")
+        response.headers[SERVER] = VERSION_STRING
 
         rack_status  = response.code
-        rack_headers = response.headers.flattened("\n")
+        rack_headers = response.headers.flattened(NEWLINE)
         rack_body = case response.body
                     when String # Strings are enumerable in ruby 1.8
                       [response.body]
@@ -76,7 +81,7 @@ def call(env)
                         Webmachine::ChunkedBody.new(Array(response.body.call))
                       elsif response.body.respond_to?(:each)
                         # This might be an IOEncoder with a Content-Length, which shouldn't be chunked.
-                        if response.headers["Transfer-Encoding"] == "chunked"
+                        if response.headers[TRANSFER_ENCODING] == "chunked"
                           Webmachine::ChunkedBody.new(response.body)
                         else
                           response.body
@@ -91,15 +96,17 @@ def call(env)
       end
 
       class RackResponse
+        ONE_FIVE = '1.5'.freeze
+
         def initialize(body, status, headers)
           @body    = body
           @status  = status
           @headers = headers
         end
 
         def finish
-          @headers['Content-Type'] ||= 'text/html' if rack_release_enforcing_content_type
-          @headers.delete('Content-Type')          if response_without_body
+          @headers[CONTENT_TYPE] ||= TEXT_HTML if rack_release_enforcing_content_type
+          @headers.delete(CONTENT_TYPE)        if response_without_body
           [@status, @headers, @body]
         end
 
@@ -110,7 +117,7 @@ def response_without_body
         end
 
         def rack_release_enforcing_content_type
-          ::Rack.release < '1.5'
+          ::Rack.release < ONE_FIVE
         end
       end
 

lib/webmachine/adapters/reel.rb

@@ -1,10 +1,10 @@
+require 'webmachine/adapter'
+require 'webmachine/constants'
+require 'set'
 require 'reel'
-require 'webmachine/version'
 require 'webmachine/headers'
 require 'webmachine/request'
 require 'webmachine/response'
-require 'webmachine/dispatcher'
-require 'set'
 
 module Webmachine
   module Adapters
@@ -55,7 +55,7 @@ def process(connection)
           # state machine. Do the "Railsy" thing and handle them like POSTs
           # with a magical parameter
           if @extra_verbs.include?(request.method)
-            method = "POST"
+            method = POST_METHOD
             param  = "_method=#{request.method}"
             uri    = request_uri(request.url, request.headers, param)
           else

lib/webmachine/adapters/webrick.rb

@@ -1,9 +1,11 @@
+require 'webmachine/adapter'
 require 'webrick'
-require 'webmachine/version'
+require 'webmachine/constants'
 require 'webmachine/headers'
+require 'webmachine/adapters/lazy_request_body'
 require 'webmachine/request'
 require 'webmachine/response'
-require 'webmachine/dispatcher'
+require 'webmachine/version'
 
 module Webmachine
   module Adapters
@@ -25,6 +27,7 @@ def run
 
       # WEBRick::HTTPServer that is run by the WEBrick adapter.
       class Server < ::WEBrick::HTTPServer
+
         def initialize(options)
           @application = options[:application]
           super(options)
@@ -49,12 +52,12 @@ def service(wreq, wres)
           cookies = [response.headers['Set-Cookie'] || []].flatten
           cookies.each { |c| wres.cookies << c }
 
-          wres['Server'] = [Webmachine::SERVER_STRING, wres.config[:ServerSoftware]].join(" ")
+          wres[SERVER] = [Webmachine::SERVER_STRING, wres.config[:ServerSoftware]].join(" ")
           case response.body
           when String
             wres.body << response.body
           when Enumerable
-            wres.chunked = response.headers['Transfer-Encoding'] == 'chunked'
+            wres.chunked = response.headers[TRANSFER_ENCODING] == 'chunked'
             response.body.each {|part| wres.body << part }
           else
             if response.body.respond_to?(:call)

lib/webmachine/chunked_body.rb

@@ -1,3 +1,5 @@
+require 'webmachine/constants'
+
 module Webmachine
   # {ChunkedBody} is used to wrap an {Enumerable} object (like an enumerable
   # {Response#body}) so it yields proper chunks for chunked transfer encoding.
@@ -13,11 +15,8 @@ module Webmachine
   #
   # This is needed for Ruby webservers which don't do the chunking themselves.
   class ChunkedBody
-    # Delimiter for chunked encoding
-    CRLF = "\r\n"
-
     # Final chunk in any chunked-encoding response
-    FINAL_CHUNK = "0#{CRLF}#{CRLF}"
+    FINAL_CHUNK = "0#{CRLF}#{CRLF}".freeze
 
     # Creates a new {ChunkedBody} from the given {Enumerable}.
     # @param [Enumerable] body the enumerable response body

lib/webmachine/constants.rb

@@ -0,0 +1,75 @@
+module Webmachine
+  # Universal HTTP delimiter
+  CRLF = "\r\n".freeze
+
+  # HTTP Content-Type
+  CONTENT_TYPE = 'Content-Type'.freeze
+
+  # Default Content-Type
+  TEXT_HTML = 'text/html'.freeze
+
+  # HTTP Date
+  DATE = 'Date'.freeze
+
+  # HTTP Transfer-Encoding
+  TRANSFER_ENCODING = 'Transfer-Encoding'.freeze
+
+  # HTTP Content-Length
+  CONTENT_LENGTH = 'Content-Length'.freeze
+
+  # A underscore
+  UNDERSCORE = '_'.freeze
+
+  # A dash
+  DASH = '-'.freeze
+
+  # A Slash
+  SLASH = '/'.freeze
+
+  MATCHES_ALL = '*/*'.freeze
+
+  GET_METHOD     = "GET"
+  HEAD_METHOD    = "HEAD"
+  POST_METHOD    = "POST"
+  PUT_METHOD     = "PUT"
+  DELETE_METHOD  = "DELETE"
+  OPTIONS_METHOD = "OPTIONS"
+  TRACE_METHOD   = "TRACE"
+  CONNECT_METHOD = "CONNECT"
+
+  STANDARD_HTTP_METHODS = [
+                           GET_METHOD, HEAD_METHOD, POST_METHOD,
+                           PUT_METHOD, DELETE_METHOD, TRACE_METHOD,
+                           CONNECT_METHOD, OPTIONS_METHOD
+                          ].map!(&:freeze)
+  STANDARD_HTTP_METHODS.freeze
+
+  # A colon
+  COLON = ':'.freeze
+
+  # http string
+  HTTP = 'http'.freeze
+
+  # Host string
+  HOST = 'Host'.freeze
+
+  # HTTP Content-Encoding
+  CONTENT_ENCODING = 'Content-Encoding'.freeze
+
+  # Charset string
+  CHARSET = 'Charset'.freeze
+
+  # Semicolon split match
+  SPLIT_SEMI = /\s*,\s*/.freeze
+
+  # Star Character
+  STAR = '*'.freeze
+
+  # HTTP Location
+  LOCATION = 'Location'.freeze
+
+  # identity Encoding
+  IDENTITY = 'identity'.freeze
+
+  SERVER = 'Server'.freeze
+end

lib/webmachine/decision/conneg.rb

@@ -1,3 +1,4 @@
+require 'webmachine/constants'
 require 'webmachine/translation'
 require 'webmachine/media_type'
 
@@ -13,7 +14,7 @@ module Conneg
       # appropriate media type.
       # @api private
       def choose_media_type(provided, header)
-        types = Array(header).map{|h| h.split(/\s*,\s*/) }.flatten
+        types = Array(header).map{|h| h.split(SPLIT_SEMI) }.flatten
         requested = MediaTypeList.build(types)
         provided = provided.map do |p| # normalize_provided
           MediaType.parse(p)
@@ -31,9 +32,9 @@ def choose_media_type(provided, header)
       # @api private
       def choose_encoding(provided, header)
         encodings = provided.keys
-        if encoding = do_choose(encodings, header, "identity")
-          response.headers['Content-Encoding'] = encoding unless encoding == 'identity'
-          metadata['Content-Encoding'] = encoding
+        if encoding = do_choose(encodings, header, IDENTITY)
+          response.headers[CONTENT_ENCODING] = encoding unless encoding == IDENTITY
+          metadata[CONTENT_ENCODING] = encoding
         end
       end
 
@@ -44,7 +45,7 @@ def choose_charset(provided, header)
         if provided && !provided.empty?
           charsets = provided.map {|c| c.first }
           if charset = do_choose(charsets, header, HAS_ENCODING ? Encoding.default_external.name : kcode_charset)
-            metadata['Charset'] = charset
+            metadata[CHARSET] = charset
           end
         else
           true
@@ -56,8 +57,8 @@ def choose_charset(provided, header)
       # @api private
       def choose_language(provided, header)
         if provided && !provided.empty?
-          requested = PriorityList.build(header.split(/\s*,\s*/))
-          star_priority = requested.priority_of("*")
+          requested = PriorityList.build(header.split(SPLIT_SEMI))
+          star_priority = requested.priority_of(STAR)
           any_ok = star_priority && star_priority > 0.0
           accepted = requested.find do |priority, range|
             if priority == 0.0
@@ -98,9 +99,9 @@ def language_match(range, tag)
       # @api private
       def do_choose(choices, header, default)
         choices = choices.dup.map {|s| s.downcase }
-        accepted = PriorityList.build(header.split(/\s*,\s*/))
+        accepted = PriorityList.build(header.split(SPLIT_SEMI))
         default_priority = accepted.priority_of(default)
-        star_priority = accepted.priority_of("*")
+        star_priority = accepted.priority_of(STAR)
         default_ok = (default_priority.nil? && star_priority != 0.0) || default_priority
         any_ok = star_priority && star_priority > 0.0
         chosen = accepted.find do |priority, acceptable|
@@ -118,7 +119,7 @@ def do_choose(choices, header, default)
 
       private
       # Matches acceptable items that include 'q' values
-      CONNEG_REGEX = /^\s*(\S+);\s*q=(\S*)\s*$/
+      CONNEG_REGEX = /^\s*(\S+);\s*q=(\S*)\s*$/.freeze
 
       # Matches the requested media type (with potential modifiers)
       # against the provided types (with potential modifiers).