Merge branch 'master' of git@github.com:mtodd/halcyon

mtodd · Jun 10, 2008 · 56f4112 · 56f4112
2 parents 5d7a5a2 + c844d17
commit 56f4112
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,4 @@
-== 0.5.0 2008-05-15 WIP
+== 0.5.0 2008-05-29
 * major refactor, completely incompatible with 0.4.0 applications
 * new application-centric structure and design [#13 resolved]
 * remove coupled server code, completely Rack-based
@@ -21,6 +21,7 @@
 * new examples [#23 resolved]
 * app init can specify to initialize new Git repo for new app [#25 resolved]
 * fixed bug with interactive shell not loading the correct paths [#39 resolved]
+* extended status codes to provide more extensive errors/states
 
 == 0.4.1 2008-05-09
 * added explicit dependency versions

diff --git a/lib/halcyon/exceptions.rb b/lib/halcyon/exceptions.rb
@@ -34,19 +34,22 @@ def initialize(status, body)
     HTTP_STATUS_CODES = {
       100  => 'Continue',
       101  => 'Switching Protocols',
+      102  => 'Processing',
       200  => 'OK',
       201  => 'Created',
       202  => 'Accepted',
       203  => 'Non-Authoritative Information',
       204  => 'No Content',
       205  => 'Reset Content',
       206  => 'Partial Content',
+      207  => 'Multi-Status',
       300  => 'Multiple Choices',
       301  => 'Moved Permanently',
       302  => 'Moved Temporarily',
       303  => 'See Other',
       304  => 'Not Modified',
       305  => 'Use Proxy',
+      307  => 'Temporary Redirect',
       400  => 'Bad Request',
       401  => 'Unauthorized',
       402  => 'Payment Required',
@@ -63,14 +66,27 @@ def initialize(status, body)
       413  => 'Request Entity Too Large',
       414  => 'Request-URI Too Large',
       415  => 'Unsupported Media Type',
+      416  => 'Requested Range Not Satisfiable',
+      417  => 'Expectation Failed',
+      422  => 'Unprocessable Entity',
+      423  => 'Locked',
+      424  => 'Failed Dependency',
+      425  => 'No Code',
+      426  => 'Upgrade Required',
       500  => 'Internal Server Error',
       501  => 'Not Implemented',
       502  => 'Bad Gateway',
       503  => 'Service Unavailable',
       504  => 'Gateway Time-out',
-      505  => 'HTTP Version not supported'
+      505  => 'HTTP Version not supported',
+      506  => 'Variant Also Negotiates',
+      507  => 'Insufficient Storage',
+      510  => 'Not Extended'
     }
 
+    # Added extended HTTP status codes found from
+    # http://www.askapache.com/htaccess/apache-status-code-headers-errordocument.html
+
     #--
     # Classify Status Codes
     #++