Merge pull request #149 from skipperbent/v2-development

Updated documentation
2026-06-17 16:57:53 +00:00 · 2016-11-17 17:33:49 +02:00 · 2016-11-17 16:33:27 +01:00 · 2016-11-17 17:25:30 +02:00 · 2016-11-17 16:24:24 +01:00 · 2016-11-17 15:17:27 +01:00
48 changed files with 2844 additions and 764 deletions
@@ -1,2 +1,4 @@
 .idea
-composer.lock
+composer.lock
+vendor/
+demo-project/vendor
@@ -1,29 +1,44 @@
 # Simple PHP router
-Simple, fast PHP router that is easy to get integrated and in almost any project. Heavily inspired by the Laravel router.
+Simple, fast and yet powerful PHP router that is easy to get integrated and in any project. Heavily inspired by the way Laravel handles routing, with both simplicity and expandability in mind.

 ## Installation
-Add the latest version pf Simple PHP Router to your ```composer.json```
+Add the latest version of Simple PHP Router running this command.

-```json
-{
-    "require": {
-        "pecee/simple-php-router": "1.*"
-    },
-    "require-dev": {
-        "pecee/simple-php-router": "1.*"
-    }
-}
 ```
+composer require pecee/simple-router
+```
+
+## Requirements
+
+- PHP 5.4 or greater

 ## Notes

-### Features currently "in-the-works"
+The goal of this project is to create a router that is 100% compatible with the Laravel documentation, but as simple as possible and as easy to integrate and change as possible.

- Global Constraints
- Named Routes
- Sub-Domain Routing
- CSRF Protection
- Optional/required parameters
+### Features
+
+- Basic routing (`GET`, `POST`, `PUT`, `DELETE`) with support for custom multiple verbs.
+- Regular Expression Constraints for parameters.
+- Named routes.
+- Generating url to routes.
+- Route groups.
+- Middleware (classes that intercepts before the route is rendered).
+- Namespaces.
+- Route prefixes.
+- CSRF protection.
+- Optional parameters
+- Sub-domain routing
+- Custom boot managers to redirect urls to other routes
+- Input manager; to manage `GET`, `POST` params.
+
+## Installation and demo
+
+We've included a simple demo project for the router which can be found in the `demo-project` folder.
+
+Please refer to the demo-project documentation for further reading on how to setup and install simple-php-router:
+
+[Link to demo documentation](demo-project/README.md)

 ## Initialising the router

@@ -32,15 +47,20 @@ In your ```index.php``` require your ```routes.php``` and call the ```routeReque
 This is an example of a basic ```index.php``` file:

 ```php
-use \Pecee\SimpleRouter;
+use \Pecee\SimpleRouter\SimpleRouter;

-require_once 'routes.php'; // change this to whatever makes sense in your project
+// Load external routes file
+require_once 'routes.php';

-// The apps default namespace (so we don't have to specify it each time we use MyController@home)
-$defaultControllerNamespace = 'MyWebsite\\Controller';
+/* 
+ * The default namespace for route-callbacks, so we don't have to specify it each time.
+ * Can be overwritten by using the namespace config option.
+ */
+ 
+SimpleRouter::setDefaultNamespace('MyWebsite\Controller');

-// Do the routing
-SimpleRouter::init($defaultControllerNamespace);
+// Start the routing
+SimpleRouter::start();
 ```

 ## Adding routes
@@ -49,6 +69,9 @@ This router is heavily inspired by the Laravel 5.* router, so anything you find

 ### Basic example

+- ExceptionsHandlers must implement the `IExceptionHandler` interface.
+- Middlewares must implement the `IMiddleware` interface.
+
 ```php
 use Pecee\SimpleRouter\SimpleRouter;

@@ -60,20 +83,27 @@ use Pecee\SimpleRouter\SimpleRouter;
 * the request, for instance if a user is not authenticated.
 */

-SimpleRouter::group(['prefix' => 'v1', 'middleware' => '\MyWebsite\Middleware\SomeMiddlewareClass'], function() {
+// Add CSRF support (if needed)
+SimpleRouter::csrfVerifier(new \Pecee\Http\Middleware\BaseCsrfVerifier());

-    SimpleRouter::group(['prefix' => 'services'], function() {
+SimpleRouter::get('/page/404', 'ControllerPage@notFound', ['as' => 'page.notfound']);

-        SimpleRouter::get('/answers/{id}', 'ControllerAnswers@show')
-        ->where(['id' => '[0-9]+');
+SimpleRouter::group(['prefix' => '/v1', 'middleware' => '\MyWebsite\Middleware\SomeMiddlewareClass'], function() {
+
+    SimpleRouter::group(['prefix' => '/services', 'exceptionHandler' => '\MyProject\Handler\CustomExceptionHandler'], function() {
+
+        SimpleRouter::get('/answers/{id}', 'ControllerAnswers@show')->where(['id' => '[0-9]+');
+
+        // Optional parameter
+        SimpleRouter::get('/answers/{id?}', 'ControllerAnswers@show');

        /**
         * This example will route url when matching the regular expression to the method.
-         * For example route: /ajax/music/world -> ControllerAjax@process (parameter: music/world)
+         * For example route: domain.com/ajax/music/world -> ControllerAjax@process (parameter: music/world)
         */
-        SimpleRouter::all('/ajax', 'ControllerAjax@process')->match('ajax\\/([A-Za-z0-9\\/]+)');
+        SimpleRouter::all('/ajax', 'ControllerAjax@process')->match('.*?\\/ajax\\/([A-Za-z0-9\\/]+)');

-        // Resetful resource
+        // Restful resource
        SimpleRouter::resource('/rest', 'ControllerRessource');

        // Load the entire controller (where url matches method names - getIndex(), postIndex() etc)
@@ -88,6 +118,58 @@ SimpleRouter::group(['prefix' => 'v1', 'middleware' => '\MyWebsite\Middleware\So
 });
 ```

+#### ExceptionHandler example
+
+This is a basic example of an ExceptionHandler implementation:
+
+```php
+namespace Demo\Handlers;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+class CustomExceptionHandler implements IExceptionHandler {
+
+    public function handleError( Request $request, RouterEntry $router = null, \Exception $error) {
+
+        // If the error-code is 404; show another route which contains the page-not-found
+        if($error->getCode() === 404) {
+        
+            // Throw your custom 404-page view
+            // - or -
+            // load another route with our 404 page
+            // - or -
+            // you can return the $request object to ignore the error and continue on rendering the route.
+            
+            return $request->setUri(url('page.notfound'));
+        }
+
+        // Output error as json if on api path.
+        if(stripos($request->getUri(), '/api') !== false) {
+            response()->json(['error' => $error->getMessage()]);
+        }
+
+        // Otherwise default exception will be thrown by the router.
+
+    }
+
+}
+```
+
+### Sub-domain routing
+
+Route groups may also be used to route wildcard sub-domains. Sub-domains may be assigned route parameters just like route URIs, allowing you to capture a portion of the sub-domain for usage in your route or controller. The sub-domain may be specified using the ```domain``` key on the group attribute array:
+
+```php
+Route::group(['domain' => '{account}.myapp.com'], function () {
+    Route::get('user/{id}', function ($account, $id) {
+        //
+    });
+});
+```
+
+The prefix group array attribute may be used to prefix each route in the group with a given URI. For example, you may want to prefix all route URIs within the group with admin:
+
 ### 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.
@@ -116,72 +198,301 @@ This is a simple example of an integration into a framework.
 The framework has it's own ```Router``` class which inherits from the ```SimpleRouter``` class. This allows the framework to add custom functionality.

 ```php
-namespace MyProject;
+namespace Demo;

-use Pecee\Handler\ExceptionHandler;
 use Pecee\SimpleRouter\SimpleRouter;

 class Router extends SimpleRouter {

-    protected static $exceptionHandlers = array();
-
    public static function start() {

-        Debug::getInstance()->add('Router initialised.');
+        // change this to whatever makes sense in your project
+        require_once 'routes.php';
+        
+        // change default namespace for all routes
+        parent::setDefaultNamespace('\Demo\Controllers');

-        // Load routes.php
-        $file = $_ENV['basePath'] . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'routes.php';
-        if(file_exists($file)) {
-            require_once $file;
-        }
+        // Do initial stuff
+        parent::start();

-        // Init locale settings
-        Locale::getInstance();
-
-        // Set default namespace
-        $defaultNamespace = '\\'.Registry::getInstance()->get('AppName') . '\\Controller';
-
-        // Handle exceptions
-        try {
-            parent::start($defaultNamespace);
-        } catch(\Exception $e) {
-            /* @var $handler ExceptionHandler */
-            foreach(self::$exceptionHandlers as $handler) {
-                $class = new $handler();
-                $class->handleError($e);
-            }
-
-            throw $e;
-        }
-    }
-
-    public static function addExceptionHandler($handler) {
-        self::$exceptionHandlers[] = $handler;
    }

 }
 ```

-This is a basic example of a helper function for generating urls.
+## Helper functions
+
+To simplify to use of simple-router functionality, we recommend you add these helper functions to your project.

 ```php
-use Pecee\SimpleRouter\RouterBase;
+use Pecee\SimpleRouter\SimpleRouter;
+
 function url($controller, $parameters = null, $getParams = null) {
-    RouterBase::getInstance()->getRoute($controller, $parameters, $getParams);
+    SimpleRouter::getRoute($controller, $parameters, $getParams);
+}
+
+/**
+ * Get current csrf-token
+ * @return null|string
+ */
+function csrf_token() {
+    $token = new \Pecee\CsrfToken();
+    return $token->getToken();
+}
+
+/**
+ * Get request object
+ * @return \Pecee\Http\Request
+ */
+function request() {
+    return SimpleRouter::request();
+}
+
+/**
+ * Get response object
+ * @return \Pecee\Http\Response
+ */
+function response() {
+    return SimpleRouter::response();
+}
+
+/**
+ * Get input class
+ * @return \Pecee\Http\Input\Input
+ */
+function input() {
+    return SimpleRouter::request()->getInput();
 }
 ```

-In ```routes.php``` we have added this route:
+## Getting urls

-```SimpleRouter::get('/item/{id}', 'myController@show');```
+**In ```routes.php``` we have added this route:**

-In the template we then call:
+```php
+SimpleRouter::get('/item/{id}', 'myController@show', ['as' => 'item']);
+```

-```url('myController@show', ['id' => 22], ['category' => 'shoes']);```
+**In the template we then call:**

-Result url is:
+```php
+url('item', ['id' => 22], ['category' => 'shoes']);
+```

-```/item/22?category=shoes ```
+**Result url is:**
+
+```php
+/item/22/?category=shoes
+```
+
+## Custom CSRF verifier
+
+Create a new class and extend the ```BaseCsrfVerifier``` middleware class provided with simple-php-router.
+
+Add the property ```except``` with an array of the urls to the routes you would like to exclude from the CSRF validation. Using ```*``` at the end for the url will match the entire url.
+
+Querystrings are ignored.
+
+```php
+use Pecee\Http\Middleware\BaseCsrfVerifier;
+
+class CsrfVerifier extends BaseCsrfVerifier {
+
+    protected $except = [
+        '/companies/*', 
+        '/api'
+    ];
+
+}
+```
+
+Register the new class in your ```routes.php```, custom ```Router``` class or wherever you register your routes.
+
+```php
+SimpleRouter::csrfVerifier(new \Demo\Middleware\CsrfVerifier());
+```
+
+## Using router bootmanager to make custom rewrite rules
+
+Sometimes it can be necessary to keep urls stored in the database, file or similar. In this example, we want the url ```/my-cat-is-beatiful``` to load the route ```/article/view/1``` which the router knows, because it's defined in the ```routes.php``` file.
+
+To interfere with the router, we create a class that inherits from ```RouterBootManager```. This class will be loaded before any other rules in ```routes.php``` and allow us to "change" the current route, if any of our criteria are fulfilled (like coming from the url ```/my-cat-is-beatiful```).
+
+```php
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterBootManager;
+
+class CustomRouterRules extends RouterBootManager{
+
+    public function boot(Request $request) {
+
+        $rewriteRules = [
+            '/my-cat-is-beatiful' => '/article/view/1',
+            '/horses-are-great' => '/article/view/2'
+        ];
+
+        foreach($rewriteRules as $url => $rule) {
+
+            // If the current uri matches the url, we use our custom route
+
+            if($request->getUri() === $url) {
+                $request->setUri($rule);
+            }
+        }
+
+        return $request;
+    }
+
+}
+
+```
+
+The above should be pretty self-explanatory and can easily be changed to loop through urls store in the database, file or cache.
+
+What happens is that if the current route matches the route defined in the index of our ```$rewriteRules``` array, we set the route to the array value instead.
+
+By doing this the route will now load the url ```/article/view/1``` instead of ```/my-cat-is-beatiful```.
+
+The last thing we need to do, is to add our custom boot-manager to the ```routes.php``` file. You can create as many bootmanagers as you like and easily add them in your ```routes.php``` file.
+
+## Easily overwrite route about to be loaded
+Sometimes it can be useful to manipulate the route about to be loaded. 
+simple-php-router allows you to easily change the route about to be executed. 
+All information about the current route is stored in the ```\Pecee\SimpleRouter\RouterBase``` instance's `loadedRoute` property. 
+
+For easy access you can use the shortcut method `\Pecee\SimpleRouter\SimpleRouter::router()`.
+
+
+```php
+use Pecee\SimpleRouter;
+$route = SimpleRouter::router()->getLoadedRoute();
+
+$route->setCallback('Example\MyCustomClass@hello');
+
+// -- or you can rewrite by doing --
+
+$route->setClass('Example\MyCustomClass');
+$route->setMethod('hello');
+```
+
+
+### Examples
+
+It's only possible to change the route BEFORE the route has initially been loaded. If you want to redirect to another route, we highly recommend that you 
+modify the `RouterEntry` object from a `Middleware` or `ExceptionHandler`, like the examples below.
+
+#### Rewriting to new route
+
+The example below will cause the router to re-route the request with another url. We are using the `url()` helper function to get the uri to another route added in the `routes.php` file.
+
+**NOTE: Use this method if you want to fully load another route using it's settings (request method etc).**
+
+
+```php
+namespace demo\Middlewares;
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+class CustomMiddleware implements Middleware {
+
+    public function handle(Request $request, RouterEntry &$route) {
+        $request->setUri(url('home'));
+    }
+    
+}
+
+```
+
+#### Changing callback
+You can also change the callback by modifying the `$route` parameter. This is perfect if you just want to display a view quickly - or change the callback depending
+on some criteria's for the request.
+
+The callback below will fire immediately after the `Middleware` or `ExceptionHandler` has been loaded, as they are loaded before the route is rendered.
+If you wish to change the callback from outside, please have this in mind.
+
+**NOTE: Use this method if you want to load another controller. No additional middlewares or rules will be loaded.**
+
+```php
+namespace demo\Middlewares;
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+class CustomMiddleware implements Middleware {
+
+    public function handle(Request $request, RouterEntry &$route) { 
+        $route->callback('DefaultController@home');
+    }
+    
+}
+```
+
+## Using the Input class to manage parameters
+
+We've added the `Input` class to easy access parameters from your Controller-classes.
+
+**Return single parameter value (matches both GET, POST, FILE):**
+```php
+$value = input()->get('name');
+```
+
+**Return parameter object (matches both GET, POST, FILE):**
+```php
+$object = input()->getObject('name');
+```
+
+**Return specific GET parameter (where name is the name of your parameter):**
+```php
+$object = input()->get->name;
+$object = input()->post->name;
+$object = input()->file->name;
+```
+
+**Return all parameters:**
+```php
+// Get all
+$values = input()->all();
+
+// Only match certain keys
+$values = input()->all([
+    'company_name',
+    'user_id'
+]);
+```
+
+All object inherits from `InputItem` class and will always contain these methods:
+- `getValue()` - returns the value of the input.
+- `getIndex()` - returns the index/key of the input.
+- `getName()` - returns a human friendly name for the input (company_name will be Company Name etc).
+
+`InputFile` has the same methods as above along with some other file-specific methods like:
+- `getTmpName()` - get file temporary name.
+- `getSize()` - get file size.
+- `move($destination)` - move file to destination.
+- `getContents()` - get file content.
+- `getType()` - get mime-type for file.
+- `getError()` - get file upload error.
+
+
+### Easy access to methods
+
+Below example requires you to have the helper functions added. Please refer to the helper functions section in the documentation.
+
+```php
+// Get parameter site_id or default-value 2
+$siteId = input()->get('site_id', 2);
+```
+
+## Sites
+This is some sites that uses the simple-router project in production.
+
+- [holla.dk](http://www.holla.dk)
+- [ninjaimg.com](http://ninjaimg.com)
+- [bookandbegin.com](https://bookandbegin.com)
+- [dscuz.com](https://www.dscuz.com)

 ## Documentation
 While I work on a better documentation, please refer to the Laravel 5 routing documentation here:
@@ -191,9 +502,12 @@ http://laravel.com/docs/5.1/routing
 ## Easily extendable
 The router can be easily extended to customize your needs.

+## Ideas and issues
+If you want a great new feature or experience any issues what-so-ever, please feel free to leave an issue and i'll look into it whenever possible.
+
 ## The MIT License (MIT)

-Copyright (c) 2015 Simon Sessing� / simple-php-router
+Copyright (c) 2016 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
@@ -211,4 +525,4 @@ 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.
+SOFTWARE.
@@ -13,14 +13,14 @@
        }
 	],
 	"require": {
-
+		"php": ">=5.4.0"
    },
    "require-dev": {
        "phpunit/phpunit": "4.7.7"
    },
    "autoload": {
        "psr-4": {
-            "Pecee\\": "src/"
+            "Pecee\\": "src/Pecee/"
        }
    }
 }
@@ -0,0 +1,100 @@
+# Simple PHP router demo project
+
+This project is here to give you a basic understanding of how to setup and using simple-php-router.
+
+Please note that this demo-project only covers how to integrate the `simple-php-router` in a project without a framework. If you are using some sort of PHP framework in your project the implementation might vary.
+
+**What we won't cover:**
+
+- How to setup a solution that fits your need. This is a basic demo to help you get started.
+- Understanding of MVC; including Controllers, Middlewares or ExceptionHandlers.
+- How to integrate into third party frameworks.
+
+**What we cover:**
+
+- How to get up and running fast - from scratch.
+- How to get ExceptionHandlers, Middlewares and Controllers working.
+- How to setup your webservers.
+
+## Installation
+
+- Navigate to the `demo-project` folder in terminal and run `composer update` to install the latest version.
+- Point your webserver to `demo-project/public`.
+
+### Setting up Nginx
+
+If you are using Nginx please make sure that url-rewriting is enabled.
+
+You can easily enable url-rewriting by adding the following configuration for the Nginx configuration-file for the demo-project.
+
+```
+location / {
+    try_files $uri $uri/ /index.php?$query_string;
+}
+```
+
+### Setting up Apache
+
+Nothing special is required for Apache to work. We've include the `.htaccess` file in the `public` folder. If rewriting is not working for you, please check that the `mod_rewrite` module (htaccess support) is enabled in the Apache configuration.
+
+## Folder structure
+
+| Folder        | Description |
+| ------------- |-------------|
+| app            |Contains projects-specific PHP classes|
+| public         |Public folder which are accessible through the web.|
+
+## Notes
+
+The demo project has it's own `Router` class implementation which extends the `SimpleRouter` class with further functionality. 
+This class can be useful adding additional functionality that are required before and after routing occurs or any extra functionality belonging to the router itself. 
+
+In this project we also use our custom router-class to autoload the `routes.php` file from our custom location (`app/routes.php`).
+
+Please check the `routes.php` file in `demo-project/app` for all the urls/rules available in the project.
+
+### CSRF-verifier
+
+For the purpose of this demo, we've added a custom CSRF-verifier middleware called `CsrfVerifier` and disabled CSRF checks for all calls to `/api/*`. This will ensure that CSRF form-checks are not applied when calling our demo api url.
+
+### Exception handlers
+
+The included `CustomExceptionHandler` class returns a very basic json response for errors received on calls to `/api/*` or otherwise just a simple formatted error response.
+
+### Middlewares
+
+`ApiVerification` class is added to all calls to `/api/*`. This simple class just adds some data to the `Request` object, which is returned in one of the methods in the `ApiController` class. We've added this class to demonstrate that you can use middlewares to ensure that the user has the correct authentication - before router loads the controller itself.
+
+### Urls
+
+Please see `routes.php` for all routes and rules.
+
+| URL        |
+| ------------- |
+| /             |
+| /api/demo       |
+| /companies       |
+| /companies/[id]  |
+| /contact         |
+
+## The MIT License (MIT)
+
+Copyright (c) 2016 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.
@@ -0,0 +1,20 @@
+<?php
+namespace Demo\Controllers;
+
+use Pecee\SimpleRouter\SimpleRouter;
+
+class ApiController {
+
+    public function index() {
+
+        // The variable authenticated is set to true in the ApiVerification middleware class.
+
+        header('content-type: application/json');
+
+        echo json_encode([
+            'authenticated' => request()->authenticated
+        ]);
+
+    }
+
+}
@@ -0,0 +1,29 @@
+<?php
+namespace Demo\Controllers;
+
+class DefaultController {
+
+    public function index() {
+
+        // implement
+        echo sprintf('DefaultController -> index (?fun=%s)', input()->get('fun'));
+
+    }
+
+    public function contact() {
+
+        echo 'DefaultController -> contact';
+
+    }
+
+    public function companies($id = null) {
+
+        echo 'DefaultController -> companies -> id: ' . $id;
+
+    }
+
+    public function notFound() {
+        echo 'Page not found';
+    }
+
+}
@@ -0,0 +1,34 @@
+<?php
+namespace Demo\Handlers;
+
+use Pecee\Handler\IExceptionHandler;
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+class CustomExceptionHandler implements IExceptionHandler {
+
+    public function handleError( Request $request, RouterEntry &$route = null, \Exception $error) {
+
+        // Return json errors if we encounter an error on /api.
+        if(stripos($request->getUri(), '/api') !== false) {
+            header('content-type: application/json');
+            echo json_encode([
+                'error' => $error->getMessage(),
+                'code' => $error->getCode()
+            ]);
+            die();
+        }
+
+        // else we just throw the error
+        if($error->getCode() == 404) {
+
+            // Return 404 path
+            $request->setUri('/404');
+            return $request;
+
+        }
+
+        throw $error;
+    }
+
+}
@@ -0,0 +1,19 @@
+<?php
+namespace Demo\Middlewares;
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+class ApiVerification implements IMiddleware {
+
+    public function handle(Request $request, RouterEntry &$route) {
+
+        // Do authentication
+        $request->authenticated = true;
+
+        return $request;
+
+    }
+
+}
@@ -0,0 +1,13 @@
+<?php
+namespace Demo\Middlewares;
+
+use Pecee\Http\Middleware\BaseCsrfVerifier;
+
+class CsrfVerifier extends BaseCsrfVerifier {
+
+    /**
+     * CSRF validation will be ignored on the following urls.
+     */
+    protected $except = ['/api/*'];
+
+}
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Custom router which handles default middlewares, default exceptions and things
+ * that should be happen before and after the router is initialised.
+ */
+
+namespace Demo;
+
+use Pecee\SimpleRouter\SimpleRouter;
+
+class Router extends SimpleRouter {
+
+    public static function start($defaultNamespace = null) {
+
+        // Load our helpers
+        require_once 'helpers.php';
+
+        // Load our custom routes
+        require_once 'routes.php';
+
+        parent::setDefaultNamespace('\Demo\Controllers');
+
+        // Do initial stuff
+        parent::start();
+
+    }
+
+}
@@ -0,0 +1,39 @@
+<?php
+use Pecee\SimpleRouter\SimpleRouter;
+
+function url($controller, $parameters = null, $getParams = null) {
+    SimpleRouter::getRoute($controller, $parameters, $getParams);
+}
+
+/**
+ * Get current csrf-token
+ * @return null|string
+ */
+function csrf_token() {
+    $token = new \Pecee\CsrfToken();
+    return $token->getToken();
+}
+
+/**
+ * Get request object
+ * @return \Pecee\Http\Request
+ */
+function request() {
+    return SimpleRouter::request();
+}
+
+/**
+ * Get response object
+ * @return \Pecee\Http\Response
+ */
+function response() {
+    return SimpleRouter::response();
+}
+
+/**
+ * Get input class
+ * @return \Pecee\Http\Input\Input
+ */
+function input() {
+    return SimpleRouter::request()->getInput();
+}
@@ -0,0 +1,23 @@
+<?php
+/**
+ * This file contains all the routes for the project
+ */
+
+use Demo\Router;
+
+Router::csrfVerifier(new \Demo\Middlewares\CsrfVerifier());
+
+Router::group(['exceptionHandler' => 'Demo\Handlers\CustomExceptionHandler'], function() {
+
+    Router::get('/', 'DefaultController@index')->setAlias('home');
+    Router::get('/contact', 'DefaultController@contact')->setAlias('contact');
+    Router::get('/404', 'DefaultController@notFound')->setAlias('404');
+    Router::basic('/companies', 'DefaultController@companies')->setAlias('companies');
+    Router::basic('/companies/{id}', 'DefaultController@companies')->setAlias('companies');
+
+    // Api
+    Router::group(['prefix' => '/api', 'middleware' => 'Demo\Middlewares\ApiVerification'], function() {
+        Router::resource('/demo', 'ApiController');
+    });
+
+});
@@ -0,0 +1,26 @@
+{
+ 	"name": "pecee/simple-router-demo",
+ 	"description": "Simple router demo project",
+ 	"keywords": [
+		"simple-router",
+		"php",
+		"php-simple-router"
+	],
+	"license": "MIT",
+	"type": "project",
+	"require": {
+		"php": ">=5.4.0",
+		"pecee/simple-router": "2.*"
+	},
+	"require-dev": {
+
+	},
+	"config": {
+		"preferred-install": "dist"
+	},
+    "autoload": {
+      "psr-4": {
+        "Demo\\": "app/"
+      }
+    }
+}
@@ -0,0 +1,5 @@
+RewriteEngine on
+RewriteCond %{SCRIPT_FILENAME} !-f
+RewriteCond %{SCRIPT_FILENAME} !-d
+RewriteCond %{SCRIPT_FILENAME} !-l
+RewriteRule ^(.*)$ index.php/$1
@@ -0,0 +1,7 @@
+<?php
+
+// load composer dependencies
+require '../vendor/autoload.php';
+
+// Start the routing
+\Demo\Router::start();
@@ -3,37 +3,15 @@ namespace Pecee;

 class CsrfToken {

-    const CSRF_KEY = 'csrf_token';
+    const CSRF_KEY = 'XSRF-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;
-    }
+    protected $token;

    /**
     * Generate random identifier for CSRF token
     * @return string
     */
-    public static function generate() {
+    public static function generateToken() {
        if (function_exists('mcrypt_create_iv')) {
            return bin2hex(mcrypt_create_iv(32, MCRYPT_DEV_URANDOM));
        }
@@ -47,28 +25,38 @@ class CsrfToken {
     * @return bool
     */
    public function validate($token) {
-        return hash_equals($token, $_SESSION[self::CSRF_KEY]);
+        if($token !== null && $this->getToken() !== null) {
+            return hash_equals($token, $this->getToken());
+        }
+        return false;
    }

    /**
+     * Set csrf token cookie
+     *
+     * @param $token
+     */
+    public function setToken($token) {
+        setcookie(static::CSRF_KEY, $token, time() + 60 * 120, '/');
+    }
+
+    /**
+     * Get csrf token
     * @return string|null
     */
-    public function getLastToken(){
-        return $this->lastToken;
+    public function getToken(){
+        if($this->hasToken()) {
+            return $_COOKIE[static::CSRF_KEY];
+        }
+        return null;
    }

    /**
-     * @param string|null $lastToken
+     * Returns whether the csrf token has been defined
+     * @return bool
     */
-    public function setLastToken($lastToken){
-        $this->lastToken = $lastToken;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getCurrentToken(){
-        return $this->currentToken;
+    public function hasToken() {
+        return isset($_COOKIE[static::CSRF_KEY]);
    }

 }
@@ -1,3 +1,4 @@
 <?php
-namespace Pecee\SimpleRouter;
+namespace Pecee\Exception;
+
 class RouterException extends \Exception { }
@@ -0,0 +1,4 @@
+<?php
+namespace Pecee\Exception;
+
+class TokenMismatchException extends \Exception {}
@@ -0,0 +1,17 @@
+<?php
+namespace Pecee\Handler;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+interface IExceptionHandler {
+
+    /**
+     * @param Request $request
+     * @param RouterEntry|null $route
+     * @param \Exception $error
+     * @return Request|null
+     */
+	public function handleError(Request $request, RouterEntry &$route = null, \Exception $error);
+
+}
@@ -0,0 +1,213 @@
+<?php
+namespace Pecee\Http\Input;
+
+use Pecee\Http\Request;
+
+class Input {
+
+    /**
+     * @var \Pecee\Http\Input\InputCollection
+     */
+    public $get;
+
+    /**
+     * @var \Pecee\Http\Input\InputCollection
+     */
+    public $post;
+
+    /**
+     * @var \Pecee\Http\Input\InputCollection
+     */
+    public $file;
+
+    /**
+     * @var Request
+     */
+    protected $request;
+
+    public function __construct(Request $request) {
+        $this->request = $request;
+        $this->setGet();
+        $this->setPost();
+        $this->setFile();
+    }
+
+    /**
+     * Get all get/post items
+     * @param array|null $filter Only take items in filter
+     * @return array
+     */
+    public function all(array $filter = null) {
+
+        $output = $_POST;
+
+        if($this->request->getMethod() === 'post') {
+
+            $contents = file_get_contents('php://input');
+
+            if (stripos(trim($contents), '{') === 0) {
+                $output = json_decode($contents, true);
+                if($output === false) {
+                    $output = array();
+                }
+            }
+        }
+
+        $output = array_merge($_GET, $output);
+
+        if($filter !== null) {
+            $output = array_filter($output, function ($key) use ($filter) {
+                if (in_array($key, $filter)) {
+                    return true;
+                }
+
+                return false;
+            }, ARRAY_FILTER_USE_KEY);
+        }
+
+        return $output;
+    }
+
+    public function getObject($index, $default = null) {
+        $key = (strpos($index, '[') > -1) ? substr($index, strpos($index, '[')+1, strpos($index, ']') - strlen($index)) : null;
+        $index = (strpos($index, '[') > -1) ? substr($index, 0, strpos($index, '[')) : $index;
+
+        $element = $this->get->findFirst($index);
+
+        if($element !== null) {
+            return ($key !== null) ? $element[$key] : $element;
+        }
+
+        if($this->request->getMethod() !== 'get') {
+
+            $element = $this->post->findFirst($index);
+
+            if ($element !== null) {
+                return ($key !== null) ? $element[$key] : $element;
+            }
+
+            $element = $this->file->findFirst($index);
+            if ($element !== null) {
+                return ($key !== null) ? $element[$key] : $element;
+            }
+        }
+
+        return $default;
+    }
+
+    /**
+     * Get input element value matching index
+     * @param string $index
+     * @param string|null $default
+     * @return string|null
+     */
+    public function get($index, $default = null) {
+
+        $item = $this->getObject($index);
+
+        if($item !== null) {
+
+            if($item instanceof InputCollection || $item instanceof InputFile) {
+                return $item;
+            }
+
+            return (trim($item->getValue()) === '') ? $default : $item->getValue();
+        }
+
+        return $default;
+    }
+
+    public function exists($index) {
+        return ($this->getObject($index) !== null);
+    }
+
+    public function setGet() {
+        $this->get = new InputCollection();
+
+        if(count($_GET)) {
+            foreach($_GET as $key => $get) {
+                if(!is_array($get)) {
+                    $this->get->{$key} = new InputItem($key, $get);
+                    continue;
+                }
+
+                $output = new InputCollection();
+
+                foreach($get as $k => $g) {
+                    $output->{$k} = new InputItem($k, $g);
+                }
+
+                $this->get->{$key} = $output;
+            }
+        }
+    }
+
+    public function setPost() {
+        $this->post = new InputCollection();
+
+        $postVars = $_POST;
+
+        if(in_array($this->request->getMethod(), ['put', 'patch', 'delete'])) {
+            parse_str(file_get_contents('php://input'), $postVars);
+        }
+
+        if(count($postVars)) {
+
+            foreach($postVars as $key => $post) {
+                if(!is_array($post)) {
+                    $this->post->{strtolower($key)} = new InputItem($key, $post);
+                    continue;
+                }
+
+                $output = new InputCollection();
+
+                foreach($post as $k => $p) {
+                    $output->{$k} = new InputItem($k, $p);
+                }
+
+                $this->post->{strtolower($key)} = $output;
+            }
+        }
+    }
+
+    public function setFile() {
+        $this->file = new InputCollection();
+
+        if(count($_FILES)) {
+            foreach($_FILES as $key => $value) {
+                // Multiple files
+                if(!is_array($value['name'])) {
+                    // Strip empty values
+                    if($value['error'] != '4') {
+                        $file = new InputFile($key);
+                        $file->setName($value['name']);
+                        $file->setSize($value['size']);
+                        $file->setType($value['type']);
+                        $file->setTmpName($value['tmp_name']);
+                        $file->setError($value['error']);
+                        $this->file->{strtolower($key)} = $file;
+                    }
+                    continue;
+                }
+
+                $output = new InputCollection();
+
+                foreach($value['name'] as $k=>$val) {
+                    // Strip empty values
+                    if($value['error'][$k] != '4') {
+                        $file = new InputFile($k);
+                        $file->setName($value['name'][$k]);
+                        $file->setSize($value['size'][$k]);
+                        $file->setType($value['type'][$k]);
+                        $file->setTmpName($value['tmp_name'][$k]);
+                        $file->setError($value['error'][$k]);
+                        $output->{$k} = $file;
+                    }
+                }
+
+                $this->file->{strtolower($key)} = $output;
+            }
+        }
+    }
+
+}
@@ -0,0 +1,85 @@
+<?php
+namespace Pecee\Http\Input;
+
+class InputCollection implements \IteratorAggregate {
+
+    protected $data = array();
+
+    /**
+     * Search for input element matching index.
+     * Useful for searching for finding items where $index doesn't contain form name.
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @return mixed
+     */
+    public function findFirst($index, $defaultValue = null) {
+        if(count($this->data)) {
+
+            if(isset($this->data[$index])) {
+                return $this->data[$index];
+            }
+
+            foreach($this->data as $key => $value) {
+                if(strtolower($index) === strtolower($key)) {
+                    return $value;
+                }
+            }
+        }
+
+        return $defaultValue;
+    }
+
+    public function getValue($index, $defaultValue = null) {
+        if(count($this->data)) {
+
+            if(isset($this->data[$index])) {
+                return $this->data[$index]->getValue();
+            }
+
+            foreach($this->data as $key => $value) {
+                if(strtolower($index) === strtolower($key)) {
+                    return $value->getValue();
+                }
+            }
+        }
+
+        return $defaultValue;
+    }
+
+    /**
+     * @param $index
+     * @throws \InvalidArgumentException
+     * @return InputItem
+     */
+    public function __get($index) {
+        $item = $this->findFirst($index);
+        // Ensure that item are always available
+        if($item === null) {
+            $this->data[$index] = new InputItem($index, null);
+            return $this->data[$index];
+        }
+
+        return $item;
+    }
+
+    public function __set($index, $value) {
+        $this->data[$index] = $value;
+    }
+
+    public function getData() {
+        return $this->data;
+    }
+
+    /**
+     * Retrieve an external iterator
+     * @link http://php.net/manual/en/iteratoraggregate.getiterator.php
+     * @return \Traversable An instance of an object implementing <b>Iterator</b> or
+     * <b>Traversable</b>
+     * @since 5.0.0
+     */
+    public function getIterator() {
+        return new \ArrayIterator($this->data);
+    }
+
+}
@@ -0,0 +1,68 @@
+<?php
+namespace Pecee\Http\Input;
+
+class InputFile extends InputItem {
+
+	protected $name;
+	protected $size;
+	protected $type;
+	protected $error;
+	protected $tmpName;
+
+	/**
+	 * @return string
+	 */
+	public function getSize() {
+		return $this->size;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getType() {
+		return $this->type;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getError() {
+		return $this->error;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTmpName() {
+		return $this->tmpName;
+	}
+
+    public function getExtension() {
+		return pathinfo($this->getName(), PATHINFO_EXTENSION);
+    }
+
+	public function move($destination) {
+		return move_uploaded_file($this->tmpName, $destination);
+	}
+
+	public function getContents() {
+		return file_get_contents($this->tmpName);
+	}
+
+    public function setTmpName($name) {
+        $this->tmpName = $name;
+    }
+
+    public function setSize($size) {
+        $this->size = $size;
+    }
+
+    public function setType($type) {
+        $this->type = $type;
+    }
+
+    public function setError($error) {
+        $this->error = $error;
+    }
+
+}
@@ -0,0 +1,63 @@
+<?php
+namespace Pecee\Http\Input;
+
+class InputItem {
+
+    protected $index;
+    protected $name;
+    protected $value;
+
+    public function __construct($index, $value = null) {
+        $this->index = $index;
+        $this->value = $value;
+
+        // Make the name human friendly, by replace _ with space
+        $this->name = ucfirst(str_replace('_', ' ', $this->index));
+    }
+
+    /**
+     * @return array
+     */
+    public function getName() {
+        return $this->name;
+    }
+
+    /**
+     * @return array
+     */
+    public function getValue() {
+        return $this->value;
+    }
+
+    /**
+     * @return string
+     */
+    public function getIndex() {
+        return $this->index;
+    }
+
+    /**
+     * Set input name
+     * @param string $name
+     * @return static $this
+     */
+    public function setName($name) {
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * Set input value
+     * @param string $value
+     * @return static $this
+     */
+    public function setValue($value) {
+        $this->value = $value;
+        return $this;
+    }
+
+    public function __toString() {
+        return (string)$this->getValue();
+    }
+
+}
@@ -0,0 +1,90 @@
+<?php
+namespace Pecee\Http\Middleware;
+
+use Pecee\CsrfToken;
+use Pecee\Exception\TokenMismatchException;
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+class BaseCsrfVerifier implements IMiddleware {
+
+    const POST_KEY = 'csrf-token';
+    const HEADER_KEY = 'X-CSRF-TOKEN';
+
+    protected $except;
+    protected $csrfToken;
+    protected $token;
+
+    public function __construct() {
+        $this->csrfToken = new CsrfToken();
+
+        // Generate or get the CSRF-Token from Cookie.
+        $this->token = (!$this->hasToken()) ? $this->generateToken() : $this->csrfToken->getToken();
+    }
+
+    /**
+     * Check if the url matches the urls in the except property
+     * @param Request $request
+     * @return bool
+     */
+    protected function skip(Request $request) {
+
+        if($this->except === null || !is_array($this->except)) {
+            return false;
+        }
+
+        foreach($this->except as $url) {
+            $url = rtrim($url, '/');
+            if($url[strlen($url)-1] === '*') {
+                $url = rtrim($url, '*');
+                $skip = (stripos($request->getUri(), $url) === 0);
+            } else {
+                $skip = ($url === rtrim($request->getUri(), '/'));
+            }
+
+            if($skip) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function handle(Request $request, RouterEntry &$route = null) {
+
+        if($request->getMethod() !== 'get' && !$this->skip($request)) {
+
+            $token = $request->getInput()->post->getValue(static::POST_KEY);
+
+            // If the token is not posted, check headers for valid x-csrf-token
+            if($token === null) {
+                $token = $request->getHeader(static::HEADER_KEY);
+            }
+
+            if( !$this->csrfToken->validate($token) ) {
+                throw new TokenMismatchException('Invalid csrf-token.');
+            }
+
+        }
+
+    }
+
+    public function generateToken() {
+        $token = $this->csrfToken->generateToken();
+        $this->csrfToken->setToken($token);
+        return $token;
+    }
+
+    public function hasToken() {
+        if($this->token != null) {
+            return true;
+        }
+
+        return $this->csrfToken->hasToken();
+    }
+
+    public function getToken() {
+        return $this->token;
+    }
+
+}
@@ -0,0 +1,16 @@
+<?php
+namespace Pecee\Http\Middleware;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+interface IMiddleware {
+
+    /**
+     * @param Request $request
+     * @param RouterEntry $route
+     * @return Request|null
+     */
+    public function handle(Request $request, RouterEntry &$route);
+
+}
@@ -1,13 +0,0 @@
-<?php
-
-namespace Pecee\Http\Middleware;
-
-use Pecee\Http\Request;
-use Pecee\SimpleRouter\RouterEntry;
-
-abstract class Middleware
-{
-    public function handle(Request $request) {
-        return true;
-    }
-}
@@ -1,9 +0,0 @@
-<?php
-
-namespace Pecee\Http\Middleware;
-
-class VerifyCsrfToken extends Middleware {
-
-
-
-}
@@ -1,16 +1,45 @@
 <?php
 namespace Pecee\Http;

+use Pecee\Http\Input\Input;
+
 class Request {

-    protected $uri;
+    protected $data = array();
+    protected $headers;
    protected $host;
+    protected $uri;
    protected $method;
+    protected $input;
+

    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']);
+        $this->parseHeaders();
+        $this->input = new Input($this);
+
+        $this->host = $this->getHeader('http_host');;
+        $this->uri = $this->getHeader('request_uri');
+        $this->method = strtolower($this->input->post->findFirst('_method', $this->getHeader('request_method')));
+    }
+
+    protected function parseHeaders() {
+        $this->headers = array();
+
+        foreach ($_SERVER as $name => $value) {
+            $this->headers[strtolower($name)] = $value;
+        }
+    }
+
+    public function isSecure() {
+        if($this->getHeader('http_x_forwarded_proto') === 'https') {
+            return true;
+        }
+
+        if($this->getHeader('https') !== null) {
+            return true;
+        }
+
+        return ($this->getHeader('server_port') === 443);
    }

    /**
@@ -39,8 +68,119 @@ class Request {
     * @return string|null
     */
    public function getUser() {
-        $data = http_digest_parse($_SERVER['PHP_AUTH_DIGEST']);
-        return (isset($data['username'])) ? $data['username'] : null;
+        return $this->getHeader('php_auth_user');
+    }
+
+    /**
+     * Get http basic auth password
+     * @return string|null
+     */
+    public function getPassword() {
+        return $this->getHeader('php_auth_pw');
+    }
+
+    /**
+     * Get all headers
+     * @return array
+     */
+    public function getHeaders() {
+        return $this->headers;
+    }
+
+    /**
+     * Get id address
+     * @return string
+     */
+    public function getIp() {
+        if($this->getHeader('http_cf_connecting_ip') !== null) {
+            return $this->getHeader('http_cf_connecting_ip');
+        }
+
+        if($this->getHeader('http_x_forwarded_for') !== null && strlen($this->getHeader('http_x_forwarded_for'))) {
+            return $this->getHeader('http_x_forwarded_for');
+        }
+
+        return $this->getHeader('remote_addr');
+    }
+
+    /**
+     * Get referer
+     * @return string
+     */
+    public function getReferer() {
+        return $this->getHeader('http_referer');
+    }
+
+    /**
+     * Get user agent
+     * @return string
+     */
+    public function getUserAgent() {
+        return $this->getHeader('http_user_agent');
+    }
+
+    /**
+     * Get header value by name
+     * @param string $name
+     * @param object|null $defaultValue
+     * @return string|null
+     */
+    public function getHeader($name, $defaultValue = null) {
+        return isset($this->headers[strtolower($name)]) ? $this->headers[strtolower($name)] : $defaultValue;
+    }
+
+    /**
+     * Get input class
+     * @return Input
+     */
+    public function getInput() {
+        return $this->input;
+    }
+
+    /**
+     * Is format accepted
+     * @param string $format
+     * @return bool
+     */
+    public function isFormatAccepted($format) {
+        return ($this->getHeader('http_accept') !== null && stripos($this->getHeader('http_accept'), $format) > -1);
+    }
+
+    /**
+     * Get accept formats
+     * @return array
+     */
+    public function getAcceptFormats() {
+        return explode(',', $this->getHeader('http_accept'));
+    }
+
+    /**
+     * @param string $uri
+     */
+    public function setUri($uri) {
+        $this->uri = $uri;
+    }
+
+    /**
+     * @param string $host
+     */
+    public function setHost($host) {
+        $this->host = $host;
+    }
+
+    /**
+     * @param string $method
+     */
+    public function setMethod($method) {
+        $this->method = $method;
+    }
+
+    public function __set($name, $value = null) {
+        $this->data[$name] = $value;
+    }
+
+    public function __get($name) {
+        return isset($this->data[$name]) ? $this->data[$name] : null;
    }

 }
@@ -4,11 +4,17 @@ namespace Pecee\Http;

 class Response {

+    protected $request;
+
+    public function __construct(Request $request) {
+        $this->request = $request;
+    }
+
    /**
     * Set the http status code
     *
     * @param int $code
-     * @return self $this
+     * @return static
     */
    public function httpCode($code) {
        http_response_code($code);
@@ -19,14 +25,85 @@ class Response {
     * Redirect the response
     *
     * @param string $url
+     * @param int $httpCode
     */
-    public function redirect($url) {
-        header('location: ' . $url);
+    public function redirect($url, $httpCode = null) {
+        if($httpCode !== null) {
+            $this->httpCode($httpCode);
+        }
+
+        $this->header('location: ' . $url);
        die();
    }

    public function refresh() {
-        $this->redirect(url());
+        $this->redirect($this->request->getUri());
+    }
+
+    /**
+     * Add http authorisation
+     * @param string $name
+     * @return static
+     */
+    public function auth($name = '') {
+        $this->headers([
+            'WWW-Authenticate: Basic realm="' . $name . '"',
+            'HTTP/1.0 401 Unauthorized'
+        ]);
+        return $this;
+    }
+
+    public function cache($eTag, $lastModified = 2592000) {
+
+        $this->headers([
+            'Cache-Control: public',
+            'Last-Modified: ' . gmdate("D, d M Y H:i:s", $lastModified) . ' GMT',
+            'Etag: ' . $eTag
+        ]);
+
+        if(isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $lastModified ||
+            isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] === $eTag) {
+
+            $this->headers([
+                'HTTP/1.1 304 Not Modified'
+            ]);
+
+            exit();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Json encode array
+     * @param array $value
+     */
+    public function json(array $value) {
+        $this->header('Content-type: application/json');
+        echo json_encode($value);
+        die();
+    }
+
+    /**
+     * Add header to response
+     * @param string $value
+     * @return static
+     */
+    public function header($value) {
+        header($value);
+        return $this;
+    }
+
+    /**
+     * Add multiple headers to response
+     * @param array $headers
+     * @return static
+     */
+    public function headers(array $headers) {
+        foreach($headers as $header) {
+            header($header);
+        }
+        return $this;
    }

 }
@@ -0,0 +1,11 @@
+<?php
+namespace Pecee\SimpleRouter;
+
+interface IControllerRoute {
+
+    public function getController();
+    public function setController($controller);
+    public function getMethod();
+    public function setMethod($method);
+
+}
@@ -0,0 +1,9 @@
+<?php
+namespace Pecee\SimpleRouter;
+
+interface ILoadableRoute {
+
+    public function getUrl();
+    public function setUrl($url);
+
+}
@@ -1,7 +0,0 @@
-<?php
-
-namespace Pecee\SimpleRouter;
-
-interface IRouteEntry {
-
-}
@@ -0,0 +1,84 @@
+<?php
+namespace Pecee\SimpleRouter;
+
+abstract class LoadableRoute extends RouterEntry implements ILoadableRoute {
+
+    const PARAMETERS_REGEX_MATCH = '{([A-Za-z\-\_]*?)\?{0,1}}';
+
+    protected $url;
+    protected $alias;
+
+    public function getUrl() {
+        return $this->url;
+    }
+
+    /**
+     * Set url
+     *
+     * @param string $url
+     * @return static
+     */
+    public function setUrl($url) {
+        $this->url = '/' . trim($url, '/') . '/';
+
+        if(preg_match_all('/' . static::PARAMETERS_REGEX_MATCH . '/is', $this->url, $matches)) {
+            if (count($matches[1])) {
+                foreach ($matches[1] as $key) {
+                    $this->parameters[$key] = null;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get alias for the url which can be used when getting the url route.
+     * @return string|array
+     */
+    public function getAlias(){
+        return $this->alias;
+    }
+
+    /**
+     * Check if route has given alias.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasAlias($name) {
+        if ($this->getAlias() !== null) {
+            if (is_array($this->getAlias())) {
+                foreach ($this->getAlias() as $alias) {
+                    if (strtolower($alias) === strtolower($name)) {
+                        return true;
+                    }
+                }
+            }
+            return strtolower($this->getAlias()) === strtolower($name);
+        }
+
+        return false;
+    }
+
+    /**
+     * Set the url alias for easier getting the url route.
+     * @param string|array $alias
+     * @return static
+     */
+    public function setAlias($alias){
+        $this->alias = $alias;
+        return $this;
+    }
+
+    public function setData(array $settings) {
+
+        // Change as to alias
+        if(isset($settings['as'])) {
+            $this->setAlias($settings['as']);
+        }
+
+        return parent::setData($settings);
+    }
+
+}
@@ -1,131 +1,287 @@
 <?php
 namespace Pecee\SimpleRouter;

-use Pecee\ArrayUtil;
+use Pecee\Exception\RouterException;
+use Pecee\Handler\IExceptionHandler;
+use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Request;
-use Pecee\Url;
+use Pecee\Http\Response;

 class RouterBase {

    protected static $instance;

+    /**
+     * Current request
+     * @var Request
+     */
    protected $request;
-    protected $currentRoute;
+
+    /**
+     * Response
+     * @var Response
+     */
+    protected $response;
+
+    /**
+     * Used to keep track of whether or not a should should be added to
+     * the backstack-list for group-processing or not.
+     * @var bool
+     */
+    protected $processingRoute;
+
+    /**
+     * All added routes
+     * @var array
+     */
    protected $routes;
-    protected $processedRoutes;
+
+    /**
+     * List of
+     * @var array
+     */
    protected $controllerUrlMap;
-    protected $backstack;
-    protected $loadedRoute;
+
+    /**
+     * Backstack array used to keep track of sub-routes
+     * @var array
+     */
+    protected $backStack;
+
+    /**
+     * The default namespace that all routes will inherit
+     * @var string
+     */
    protected $defaultNamespace;

-    // TODO: make interface for controller routers, so they can be easily detected
-    // TODO: clean up - cut some of the methods down to smaller pieces
+    /**
+     * List of added bootmanagers
+     * @var array
+     */
+    protected $bootManagers;
+
+    /**
+     * Csrf verifier class
+     * @var BaseCsrfVerifier
+     */
+    protected $csrfVerifier;
+
+    /**
+     * Get exception handlers
+     * @var array
+     */
+    protected $exceptionHandlers;
+
+    /**
+     * The current loaded route
+     * @var RouterRoute|null
+     */
+    protected $loadedRoute;
+
+    /**
+     * List over route changes (to avoid endless-looping)
+     * @var array
+     */
+    protected $routeRewrites = array();
+
+    protected $originalUrl;

    public function __construct() {
-        $this->routes = array();
-        $this->backstack = array();
-        $this->controllerUrlMap = array();
-        $this->request = new Request();
+        $this->reset();
    }

+    public function reset() {
+        $this->processingRoute = false;
+        $this->request = new Request();
+        $this->response = new Response($this->request);
+        $this->routes = array();
+        $this->bootManagers = array();
+        $this->backStack = array();
+        $this->controllerUrlMap = array();
+        $this->exceptionHandlers = array();
+    }
+
+    /**
+     * Add route
+     * @param RouterEntry $route
+     * @return RouterEntry
+     */
    public function addRoute(RouterEntry $route) {
-        if($this->currentRoute !== null) {
-            $this->backstack[] = $route;
+        if($this->processingRoute) {
+            $this->backStack[] = $route;
        } else {
            $this->routes[] = $route;
        }
+
+        return $route;
    }

-    protected function processRoutes(array $routes, array $settings = array(), array $prefixes = array(), $backstack = false) {
+    protected function processRoutes(array $routes, array $settings = array(), array $prefixes = array(), RouterEntry $parent = null) {
        // Loop through each route-request

        /* @var $route RouterEntry */
-        foreach($routes as $route) {
+        for($i = 0; $i < count($routes); $i++) {

-            if($this->defaultNamespace && !$route->getNamespace()) {
-                $namespace = null;
+            $route = $routes[$i];
+
+            $route->setData($settings);
+
+            if($parent !== null) {
+
+                if($parent instanceof RouterGroup) {
+                    if ($parent->getPrefix() !== null && trim($parent->getPrefix(), '/') !== '') {
+                        $prefixes[] = trim($parent->getPrefix(), '/');
+                    }
+                }
+
+                $route->setParent($parent);
+            }
+
+            if($route->getNamespace() === null && $this->defaultNamespace !== null) {
+                $namespace = $this->defaultNamespace;
                if ($route->getNamespace()) {
-                    $namespace = $this->defaultNamespace . '\\' . $route->getNamespace();
-                } else {
-                    $namespace = $this->defaultNamespace;
+                    $namespace .= '\\' . $route->getNamespace();
                }

                $route->setNamespace($namespace);
            }

-            $newPrefixes = $prefixes;
-            $mergedSettings = array_merge($settings, $route->getMergeableSettings());
-            if($route->getPrefix()) {
-                array_push($newPrefixes, rtrim($route->getPrefix(), '/'));
-            }
-            $route->addSettings($mergedSettings);
-
-            if(!($route instanceof RouterGroup)) {
-                if(is_array($newPrefixes) && count($newPrefixes) && $backstack) {
-                    $route->setUrl( join('/', $newPrefixes) . $route->getUrl() );
-                }
+            if($route instanceof ILoadableRoute) {

+                $route->setUrl( trim(join('/', $prefixes) . $route->getUrl(), '/') );
                $this->controllerUrlMap[] = $route;
+            } elseif($route instanceof RouterGroup) {
+
+                if ($route->getCallback() !== null && is_callable($route->getCallback())) {
+                    $this->processingRoute = true;
+                    $route->renderRoute($this->request);
+                    $this->processingRoute = false;
+
+                    if ($route->matchRoute($this->request)) {
+
+                        $settings = array_merge($settings, $route->getMergeableData());
+
+                        // Add ExceptionHandler
+                        if (count($route->getExceptionHandlers())) {
+                            $this->exceptionHandlers = array_merge($route->getExceptionHandlers(), $this->exceptionHandlers);
+                        }
+                    }
+
+                }
            }

-            $this->currentRoute = $route;
-            if($route instanceof RouterGroup && is_callable($route->getCallback())) {
-                $route->renderRoute($this->request);
-            }
-            $this->currentRoute = null;
-
-            if(count($this->backstack)) {
-                $backstack = $this->backstack;
-                $this->backstack = array();
+            if(count($this->backStack)) {
+                $backStack = $this->backStack;
+                $this->backStack = array();

                // Route any routes added to the backstack
-                $this->processRoutes($backstack, $mergedSettings, $newPrefixes, true);
+                $this->processRoutes($backStack, $settings, $prefixes, $route);
            }
+
+            $prefixes = [];
        }
    }

-    public function routeRequest() {
-        // Loop through each route-request
-
-        $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());
-        });
+    public function routeRequest($rewrite = false) {

+        $this->loadedRoute = null;
        $routeNotAllowed = false;

-        /* @var $route RouterEntry */
-        foreach($this->controllerUrlMap as $route) {
-            $routeMatch = $route->matchRoute($this->request);
+        try {

+            // Initialize boot-managers
+            if(count($this->bootManagers)) {
+                /* @var $manager RouterBootManager */
+                foreach($this->bootManagers as $manager) {
+                    $this->request = $manager->boot($this->request);

-            if($routeMatch && !($routeMatch instanceof RouterGroup)) {
+                    if(!($this->request instanceof Request)) {
+                        throw new RouterException('Custom router bootmanager "'. get_class($manager) .'" must return instance of Request.');
+                    }
+                }
+            }

-                if(count($route->getRequestMethods()) && !in_array($this->request->getMethod(), $route->getRequestMethods())) {
-                    $routeNotAllowed = true;
-                    continue;
+            if($rewrite === false) {
+
+                // Loop through each route-request
+                $this->processRoutes($this->routes);
+
+                if($this->csrfVerifier !== null) {
+
+                    // Verify csrf token for request
+                    $this->csrfVerifier->handle($this->request);
                }

-                $routeNotAllowed = false;
-
-                $this->loadedRoute = $routeMatch;
-                $routeMatch->renderRoute($this->request);
-                break;
+                $this->originalUrl = $this->request->getUri();
            }
+
+            /* @var $route RouterEntry */
+            for ($i = 0; $i < count($this->controllerUrlMap); $i++) {
+
+                $route = $this->controllerUrlMap[$i];
+
+                if ($route->matchRoute($this->request)) {
+
+                    if (count($route->getRequestMethods()) && !in_array($this->request->getMethod(), $route->getRequestMethods())) {
+                        $routeNotAllowed = true;
+                        continue;
+                    }
+
+                    $this->loadedRoute = $route;
+                    $this->loadedRoute->loadMiddleware($this->request, $this->loadedRoute);
+
+                    if($this->request->getUri() !== $this->originalUrl && !in_array($this->request->getUri(), $this->routeRewrites)) {
+                        $this->routeRewrites[] = $this->request->getUri();
+                        $this->routeRequest(true);
+                        return;
+                    }
+
+                    $routeNotAllowed = false;
+                    $this->request->setUri($this->originalUrl);
+                    $this->loadedRoute->renderRoute($this->request);
+
+                    break;
+                }
+            }
+
+        } catch(\Exception $e) {
+            $this->handleException($e);
        }

        if($routeNotAllowed) {
-            throw new RouterException('Route or method not allowed', 403);
+            $this->handleException(new RouterException('Route or method not allowed', 403));
        }

-        if(!$this->loadedRoute) {
-            throw new RouterException(sprintf('Route not found: %s', $this->request->getUri()), 404);
+        if($this->loadedRoute === null) {
+            $this->handleException(new RouterException(sprintf('Route not found: %s', $this->request->getUri()), 404));
        }
    }

+    protected function handleException(\Exception $e) {
+
+        /* @var $handler IExceptionHandler */
+        foreach ($this->exceptionHandlers as $handler) {
+            $handler = new $handler();
+
+            if (!($handler instanceof IExceptionHandler)) {
+                throw new RouterException('Exception handler must implement the IExceptionHandler interface.');
+            }
+
+            $request = $handler->handleError($this->request, $this->loadedRoute, $e);
+
+            if($request !== null && $request->getUri() !== $this->originalUrl && !in_array($request->getUri(), $this->routeRewrites)) {
+                $this->routeRewrites[] = $request->getUri();
+                $this->routeRequest(true);
+                return;
+            }
+
+        }
+
+        throw $e;
+    }
+
    /**
+     * Get default namespace
     * @return string
     */
    public function getDefaultNamespace(){
@@ -133,34 +289,37 @@ class RouterBase {
    }

    /**
+     * Set the main default namespace that all routes will inherit
     * @param string $defaultNamespace
+     * @return static
     */
    public function setDefaultNamespace($defaultNamespace) {
        $this->defaultNamespace = $defaultNamespace;
+        return $this;
    }

    /**
-     * @return RouterEntry
-     */
-    public function getLoadedRoute() {
-        if(!($this->loadedRoute instanceof RouterGroup)) {
-            return $this->loadedRoute;
-        }
-        return null;
-    }
-
-    /**
+     * Get bootmanagers
     * @return array
     */
-    public function getBackstack() {
-        return $this->backstack;
+    public function getBootManagers() {
+        return $this->bootManagers;
    }

    /**
-     * @return RouterEntry
+     * Set bootmanagers
+     * @param array $bootManagers
     */
-    public function getCurrentRoute(){
-        return $this->currentRoute;
+    public function setBootManagers(array $bootManagers) {
+        $this->bootManagers = $bootManagers;
+    }
+
+    /**
+     * Add bootmanager
+     * @param RouterBootManager $bootManager
+     */
+    public function addBootManager(RouterBootManager $bootManager) {
+        $this->bootManagers[] = $bootManager;
    }

    /**
@@ -179,35 +338,94 @@ class RouterBase {
        return $this->request;
    }

-    protected function processUrl($route, $method = null, $parameters = null, $getParams = null) {
+    /**
+     * Get response
+     * @return Response
+     */
+    public function getResponse() {
+        return $this->response;
+    }

-        $url = $route->getUrl();
+    /**
+     * Get csrf verifier class
+     * @return BaseCsrfVerifier
+     */
+    public function getCsrfVerifier() {
+        return $this->csrfVerifier;
+    }

-        if(($route instanceof RouterController || $route instanceof RouterResource) && $method !== null) {
-            $url .= $method;
+    /**
+     * Set csrf verifier class
+     *
+     * @param BaseCsrfVerifier $csrfVerifier
+     * @return static
+     */
+    public function setCsrfVerifier(BaseCsrfVerifier $csrfVerifier) {
+        $this->csrfVerifier = $csrfVerifier;
+        return $this;
+    }
+
+    public function arrayToParams(array $getParams = null, $includeEmpty = true) {
+
+        if(is_array($getParams) && count($getParams)) {
+            if ($includeEmpty === false) {
+                $getParams = array_filter($getParams, function ($item) {
+                    return (!empty($item));
+                });
+            }
+
+            return '?' . http_build_query($getParams);
        }

-        if($route instanceof RouterController || $route instanceof RouterResource) {
+        return '';
+    }
+
+    protected function processUrl(RouterRoute $route, $method = null, $parameters = null, $getParams = null) {
+
+        $domain = '';
+
+        $parent = $route->getParent();
+
+        if($parent !== null && $parent instanceof RouterGroup && count($parent->getDomains())) {
+            $domain = $parent->getDomains();
+            $domain = '//' . $domain[0];
+        }
+
+        $url = $domain . '/' . trim($route->getUrl(), '/');
+
+        if($route instanceof IControllerRoute && $method !== null) {
+            $url .= $method;
+
            if(count($parameters)) {
                $url .= join('/', $parameters);
            }
        } else {
-            /* @var $route RouterEntry */
-            $params = $route->getParameters();
-            if(count($params)) {
-                $i = 0;
-                foreach($params as $param => $value) {
-                    $value = (isset($parameters[$param])) ? $parameters[$param] : $value;
-                    $url = str_ireplace('{' . $param. '}', $value, $url);
-                    $i++;
-                }
+            if($parameters !== null && is_array($parameters)) {
+                $params = array_merge($route->getParameters(), $parameters);
+            } else {
+                $params = $route->getParameters();
            }
+
+            $otherParams = array();
+            $i = 0;
+
+            foreach($params as $param => $value) {
+                $value = (isset($parameters[$param])) ? $parameters[$param] : $value;
+                if(stripos($url, '{' . $param. '}') !== false || stripos($url, '{' . $param . '?}') !== false) {
+                    $url = str_ireplace(array('{' . $param . '}', '{' . $param . '?}'), $value, $url);
+                } else {
+                    $otherParams[$param] = $value;
+                }
+                $i++;
+            }
+
+            $url = rtrim($url, '/') . '/' . join('/', $otherParams);
        }

        $url = rtrim($url, '/') . '/';

-        if($getParams !== null && count($getParams)) {
-            $url .= '?'.Url::arrayToParams($getParams);
+        if($getParams !== null) {
+            $url .= $this->arrayToParams($getParams);
        }

        return $url;
@@ -223,25 +441,52 @@ class RouterBase {
            throw new \InvalidArgumentException('Invalid type for getParams. Must be array or null');
        }

+        // Return current route if no options has been specified
        if($controller === null && $parameters === null) {
-            return $this->processUrl($this->loadedRoute, null, $getParams);
+            $getParams = ($getParams !== null && is_array($getParams)) ? array_merge($_GET, $getParams) : $_GET;
+
+            $url = parse_url($this->request->getUri(), PHP_URL_PATH);
+
+            if($getParams !== null) {
+                $url .= $this->arrayToParams($getParams);
+            }
+
+            return $url;
+        }
+
+        if($controller === null && $this->loadedRoute !== null) {
+            return $this->processUrl($this->loadedRoute, $this->loadedRoute->getMethod(), $parameters, $getParams);
        }

        $c = '';
        $method = null;
+        $max = count($this->controllerUrlMap);

        /* @var $route RouterRoute */
-        foreach($this->controllerUrlMap as $route) {
+        for($i = 0; $i < $max; $i++) {
+
+            $route = $this->controllerUrlMap[$i];

            // 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 LoadableRoute) {
+
+                // Check for alias
+                if ($route->hasAlias($controller)) {
+                    return $this->processUrl($route, $route->getMethod(), $parameters, $getParams);
+                }
+
+                // Use controller name
+                if($route instanceof RouterController) {
+                    $c = $route->getController();
+                } else {
+
+                    // Use callback if it's not a function
+                    if (stripos($route->getCallback(), '@') !== false && !is_callable($route->getCallback())) {
+                        $c = $route->getCallback();
+                    }
+
+                }

-            if($route instanceof RouterRoute && !is_callable($route->getCallback()) && stripos($route->getCallback(), '@') !== false) {
-                $c = $route->getCallback();
-            } else if($route instanceof RouterController || $route instanceof RouterResource) {
-                $c = $route->getController();
            }

            if($c === $controller || strpos($c, $controller) === 0) {
@@ -252,11 +497,14 @@ class RouterBase {
        $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->getClass();
-            } else if($route instanceof RouterController || $route instanceof RouterResource) {
+        for($i = 0; $i < $max; $i++) {
+
+            $route = $this->controllerUrlMap[$i];
+
+            if($route instanceof IControllerRoute) {
                $c = $route->getController();
+            } else if(!is_callable($route->getCallback()) && stripos($route->getCallback(), '@') !== false) {
+                $c = $route->getClass();
            }

            if(stripos($controller, '@') !== false) {
@@ -273,18 +521,29 @@ class RouterBase {
        $controller = ($controller === null) ? '/' : $controller;
        $url = array($controller);

-        if(is_array($parameters)) {
-            ArrayUtil::append($url, $parameters);
+        if($parameters !== null && is_array($parameters) && count($parameters)) {
+            $url = array_merge($url, $parameters);
        }

-        return join('/', $url);
+        $url = '/' . trim(join('/', $url), '/') . '/';
+
+        if($getParams !== null) {
+            $url .= $this->arrayToParams($getParams);
+        }
+
+        return $url;
    }

+    /**
+     * Get current router instance
+     * @return static
+     */
    public static function getInstance() {
-        if(self::$instance === null) {
-            self::$instance = new static();
+        if(static::$instance === null) {
+            static::$instance = new static();
        }
-        return self::$instance;
+
+        return static::$instance;
    }

 }
@@ -0,0 +1,10 @@
+<?php
+namespace Pecee\SimpleRouter;
+
+use Pecee\Http\Request;
+
+abstract class RouterBootManager {
+
+    abstract public function boot(Request $request);
+
+}
@@ -1,25 +1,49 @@
 <?php
 namespace Pecee\SimpleRouter;

+use Pecee\Exception\RouterException;
 use Pecee\Http\Request;

-class RouterController extends RouterEntry {
+class RouterController extends LoadableRoute implements IControllerRoute {

    const DEFAULT_METHOD = 'index';

-    protected $url;
    protected $controller;
    protected $method;

    public function __construct($url, $controller) {
-        parent::__construct();
-        $this->url = $url;
+        $this->setUrl($url);
        $this->controller = $controller;
    }

+    public function renderRoute(Request $request) {
+        if($this->getCallback() !== null && is_callable($this->getCallback())) {
+
+            // When the callback is a function
+            call_user_func_array($this->getCallback(), $this->getParameters());
+        } else {
+            // When the callback is a method
+            $controller = explode('@', $this->getCallback());
+            $className = $this->getNamespace() . '\\' . $controller[0];
+
+            $class = $this->loadClass($className);
+            $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);
+            }
+
+            call_user_func_array(array($class, $method), $this->getParameters());
+
+            return $class;
+        }
+
+        return null;
+    }
+
    public function matchRoute(Request $request) {
-        $url = parse_url($request->getUri());
-        $url = rtrim($url['path'], '/') . '/';
+        $url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = rtrim($url, '/') . '/';

        if(strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {

@@ -29,7 +53,7 @@ class RouterController extends RouterEntry {

            if(count($path)) {

-                $method = (!isset($path[0]) || trim($path[0]) === '') ? self::DEFAULT_METHOD : $path[0];
+                $method = (!isset($path[0]) || trim($path[0]) === '') ? static::DEFAULT_METHOD : $path[0];
                $this->method = $method;

                array_shift($path);
@@ -38,27 +62,12 @@ class RouterController extends RouterEntry {
                // Set callback
                $this->setCallback($this->controller . '@' . $this->method);

-                return $this;
+                return true;
            }
        }
        return null;
    }

-    /**
-     * @return string
-     */
-    public function getUrl() {
-        return $this->url;
-    }
-
-    /**
-     * @param string $url
-     */
-    public function setUrl($url) {
-        $url = rtrim($url, '/') . '/';
-        $this->url = $url;
-    }
-
    /**
     * @return string
     */
@@ -68,9 +77,11 @@ class RouterController extends RouterEntry {

    /**
     * @param string $controller
+     * @return static
     */
    public function setController($controller) {
        $this->controller = $controller;
+        return $this;
    }

    /**
@@ -82,9 +93,11 @@ class RouterController extends RouterEntry {

    /**
     * @param string $method
+     * @return static
     */
    public function setMethod($method) {
        $this->method = $method;
+        return $this;
    }

 }
@@ -2,53 +2,212 @@

 namespace Pecee\SimpleRouter;

-use Pecee\Http\Middleware\Middleware;
+use Pecee\Exception\RouterException;
+use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;

 abstract class RouterEntry {

-    const REQUEST_TYPE_POST = 'post';
    const REQUEST_TYPE_GET = 'get';
+    const REQUEST_TYPE_POST = 'post';
    const REQUEST_TYPE_PUT = 'put';
+    const REQUEST_TYPE_PATCH = 'patch';
+    const REQUEST_TYPE_OPTIONS = 'options';
    const REQUEST_TYPE_DELETE = 'delete';

-    public static $allowedRequestTypes = array(
-        self::REQUEST_TYPE_DELETE,
+    public static $allowedRequestTypes = [
        self::REQUEST_TYPE_GET,
        self::REQUEST_TYPE_POST,
-        self::REQUEST_TYPE_PUT
-    );
+        self::REQUEST_TYPE_PUT,
+        self::REQUEST_TYPE_PATCH,
+        self::REQUEST_TYPE_OPTIONS,
+        self::REQUEST_TYPE_DELETE,
+    ];

-    protected $settings;
+    protected $parent;
    protected $callback;
-    protected $parameters;
-    protected $parametersRegex;
-    protected $regexMatch;

-    public function __construct() {
-        $this->settings = array();
-        $this->settings['requestMethods'] = array();
-        $this->parameters = array();
-        $this->parametersRegex = array();
+    protected $namespace;
+    protected $regex;
+    protected $requestMethods = array();
+    protected $where = array();
+    protected $parameters = array();
+    protected $middlewares = array();
+
+    protected function loadClass($name) {
+        if(!class_exists($name)) {
+            throw new RouterException(sprintf('Class %s does not exist', $name));
+        }
+
+        return new $name();
+    }
+
+    protected function parseParameters($route, $url, $parameterRegex = '[\w]+') {
+        $parameterNames = array();
+        $regex = '';
+        $lastCharacter = '';
+        $isParameter = false;
+        $parameter = '';
+
+        $routeLength = strlen($route);
+        for($i = 0; $i < $routeLength; $i++) {
+
+            $character = $route[$i];
+
+            if($character === '{') {
+                // Remove "/" and "\" from regex
+                if(substr($regex, strlen($regex)-1) === '/') {
+                    $regex = substr($regex, 0, strlen($regex) - 2);
+                }
+
+                $isParameter = true;
+            } elseif($isParameter && $character === '}') {
+                $required = true;
+                // Check for optional parameter
+
+                // Use custom parameter regex if it exists
+                if(is_array($this->where) && isset($this->where[$parameter])) {
+                    $parameterRegex = $this->where[$parameter];
+                }
+
+                if($lastCharacter === '?') {
+                    $parameter = substr($parameter, 0, strlen($parameter)-1);
+                    $regex .= '(?:\/?(?P<' . $parameter . '>'. $parameterRegex .')[^\/]?)?';
+                    $required = false;
+                } else {
+                    $regex .= '\/?(?P<' . $parameter . '>'. $parameterRegex .')[^\/]?';
+                }
+
+                $parameterNames[] = [
+                    'name' => $parameter,
+                    'required' => $required
+                ];
+
+                $parameter = '';
+                $isParameter = false;
+
+            } elseif($isParameter) {
+                $parameter .= $character;
+            } elseif($character === '/') {
+                $regex .= '\\' . $character;
+            } else {
+                $regex .= str_replace('.', '\\.', $character);
+            }
+
+            $lastCharacter = $character;
+        }
+
+        $parameterValues = array();
+
+        if(preg_match('/^'.$regex.'\/?$/is', $url, $parameterValues)) {
+
+            $parameters = array();
+
+            $max = count($parameterNames);
+
+            for($i = 0; $i < $max; $i++) {
+                $name = $parameterNames[$i];
+                $parameterValue = isset($parameterValues[$name['name']]) ? $parameterValues[$name['name']] : null;
+
+                if($name['required'] && $parameterValue === null) {
+                    throw new RouterException('Missing required parameter ' . $name['name'], 404);
+                }
+
+                if(!$name['required'] && $parameterValue === null) {
+                    continue;
+                }
+
+                $parameters[$name['name']] = $parameterValue;
+            }
+
+            return $parameters;
+        }
+
+        return null;
+    }
+
+    public function loadMiddleware(Request $request, RouterEntry &$route) {
+        if(count($this->getMiddlewares())) {
+            foreach($this->getMiddlewares() as $middleware) {
+                $middleware = $this->loadClass($middleware);
+                if (!($middleware instanceof IMiddleware)) {
+                    throw new RouterException($middleware . ' must be instance of Middleware');
+                }
+
+                /* @var $class IMiddleware */
+                $middleware->handle($request, $route);
+            }
+        }
+    }
+
+    public function renderRoute(Request $request) {
+        if($this->getCallback() !== null && is_callable($this->getCallback())) {
+            // When the callback is a function
+            call_user_func_array($this->getCallback(), $this->getParameters());
+        } else {
+            // When the callback is a method
+            $controller = explode('@', $this->getCallback());
+            $className = $this->getNamespace() . '\\' . $controller[0];
+
+            $class = $this->loadClass($className);
+            $method = $controller[1];
+
+            if (!method_exists($class, $method)) {
+                throw new RouterException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
+            }
+
+            $parameters = array_filter($this->getParameters(), function($var){
+                return ($var !== null);
+            });
+
+            call_user_func_array(array($class, $method), $parameters);
+
+            return $class;
+        }
+
+        return null;
    }

    /**
-     * Returns callback name/identifier for the current route based on the callback.
-     * Useful if you need to get a unique identifier for the loaded route, for instance
-     * when using translations etc.
+     * Set allowed request methods
     *
-     * @return string
+     * @param array $methods
+     * @return static $this
     */
-    public function getIdentifier() {
-        if(strpos($this->callback, '@') !== false) {
-            return $this->callback;
-        }
-        return 'function_' . md5($this->callback);
+    public function setRequestMethods(array $methods) {
+        $this->requestMethods = $methods;
+        return $this;
+    }
+
+    /**
+     * Get allowed request methods
+     *
+     * @return array
+     */
+    public function getRequestMethods() {
+        return $this->requestMethods;
+    }
+
+    /**
+     * @return RouterEntry
+     */
+    public function getParent() {
+        return $this->parent;
+    }
+
+    /**
+     * Set parent route
+     * @param RouterEntry $parent
+     * @return static $this
+     */
+    public function setParent(RouterEntry $parent) {
+        $this->parent = $parent;
+        return $this;
    }

    /**
     * @param string $callback
-     * @return self;
+     * @return static
     */
    public function setCallback($callback) {
        $this->callback = $callback;
@@ -78,27 +237,33 @@ abstract class RouterEntry {
        return null;
    }

-    /**
-     * @param string $prefix
-     * @return self
-     */
-    public function setPrefix($prefix) {
-        $this->prefix = '/' . trim($prefix, '/') . '/';
+    public function setMethod($method) {
+        $this->callback = sprintf('%s@%s', $this->getClass(), $method);
+        return $this;
+    }
+
+    public function setClass($class) {
+        $this->callback = sprintf('%s@%s', $class, $this->getMethod());
        return $this;
    }

    /**
     * @param string $middleware
-     * @return self
+     * @return static
     */
    public function setMiddleware($middleware) {
-        $this->middleware = $middleware;
+        $this->middlewares[] = $middleware;
+        return $this;
+    }
+
+    public function setMiddlewares(array $middlewares) {
+        $this->middlewares = $middlewares;
        return $this;
    }

    /**
     * @param string $namespace
-     * @return self
+     * @return static
     */
    public function setNamespace($namespace) {
        $this->namespace = $namespace;
@@ -106,17 +271,10 @@ abstract class RouterEntry {
    }

    /**
-     * @return string
+     * @return string|array
     */
-    public function getPrefix() {
-        return $this->prefix;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMiddleware() {
-        return $this->middleware;
+    public function getMiddlewares() {
+        return $this->middlewares;
    }

    /**
@@ -129,20 +287,13 @@ abstract class RouterEntry {
    /**
     * @return array
     */
-    public function getSettings() {
-        return $this->settings;
-    }
-
-    /**
-     * @return mixed
-     */
    public function getParameters(){
        return $this->parameters;
    }

    /**
     * @param mixed $parameters
-     * @return self
+     * @return static
     */
    public function setParameters($parameters) {
        $this->parameters = $parameters;
@@ -153,10 +304,10 @@ abstract class RouterEntry {
     * Add regular expression parameter match
     *
     * @param array $options
-     * @return self
+     * @return static
     */
    public function where(array $options) {
-        $this->parametersRegex = array_merge($this->parametersRegex, $options);
+        $this->where = $options;
        return $this;
    }

@@ -164,149 +315,77 @@ abstract class RouterEntry {
     * Add regular expression match for url
     *
     * @param string $regex
-     * @return self
+     * @return static
     */
    public function match($regex) {
-        $this->regexMatch = $regex;
+        $this->regex = $regex;
        return $this;
    }

    /**
-     * Get settings that are allowed to be inherited by child routes.
+     * Get arguments that can be inherited by child routes.
     *
     * @return array
     */
-    public function getMergeableSettings() {
-        $settings = $this->settings;
+    public function getMergeableData() {

-        if(isset($settings['middleware'])) {
-            unset($settings['middleware']);
+        $output = array();
+
+        if($this->namespace !== null) {
+            $output['namespace'] = $this->namespace;
        }

-        if(isset($settings['prefix'])) {
-            unset($settings['prefix']);
+        if(count($this->middlewares)) {
+            $output['middleware'] = $this->middlewares;
        }

-        return $settings;
+        if(count($this->where)) {
+            $output['where'] = $this->where;
+        }
+
+        if(count($this->requestMethods)) {
+            $output['method'] = $this->requestMethods;
+        }
+
+        if(count($this->parameters)) {
+            $output['parameters'] = $this->parameters;
+        }
+
+        return $output;
    }

    /**
+     * Set arguments/data by array
+     *
     * @param array $settings
-     * @return self
+     * @return static
     */
-    public function addSettings(array $settings = null) {
-        if(is_array($settings)) {
-            $this->settings = array_merge($this->settings, $settings);
+    public function setData(array $settings) {
+
+        if (isset($settings['namespace']) && $this->namespace === null) {
+            $this->setNamespace($settings['namespace']);
        }
-        return $this;
-    }

-    /**
-     * @param array $settings
-     * @return self
-     */
-    public function setSettings($settings) {
-        $this->settings = $settings;
+        // Push middleware if multiple
+        if (isset($settings['middleware'])) {
+            $this->middlewares = array_merge((array)$settings['middleware'], $this->middlewares);
+        }

-        if($settings['prefix']) {
-            $this->setPrefix($settings['prefix']);
+        if(isset($settings['method'])) {
+            $this->setRequestMethods((array)$settings['method']);
+        }
+
+        if(isset($settings['where'])) {
+            $this->where($settings['where']);
+        }
+
+        if(isset($settings['parameters'])) {
+            $this->setParameters($settings['parameters']);
        }

        return $this;
    }

-    /**
-     * Dynamicially access settings value
-     *
-     * @param $name
-     * @return mixed|null
-     */
-    public function __get($name) {
-        return (isset($this->settings[$name]) ? $this->settings[$name] : null);
-    }
-
-    /**
-     * Dynamicially set settings value
-     *
-     * @param string $name
-     * @param mixed|null $value
-     */
-    public function __set($name, $value = null) {
-        $this->settings[$name] = $value;
-    }
-
-    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
-            call_user_func_array($this->getCallback(), $this->getParameters());
-        } else {
-            // When the callback is a method
-            $controller = explode('@', $this->getCallback());
-            $className = $this->getNamespace() . '\\' . $controller[0];
-
-            $class = $this->loadClass($className);
-            $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);
-            }
-
-            call_user_func_array(array($class, $method), $this->getParameters());
-
-            return $class;
-        }
-
-        return null;
-    }
-
-    /**
-     * 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);

 }
@@ -6,34 +6,88 @@ use Pecee\Http\Request;

 class RouterGroup extends RouterEntry {

-    public function __construct() {
-        parent::__construct();
-    }
+    protected $prefix;
+    protected $domains = array();
+    protected $exceptionHandlers = array();

-    public function matchRoute(Request $request) {
-        // Check if request method is allowed
+    public function matchDomain(Request $request) {
+        if(count($this->domains)) {
+            for($i = 0; $i < count($this->domains); $i++) {
+                $domain = $this->domains[$i];

-        if(strtolower($request->getUri()) == strtolower($this->prefix) || stripos($request->getUri(), $this->prefix) === 0) {
+                $parameters = $this->parseParameters($domain, $request->getHost(), '.*');

-            $hasAccess = (!$this->method);
-
-            if($this->method) {
-                if(is_array($this->method)) {
-                    $hasAccess = (in_array($request->getMethod(), $this->getRequestMethods()));
-                } else {
-                    $hasAccess = strtolower($this->getRequestMethods()) == strtolower($request->getMethod());
+                if($parameters !== null) {
+                    $this->parameters = $parameters;
+                    return true;
                }
            }

-            if(!$hasAccess) {
-                throw new RouterException('Method not allowed');
-            }
-
-            return $this;
+            return false;
        }

-        // No match here, move on...
-        return null;
+        return true;
+    }
+
+    public function matchRoute(Request $request) {
+        // Skip if prefix doesn't match
+        if($this->prefix !== null && stripos($request->getUri(), $this->prefix) === false) {
+            return false;
+        }
+
+        return $this->matchDomain($request);
+    }
+
+    public function setExceptionHandlers(array $handlers) {
+        $this->exceptionHandlers = $handlers;
+        return $this;
+    }
+
+    public function getExceptionHandlers() {
+        return $this->exceptionHandlers;
+    }
+
+    public function getDomains() {
+        return $this->domains;
+    }
+
+    public function setDomains(array $domains) {
+        $this->domains = $domains;
+        return $this;
+    }
+
+    /**
+     * @param string $prefix
+     * @return static
+     */
+    public function setPrefix($prefix) {
+        $this->prefix = '/' . trim($prefix, '/');
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPrefix() {
+        return $this->prefix;
+    }
+
+    public function setData(array $settings) {
+
+        if(isset($settings['prefix'])) {
+            $this->setPrefix($settings['prefix']);
+        }
+
+        if(isset($settings['exceptionHandler'])) {
+            $this->setExceptionHandlers((array)$settings['exceptionHandler']);
+        }
+
+        if(isset($settings['domain'])) {
+            $this->setDomains((array)$settings['domain']);
+        }
+
+        return parent::setData($settings);
+
    }

 }
@@ -1,29 +1,20 @@
 <?php
 namespace Pecee\SimpleRouter;

+use Pecee\Exception\RouterException;
 use Pecee\Http\Request;

-class RouterResource extends RouterEntry {
+class RouterResource extends LoadableRoute implements IControllerRoute {

-    const DEFAULT_METHOD = 'index';
-
-    protected $url;
    protected $controller;
-    protected $method;
-    protected $postMethod;

    public function __construct($url, $controller) {
-        parent::__construct();
-        $this->url = $url;
+        $this->setUrl($url);
        $this->controller = $controller;
-        $this->postMethod = strtolower(($_SERVER['REQUEST_METHOD'] != 'GET') ? 'post' : 'get');
    }

    public function renderRoute(Request $request) {
-        // Load middleware
-        $this->loadMiddleware($request);
-
-        if(is_object($this->getCallback()) && is_callable($this->getCallback())) {
+        if($this->getCallback() !== null && is_callable($this->getCallback())) {
            // When the callback is a function
            call_user_func_array($this->getCallback(), $this->getParameters());
        } else {
@@ -48,82 +39,63 @@ class RouterResource extends RouterEntry {
    protected function call($method, $parameters) {
        $this->setCallback($this->controller . '@' . $method);
        $this->parameters = $parameters;
-        return $this;
+        return true;
    }

    public function matchRoute(Request $request) {
-        $url = parse_url($request->getUri());
-        $url = rtrim($url['path'], '/') . '/';
+        $url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = rtrim($url, '/') . '/';

-        if(strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {
-            $url = rtrim($url, '/');
+        $route = rtrim($this->url, '/') . '/{id?}/{action?}';

-            $strippedUrl = trim(substr($url, strlen($this->url)), '/');
-            $path = explode('/', $strippedUrl);
+        $parameters = $this->parseParameters($route, $url);

-            $args = $path;
-            $action = '';
+        if($parameters !== null) {

-            if(count($args)) {
-                $action = $args[0];
-                array_shift($args);
+            if(is_array($parameters)) {
+                $parameters = array_merge($this->parameters, $parameters);
            }

-            if (count($path)) {
+            $action = isset($parameters['action']) ? $parameters['action'] : null;
+            unset($parameters['action']);

-                // Delete
-                if($request->getMethod() === self::REQUEST_TYPE_DELETE && $this->postMethod === self::REQUEST_TYPE_POST) {
-                    return $this->call('destroy', $args);
-                }
-
-                // Update
-                if(in_array($request->getMethod(), array('put', 'patch')) && $this->postMethod === self::REQUEST_TYPE_POST) {
-                    return $this->call('update', array_merge(array($action), $args));
-                }
-
-                // Edit
-                if(isset($args[0]) && strtolower($args[0]) === 'edit' && $this->postMethod === self::REQUEST_TYPE_GET) {
-                    return $this->call('edit', array_merge(array($action), array_slice($args, 1)));
-                }
-
-                // Create
-                if(strtolower($action) === 'create' && $request->getMethod() === self::REQUEST_TYPE_GET) {
-                    return $this->call('create', $args);
-                }
-
-                // Save
-                if($this->postMethod === self::REQUEST_TYPE_POST) {
-                    return $this->call('store', $args);
-                }
-
-                // Show
-                if($action && $this->postMethod === self::REQUEST_TYPE_GET) {
-                    return $this->call('show', array_merge(array($action), $args));
-                }
-
-                // Index
-                return $this->call('index', $args);
+            // Delete
+            if($request->getMethod() === static::REQUEST_TYPE_DELETE && $request->getMethod() === static::REQUEST_TYPE_POST) {
+                return $this->call('destroy', $parameters);
            }
+
+            // Update
+            if(in_array($request->getMethod(), array(static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT)) && $request->getMethod() === static::REQUEST_TYPE_POST) {
+                return $this->call('update', $parameters);
+            }
+
+            // Edit
+            if(isset($action) && strtolower($action) === 'edit' && $request->getMethod() === static::REQUEST_TYPE_GET) {
+                return $this->call('edit', $parameters);
+            }
+
+            // Create
+            if(strtolower($action) === 'create' && $request->getMethod() === static::REQUEST_TYPE_GET) {
+                return $this->call('create', $parameters);
+            }
+
+            // Save
+            if($request->getMethod() === static::REQUEST_TYPE_POST) {
+                return $this->call('store', $parameters);
+            }
+
+            // Show
+            if(isset($parameters['id']) && $request->getMethod() === static::REQUEST_TYPE_GET) {
+                return $this->call('show', $parameters);
+            }
+
+            // Index
+            return $this->call('index', $parameters);
        }

        return null;
    }

-    /**
-     * @return string
-     */
-    public function getUrl() {
-        return $this->url;
-    }
-
-    /**
-     * @param string $url
-     */
-    public function setUrl($url) {
-        $url = rtrim($url, '/') . '/';
-        $this->url = $url;
-    }
-
    /**
     * @return string
     */
@@ -133,23 +105,11 @@ class RouterResource extends RouterEntry {

    /**
     * @param string $controller
+     * @return static
     */
    public function setController($controller) {
        $this->controller = $controller;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMethod() {
-        return $this->method;
-    }
-
-    /**
-     * @param string $method
-     */
-    public function setMethod($method) {
-        $this->method = $method;
+        return $this;
    }

 }
@@ -4,161 +4,39 @@ namespace Pecee\SimpleRouter;

 use Pecee\Http\Request;

-class RouterRoute extends RouterEntry {
-
-    const PARAMETERS_REGEX_MATCH = '{([A-Za-z\-\_]*?)}';
-
-    protected $url;
+class RouterRoute extends LoadableRoute {

    public function __construct($url, $callback) {
-        parent::__construct();
        $this->setUrl($url);
        $this->setCallback($callback);
-
-        $this->settings['aliases'] = array();
-    }
-
-    protected function parseParameters($url, $multiple = false, $regex = self::PARAMETERS_REGEX_MATCH) {
-        $parameters = array();
-
-        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];
-        }
-
-        return null;
    }

    public function matchRoute(Request $request) {

-        // Check if request method is allowed
+        $url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = rtrim($url, '/') . '/';

-        $url = parse_url($request->getUri());
-        $url = $url['path'];
-
-        $route = $this->url;
-
-        $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();
-
-                // Check if url matches
-                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])) {
-                        $matches = false;
-                        break;
-                    }
-
-                    // Save parameter if we have one
-                    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;
+        // Match on custom defined regular expression
+        if($this->regex !== null) {
+            $parameters = array();
+            if(preg_match('/(' . $this->regex . ')/is', $request->getHost() . $url, $parameters)) {
+                $this->parameters = (!is_array($parameters[0]) ? array($parameters[0]) : $parameters[0]);
+                return true;
            }
+            return null;
+        }
+
+        // Make regular expression based on route
+        $route = rtrim($this->url, '/') . '/';
+
+        $parameters = $this->parseParameters($route, $url);
+
+        if($parameters !== null) {
+            $this->parameters = array_merge($this->parameters, $parameters);
+            return true;
        }

-        // No match here, move on...
        return null;
    }

-    /**
-     * @return string
-     */
-    public function getUrl() {
-        return $this->url;
-    }
-
-    /**
-     * @param string $url
-     * @return self
-     */
-    public function setUrl($url) {
-
-        $parameters = $this->parseParameters($url, true);
-
-        if($parameters !== null) {
-            foreach($parameters as $param) {
-                $this->parameters[$param] = '';
-            }
-        }
-
-        $this->url = $url;
-        return $this;
-    }
-
-    /**
-     * Get alias for the url which can be used when getting the url route.
-     * @return string
-     */
-    public function getAlias(){
-        return $this->alias;
-    }
-
-    /**
-     * Set the url alias for easier getting the url route.
-     * @param string $alias
-     * @return self
-     */
-    public function setAlias($alias){
-        $this->alias = $alias;
-        return $this;
-    }
-
-    public function setSettings($settings) {
-
-        // Change as to alias
-        if(isset($settings{'as'})) {
-            $this->setAlias($settings['as']);
-        }
-
-        return parent::setSettings($settings);
-    }
-
-
 }
@@ -4,61 +4,65 @@
 * ---------------------------
 * Router helper class
 * ---------------------------
- * This class is added so calls can be made staticly like Router::get() making the code look more pretty.
+ * This class is added so calls can be made statically like Router::get() making the code look more pretty.
 */

 namespace Pecee\SimpleRouter;

+use Pecee\Http\Middleware\BaseCsrfVerifier;
+
 class SimpleRouter {

-    public static function start($defaultNamespace = null) {
-        $router = RouterBase::GetInstance();
-        $router->setDefaultNamespace($defaultNamespace);
-        $router->routeRequest();
+    /**
+     * Start/route request
+     * @throws \Pecee\Exception\RouterException
+     */
+    public static function start() {
+        RouterBase::getInstance()->routeRequest();
+    }
+
+    /**
+     * Set default namespace for all routes
+     * @param string $defaultNamespace
+     */
+    public static function setDefaultNamespace($defaultNamespace) {
+        RouterBase::getInstance()->setDefaultNamespace($defaultNamespace);
+    }
+
+    /**
+     * Set base csrf verifier
+     * @param BaseCsrfVerifier $baseCsrfVerifier
+     */
+    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier) {
+        RouterBase::getInstance()->setCsrfVerifier($baseCsrfVerifier);
+    }
+
+    public static function addBootManager(RouterBootManager $bootManager) {
+        RouterBase::getInstance()->addBootManager($bootManager);
    }

    public static function get($url, $callback, array $settings = null) {
-        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_GET));
-
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
-
-        return $route;
+        return static::match(['get'], $url, $callback, $settings);
    }

    public static function post($url, $callback, array $settings = null) {
-        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_POST));
-
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
-
-        return $route;
+        return static::match(['post'], $url, $callback, $settings);
    }

    public static function put($url, $callback, array $settings = null) {
-        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_PUT));
+        return static::match(['put'], $url, $callback, $settings);
+    }

-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
+    public static function patch($url, $callback, array $settings = null) {
+        return static::match(['patch'], $url, $callback, $settings);
+    }

-        return $route;
+    public static function options($url, $callback, array $settings = null) {
+        return static::match(['options'], $url, $callback, $settings);
    }

    public static function delete($url, $callback, array $settings = null) {
-        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_DELETE));
-
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
-
-        return $route;
+        return static::match(['delete'], $url, $callback, $settings);
    }

    public static function group($settings = array(), $callback) {
@@ -66,55 +70,89 @@ class SimpleRouter {
        $group->setCallback($callback);

        if($settings !== null && is_array($settings)) {
-            $group->setSettings($settings);
+            $group->setData($settings);
        }

-        $router = RouterBase::getInstance();
-        $router->addRoute($group);
+        RouterBase::getInstance()->addRoute($group);

        return $group;
    }

+    /**
+     * Adds get + post route
+     *
+     * @param string $url
+     * @param callable $callback
+     * @param array|null $settings
+     * @return RouterRoute
+     */
+    public static function basic($url, $callback, array $settings = null) {
+        return static::match(['get', 'post'], $url, $callback, $settings);
+    }
+
    public static function match(array $requestMethods, $url, $callback, array $settings = null) {
        $route = new RouterRoute($url, $callback);
        $route->setRequestMethods($requestMethods);
-        $route->addSettings($settings);

-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
+        if($settings !== null) {
+            $route->setData($settings);
+        }
+
+        RouterBase::getInstance()->addRoute($route);

        return $route;
    }

    public static function all($url, $callback, array $settings = null) {
        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
+
+        if($settings !== null) {
+            $route->setData($settings);
+        }
+
+        RouterBase::getInstance()->addRoute($route);

        return $route;
    }

    public static function controller($url, $controller, array $settings = null) {
        $route = new RouterController($url, $controller);
-        $route->addSettings($settings);
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
+
+        if($settings !== null) {
+            $route->setData($settings);
+        }
+
+        RouterBase::getInstance()->addRoute($route);

        return $route;
    }

    public static function resource($url, $controller, array $settings = null) {
        $route = new RouterResource($url, $controller);
-        $route->addSettings($settings);
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
+
+        if($settings !== null) {
+            $route->setData($settings);
+        }
+
+        static::router()->addRoute($route);

        return $route;
    }

-    public function getRoute($controller = null, $parameters = null, $getParams = null) {
-        return RouterBase::getInstance()->getRoute($controller, $parameters, $getParams);
+    public static function getRoute($controller = null, $parameters = null, $getParams = null) {
+        return static::router()->getRoute($controller, $parameters, $getParams);
+    }
+
+    public static function request() {
+        return static::router()->getRequest();
+    }
+
+    public static function response() {
+        return static::router()->getResponse();
+    }
+
+    protected static function router() {
+        return RouterBase::getInstance();
    }

 }
@@ -0,0 +1,18 @@
+<?php
+
+class DummyController {
+
+    public function start() {
+        echo static::class . '@' .'start() OK';
+    }
+
+    public function param($params = null) {
+        $params = func_get_args();
+        echo 'Params: ' . join(', ', $params);
+    }
+
+    public function notFound() {
+        echo 'not found';
+    }
+
+}
@@ -0,0 +1,14 @@
+<?php
+
+require_once 'Exceptions/MiddlewareLoadedException.php';
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+
+class DummyMiddleware implements IMiddleware {
+
+    public function handle(Request $request, \Pecee\SimpleRouter\RouterEntry &$route = null) {
+       throw new MiddlewareLoadedException('Middleware loaded!');
+    }
+
+}
@@ -0,0 +1,2 @@
+<?php
+class MiddlewareLoadedException extends \Exception {}
@@ -0,0 +1,8 @@
+<?php
+class ExceptionHandler implements \Pecee\Handler\IExceptionHandler {
+
+    public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\RouterEntry &$route = null, \Exception $error){
+        throw $error;
+    }
+
+}
@@ -0,0 +1,81 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+
+class GroupTest extends PHPUnit_Framework_TestCase  {
+
+    protected $result;
+
+    public function testGroupLoad() {
+
+        $this->result = false;
+
+        \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/group'], function() {
+            $this->result = true;
+        });
+
+        try {
+            \Pecee\SimpleRouter\SimpleRouter::start();
+        } catch(Exception $e) {
+            // ignore RouteNotFound exception
+        }
+
+        $this->assertTrue($this->result);
+    }
+
+    public function testNestedGroup() {
+
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/api/v1/test');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+
+        \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/api'], function() {
+            \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/v1'], function() {
+                \Pecee\SimpleRouter\SimpleRouter::get('/test', 'DummyController@start');
+            });
+        });
+
+        \Pecee\SimpleRouter\SimpleRouter::start();
+    }
+
+    public function testManyRoutes() {
+
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/match');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+
+        \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/api'], function() {
+            \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/v1'], function() {
+                \Pecee\SimpleRouter\SimpleRouter::get('/test', 'DummyController@start');
+            });
+        });
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/my/match', 'DummyController@start');
+
+        \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/service'], function() {
+            \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/v1'], function() {
+                \Pecee\SimpleRouter\SimpleRouter::get('/no-match', 'DummyController@start');
+            });
+        });
+
+        \Pecee\SimpleRouter\SimpleRouter::start();
+    }
+
+    public function testUrls() {
+
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/fancy/url/1');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/my/fancy/url/1', 'DummyController@start', ['as' => 'fancy1']);
+        \Pecee\SimpleRouter\SimpleRouter::get('/my/fancy/url/2', 'DummyController@start')->setAlias('fancy2');
+
+        \Pecee\SimpleRouter\SimpleRouter::start();
+
+        $this->assertTrue((\Pecee\SimpleRouter\SimpleRouter::getRoute('fancy1') === '/my/fancy/url/1/'));
+        $this->assertTrue((\Pecee\SimpleRouter\SimpleRouter::getRoute('fancy2') === '/my/fancy/url/2/'));
+
+    }
+
+}
@@ -0,0 +1,31 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+
+class MiddlewareTest extends PHPUnit_Framework_TestCase  {
+
+    public function testMiddlewareFound() {
+
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+
+        \Pecee\SimpleRouter\SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function() {
+            \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start', ['middleware' => 'DummyMiddleware']);
+        });
+
+        $found = false;
+
+        try {
+            \Pecee\SimpleRouter\SimpleRouter::start();
+        }catch(\Exception $e) {
+            $found = ($e instanceof MiddlewareLoadedException);
+        }
+
+        $this->assertTrue($found);
+
+    }
+
+}
@@ -0,0 +1,138 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+
+class RouterRouteTest extends PHPUnit_Framework_TestCase  {
+
+    protected $result = false;
+
+    public function testNotFound() {
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test-param1-param2');
+
+        \Pecee\SimpleRouter\SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function() {
+            \Pecee\SimpleRouter\SimpleRouter::get('/non-existing-path', 'DummyController@start');
+        });
+
+        $found = false;
+
+        try {
+            \Pecee\SimpleRouter\SimpleRouter::start();
+        }catch(\Exception $e) {
+            $found = ($e instanceof \Pecee\Exception\RouterException && $e->getCode() == 404);
+        }
+
+        $this->assertTrue($found);
+
+    }
+
+    public function testGet() {
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start');
+        \Pecee\SimpleRouter\SimpleRouter::start();
+    }
+
+    public function testPost() {
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('post');
+
+        \Pecee\SimpleRouter\SimpleRouter::post('/my/test/url', 'DummyController@start');
+        \Pecee\SimpleRouter\SimpleRouter::start();
+    }
+
+    public function testPut() {
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('put');
+
+        \Pecee\SimpleRouter\SimpleRouter::put('/my/test/url', 'DummyController@start');
+        \Pecee\SimpleRouter\SimpleRouter::start();
+    }
+
+    public function testDelete() {
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('delete');
+
+        \Pecee\SimpleRouter\SimpleRouter::delete('/my/test/url', 'DummyController@start');
+        \Pecee\SimpleRouter\SimpleRouter::start();
+
+    }
+
+    public function testMethodNotAllowed() {
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('post');
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start');
+
+        try {
+            \Pecee\SimpleRouter\SimpleRouter::start();
+        } catch(\Exception $e) {
+            $this->assertEquals(403, $e->getCode());
+        }
+
+    }
+
+    public function testSimpleParam() {
+
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test-param1');
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/test-{param1}', 'DummyController@param');
+        \Pecee\SimpleRouter\SimpleRouter::start();
+
+    }
+
+    public function testMultiParam() {
+
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test-param1-param2');
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/test-{param1}-{param2}', 'DummyController@param');
+        \Pecee\SimpleRouter\SimpleRouter::start();
+
+    }
+
+    public function testPathParamRegex() {
+
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test/path/123123');
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/test/path/{myParam}', 'DummyController@param', ['where' => ['myParam' => '([0-9]+)']]);
+        \Pecee\SimpleRouter\SimpleRouter::start();
+
+    }
+
+    public function testDomainRoute() {
+
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setHost('hello.world.com');
+
+        $this->result = false;
+
+        \Pecee\SimpleRouter\SimpleRouter::group(['domain' => '{subdomain}.world.com'], function() {
+            \Pecee\SimpleRouter\SimpleRouter::get('test', function($subdomain = null) {
+                $this->result = ($subdomain === 'hello');
+            });
+        });
+
+        \Pecee\SimpleRouter\SimpleRouter::start();
+
+        $this->assertTrue($this->result);
+
+    }
+
+}