Merge pull request #4 from skipperbent/development

Development

README.md

@@ -1,8 +1,6 @@
 # Simple PHP router
 Simple, fast PHP router that is easy to get integrated and in almost any project. Heavily inspired by the Laravel router.
 
-**Please note: this project has just been added and is still a work in progress. Please use with caution until a stable release version is available :)**
-
 ## Installation
 Add the latest version pf Simple PHP Router to your ```composer.json```
 
@@ -17,6 +15,16 @@ Add the latest version pf Simple PHP Router to your ```composer.json```
 }
 ```
 
+## Notes
+
+### Features currently "in-the-works"
+
+- Global Constraints
+- Named Routes
+- Sub-Domain Routing
+- CSRF Protection
+- Optional/required parameters
+
 ## Initialising the router
 
 In your ```index.php``` require your ```routes.php``` and call the ```routeRequest()``` method when all your custom routes has been loaded. This will trigger and do the actual routing of the requests.
@@ -36,7 +44,7 @@ SimpleRouter::init($defaultControllerNamespace);
 ```
 
 ## Adding routes
-Remember the ```routes.php``` file you required in your ```index.php```? This file will contain all your custom rules for routing. 
+Remember the ```routes.php``` file you required in your ```index.php```? This file will contain all your custom rules for routing.
 This router is heavily inspired by the Laravel 5.* router, so anything you find in the Laravel documentation should work here as well.
 
 ### Basic example
@@ -46,8 +54,8 @@ use Pecee\SimpleRouter\SimpleRouter;
 
 /*
  * This route will match the url /v1/services/answers/1/
- 
- * The middleware is just a class that renders before the 
+
+ * The middleware is just a class that renders before the
  * Controller or callback is loaded. This is useful for stopping
  * the request, for instance if a user is not authenticated.
  */
@@ -56,14 +64,21 @@ SimpleRouter::group(['prefix' => 'v1', 'middleware' => '\MyWebsite\Middleware\So
 
     SimpleRouter::group(['prefix' => 'services'], function() {
 
-        SimpleRouter::get('/answers/{id}', 'ControllerAnswers@show');
-        
-        // Resetful ressource
-        SimpleRouter::ressource('/rest', 'ControllerRessource');
-        
+        SimpleRouter::get('/answers/{id}', 'ControllerAnswers@show')
+        ->where(['id' => '[0-9]+');
+
+        /**
+         * This example will route url when matching the regular expression to the method.
+         * For example route: /ajax/music/world -> ControllerAjax@process (parameter: music/world)
+         */
+        SimpleRouter::all('/ajax', 'ControllerAjax@process')->match('ajax\\/([A-Za-z0-9\\/]+)');
+
+        // Resetful resource
+        SimpleRouter::resource('/rest', 'ControllerRessource');
+
         // Load the entire controller (where url matches method names - getIndex(), postIndex() etc)
         SimpleRouter::controller('/controller', 'ControllerDefault');
-        
+
         // Example of providing callback instead of Controller
         SimpleRouter::get('/something', function() {
             die('Callback example');
@@ -75,7 +90,7 @@ SimpleRouter::group(['prefix' => 'v1', 'middleware' => '\MyWebsite\Middleware\So
 
 ### Doing it the object oriented (hardcore) way
 
-The ```SimpleRouter``` class referenced in the previous example, is just a simple helper class that knows how to communicate with the ```RouterBase``` class. 
+The ```SimpleRouter``` class referenced in the previous example, is just a simple helper class that knows how to communicate with the ```RouterBase``` class.
 If you are up for a challenge, want the full control or simply just want to create your own ```Router``` helper class, this example is for you.
 
 ```php
@@ -162,7 +177,7 @@ In ```routes.php``` we have added this route:
 
 In the template we then call:
 
-```url('myController@show', ['id' => 22], ['category' => 'shoes']);``` 
+```url('myController@show', ['id' => 22], ['category' => 'shoes']);```
 
 Result url is:
 
@@ -174,4 +189,26 @@ While I work on a better documentation, please refer to the Laravel 5 routing do
 http://laravel.com/docs/5.1/routing
 
 ## Easily extendable
-The router can be easily extended to customize your needs. 
+The router can be easily extended to customize your needs.
+
+## The MIT License (MIT)
+
+Copyright (c) 2015 Simon Sessing� / simple-php-router
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/Pecee/CsrfToken.php

@@ -0,0 +1,74 @@
+<?php
+namespace Pecee;
+
+class CsrfToken {
+
+    const CSRF_KEY = 'csrf_token';
+
+    protected static $instance;
+
+    protected $lastToken;
+    protected $currentToken;
+
+    public static function getInstance() {
+        if(self::$instance === null) {
+            self::$instance = new static();
+        }
+        return self::$instance;
+    }
+
+    public function __construct() {
+        $this->lastToken = isset($_SESSION[self::CSRF_KEY]) ? $_SESSION[self::CSRF_KEY] : null;
+        $this->currentToken = $this->generate();
+
+        // Initialise session, if it hasn't been initialised.
+        if(!isset($_SESSION)) {
+            session_start();
+        }
+
+        $_SESSION['csrf_token'] = $this->currentToken;
+    }
+
+    /**
+     * Generate random identifier for CSRF token
+     * @return string
+     */
+    public static function generate() {
+        if (function_exists('mcrypt_create_iv')) {
+            return bin2hex(mcrypt_create_iv(32, MCRYPT_DEV_URANDOM));
+        }
+        return bin2hex(openssl_random_pseudo_bytes(32));
+    }
+
+    /**
+     * Validate valid CSRF token
+     *
+     * @param string $token
+     * @return bool
+     */
+    public function validate($token) {
+        return hash_equals($token, $_SESSION[self::CSRF_KEY]);
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getLastToken(){
+        return $this->lastToken;
+    }
+
+    /**
+     * @param string|null $lastToken
+     */
+    public function setLastToken($lastToken){
+        $this->lastToken = $lastToken;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getCurrentToken(){
+        return $this->currentToken;
+    }
+
+}

src/Pecee/Http/Middleware/Middleware.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Pecee\Http\Middleware;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+abstract class Middleware
+{
+    public function handle(Request $request) {
+        return true;
+    }
+}

src/Pecee/Http/Middleware/VerifyCsrfToken.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Pecee\Http\Middleware;
+
+class VerifyCsrfToken extends Middleware {
+
+
+
+}

src/Pecee/Http/Request.php

@@ -0,0 +1,46 @@
+<?php
+namespace Pecee\Http;
+
+class Request {
+
+    protected $uri;
+    protected $host;
+    protected $method;
+
+    public function __construct() {
+        $this->host = $_SERVER['HTTP_HOST'];
+        $this->uri = rtrim($_SERVER['REQUEST_URI'], '/') . '/';
+        $this->method = (isset($_POST['_method'])) ? strtolower($_POST['_method']) : strtolower($_SERVER['REQUEST_METHOD']);
+    }
+
+    /**
+     * @return string
+     */
+    public function getUri() {
+        return $this->uri;
+    }
+
+    /**
+     * @return string
+     */
+    public function getHost() {
+        return $this->host;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMethod() {
+        return $this->method;
+    }
+
+    /**
+     * Get http basic auth user
+     * @return string|null
+     */
+    public function getUser() {
+        $data = http_digest_parse($_SERVER['PHP_AUTH_DIGEST']);
+        return (isset($data['username'])) ? $data['username'] : null;
+    }
+
+}

src/Pecee/Http/Response.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Pecee\Http;
+
+class Response {
+
+    /**
+     * Set the http status code
+     *
+     * @param int $code
+     * @return self $this
+     */
+    public function httpCode($code) {
+        http_response_code($code);
+        return $this;
+    }
+
+    /**
+     * Redirect the response
+     *
+     * @param string $url
+     */
+    public function redirect($url) {
+        header('location: ' . $url);
+        die();
+    }
+
+    public function refresh() {
+        $this->redirect(url());
+    }
+
+}

src/Pecee/SimpleRouter/IRouteEntry.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Pecee\SimpleRouter;
+
+interface IRouteEntry {
+
+}

src/Pecee/SimpleRouter/RouterBase.php

@@ -1,19 +1,20 @@
 <?php
 namespace Pecee\SimpleRouter;
 
+use Pecee\ArrayUtil;
+use Pecee\Http\Request;
 use Pecee\Url;
 
 class RouterBase {
 
     protected static $instance;
 
+    protected $request;
     protected $currentRoute;
     protected $routes;
     protected $processedRoutes;
     protected $controllerUrlMap;
     protected $backstack;
-    protected $requestUri;
-    protected $requestMethod;
     protected $loadedRoute;
     protected $defaultNamespace;
 
@@ -24,8 +25,7 @@ class RouterBase {
         $this->routes = array();
         $this->backstack = array();
         $this->controllerUrlMap = array();
-        $this->requestUri = $_SERVER['REQUEST_URI'];
-        $this->requestMethod = (isset($_POST['_method'])) ? strtolower($_POST['_method']) : strtolower($_SERVER['REQUEST_METHOD']);
+        $this->request = new Request();
     }
 
     public function addRoute(RouterEntry $route) {
@@ -42,9 +42,8 @@ class RouterBase {
         /* @var $route RouterEntry */
         foreach($routes as $route) {
 
-            if($this->defaultNamespace) {
+            if($this->defaultNamespace && !$route->getNamespace()) {
                 $namespace = null;
-
                 if ($route->getNamespace()) {
                     $namespace = $this->defaultNamespace . '\\' . $route->getNamespace();
                 } else {
@@ -61,15 +60,17 @@ class RouterBase {
             }
             $route->addSettings($mergedSettings);
 
-            if(!($route instanceof RouterGroup) && is_array($newPrefixes) && count($newPrefixes) && $backstack) {
-                $route->setUrl( join('/', $newPrefixes) . $route->getUrl() );
-            }
+            if(!($route instanceof RouterGroup)) {
+                if(is_array($newPrefixes) && count($newPrefixes) && $backstack) {
+                    $route->setUrl( join('/', $newPrefixes) . $route->getUrl() );
+                }
 
-            $this->controllerUrlMap[] = $route;
+                $this->controllerUrlMap[] = $route;
+            }
 
             $this->currentRoute = $route;
             if($route instanceof RouterGroup && is_callable($route->getCallback())) {
-                $route->renderRoute($this->requestMethod);
+                $route->renderRoute($this->request);
             }
             $this->currentRoute = null;
 
@@ -88,18 +89,39 @@ class RouterBase {
 
         $this->processRoutes($this->routes);
 
+        // Make sure the urls is in the right order when comparing
+        usort($this->controllerUrlMap, function($a, $b) {
+            return strcmp($b->getUrl(), $a->getUrl());
+        });
+
+        $routeNotAllowed = false;
+
+        /* @var $route RouterEntry */
         foreach($this->controllerUrlMap as $route) {
-            $routeMatch = $route->matchRoute($this->requestMethod, rtrim($this->requestUri, '/') . '/');
+            $routeMatch = $route->matchRoute($this->request);
+
 
             if($routeMatch && !($routeMatch instanceof RouterGroup)) {
+
+                if(count($route->getRequestMethods()) && !in_array($this->request->getMethod(), $route->getRequestMethods())) {
+                    $routeNotAllowed = true;
+                    continue;
+                }
+
+                $routeNotAllowed = false;
+
                 $this->loadedRoute = $routeMatch;
-                $routeMatch->renderRoute($this->requestMethod);
+                $routeMatch->renderRoute($this->request);
                 break;
             }
         }
 
+        if($routeNotAllowed) {
+            throw new RouterException('Route or method not allowed', 403);
+        }
+
         if(!$this->loadedRoute) {
-            throw new RouterException(sprintf('Route not found: %s', $this->requestUri), 404);
+            throw new RouterException(sprintf('Route not found: %s', $this->request->getUri()), 404);
         }
     }
 
@@ -127,20 +149,6 @@ class RouterBase {
         return null;
     }
 
-    /**
-     * @return string
-     */
-    public function getRequestMethod() {
-        return $this->requestMethod;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRequestUri() {
-        return $this->requestUri;
-    }
-
     /**
      * @return array
      */
@@ -162,14 +170,24 @@ class RouterBase {
         return $this->routes;
     }
 
-    protected function processUrl($route, $method = null, $parameters = null, $getParams = null) {
-        $url = rtrim($route->getUrl(), '/') . '/';
+    /**
+     * Get current request
+     *
+     * @return Request
+     */
+    public function getRequest() {
+        return $this->request;
+    }
 
-        if($method !== null) {
-            $url .= $method . '/';
+    protected function processUrl($route, $method = null, $parameters = null, $getParams = null) {
+
+        $url = $route->getUrl();
+
+        if(($route instanceof RouterController || $route instanceof RouterResource) && $method !== null) {
+            $url .= $method;
         }
 
-        if($route instanceof RouterController || $route instanceof RouterRessource) {
+        if($route instanceof RouterController || $route instanceof RouterResource) {
             if(count($parameters)) {
                 $url .= join('/', $parameters);
             }
@@ -180,18 +198,17 @@ class RouterBase {
                 $i = 0;
                 foreach($params as $param => $value) {
                     $value = (isset($parameters[$param])) ? $parameters[$param] : $value;
-                    $url = str_ireplace('{' . $param. '}', $value, $route->getUrl());
+                    $url = str_ireplace('{' . $param. '}', $value, $url);
                     $i++;
                 }
             }
         }
 
-        $p = '';
-        if($getParams !== null && count($getParams)) {
-            $p = '?'.Url::arrayToParams($getParams);
-        }
+        $url = rtrim($url, '/') . '/';
 
-        $url .= $p;
+        if($getParams !== null && count($getParams)) {
+            $url .= '?'.Url::arrayToParams($getParams);
+        }
 
         return $url;
     }
@@ -206,38 +223,39 @@ class RouterBase {
             throw new \InvalidArgumentException('Invalid type for getParams. Must be array or null');
         }
 
+        if($controller === null && $parameters === null) {
+            return $this->processUrl($this->loadedRoute, null, $getParams);
+        }
+
         $c = '';
         $method = null;
 
         /* @var $route RouterRoute */
         foreach($this->controllerUrlMap as $route) {
 
+            // Check an alias exist, if the matches - use it
+            if($route instanceof RouterRoute && strtolower($route->getAlias()) === strtolower($controller)) {
+                return $this->processUrl($route, $route->getMethod(), $parameters, $getParams);
+            }
+
             if($route instanceof RouterRoute && !is_callable($route->getCallback()) && stripos($route->getCallback(), '@') !== false) {
                 $c = $route->getCallback();
-            } else if($route instanceof RouterController || $route instanceof RouterRessource) {
+            } else if($route instanceof RouterController || $route instanceof RouterResource) {
                 $c = $route->getController();
             }
 
             if($c === $controller || strpos($c, $controller) === 0) {
-                if(stripos($c, '@') !== false) {
-                    $tmp = explode('@', $route->getCallback());
-                    $method = strtolower($tmp[1]);
-                }
-                return $this->processUrl($route, $method, $parameters, $getParams);
+                return $this->processUrl($route, $route->getMethod(), $parameters, $getParams);
             }
         }
 
+        $c = '';
+
         // No match has yet been found, let's try to guess what url that should be returned
         foreach($this->controllerUrlMap as $route) {
             if($route instanceof RouterRoute && !is_callable($route->getCallback()) && stripos($route->getCallback(), '@') !== false) {
-                $c = $route->getCallback();
-
-                if(stripos($controller, '@') !== false) {
-                    $tmp = explode('@', $controller);
-                    $c = $tmp[0];
-                }
-
-            } else if($route instanceof RouterController || $route instanceof RouterRessource) {
+                $c = $route->getClass();
+            } else if($route instanceof RouterController || $route instanceof RouterResource) {
                 $c = $route->getController();
             }
 
@@ -247,20 +265,19 @@ class RouterBase {
                 $method = $tmp[1];
             }
 
-            if($controller == $c) {
+            if($controller === $c) {
                 return $this->processUrl($route, $method, $parameters, $getParams);
             }
         }
 
-        // Nothing found - return current route
-        if($this->loadedRoute) {
-            $getParams = ($getParams === null) ? array() : $getParams;
-            $params = ($this->loadedRoute->getParameters() == null) ? array() : $this->loadedRoute->getParameters();
-            $parameters = ($parameters === null) ? array() : $parameters;
-            return $this->processUrl($this->loadedRoute, null, array_merge($params, $parameters), array_merge($_GET, $getParams));
+        $controller = ($controller === null) ? '/' : $controller;
+        $url = array($controller);
+
+        if(is_array($parameters)) {
+            ArrayUtil::append($url, $parameters);
         }
 
-        return '/';
+        return join('/', $url);
     }
 
     public static function getInstance() {

src/Pecee/SimpleRouter/RouterController.php

@@ -1,6 +1,8 @@
 <?php
 namespace Pecee\SimpleRouter;
 
+use Pecee\Http\Request;
+
 class RouterController extends RouterEntry {
 
     const DEFAULT_METHOD = 'index';
@@ -15,10 +17,9 @@ class RouterController extends RouterEntry {
         $this->controller = $controller;
     }
 
-    public function matchRoute($requestMethod, $url) {
-
-        $url = parse_url($url);
-        $url = $url['path'];
+    public function matchRoute(Request $request) {
+        $url = parse_url($request->getUri());
+        $url = rtrim($url['path'], '/') . '/';
 
         if(strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {
 

src/Pecee/SimpleRouter/RouterEntry.php

@@ -2,6 +2,9 @@
 
 namespace Pecee\SimpleRouter;
 
+use Pecee\Http\Middleware\Middleware;
+use Pecee\Http\Request;
+
 abstract class RouterEntry {
 
     const REQUEST_TYPE_POST = 'post';
@@ -19,18 +22,14 @@ abstract class RouterEntry {
     protected $settings;
     protected $callback;
     protected $parameters;
+    protected $parametersRegex;
+    protected $regexMatch;
 
     public function __construct() {
         $this->settings = array();
+        $this->settings['requestMethods'] = array();
         $this->parameters = array();
-    }
-
-    protected function loadClass($name) {
-        if(!class_exists($name)) {
-            throw new RouterException(sprintf('Class %s does not exist', $name));
-        }
-
-        return new $name();
+        $this->parametersRegex = array();
     }
 
     /**
@@ -63,20 +62,20 @@ abstract class RouterEntry {
         return $this->callback;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getParameters(){
-        return $this->parameters;
+    public function getMethod() {
+        if(strpos($this->callback, '@') !== false) {
+            $tmp = explode('@', $this->callback);
+            return $tmp[1];
+        }
+        return null;
     }
 
-    /**
-     * @param mixed $parameters
-     * @return self
-     */
-    public function setParameters($parameters) {
-        $this->parameters = $parameters;
-        return $this;
+    public function getClass() {
+        if(strpos($this->callback, '@') !== false) {
+            $tmp = explode('@', $this->callback);
+            return $tmp[0];
+        }
+        return null;
     }
 
     /**
@@ -134,6 +133,44 @@ abstract class RouterEntry {
         return $this->settings;
     }
 
+    /**
+     * @return mixed
+     */
+    public function getParameters(){
+        return $this->parameters;
+    }
+
+    /**
+     * @param mixed $parameters
+     * @return self
+     */
+    public function setParameters($parameters) {
+        $this->parameters = $parameters;
+        return $this;
+    }
+
+    /**
+     * Add regular expression parameter match
+     *
+     * @param array $options
+     * @return self
+     */
+    public function where(array $options) {
+        $this->parametersRegex = array_merge($this->parametersRegex, $options);
+        return $this;
+    }
+
+    /**
+     * Add regular expression match for url
+     *
+     * @param string $regex
+     * @return self
+     */
+    public function match($regex) {
+        $this->regexMatch = $regex;
+        return $this;
+    }
+
     /**
      * Get settings that are allowed to be inherited by child routes.
      *
@@ -157,8 +194,10 @@ abstract class RouterEntry {
      * @param array $settings
      * @return self
      */
-    public function addSettings(array $settings) {
-        array_merge($this->settings, $settings);
+    public function addSettings(array $settings = null) {
+        if(is_array($settings)) {
+            $this->settings = array_merge($this->settings, $settings);
+        }
         return $this;
     }
 
@@ -196,12 +235,30 @@ abstract class RouterEntry {
         $this->settings[$name] = $value;
     }
 
-    public function renderRoute($requestMethod) {
-        // Load middleware
-        if($this->getMiddleware()) {
-            $this->loadClass($this->getMiddleware());
+    protected function loadClass($name) {
+        if(!class_exists($name)) {
+            throw new RouterException(sprintf('Class %s does not exist', $name));
         }
 
+        return new $name();
+    }
+
+    protected function loadMiddleware(Request $request) {
+        if($this->getMiddleware()) {
+            if (!($this->getMiddleware() instanceof Middleware)) {
+                throw new RouterException($this->getMiddleware() . ' must be instance of Middleware');
+            }
+
+            /* @var $class Middleware */
+            $class = $this->loadClass($this->getMiddleware());
+            $class->handle($request);
+        }
+    }
+
+    public function renderRoute(Request $request) {
+        // Load middleware
+        $this->loadMiddleware($request);
+
         if(is_object($this->getCallback()) && is_callable($this->getCallback())) {
 
             // When the callback is a function
@@ -210,8 +267,9 @@ abstract class RouterEntry {
             // When the callback is a method
             $controller = explode('@', $this->getCallback());
             $className = $this->getNamespace() . '\\' . $controller[0];
+
             $class = $this->loadClass($className);
-            $method = $requestMethod . ucfirst($controller[1]);
+            $method = $request->getMethod() . ucfirst($controller[1]);
 
             if (!method_exists($class, $method)) {
                 throw new RouterException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
@@ -225,6 +283,30 @@ abstract class RouterEntry {
         return null;
     }
 
-    abstract function matchRoute($requestMethod, $url);
+    /**
+     * Set allowed request methods
+     *
+     * @param array $methods
+     * @return self $this
+     */
+    public function setRequestMethods(array $methods) {
+        $this->settings['requestMethods'] = $methods;
+        return $this;
+    }
+
+    /**
+     * Get allowed requeset methods
+     *
+     * @return array
+     */
+    public function getRequestMethods() {
+        if(!isset($this->settings['requestMethods']) || isset($this->settings['requestMethods']) && !is_array($this->settings['requestMethods'])) {
+            $value = isset($this->settings['requestMethods']) ? $this->settings['requestMethods'] : null;
+            return array($value);
+        }
+        return $this->settings['requestMethods'];
+    }
+
+    abstract function matchRoute(Request $request);
 
 }

src/Pecee/SimpleRouter/RouterGroup.php

@@ -2,24 +2,26 @@
 
 namespace Pecee\SimpleRouter;
 
+use Pecee\Http\Request;
+
 class RouterGroup extends RouterEntry {
 
     public function __construct() {
         parent::__construct();
     }
 
-    public function matchRoute($requestMethod, $url) {
+    public function matchRoute(Request $request) {
         // Check if request method is allowed
 
-        if(strtolower($url) == strtolower($this->prefix) || stripos($url, $this->prefix) === 0) {
+        if(strtolower($request->getUri()) == strtolower($this->prefix) || stripos($request->getUri(), $this->prefix) === 0) {
 
             $hasAccess = (!$this->method);
 
             if($this->method) {
                 if(is_array($this->method)) {
-                    $hasAccess = (in_array($requestMethod, $this->method));
+                    $hasAccess = (in_array($request->getMethod(), $this->getRequestMethods()));
                 } else {
-                    $hasAccess = strtolower($this->method) == strtolower($requestMethod);
+                    $hasAccess = strtolower($this->getRequestMethods()) == strtolower($request->getMethod());
                 }
             }
 

src/Pecee/SimpleRouter/RouterResource.php

@@ -1,7 +1,9 @@
 <?php
 namespace Pecee\SimpleRouter;
 
-class RouterRessource extends RouterEntry {
+use Pecee\Http\Request;
+
+class RouterResource extends RouterEntry {
 
     const DEFAULT_METHOD = 'index';
 
@@ -17,11 +19,9 @@ class RouterRessource extends RouterEntry {
         $this->postMethod = strtolower(($_SERVER['REQUEST_METHOD'] != 'GET') ? 'post' : 'get');
     }
 
-    public function renderRoute($requestMethod) {
+    public function renderRoute(Request $request) {
         // Load middleware
-        if($this->getMiddleware()) {
-            $this->loadClass($this->getMiddleware());
-        }
+        $this->loadMiddleware($request);
 
         if(is_object($this->getCallback()) && is_callable($this->getCallback())) {
             // When the callback is a function
@@ -51,9 +51,9 @@ class RouterRessource extends RouterEntry {
         return $this;
     }
 
-    public function matchRoute($requestMethod, $url) {
-        $url = parse_url($url);
-        $url = $url['path'];
+    public function matchRoute(Request $request) {
+        $url = parse_url($request->getUri());
+        $url = rtrim($url['path'], '/') . '/';
 
         if(strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {
             $url = rtrim($url, '/');
@@ -72,12 +72,12 @@ class RouterRessource extends RouterEntry {
             if (count($path)) {
 
                 // Delete
-                if($requestMethod === self::REQUEST_TYPE_DELETE && $this->postMethod === self::REQUEST_TYPE_POST) {
+                if($request->getMethod() === self::REQUEST_TYPE_DELETE && $this->postMethod === self::REQUEST_TYPE_POST) {
                     return $this->call('destroy', $args);
                 }
 
                 // Update
-                if(in_array($requestMethod, array('put', 'patch')) && $this->postMethod === self::REQUEST_TYPE_POST) {
+                if(in_array($request->getMethod(), array('put', 'patch')) && $this->postMethod === self::REQUEST_TYPE_POST) {
                     return $this->call('update', array_merge(array($action), $args));
                 }
 
@@ -87,7 +87,7 @@ class RouterRessource extends RouterEntry {
                 }
 
                 // Create
-                if(strtolower($action) === 'create' && $requestMethod === self::REQUEST_TYPE_GET) {
+                if(strtolower($action) === 'create' && $request->getMethod() === self::REQUEST_TYPE_GET) {
                     return $this->call('create', $args);
                 }
 

src/Pecee/SimpleRouter/RouterRoute.php

@@ -2,13 +2,13 @@
 
 namespace Pecee\SimpleRouter;
 
-use Pecee\Registry;
-use Pecee\Router;
+use Pecee\Http\Request;
 
 class RouterRoute extends RouterEntry {
 
+    const PARAMETERS_REGEX_MATCH = '{([A-Za-z\-\_]*?)}';
+
     protected $url;
-    protected $requestTypes;
 
     public function __construct($url, $callback) {
         parent::__construct();
@@ -16,13 +16,16 @@ class RouterRoute extends RouterEntry {
         $this->setCallback($callback);
 
         $this->settings['aliases'] = array();
-        $this->requestTypes = array();
     }
 
-    protected function parseParameters($url) {
+    protected function parseParameters($url, $multiple = false, $regex = self::PARAMETERS_REGEX_MATCH) {
         $parameters = array();
 
-        preg_match_all('/{([A-Za-z\-\_]*?)}/is', $url, $parameters);
+        if($multiple) {
+            preg_match_all('/'.$regex.'/is', $url, $parameters);
+        } else {
+            preg_match('/'.$regex.'/is', $url, $parameters);
+        }
 
         if(isset($parameters[1]) && count($parameters[1]) > 0) {
             return $parameters[1];
@@ -31,58 +34,72 @@ class RouterRoute extends RouterEntry {
         return null;
     }
 
-    protected function parseParameter($path) {
-        $parameters = array();
-
-        preg_match('/{([A-Za-z\-\_]*?)}/is', $path, $parameters);
-
-        if(isset($parameters[1]) && count($parameters[1]) > 0) {
-            return $parameters[1];
-        }
-
-        return null;
-    }
-
-    public function matchRoute($requestMethod, $url) {
+    public function matchRoute(Request $request) {
 
         // Check if request method is allowed
-        if(count($this->requestTypes) === 0 || in_array($requestMethod, $this->requestTypes)) {
 
-            $url = parse_url($url);
-            $url = $url['path'];
+        $url = parse_url($request->getUri());
+        $url = $url['path'];
 
-            $url = explode('/', trim($url, '/'));
-            $route = explode('/', trim($this->url, '/'));
+        $route = $this->url;
 
-            // Check if url parameter count matches
-            if(count($url) === count($route)) {
+        $routeMatch = preg_replace('/'.self::PARAMETERS_REGEX_MATCH.'/is', '', $route);
+
+        // Check if url parameter count matches
+        if(stripos($url, $routeMatch) === 0) {
+
+            $matches = true;
+
+            if($this->regexMatch) {
+                $parameters = $this->parseParameters($url, true, $this->regexMatch);
+
+                // If regex doesn't match, make sure to return an array
+                if(!is_array($parameters)) {
+                    $parameters = array();
+                }
+
+            } else {
+
+                $url = explode('/', $url);
+                $route = explode('/', $route);
 
                 $parameters = array();
 
-                $matches = true;
-
                 // Check if url matches
-                foreach($route as $i => $path) {
-                    $parameter = $this->parseParameter($path);
+                foreach ($route as $i => $path) {
+                    $parameter = $this->parseParameters($path, false);
 
                     // Check if parameter of path matches, otherwise quit..
-                    if(is_null($parameter) && strtolower($path) != strtolower($url[$i])) {
+                    if (is_null($parameter) && strtolower($path) != strtolower($url[$i])) {
                         $matches = false;
                         break;
                     }
 
                     // Save parameter if we have one
-                    if($parameter) {
-                        $parameters[$parameter] = $url[$i];
+                    if ($parameter) {
+                        $parameterValue = $url[$i];
+                        $regex = (isset($this->parametersRegex[$parameter]) ? $this->parametersRegex[$parameter] : null);
+
+                        if ($regex !== null) {
+                            // Use the regular expression rule provided to filter the value
+                            $matches = array();
+                            preg_match('/' . $regex . '/is', $url[$i], $matches);
+
+                            if (count($matches)) {
+                                $parameterValue = $matches[0];
+                            }
+                        }
+
+                        // Add parameter value
+                        $parameters[$parameter] = $parameterValue;
                     }
                 }
+            }
 
-                // This route matches
-                if($matches) {
-                    $this->parameters = $parameters;
-                    return $this;
-                }
-
+            // This route matches
+            if($matches) {
+                $this->parameters = $parameters;
+                return $this;
             }
         }
 
@@ -103,7 +120,7 @@ class RouterRoute extends RouterEntry {
      */
     public function setUrl($url) {
 
-        $parameters = $this->parseParameters($url);
+        $parameters = $this->parseParameters($url, true);
 
         if($parameters !== null) {
             foreach($parameters as $param) {
@@ -116,49 +133,32 @@ class RouterRoute extends RouterEntry {
     }
 
     /**
-     * @param array $aliases
-     * @return self
+     * Get alias for the url which can be used when getting the url route.
+     * @return string
      */
-    public function setAliases(array $aliases) {
-        $this->aliases = $aliases;
-        return $this;
+    public function getAlias(){
+        return $this->alias;
     }
 
     /**
-     * Add alias
-     *
-     * @param $alias
+     * Set the url alias for easier getting the url route.
+     * @param string $alias
      * @return self
      */
-    public function addAlias($alias) {
-        $this->aliases[] = $alias;
+    public function setAlias($alias){
+        $this->alias = $alias;
         return $this;
     }
 
-    public function getAliases() {
-        $this->aliases;
-    }
+    public function setSettings($settings) {
 
-    /**
-     * Add request type
-     *
-     * @param $type
-     * @return self
-     * @throws RouterException
-     */
-    public function addRequestType($type) {
-        if(!in_array($type, self::$allowedRequestTypes)) {
-            throw new RouterException('Invalid request method: ' . $type);
+        // Change as to alias
+        if(isset($settings{'as'})) {
+            $this->setAlias($settings['as']);
         }
 
-        $this->requestTypes[] = $type;
-        return $this;
+        return parent::setSettings($settings);
     }
 
-    /**
-     * @return mixed
-     */
-    public function getRequestTypes() {
-        return $this->requestTypes;
-    }
+
 }

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -17,9 +17,10 @@ class SimpleRouter {
         $router->routeRequest();
     }
 
-    public static function get($url, $callback) {
+    public static function get($url, $callback, array $settings = null) {
         $route = new RouterRoute($url, $callback);
-        $route->addRequestType(RouterRoute::REQUEST_TYPE_GET);
+        $route->addSettings($settings);
+        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_GET));
 
         $router = RouterBase::getInstance();
         $router->addRoute($route);
@@ -27,9 +28,10 @@ class SimpleRouter {
         return $route;
     }
 
-    public static function post($url, $callback) {
+    public static function post($url, $callback, array $settings = null) {
         $route = new RouterRoute($url, $callback);
-        $route->addRequestType(RouterRoute::REQUEST_TYPE_POST);
+        $route->addSettings($settings);
+        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_POST));
 
         $router = RouterBase::getInstance();
         $router->addRoute($route);
@@ -37,9 +39,10 @@ class SimpleRouter {
         return $route;
     }
 
-    public static function put($url, $callback) {
+    public static function put($url, $callback, array $settings = null) {
         $route = new RouterRoute($url, $callback);
-        $route->addRequestType(RouterRoute::REQUEST_TYPE_PUT);
+        $route->addSettings($settings);
+        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_PUT));
 
         $router = RouterBase::getInstance();
         $router->addRoute($route);
@@ -47,9 +50,10 @@ class SimpleRouter {
         return $route;
     }
 
-    public static function delete($url, $callback) {
+    public static function delete($url, $callback, array $settings = null) {
         $route = new RouterRoute($url, $callback);
-        $route->addRequestType(RouterRoute::REQUEST_TYPE_DELETE);
+        $route->addSettings($settings);
+        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_DELETE));
 
         $router = RouterBase::getInstance();
         $router->addRoute($route);
@@ -71,11 +75,10 @@ class SimpleRouter {
         return $group;
     }
 
-    public static function match(array $requestTypes, $url, $callback) {
+    public static function match(array $requestMethods, $url, $callback, array $settings = null) {
         $route = new RouterRoute($url, $callback);
-        foreach($requestTypes as $requestType) {
-            $route->addRequestType($requestType);
-        }
+        $route->setRequestMethods($requestMethods);
+        $route->addSettings($settings);
 
         $router = RouterBase::getInstance();
         $router->addRoute($route);
@@ -83,24 +86,27 @@ class SimpleRouter {
         return $route;
     }
 
-    public static function all($url, $callback) {
+    public static function all($url, $callback, array $settings = null) {
         $route = new RouterRoute($url, $callback);
+        $route->addSettings($settings);
         $router = RouterBase::getInstance();
         $router->addRoute($route);
 
         return $route;
     }
 
-    public static function controller($url, $controller) {
+    public static function controller($url, $controller, array $settings = null) {
         $route = new RouterController($url, $controller);
+        $route->addSettings($settings);
         $router = RouterBase::getInstance();
         $router->addRoute($route);
 
         return $route;
     }
 
-    public static function ressource($url, $controller) {
-        $route = new RouterRessource($url, $controller);
+    public static function resource($url, $controller, array $settings = null) {
+        $route = new RouterResource($url, $controller);
+        $route->addSettings($settings);
         $router = RouterBase::getInstance();
         $router->addRoute($route);