Route: support for optional [<module>]

Author: dg

src/Application/Routers/Route.php

@@ -238,16 +238,12 @@ public function match(Nette\Http\IRequest $httpRequest)
 		} elseif (!is_string($params[self::PRESENTER_KEY])) {
 			return NULL;
 		}
-		if (isset($this->metadata[self::MODULE_KEY])) {
-			if (!isset($params[self::MODULE_KEY])) {
-				throw new Nette\InvalidStateException('Missing module in route definition.');
-			}
-			$presenter = $params[self::MODULE_KEY] . ':' . $params[self::PRESENTER_KEY];
-			unset($params[self::MODULE_KEY], $params[self::PRESENTER_KEY]);
+		$presenter = $params[self::PRESENTER_KEY];
+		unset($params[self::PRESENTER_KEY]);
 
-		} else {
-			$presenter = $params[self::PRESENTER_KEY];
-			unset($params[self::PRESENTER_KEY]);
+		if (isset($this->metadata[self::MODULE_KEY])) {
+			$presenter = (isset($params[self::MODULE_KEY]) ? $params[self::MODULE_KEY] . ':' : '') . $presenter;
+			unset($params[self::MODULE_KEY]);
 		}
 
 		return new Application\Request(
@@ -292,7 +288,7 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re
 				$a = strrpos($presenter, ':');
 			}
 			if ($a === FALSE) {
-				$params[self::MODULE_KEY] = '';
+				$params[self::MODULE_KEY] = isset($module[self::VALUE]) ? '' : NULL;
 			} else {
 				$params[self::MODULE_KEY] = substr($presenter, 0, $a);
 				$params[self::PRESENTER_KEY] = substr($presenter, $a + 1);

tests/Routers/Route.modules.phpt

@@ -66,3 +66,39 @@ testRouteIn($route, '/module.submodule', 'Module:Submodule:Default', [
 Assert::null(testRouteOut($route, 'Homepage'));
 Assert::same('http://example.com/module/homepage', testRouteOut($route, 'Module:Homepage'));
 Assert::same('http://example.com/module.submodule/homepage', testRouteOut($route, 'Module:Submodule:Homepage'));
+
+
+$route = new Route('[<module>/]<presenter>');
+testRouteIn($route, '/home', 'Home', [
+	'test' => 'testvalue',
+], '/home?test=testvalue');
+
+
+$route = new Route('[<module=Def>/]<presenter>');
+testRouteIn($route, '/home', 'Def:Home', [
+	'test' => 'testvalue',
+], '/home?test=testvalue');
+
+
+$route = new Route('[<module>/]<presenter>');
+testRouteIn($route, '/module/home', 'Module:Home', [
+	'test' => 'testvalue',
+], '/module/home?test=testvalue');
+
+
+$route = new Route('[<module=def>/]<presenter>');
+testRouteIn($route, '/module/home', 'Module:Home', [
+	'test' => 'testvalue',
+], '/module/home?test=testvalue');
+
+
+$route = new Route('[<module>/]<presenter>');
+testRouteIn($route, '/module.submodule/home', 'Module:Submodule:Home', [
+	'test' => 'testvalue',
+], '/module.submodule/home?test=testvalue');
+
+
+$route = new Route('[<module>/]<presenter>');
+testRouteIn($route, '/module/submodule.home', 'Module:Submodule:Home', [
+	'test' => 'testvalue',
+], '/module.submodule/home?test=testvalue');