move constants to webmachine namespace

Asmod4n · Asmod4n · commit 46384612155a · 2014-10-15T22:22:33.000+02:00
diff --git a/lib/webmachine/adapters/httpkit.rb b/lib/webmachine/adapters/httpkit.rb
@@ -10,8 +10,6 @@
 module Webmachine
   module Adapters
     class HTTPkit < Adapter
-      include Constants
-
       VERSION_STRING = "#{Webmachine::SERVER_STRING} HTTPkit/#{::HTTPkit::VERSION}".freeze
 
       def options
diff --git a/lib/webmachine/adapters/rack.rb b/lib/webmachine/adapters/rack.rb
@@ -34,7 +34,6 @@ module Adapters
     #     MyApplication.run
     #
     class Rack < Adapter
-      include Constants
       # Used to override default Rack server options (useful in testing)
       DEFAULT_OPTIONS = {}
 
@@ -97,7 +96,6 @@ def call(env)
       end
 
       class RackResponse
-        include Webmachine::Constants
         ONE_FIVE = '1.5'.freeze
 
         def initialize(body, status, headers)
diff --git a/lib/webmachine/adapters/reel.rb b/lib/webmachine/adapters/reel.rb
@@ -9,7 +9,6 @@
 module Webmachine
   module Adapters
     class Reel < Adapter
-      include Constants
       # Used to override default Reel server options (useful in testing)
       DEFAULT_OPTIONS = {}
 
diff --git a/lib/webmachine/adapters/webrick.rb b/lib/webmachine/adapters/webrick.rb
@@ -27,7 +27,6 @@ def run
 
       # WEBRick::HTTPServer that is run by the WEBrick adapter.
       class Server < ::WEBrick::HTTPServer
-        include Webmachine::Constants
 
         def initialize(options)
           @application = options[:application]
diff --git a/lib/webmachine/chunked_body.rb b/lib/webmachine/chunked_body.rb
@@ -15,8 +15,6 @@ module Webmachine
   #
   # This is needed for Ruby webservers which don't do the chunking themselves.
   class ChunkedBody
-    include Constants
-
     # Final chunk in any chunked-encoding response
     FINAL_CHUNK = "0#{CRLF}#{CRLF}".freeze
 
diff --git a/lib/webmachine/constants.rb b/lib/webmachine/constants.rb
@@ -1,76 +1,74 @@
 ﻿module Webmachine
-  module Constants
-    # Default HTTP linebreak
-    CRLF = "\r\n".freeze
+  # Universal HTTP delimiter
+  CRLF = "\r\n".freeze
 
-    # HTTP Content-Type
-    CONTENT_TYPE = 'Content-Type'.freeze
+  # HTTP Content-Type
+  CONTENT_TYPE = 'Content-Type'.freeze
 
-    # Default Content-Type
-    TEXT_HTML = 'text/html'.freeze
+  # Default Content-Type
+  TEXT_HTML = 'text/html'.freeze
 
-    # HTTP Date
-    DATE = 'Date'.freeze
+  # HTTP Date
+  DATE = 'Date'.freeze
 
-    # HTTP Transfer-Encoding
-    TRANSFER_ENCODING = 'Transfer-Encoding'.freeze
+  # HTTP Transfer-Encoding
+  TRANSFER_ENCODING = 'Transfer-Encoding'.freeze
 
-    # HTTP Content-Length
-    CONTENT_LENGTH = 'Content-Length'.freeze
+  # HTTP Content-Length
+  CONTENT_LENGTH = 'Content-Length'.freeze
 
-    # A underscore
-    UNDERSCORE = '_'.freeze
+  # A underscore
+  UNDERSCORE = '_'.freeze
 
-    # A dash
-    DASH = '-'.freeze
+  # A dash
+  DASH = '-'.freeze
 
-    # A Slash
-    SLASH = '/'.freeze
+  # A Slash
+  SLASH = '/'.freeze
 
-    MATCHES_ALL = '*/*'.freeze
+  MATCHES_ALL = '*/*'.freeze
 
-    GET_METHOD     = "GET".freeze
-    HEAD_METHOD    = "HEAD".freeze
-    POST_METHOD    = "POST".freeze
-    PUT_METHOD     = "PUT".freeze
-    DELETE_METHOD  = "DELETE".freeze
-    OPTIONS_METHOD = "OPTIONS".freeze
-    TRACE_METHOD   = "TRACE".freeze
-    CONNECT_METHOD = "CONNECT".freeze
+  GET_METHOD     = "GET".freeze
+  HEAD_METHOD    = "HEAD".freeze
+  POST_METHOD    = "POST".freeze
+  PUT_METHOD     = "PUT".freeze
+  DELETE_METHOD  = "DELETE".freeze
+  OPTIONS_METHOD = "OPTIONS".freeze
+  TRACE_METHOD   = "TRACE".freeze
+  CONNECT_METHOD = "CONNECT".freeze
 
-    STANDARD_HTTP_METHODS = [
-                             GET_METHOD, HEAD_METHOD, POST_METHOD,
-                             PUT_METHOD, DELETE_METHOD, TRACE_METHOD,
-                             CONNECT_METHOD, OPTIONS_METHOD
-                            ].map!(&:freeze)
+  STANDARD_HTTP_METHODS = [
+                           GET_METHOD, HEAD_METHOD, POST_METHOD,
+                           PUT_METHOD, DELETE_METHOD, TRACE_METHOD,
+                           CONNECT_METHOD, OPTIONS_METHOD
+                          ].map!(&:freeze)
 
-    # A colon
-    COLON = ':'.freeze
+  # A colon
+  COLON = ':'.freeze
 
-    # http string
-    HTTP = 'http'.freeze
+  # http string
+  HTTP = 'http'.freeze
 
-    # Host string
-    HOST = 'Host'.freeze
+  # Host string
+  HOST = 'Host'.freeze
 
-    # HTTP Content-Encoding
-    CONTENT_ENCODING = 'Content-Encoding'.freeze
+  # HTTP Content-Encoding
+  CONTENT_ENCODING = 'Content-Encoding'.freeze
 
-    # Charset string
-    CHARSET = 'Charset'.freeze
+  # Charset string
+  CHARSET = 'Charset'.freeze
 
-    # Semicolon split match
-    SPLIT_SEMI = /\s*,\s*/.freeze
+  # Semicolon split match
+  SPLIT_SEMI = /\s*,\s*/.freeze
 
-    # Star Character
-    STAR = '*'.freeze
+  # Star Character
+  STAR = '*'.freeze
 
-    # HTTP Location
-    LOCATION = 'Location'.freeze
+  # HTTP Location
+  LOCATION = 'Location'.freeze
 
-    # identity Encoding
-    IDENTITY = 'identity'.freeze
+  # identity Encoding
+  IDENTITY = 'identity'.freeze
 
-    SERVER = 'Server'.freeze
-  end
+  SERVER = 'Server'.freeze
 end
diff --git a/lib/webmachine/decision/conneg.rb b/lib/webmachine/decision/conneg.rb
@@ -8,7 +8,6 @@ module Decision
     # specifically, choosing media types, encodings, character sets
     # and languages.
     module Conneg
-      include Constants
       HAS_ENCODING = defined?(::Encoding) # Ruby 1.9 compat
 
       # Given the 'Accept' header and provided types, chooses an
diff --git a/lib/webmachine/decision/flow.rb b/lib/webmachine/decision/flow.rb
@@ -19,7 +19,6 @@ module Decision
     # @see https://raw.github.com/wiki/basho/webmachine/images/http-headers-status-v3.png
     module Flow
       include Base64
-      include Constants
 
       # Version of the flow diagram
       VERSION = 3
diff --git a/lib/webmachine/decision/fsm.rb b/lib/webmachine/decision/fsm.rb
@@ -12,7 +12,6 @@ class FSM
       include Helpers
       include Trace::FSM
       include Translation
-      include Constants
 
       attr_reader :resource, :request, :response, :metadata
 
diff --git a/lib/webmachine/decision/helpers.rb b/lib/webmachine/decision/helpers.rb
@@ -14,7 +14,6 @@ module Helpers
       include QuotedString
       include Streaming
       include HeaderNegotiation
-      include Constants
 
       # Determines if the response has a body/entity set.
       def has_response_body?
diff --git a/lib/webmachine/dispatcher/route.rb b/lib/webmachine/dispatcher/route.rb
@@ -8,7 +8,6 @@ class Dispatcher
     # create routes, use {Dispatcher#add_route}.
     class Route
       include Translation
-      include Constants
 
       # @return [Class] the resource this route will dispatch to, a
       #   subclass of {Resource}
diff --git a/lib/webmachine/errors.rb b/lib/webmachine/errors.rb
@@ -6,7 +6,6 @@
 module Webmachine
   extend HeaderNegotiation
   extend Translation
-  include Constants
 
   # Renders a standard error message body for the response. The
   # standard messages are defined in localization files.
diff --git a/lib/webmachine/header_negotiation.rb b/lib/webmachine/header_negotiation.rb
@@ -2,7 +2,6 @@
 
 module Webmachine
   module HeaderNegotiation
-    include Constants
     def ensure_date_header(res)
       if (200..499).include?(res.code)
         res.headers[DATE] ||= Time.now.httpdate
diff --git a/lib/webmachine/headers.rb b/lib/webmachine/headers.rb
@@ -3,7 +3,6 @@
 module Webmachine
   # Case-insensitive Hash of Request headers
   class Headers < ::Hash
-    include Constants
     CGI_HTTP_MATCH = /^HTTP_(\w+)$/.freeze
     CONTENT_TYPE_LENGTH_MATCH = /^(CONTENT_(?:TYPE|LENGTH))$/.freeze
 
diff --git a/lib/webmachine/media_type.rb b/lib/webmachine/media_type.rb
@@ -6,7 +6,6 @@ module Webmachine
   # Encapsulates a MIME media type, with logic for matching types.
   class MediaType
     extend Translation
-    include Constants
     # Matches valid media types
     MEDIA_TYPE_REGEX = /^\s*([^;\s]+)\s*((?:;\s*\S+\s*)*)\s*$/.freeze
 
diff --git a/lib/webmachine/request.rb b/lib/webmachine/request.rb
@@ -9,7 +9,7 @@ class Request
     HTTP_HEADERS_MATCH = /^(?:[a-z0-9])+(?:_[a-z0-9]+)*$/i.freeze
 
     extend Forwardable
-    include Constants
+
     attr_reader :method, :uri, :headers, :body
     attr_accessor :disp_path, :path_info, :path_tokens
 
diff --git a/lib/webmachine/resource/callbacks.rb b/lib/webmachine/resource/callbacks.rb
@@ -8,8 +8,6 @@ class Resource
     # the portions of the graph that are made available to your
     # application.
     module Callbacks
-      include Constants
-
       # Does the resource exist? Returning a falsey value (false or nil)
       # will result in a '404 Not Found' response. Defaults to true.
       # @return [true,false] Whether the resource exists

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@ module Webmachine`
`15`	`15`	`#`
`16`	`16`	`# This is needed for Ruby webservers which don't do the chunking themselves.`
`17`	`17`	`class ChunkedBody`
`18`		`- include Constants`
`19`		`-`
`20`	`18`	`# Final chunk in any chunked-encoding response`
`21`	`19`	`FINAL_CHUNK = "0#{CRLF}#{CRLF}".freeze`
`22`	`20`