Route: add %host% variable (#140)

Author: davidkrmela

src/Application/Routers/Route.php

@@ -150,12 +150,13 @@ public function match(Nette\Http\IRequest $httpRequest)
 if ($this->type === self::HOST) {
 $host = $url->getHost();
 $path = '//' . $host . $url->getPath();
-$host = ip2long($host) ? array($host) : array_reverse(explode('.', $host));
+$parts = ip2long($host) ? array($host) : array_reverse(explode('.', $host));
 $re = strtr($re, array(
 '/%basePath%/' => preg_quote($url->getBasePath(), '#'),
-'%tld%' => preg_quote($host[0], '#'),
-'%domain%' => preg_quote(isset($host[1]) ? "$host[1].$host[0]" : $host[0], '#'),
-'%sld%' => preg_quote(isset($host[1]) ? $host[1] : '', '#'),
+'%tld%' => preg_quote($parts[0], '#'),
+'%domain%' => preg_quote(isset($parts[1]) ? "$parts[1].$parts[0]" : $parts[0], '#'),
+'%sld%' => preg_quote(isset($parts[1]) ? $parts[1] : '', '#'),
+'%host%' => preg_quote($host, '#'),
 ));
 
 } elseif ($this->type === self::RELATIVE) {
@@ -381,25 +382,25 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re
 } while (TRUE);
 
 
-if ($this->type !== self::HOST) {
+if ($this->type === self::HOST) {
+$host = $refUrl->getHost();
+$parts = ip2long($host) ? array($host) : array_reverse(explode('.', $host));
+$url = strtr($url, array(
+'/%basePath%/' => $refUrl->getBasePath(),
+'%tld%' => $parts[0],
+'%domain%' => isset($parts[1]) ? "$parts[1].$parts[0]" : $parts[0],
+'%sld%' => isset($parts[1]) ? $parts[1] : '',
+'%host%' => $host,
+));
+$url = ($this->flags & self::SECURED ? 'https:' : 'http:') . $url;
+} else {
 if ($this->lastRefUrl !== $refUrl) {
 $scheme = ($this->flags & self::SECURED ? 'https://' : 'http://');
 $basePath = ($this->type === self::RELATIVE ? $refUrl->getBasePath() : '');
 $this->lastBaseUrl = $scheme . $refUrl->getAuthority() . $basePath;
 $this->lastRefUrl = $refUrl;
 }
 $url = $this->lastBaseUrl . $url;
-
-} else {
-$host = $refUrl->getHost();
-$host = ip2long($host) ? array($host) : array_reverse(explode('.', $host));
-$url = strtr($url, array(
-'/%basePath%/' => $refUrl->getBasePath(),
-'%tld%' => $host[0],
-'%domain%' => isset($host[1]) ? "$host[1].$host[0]" : $host[0],
-'%sld%' => isset($host[1]) ? $host[1] : '',
-));
-$url = ($this->flags & self::SECURED ? 'https:' : 'http:') . $url;
 }
 
 if (strpos($url, '//', 7) !== FALSE) {

tests/Routers/Route.variables.phpt

@@ -55,6 +55,13 @@ testRouteIn(new Route('//%sld%.%tld%/<path>', 'Default:default'), '/abc', 'Defau
 ), '/abc?test=testvalue');
 
 
+testRouteIn(new Route('//%host%/<path>', 'Default:default'), '/abc', 'Default', array(
+'path' => 'abc',
+'action' => 'default',
+'test' => 'testvalue',
+), '/abc?test=testvalue');
+
+
 // alternative
 testRouteIn(new Route('//example.%tld%/<path>', 'Default:default'), '/abc', 'Default', array(
 'path' => 'abc',
@@ -97,3 +104,10 @@ Assert::same('http://localhost/', $route->constructUrl($route->match($httpReques
 
 $route = new Route('//%tld%/', 'Default:default');
 Assert::same('http://localhost/', $route->constructUrl($route->match($httpRequest), $url));
+
+
+// host
+$url = new Nette\Http\UrlScript('http://www.example.com/');
+$httpRequest = new Nette\Http\Request($url);
+$route = new Route('//%host%/', 'Default:default');
+Assert::same('http://www.example.com/', $route->constructUrl($route->match($httpRequest), $url));