webmachine 1.2.2 → 1.3.0

data/lib/webmachine/decision/helpers.rb

@@ -1,9 +1,11 @@
-require 'stringio'
+require 'stringio'
 require 'time'
 require 'webmachine/streaming'
 require 'webmachine/media_type'
 require 'webmachine/quoted_string'
 require 'webmachine/etags'
+require 'webmachine/header_negotiation'
+require 'webmachine/constants'
 
 module Webmachine
   module Decision
@@ -11,6 +13,7 @@ module Webmachine
     module Helpers
       include QuotedString
       include Streaming
+      include HeaderNegotiation
 
       # Determines if the response has a body/entity set.
       def has_response_body?
@@ -26,8 +29,8 @@ module Webmachine
       # Encodes the body in the selected charset and encoding.
       def encode_body
         body = response.body
-        chosen_charset = metadata['Charset']
-        chosen_encoding = metadata['Content-Encoding']
+        chosen_charset = metadata[CHARSET]
+        chosen_encoding = metadata[CONTENT_ENCODING]
         charsetter = resource.charsets_provided && resource.charsets_provided.find {|c,_| c == chosen_charset }.last || :charset_nop
         encoder = resource.encodings_provided[chosen_encoding]
         response.body = case body
@@ -47,10 +50,10 @@ module Webmachine
                           end
                         end
         if body_is_fixed_length?
-          set_content_length
+          ensure_content_length(response)
         else
-          response.headers.delete 'Content-Length'
-          response.headers['Transfer-Encoding'] = 'chunked'
+          response.headers.delete CONTENT_LENGTH
+          response.headers[TRANSFER_ENCODING] = 'chunked'
         end
       end
 
@@ -88,37 +91,6 @@ module Webmachine
         end
       end
 
-      # Ensures that responses have an appropriate Content-Length
-      # header
-      def ensure_content_length
-        case
-        when response.headers['Transfer-Encoding']
-          return
-        when [204, 205, 304].include?(response.code)
-          response.headers.delete 'Content-Length'
-        when has_response_body?
-          set_content_length
-        else
-          response.headers['Content-Length'] = '0'
-        end
-      end
-
-      # Ensures that responses have an appropriate Date header
-      def ensure_date_header
-        if (200..499).include?(response.code)
-          response.headers['Date'] ||= Time.now.httpdate
-        end
-      end
-
-      # Sets the Content-Length header on the response
-      def set_content_length
-        if response.body.respond_to?(:bytesize)
-          response.headers['Content-Length'] = response.body.bytesize.to_s
-        else
-          response.headers['Content-Length'] = response.body.length.to_s
-        end
-      end
-
       # Determines whether the response is of a fixed lenghth, i.e. it
       # is a String or IO with known size.
       def body_is_fixed_length?

data/lib/webmachine/dispatcher.rb

@@ -1,12 +1,13 @@
-require 'forwardable'
+require 'forwardable'
 require 'webmachine/decision'
 require 'webmachine/dispatcher/route'
-require 'webmachine/dispatcher/not_found_resource'
 
 module Webmachine
   # Handles dispatching incoming requests to the proper registered
   # resources and initializing the decision logic.
   class Dispatcher
+    WM_DISPATCH = 'wm.dispatch'.freeze
+
     # @return [Array<Route>] the list of routes that will be
     #   dispatched to
     # @see #add_route
@@ -40,12 +41,16 @@ module Webmachine
     # @param [Request] request the request object
     # @param [Response] response the response object
     def dispatch(request, response)
-      resource = find_resource(request, response)
-      Webmachine::Events.instrument('wm.dispatch') do |payload|
-        Webmachine::Decision::FSM.new(resource, request, response).run
-        payload[:resource] = resource.class.name
-        payload[:request] = request.dup
-        payload[:code] = response.code
+      if resource = find_resource(request, response)
+        Webmachine::Events.instrument(WM_DISPATCH) do |payload|
+          Webmachine::Decision::FSM.new(resource, request, response).run
+
+          payload[:resource] = resource.class.name
+          payload[:request] = request.dup
+          payload[:code] = response.code
+        end
+      else
+        Webmachine.render_error(404, request, response)
       end
     end
 
@@ -61,8 +66,6 @@ module Webmachine
     def find_resource(request, response)
       if route = find_route(request)
         prepare_resource(route, request, response)
-      else
-        NotFoundResource.new(request, response)
       end
     end
 

data/lib/webmachine/dispatcher/route.rb

@@ -1,12 +1,13 @@
-require 'webmachine/resource'
+require 'webmachine/resource'
 require 'webmachine/translation'
+require 'webmachine/constants'
 
 module Webmachine
   class Dispatcher
     # Pairs URIs with {Resource} classes in the {Dispatcher}. To
     # create routes, use {Dispatcher#add_route}.
     class Route
-      include Webmachine::Translation
+      include Translation
 
       # @return [Class] the resource this route will dispatch to, a
       #   subclass of {Resource}
@@ -22,13 +23,16 @@ module Webmachine
 
       # When used in a path specification, will match all remaining
       # segments
-      MATCH_ALL = '*'.freeze
+      MATCH_ALL = :*
+
+      # String version of MATCH_ALL, deprecated. Use the symbol instead.
+      MATCH_ALL_STR = '*'.freeze
 
       # Creates a new Route that will associate a pattern to a
       # {Resource}.
       #
       # @example Standard route
-      #   Route.new(["*"], MyResource)
+      #   Route.new([:*], MyResource)
       #
       # @example Guarded route
       #   Route.new ["/notes"],
@@ -65,6 +69,8 @@ module Webmachine
         guards = args
         guards << Proc.new if block_given?
 
+        warn t('match_all_symbol') if path_spec.include? MATCH_ALL_STR
+
         @path_spec = path_spec
         @guards    = guards
         @resource  = resource
@@ -73,11 +79,13 @@ module Webmachine
         raise ArgumentError, t('not_resource_class', :class => resource.name) unless resource < Resource
       end
 
+      PATH_MATCH = /^\/(.*)/.freeze
+
       # Determines whether the given request matches this route and
       # should be dispatched to the {#resource}.
       # @param [Reqeust] request the request object
       def match?(request)
-        tokens = request.uri.path.match(/^\/(.*)/)[1].split('/')
+        tokens = request.uri.path.match(PATH_MATCH)[1].split(SLASH)
         bind(tokens, {}) && guards.all? { |guard| guard.call(request) }
       end
 
@@ -85,9 +93,9 @@ module Webmachine
       # route, including path bindings.
       # @param [Request] request the request object
       def apply(request)
-        request.disp_path = request.uri.path.match(/^\/(.*)/)[1]
+        request.disp_path = request.uri.path.match(PATH_MATCH)[1]
         request.path_info = @bindings.dup
-        tokens = request.disp_path.split('/')
+        tokens = request.disp_path.split(SLASH)
         depth, trailing = bind(tokens, request.path_info)
         request.path_tokens = trailing || []
       end
@@ -107,12 +115,14 @@ module Webmachine
           case
           when spec.empty? && tokens.empty?
             return depth
+          when spec == [MATCH_ALL_STR]
+            return [depth, tokens]
           when spec == [MATCH_ALL]
             return [depth, tokens]
           when tokens.empty?
             return false
           when Symbol === spec.first
-            bindings[spec.first] = tokens.first
+            bindings[spec.first] = URI.decode(tokens.first)
           when spec.first == tokens.first
           else
             return false

data/lib/webmachine/errors.rb

@@ -1,7 +1,10 @@
+require 'webmachine/header_negotiation'
 require 'webmachine/translation'
+require 'webmachine/constants'
 require 'webmachine/version'
 
 module Webmachine
+  extend HeaderNegotiation
   extend Translation
 
   # Renders a standard error message body for the response. The
@@ -21,10 +24,13 @@ module Webmachine
                    {:title => title,
                      :message => message,
                      :version => Webmachine::SERVER_STRING}.merge(options))
-      res.headers['Content-Type'] = "text/html"
+      res.headers[CONTENT_TYPE] = TEXT_HTML
     end
+    ensure_content_length(res)
+    ensure_date_header(res)
   end
 
+
   # Superclass of all errors generated by Webmachine.
   class Error < ::StandardError; end
 

data/lib/webmachine/header_negotiation.rb

@@ -0,0 +1,25 @@
+require 'webmachine/constants'
+
+module Webmachine
+  module HeaderNegotiation
+    def ensure_date_header(res)
+      if (200..499).include?(res.code)
+        res.headers[DATE] ||= Time.now.httpdate
+      end
+    end
+
+    def ensure_content_length(res)
+      body = res.body
+      case
+      when res.headers[TRANSFER_ENCODING]
+        return
+      when [204, 205, 304].include?(res.code)
+        res.headers.delete CONTENT_LENGTH
+      when body != nil
+        res.headers[CONTENT_LENGTH] = body.respond_to?(:bytesize) ? body.bytesize.to_s : body.length.to_s
+      else
+        res.headers[CONTENT_LENGTH] = '0'
+      end
+    end
+  end
+end

data/lib/webmachine/headers.rb

@@ -1,13 +1,18 @@
+require 'webmachine/constants'
+
 module Webmachine
   # Case-insensitive Hash of Request headers
   class Headers < ::Hash
+    CGI_HTTP_MATCH = /^HTTP_(\w+)$/.freeze
+    CONTENT_TYPE_LENGTH_MATCH = /^(CONTENT_(?:TYPE|LENGTH))$/.freeze
+
     # Convert CGI-style Hash into Request headers
     # @param [Hash] env a hash of CGI-style env/headers
     # @return [Webmachine::Headers]
     def self.from_cgi(env)
       env.inject(new) do |h,(k,v)|
-        if k =~ /^HTTP_(\w+)$/ || k =~ /^(CONTENT_(?:TYPE|LENGTH))$/
-          h[$1.tr("_", "-")] = v
+        if k =~ CGI_HTTP_MATCH || k =~ CONTENT_TYPE_LENGTH_MATCH
+          h[$1.tr(UNDERSCORE, DASH)] = v
         end
         h
       end

data/lib/webmachine/locale/en.yml

@@ -1,10 +1,11 @@
 en:
   webmachine:
     errors:
-      standard_body: "<!DOCTYPE html><html>
-        <head><title>%{title}</title></head>
-        <body><h1>%{title}</h1><p>%{message}</p>
-        <address>%{version} server</address></body></html>"
+      standard_body: "<!DOCTYPE html><html>\n
+        <head><title>%{title}</title></head>\n
+        <body><h1>%{title}</h1>\n
+        <p>%{message}</p>\n
+        <address>%{version} server</address></body></html>\n"
       "400":
         title: 400 Malformed Request
         message: The request was malformed and could not be processed.
@@ -13,7 +14,7 @@ en:
         message: The requested document was not found on this server.
       "500":
         title: 500 Internal Server Error
-        message: "The server encountered an error while processing this request: <pre>%{error}</pre>"
+        message: "The server encountered an error while processing this request: <pre>\n%{error}</pre>"
       "501":
         title: 501 Not Implemented
         message: "The server does not support the %{method} method."
@@ -26,3 +27,4 @@ en:
     invalid_media_type: "Invalid media type: %{type}"
     not_resource_class: "%{class} is not a subclass of Webmachine::Resource"
     process_post_invalid: "process_post returned %{result}"
+    match_all_symbol: '"*" as a path segment is deprecated and will be removed in a future release. Please use :*'

data/lib/webmachine/media_type.rb

@@ -1,14 +1,16 @@
-require 'webmachine/translation'
+require 'webmachine/translation'
+require 'webmachine/constants'
+require 'webmachine/dispatcher/route'
 
 module Webmachine
   # Encapsulates a MIME media type, with logic for matching types.
   class MediaType
     extend Translation
     # Matches valid media types
-    MEDIA_TYPE_REGEX = /^\s*([^;\s]+)\s*((?:;\s*\S+\s*)*)\s*$/
+    MEDIA_TYPE_REGEX = /^\s*([^;\s]+)\s*((?:;\s*\S+\s*)*)\s*$/.freeze
 
     # Matches sub-type parameters
-    PARAMS_REGEX = /;\s*([^=]+)(=([^;=\s]*))?/
+    PARAMS_REGEX = /;\s*([^=]+)(=([^;=\s]*))?/.freeze
 
     # Creates a new MediaType by parsing an alternate representation.
     # @param [MediaType, String, Array<String,Hash>] obj the raw type
@@ -48,7 +50,7 @@ module Webmachine
     # Detects whether the {MediaType} represents an open wildcard
     # type, that is, "*/*" without any {#params}.
     def matches_all?
-      @type == "*/*" && @params.empty?
+      @type == MATCHES_ALL && @params.empty?
     end
 
     # @return [true,false] Are these two types strictly equal?
@@ -97,12 +99,12 @@ module Webmachine
 
     # @return [String] The major type, e.g. "application", "text", "image"
     def major
-      type.split("/").first
+      type.split(SLASH).first
     end
 
     # @return [String] the minor or sub-type, e.g. "json", "html", "jpeg"
     def minor
-      type.split("/").last
+      type.split(SLASH).last
     end
 
     # @param [MediaType] other the other type
@@ -110,10 +112,10 @@ module Webmachine
     #   ignoring params and taking into account wildcards
     def type_matches?(other)
       other = self.class.parse(other)
-      if ["*", "*/*", type].include?(other.type)
+      if [Dispatcher::Route::MATCH_ALL_STR, MATCHES_ALL, type].include?(other.type)
         true
       else
-        other.major == major && other.minor == "*"
+        other.major == major && other.minor == Dispatcher::Route::MATCH_ALL_STR
       end
     end
   end # class MediaType

data/lib/webmachine/request.rb

@@ -1,16 +1,18 @@
-require 'cgi'
+require 'cgi'
 require 'forwardable'
+require 'webmachine/constants'
 
 module Webmachine
   # Request represents a single HTTP request sent from a client. It
   # should be instantiated by {Adapters} when a request is received
   class Request
+    HTTP_HEADERS_MATCH = /^(?:[a-z0-9])+(?:_[a-z0-9]+)*$/i.freeze
+
     extend Forwardable
+
     attr_reader :method, :uri, :headers, :body
     attr_accessor :disp_path, :path_info, :path_tokens
 
-    STANDARD_HTTP_METHODS = %w[GET HEAD POST PUT DELETE TRACE CONNECT OPTIONS]
-
     # @param [String] method the HTTP request method
     # @param [URI] uri the requested URI, including host, scheme and
     #   port
@@ -18,7 +20,8 @@ module Webmachine
     # @param [String,#to_s,#each,nil] body the entity included in the
     #   request, if present
     def initialize(method, uri, headers, body)
-      @method, @uri, @headers, @body = method, uri, headers, body
+      @method, @headers, @body = method, headers, body
+      @uri = build_uri(uri, headers)
     end
 
     def_delegators :headers, :[]
@@ -27,9 +30,18 @@ module Webmachine
     # lowercased-underscored version of the header name, e.g.
     # `if_unmodified_since`.
     def method_missing(m, *args, &block)
-      if m.to_s =~ /^(?:[a-z0-9])+(?:_[a-z0-9]+)*$/i
+      if m =~ HTTP_HEADERS_MATCH
         # Access headers more easily as underscored methods.
-        self[m.to_s.tr('_', '-')]
+        header_name = m.to_s.tr(UNDERSCORE, DASH)
+        if (header_value = headers[header_name])
+          # Make future lookups faster.
+          self.class.class_eval <<-RUBY, __FILE__, __LINE__
+          def #{m}
+            headers["#{header_name}"]
+          end
+          RUBY
+        end
+        header_value
       else
         super
       end
@@ -45,7 +57,7 @@ module Webmachine
     # @return [URI]
     def base_uri
       @base_uri ||= uri.dup.tap do |u|
-        u.path = "/"
+        u.path = SLASH
         u.query = nil
       end
     end
@@ -92,7 +104,7 @@ module Webmachine
     # @return [Boolean]
     #   true if this request was made with the GET method
     def get?
-      method == "GET"
+      method == GET_METHOD
     end
 
     # Is this a HEAD request?
@@ -100,7 +112,7 @@ module Webmachine
     # @return [Boolean]
     #   true if this request was made with the HEAD method
     def head?
-      method == "HEAD"
+      method == HEAD_METHOD
     end
 
     # Is this a POST request?
@@ -108,7 +120,7 @@ module Webmachine
     # @return [Boolean]
     #   true if this request was made with the GET method
     def post?
-      method == "POST"
+      method == POST_METHOD
     end
 
     # Is this a PUT request?
@@ -116,7 +128,7 @@ module Webmachine
     # @return [Boolean]
     #   true if this request was made with the PUT method
     def put?
-      method == "PUT"
+      method == PUT_METHOD
     end
 
     # Is this a DELETE request?
@@ -124,7 +136,7 @@ module Webmachine
     # @return [Boolean]
     #   true if this request was made with the DELETE method
     def delete?
-      method == "DELETE"
+      method == DELETE_METHOD
     end
 
     # Is this a TRACE request?
@@ -132,7 +144,7 @@ module Webmachine
     # @return [Boolean]
     #   true if this request was made with the TRACE method
     def trace?
-      method == "TRACE"
+      method == TRACE_METHOD
     end
 
     # Is this a CONNECT request?
@@ -140,7 +152,7 @@ module Webmachine
     # @return [Boolean]
     #   true if this request was made with the CONNECT method
     def connect?
-      method == "CONNECT"
+      method == CONNECT_METHOD
     end
 
     # Is this an OPTIONS request?
@@ -148,7 +160,24 @@ module Webmachine
     # @return [Boolean]
     #   true if this request was made with the OPTIONS method
     def options?
-      method == "OPTIONS"
+      method == OPTIONS_METHOD
+    end
+
+    private
+
+    def build_uri(uri, headers)
+      uri = URI(uri)
+
+      host, _, port = headers.fetch(HOST, "").rpartition(COLON)
+      return uri if host.empty?
+
+      host = "[#{host}]" if host.include?(COLON)
+      port = 80 if port.empty?
+
+      uri.scheme = HTTP
+      uri.host, uri.port = host, port.to_i
+
+      URI.parse(uri.to_s)
     end
 
   end # class Request