Merge branch 'http-statuses'

hanami · Apr 28, 2014 · ae188c7 · ae188c7
2 parents 14d5b6a + c2854b6
commit ae188c7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 78 deletions.
diff --git a/lib/lotus/http/status.rb b/lib/lotus/http/status.rb
@@ -1,3 +1,5 @@
+require 'rack/utils'
+
 module Lotus
   module Http
     # An HTTP status
@@ -9,78 +11,19 @@ class Status
       #
       # @since 0.1.0
       # @api private
-      ALL = {
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        102 => 'Processing (WebDAV) (RFC 2518)',
+      ALL = ::Rack::Utils::HTTP_STATUS_CODES.dup.merge({
         103 => 'Checkpoint',
         122 => 'Request-URI too long',
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        207 => 'Multi-Status (WebDAV) (RFC 4918)',
-        208 => 'Already Reported (WebDAV) (RFC 5842)',
-        226 => 'IM Used (RFC 3229)',
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        306 => 'Switch Proxy',
-        307 => 'Temporary Redirect',
-        308 => 'Resume Incomplete',
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-        418 => 'I\'m a teapot (RFC 2324)',
+        418 => 'I\'m a teapot',
         420 => 'Enhance Your Calm',
-        422 => 'Unprocessable Entity (WebDAV) (RFC 4918)',
-        423 => 'Locked (WebDAV) (RFC 4918)',
-        424 => 'Failed Dependency (WebDAV) (RFC 4918)',
-        426 => 'Upgrade Required (RFC 2817)',
-        428 => 'Precondition Required',
-        429 => 'Too Many Requests',
-        431 => 'Request Header Fields Too Large',
         444 => 'No Response',
         449 => 'Retry With',
         450 => 'Blocked by Windows Parental Controls',
         451 => 'Wrong Exchange server',
         499 => 'Client Closed Request',
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        506 => 'Variant Also Negotiates (RFC 2295)',
-        507 => 'Insufficient Storage (WebDAV) (RFC 4918)',
-        508 => 'Loop Detected (WebDAV) (RFC 5842)',
-        509 => 'Bandwidth Limit Exceeded (Apache bw\/limited extension)',
-        510 => 'Not Extended (RFC 2774)',
-        511 => 'Network Authentication Required',
         598 => 'Network read timeout error',
         599 => 'Network connect timeout error'
-      }.freeze
+      }).freeze
 
       # Return a status for the given code
       #

diff --git a/test/fixtures.rb b/test/fixtures.rb
@@ -1,7 +1,7 @@
 HTTP_TEST_STATUSES = {
   100 => 'Continue',
   101 => 'Switching Protocols',
-  102 => 'Processing (WebDAV) (RFC 2518)',
+  102 => 'Processing',
   103 => 'Checkpoint',
   122 => 'Request-URI too long',
   200 => 'OK',
@@ -11,18 +11,18 @@
   204 => 'No Content',
   205 => 'Reset Content',
   206 => 'Partial Content',
-  207 => 'Multi-Status (WebDAV) (RFC 4918)',
-  208 => 'Already Reported (WebDAV) (RFC 5842)',
-  226 => 'IM Used (RFC 3229)',
+  207 => 'Multi-Status',
+  208 => 'Already Reported',
+  226 => 'IM Used',
   300 => 'Multiple Choices',
   301 => 'Moved Permanently',
   302 => 'Found',
   303 => 'See Other',
   304 => 'Not Modified',
   305 => 'Use Proxy',
-  306 => 'Switch Proxy',
+  306 => 'Reserved',
   307 => 'Temporary Redirect',
-  308 => 'Resume Incomplete',
+  308 => 'Permanent Redirect',
   400 => 'Bad Request',
   401 => 'Unauthorized',
   402 => 'Payment Required',
@@ -41,12 +41,12 @@
   415 => 'Unsupported Media Type',
   416 => 'Requested Range Not Satisfiable',
   417 => 'Expectation Failed',
-  418 => 'I\'m a teapot (RFC 2324)',
+  418 => 'I\'m a teapot',
   420 => 'Enhance Your Calm',
-  422 => 'Unprocessable Entity (WebDAV) (RFC 4918)',
-  423 => 'Locked (WebDAV) (RFC 4918)',
-  424 => 'Failed Dependency (WebDAV) (RFC 4918)',
-  426 => 'Upgrade Required (RFC 2817)',
+  422 => 'Unprocessable Entity',
+  423 => 'Locked',
+  424 => 'Failed Dependency',
+  426 => 'Upgrade Required',
   428 => 'Precondition Required',
   429 => 'Too Many Requests',
   431 => 'Request Header Fields Too Large',
@@ -61,11 +61,11 @@
   503 => 'Service Unavailable',
   504 => 'Gateway Timeout',
   505 => 'HTTP Version Not Supported',
-  506 => 'Variant Also Negotiates (RFC 2295)',
-  507 => 'Insufficient Storage (WebDAV) (RFC 4918)',
-  508 => 'Loop Detected (WebDAV) (RFC 5842)',
-  509 => 'Bandwidth Limit Exceeded (Apache bw\/limited extension)',
-  510 => 'Not Extended (RFC 2774)',
+  506 => 'Variant Also Negotiates (Experimental)',
+  507 => 'Insufficient Storage',
+  508 => 'Loop Detected',
+  509 => 'Unassigned',
+  510 => 'Not Extended',
   511 => 'Network Authentication Required',
   598 => 'Network read timeout error',
   599 => 'Network connect timeout error'