RouteList: added addRoute() & withModule()

Author: dg

src/Application/Routers/RouteList.php

@@ -62,6 +62,31 @@ public function constructUrl(array $params, Nette\Http\UrlScript $refUrl): ?stri
 	}
 
 
+	/**
+	 * @param  string  $mask  e.g. '<presenter>/<action>/<id \d{1,3}>'
+	 * @param  array|string|\Closure  $metadata  default values or metadata or callback for NetteModule\MicroPresenter
+	 * @return static
+	 */
+	public function addRoute(string $mask, $metadata = [], int $flags = 0)
+	{
+		$this->add(new Route($mask, $metadata), $flags);
+		return $this;
+	}
+
+
+	/**
+	 * @return static
+	 */
+	public function withModule(string $module)
+	{
+		$router = new static;
+		$router->module = $module . ':';
+		$router->parent = $this;
+		$this->add($router);
+		return $router;
+	}
+
+
 	public function getModule(): ?string
 	{
 		return $this->module;

tests/Routers/RouteList.addRoute.phpt

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Application\Routers\RouteList;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+require __DIR__ . '/Route.php';
+
+
+$list = new RouteList;
+$list->addRoute('foo', ['presenter' => 'foo'], RouteList::ONE_WAY);
+$list->addRoute('bar', ['presenter' => 'bar'], RouteList::ONE_WAY);
+$list->addRoute('hello', ['presenter' => 'hello']);
+
+
+testRouteIn($list, '/foo', ['presenter' => 'foo', 'test' => 'testvalue']);
+
+testRouteIn($list, '/bar', ['presenter' => 'bar', 'test' => 'testvalue']);
+
+testRouteIn($list, '/hello',
+	['presenter' => 'hello', 'test' => 'testvalue'],
+	'/hello?test=testvalue'
+);
+
+testRouteIn($list, '/none');

tests/Routers/RouteList.withModule.phpt

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Application\Routers\RouteList;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+require __DIR__ . '/Route.php';
+
+
+$list = new RouteList;
+$list
+	->withModule('A')
+		->addRoute('foo', ['presenter' => 'foo'])
+		->withModule('B')
+			->addRoute('bar', ['presenter' => 'bar'])
+		->end()
+	->end()
+	->withModule('C')
+		->addRoute('hello', ['presenter' => 'hello']);
+
+
+testRouteIn($list, '/foo',
+	['presenter' => 'A:foo', 'test' => 'testvalue'],
+	'/foo?test=testvalue'
+);
+
+testRouteIn($list, '/bar',
+	['presenter' => 'A:B:bar', 'test' => 'testvalue'],
+	'/bar?test=testvalue'
+);
+
+testRouteIn($list, '/hello',
+	['presenter' => 'C:hello', 'test' => 'testvalue'],
+	'/hello?test=testvalue'
+);
+
+testRouteIn($list, '/none');