Added RoutePartialGroup support.

README.md

@@ -43,6 +43,7 @@ If you want a great new feature or experience any issues what-so-ever, please fe
 		- [Namespaces](#namespaces)
 		- [Subdomain-routing](#subdomain-routing)
 		- [Route prefixes](#route-prefixes)
+	- [Partial groups](#partial-groups)
 	- [Form Method Spoofing](#form-method-spoofing)
 	- [Accessing The Current Route](#accessing-the-current-route)
 	- [Other examples](#other-examples)
@@ -357,7 +358,7 @@ SimpleRouter::any('foo', function() {
 });
 ```
 
-We've created a simple method which matches `GET` and `POST` which is most commenly used:
+We've created a simple method which matches `GET` and `POST` which is most commonly used:
 
 ```php
 SimpleRouter::form('foo', function() {
@@ -541,7 +542,7 @@ SimpleRouter::group(['namespace' => 'Admin'], function () {
 });
 ```
 
-### Subdomain-routing
+### Sub domain-routing
 
 Route groups may also be used to handle sub-domain routing. 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:
 
@@ -565,6 +566,27 @@ SimpleRouter::group(['prefix' => '/admin'], function () {
 });
 ```
 
+## Partial groups
+
+Partial router groups has the same benefits as a normal group, but supports parameters and are only rendered when the url is matched.
+
+This can be extremely useful in situations where you only want certain routes added when certain criteria has been met.
+
+**NOTE:** Use partial groups with caution as routes added within are only rendered and available once the url of the partial-group has matched. This can cause `url()` not to find urls for the routes added within.
+
+**Example:**
+
+```php
+SimpleRouter::partialGroup('/admin/{applicationId}', function ($applicationId) {
+
+    // Routes within are rendered when the group matches
+
+    // The url "/admin/{applicationId}" will be prepended to any routes added here.
+
+});
+```
+
+
 ## Form Method Spoofing
 
 HTML forms do not support `PUT`, `PATCH` or `DELETE` actions. So, when defining `PUT`, `PATCH` or `DELETE` routes that are called from an HTML form, you will need to add a hidden `_method` field to the form. The value sent with the `_method` field will be used as the HTTP request method:

src/Pecee/SimpleRouter/Route/IPartialGroupRoute.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\SimpleRouter\Route;
+
+interface IPartialGroupRoute
+{
+
+}

src/Pecee/SimpleRouter/Route/RouteGroup.php

@@ -48,17 +48,9 @@ class RouteGroup extends Route implements IGroupRoute
      */
     public function matchRoute($url, Request $request)
     {
-        if ($this->prefix !== null) {
-            /* Parse parameters from current route */
-            $parameters = $this->parseParameters($this->prefix, $url);
-
-            /* If no custom regular expression or parameters was found on this route, we stop */
-            if ($parameters === null) {
-                return false;
-            }
-
-            /* Set the parameters */
-            $this->setParameters((array)$parameters);
+        /* Skip if prefix doesn't match */
+        if ($this->prefix !== null && stripos($url, $this->prefix) === false) {
+            return false;
         }
 
         return $this->matchDomain($request);

src/Pecee/SimpleRouter/Route/RoutePartialGroup.php

@@ -4,8 +4,10 @@ namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
 
-class PartialGroup extends RouteGroup
+class RoutePartialGroup extends RouteGroup implements IPartialGroupRoute
 {
+    protected $urlRegex = '/^%s\/?/u';
+
     /**
      * Method called to check if route matches
      *
@@ -15,7 +17,7 @@ class PartialGroup extends RouteGroup
      */
     public function matchRoute($url, Request $request)
     {
-        if($this->prefix !== null) {
+        if ($this->prefix !== null) {
             /* Parse parameters from current route */
             $parameters = $this->parseParameters($this->prefix, $url);
 

src/Pecee/SimpleRouter/Router.php

@@ -10,6 +10,7 @@ use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 use Pecee\SimpleRouter\Route\IControllerRoute;
 use Pecee\SimpleRouter\Route\IGroupRoute;
 use Pecee\SimpleRouter\Route\ILoadableRoute;
+use Pecee\SimpleRouter\Route\IPartialGroupRoute;
 use Pecee\SimpleRouter\Route\IRoute;
 
 class Router
@@ -158,11 +159,20 @@ class Router
                         $exceptionHandlers += $route->getExceptionHandlers();
                     }
 
+                    /* Only render partial group if it matches */
+                    if ($route instanceof IPartialGroupRoute) {
+                        $this->processingRoute = true;
+                        $route->renderRoute($this->request);
+                        $this->processingRoute = false;
+                    }
+
                 }
 
-                $this->processingRoute = true;
-                $route->renderRoute($this->request);
-                $this->processingRoute = false;
+                if (($route instanceof IPartialGroupRoute) === false) {
+                    $this->processingRoute = true;
+                    $route->renderRoute($this->request);
+                    $this->processingRoute = false;
+                }
             }
 
             if ($route instanceof ILoadableRoute) {

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -16,6 +16,7 @@ use Pecee\Http\Response;
 use Pecee\SimpleRouter\Exceptions\HttpException;
 use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 use Pecee\SimpleRouter\Route\IRoute;
+use Pecee\SimpleRouter\Route\RoutePartialGroup;
 use Pecee\SimpleRouter\Route\RouteController;
 use Pecee\SimpleRouter\Route\RouteGroup;
 use Pecee\SimpleRouter\Route\RouteResource;
@@ -171,14 +172,41 @@ class SimpleRouter
      */
     public static function group(array $settings = [], \Closure $callback)
     {
+        if (is_callable($callback) === false) {
+            throw new \InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
+        }
+
         $group = new RouteGroup();
         $group->setCallback($callback);
         $group->setSettings($settings);
 
+        static::router()->addRoute($group);
+
+        return $group;
+    }
+
+    /**
+     * Special group that has the same benefits as group but supports
+     * parameters and which are only rendered when the url matches.
+     *
+     * @param string $url
+     * @param array $settings
+     * @param \Closure $callback
+     * @throws \InvalidArgumentException
+     * @return RoutePartialGroup
+     */
+    public static function partialGroup($url, \Closure $callback, array $settings = [])
+    {
         if (is_callable($callback) === false) {
             throw new \InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
         }
 
+        $settings['prefix'] = $url;
+
+        $group = new RoutePartialGroup();
+        $group->setSettings($settings);
+        $group->setCallback($callback);
+
         static::router()->addRoute($group);
 
         return $group;

test/RouterPartialGroupTest.php

@@ -5,7 +5,7 @@ require_once 'Dummy/DummyController.php';
 require_once 'Dummy/Handler/ExceptionHandler.php';
 require_once 'Helpers/TestRouter.php';
 
-class RouterGroupTest extends PHPUnit_Framework_TestCase
+class RouterPartialGroupTest extends PHPUnit_Framework_TestCase
 {
 
     public function testParameters()
@@ -13,7 +13,7 @@ class RouterGroupTest extends PHPUnit_Framework_TestCase
         $result1 = null;
         $result2 = null;
 
-        TestRouter::group(['prefix' => '{param1}/{param2}'], function ($param1 = null, $param2 = null) use (&$result1, &$result2) {
+        TestRouter::partialGroup('{param1}/{param2}', function ($param1 = null, $param2 = null) use (&$result1, &$result2) {
             $result1 = $param1;
             $result2 = $param2;