Fixing up additional verbs and adding appropriate body parsing

Author: guahanweb

src/GuahanWeb/Http/request.php

@@ -23,6 +23,13 @@ public function __construct() {
         $this->params = array();
     }
 
+    /**
+     * Let's try to make some variables more accessible for consumption
+     *
+     * @public
+     * @param {string} $k The key being requested
+     * @return {mixed}
+     */
     public function __get($k) {
         static $body;
 
@@ -35,6 +42,8 @@ public function __get($k) {
                 break;
 
             case 'body':
+                // We will only parse the body if it is requested, and then only
+                // once. We want to keep the processing as light as possible
                 if (is_null($body)) {
                     $body = $this->parseBody();
                 }
@@ -61,15 +70,21 @@ protected function getAllHeaders() {
         return $headers;
     }
 
+    /**
+     * Attempt to parse the body of the request (considering all HTTP verbs and limitations).
+     *
+     * @protected
+     * @return {string|object|null}
+     */
     protected function parseBody() {
         // no body allowed for GET or DELETE requests
         if ($this->method == 'GET' || $this->method == 'DELETE') {
-            return '';
+            return null;
         }
 
-        // Process POST and PUT appropriately
         $data = null;
-        if (isset($_POST)) {
+        if ($this->method == 'POST' && isset($this->headers['Content-Type']) && strpos($this->headers['Content-Type'], 'multipart/form-data') === 0) {
+            // POST requests may have multipart/form-data already parsed
             $data = $_POST;
         } else {
             // handle raw body, and parse if content-type if application/json
@@ -78,6 +93,7 @@ protected function parseBody() {
                 $data = json_decode(trim($data));
             }
         }
+        return $data;
     }
 }
 

src/GuahanWeb/Http/router.php

@@ -6,15 +6,26 @@ class RouterException extends \Exception {}
 class Router {
     protected $routes;
     protected $supported_methods;
+    protected $default_handlers;
 
     protected function __construct() {
         $this->supported_methods = array('GET', 'POST', 'PUT', 'DELETE');
         $this->routes = array();
         foreach ($this->supported_methods as $method) {
             $this->routes[$method] = array();
+            $this->default_handlers[$method] = function ($req, $res) {
+                // All verbs will return a 404 by default
+                $res->send('Not found', 404);
+            };
         }
     }
 
+    /**
+     * Retrieves the shared router instance
+     *
+     * @public
+     * @return {Router}
+     */
     static public function instance() {
         static $instance;
 
@@ -25,6 +36,15 @@ static public function instance() {
         return $instance;
     }
 
+    /**
+     * Looks for a matching registered route for the provided method and uri combination.
+     *
+     * @protected
+     * @param {string} $method The HTTP verb of the request
+     * @param {string} $uri The URI of the request
+     * @param {array} $params Optional reference for extracted parameters
+     * @return {function|false}
+     */
     protected function match($method, $uri, &$params = null) {
         if (isset($this->routes[$method])) {
             foreach ($this->routes[$method] as $route => $handler) {
@@ -140,7 +160,7 @@ public function process() {
 
         if (false === ($handler = $this->match($request->method, $request->uri, $params))) {
             // Error case
-            $response->send('Not found', 404);
+            $this->default_handlers[$request->method]($request, $response);
         }
 
         // route params applied to the request object