Domain level routing, add the domain name to the route value and set …

…domain as true, no tests have been written. Will write if that's worth
harikt · May 10, 2012 · 2727670 · 2727670
1 parent 8fb265c
commit 2727670
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/Aura/Router/Route.php b/src/Aura/Router/Route.php
@@ -167,6 +167,15 @@ class Route
      * 
      */
     protected $debug;
+
+    /**
+     *
+     * If domain level routing requested, set to true or 1
+     *
+     * @var bool
+     *
+     */
+    protected $domain;
 
     /**
      * 
@@ -210,7 +219,8 @@ public function __construct(
         $is_match    = null,
         $generate    = null,
         $name_prefix = null,
-        $path_prefix = null
+        $path_prefix = null,
+        $domain      = null
     ) {
         // set the name, with prefix if needed
         $this->name_prefix = (string) $name_prefix;
@@ -236,6 +246,7 @@ public function __construct(
         $this->routable    = (bool) $routable;
         $this->is_match    = $is_match;
         $this->generate    = $generate;
+        $this->domain      = ($domain === null) ? false : true;
 
         // convert path and params to a regular expression
         $this->setRegex();
@@ -275,7 +286,7 @@ public function isMatch($path, array $server)
             return false;
         }
 
-        $is_match = $this->isRegexMatch($path)
+        $is_match = $this->isRegexMatch($path, $server)
                  && $this->isMethodMatch($server)
                  && $this->isSecureMatch($server)
                  && $this->isCustomMatch($server);
@@ -380,8 +391,11 @@ protected function setRegex()
      * @return bool True on a match, false if not.
      * 
      */
-    protected function isRegexMatch($path)
+    protected function isRegexMatch($path, $server)
     {
+        if ($this->domain) {
+            $path = $server['HTTP_HOST'] . $path;
+        }
         $match = preg_match("#^{$this->regex}$#", $path, $this->matches);
         if (! $match) {
             $this->debug[] = 'Not a regex match.';

diff --git a/src/Aura/Router/RouteFactory.php b/src/Aura/Router/RouteFactory.php
@@ -36,6 +36,7 @@ class RouteFactory
         'generate'    => null,
         'name_prefix' => null,
         'path_prefix' => null,
+        'domain'      => null
     ];
 
     /**
@@ -62,7 +63,8 @@ public function newInstance(array $params)
             $params['is_match'],
             $params['generate'],
             $params['name_prefix'],
-            $params['path_prefix']
+            $params['path_prefix'],
+            $params['domain']
         );
     }
 }