add basepath support

.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: php
 php:
   - 5.3

src/Regex.php

@@ -55,10 +55,10 @@ class Regex
      * @return bool
      *
      */
-    public function match(Route $route, $path)
+    public function match(Route $route, $path, $basepath = null)
     {
         $this->route = $route;
-        $this->regex = $this->route->path;
+        $this->regex = $basepath . $this->route->path;
         $this->setRegexOptionalParams();
         $this->setRegexParams();
         $this->setRegexWildcard();

src/Route.php

@@ -241,13 +241,13 @@ public function __isset($key)
      * @return bool
      *
      */
-    public function isMatch($path, array $server)
+    public function isMatch($path, array $server, $basepath = null)
     {
         $this->debug = array();
         $this->params = array();
         $this->score = 0;
         $this->failed = null;
-        if ($this->isFullMatch($path, $server)) {
+        if ($this->isFullMatch($path, $server, $basepath)) {
             $this->setParams();
             return true;
         }
@@ -266,11 +266,11 @@ public function isMatch($path, array $server)
      * @return bool
      *
      */
-    protected function isFullMatch($path, array $server)
+    protected function isFullMatch($path, array $server, $basepath = null)
     {
         return $this->isRoutableMatch()
             && $this->isSecureMatch($server)
-            && $this->isRegexMatch($path)
+            && $this->isRegexMatch($path, $basepath)
             && $this->isMethodMatch($server)
             && $this->isAcceptMatch($server)
             && $this->isServerMatch($server)
@@ -394,10 +394,10 @@ protected function serverIsSecure($server)
      * @return bool True on a match, false if not.
      *
      */
-    protected function isRegexMatch($path)
+    protected function isRegexMatch($path, $basepath = null)
     {
         $regex = clone $this->regex;
-        $match = $regex->match($this, $path);
+        $match = $regex->match($this, $path, $basepath);
         if (! $match) {
             return $this->fail(self::FAILED_REGEX);
         }

src/Router.php

@@ -72,6 +72,8 @@ class Router
      */
     protected $failed_route = null;
 
+    protected $basepath;
+
     /**
      *
      * Constructor.
@@ -81,10 +83,14 @@ class Router
      * @param Generator $generator A URL path generator.
      *
      */
-    public function __construct(RouteCollection $routes, Generator $generator)
-    {
+    public function __construct(
+        RouteCollection $routes,
+        Generator $generator,
+        $basepath = null
+    ) {
         $this->routes = $routes;
         $this->generator = $generator;
+        $this->basepath = rtrim($basepath, '/');
     }
 
     /**
@@ -124,7 +130,7 @@ public function match($path, array $server = array())
 
             $this->debug[] = $route;
 
-            $match = $route->isMatch($path, $server);
+            $match = $route->isMatch($path, $server, $this->basepath);
             if ($match) {
                 $this->matched_route = $route;
                 return $route;
@@ -187,7 +193,7 @@ public function getMatchedRoute()
     public function generate($name, $data = array())
     {
         $route = $this->getRouteForGenerate($name);
-        return $this->generator->generate($route, $data);
+        return $this->basepath . $this->generator->generate($route, $data);
     }
 
     /**
@@ -208,7 +214,7 @@ public function generate($name, $data = array())
     public function generateRaw($name, $data = array())
     {
         $route = $this->getRouteForGenerate($name);
-        return $this->generator->generateRaw($route, $data);
+        return $this->basepath . $this->generator->generateRaw($route, $data);
     }
 
     /**

src/RouterFactory.php

@@ -24,11 +24,12 @@ class RouterFactory
      * @return Router
      *
      */
-    public function newInstance()
+    public function newInstance($basepath = null)
     {
         return new Router(
             new RouteCollection(new RouteFactory),
-            new Generator
+            new Generator,
+            $basepath
         );
     }
 }

tests/RouterTest.php

@@ -8,13 +8,13 @@ class RouterTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->factory = new RouterFactory;
         $this->router = $this->newRouter();
     }
 
-    protected function newRouter()
+    protected function newRouter($basepath = null)
     {
-        return $this->factory->newInstance();
+        $factory = new RouterFactory;
+        return $factory->newInstance($basepath);
     }
 
     protected function assertIsRoute($actual)
@@ -498,4 +498,41 @@ public function testAddWithAction()
         $actual = $this->router->match('/foo/bar');
         $this->assertSame('DirectAction', $actual->values['action']);
     }
+
+    public function testWithBasepathIndex()
+    {
+        $this->router = $this->newRouter('/path/to/sub/index.php');
+        $this->router->add('foo.bar', '/foo/bar', 'DirectAction');
+
+        // should fail without basepath
+        $this->assertFalse($this->router->match('/foo/bar'));
+
+        // should pass with basepath
+        $actual = $this->router->match('/path/to/sub/index.php/foo/bar');
+        $this->assertSame('DirectAction', $actual->values['action']);
+
+        // should get the basepath in place
+        $expect = '/path/to/sub/index.php/foo/bar';
+        $actual = $this->router->generate('foo.bar');
+        $this->assertSame($expect, $actual);
+    }
+
+
+    public function testWithBasepathDir()
+    {
+        $this->router = $this->newRouter('/path/to/sub');
+        $this->router->add('foo.bar', '/foo/bar', 'DirectAction');
+
+        // should fail without basepath
+        $this->assertFalse($this->router->match('/foo/bar'));
+
+        // should pass with basepath
+        $actual = $this->router->match('/path/to/sub/foo/bar');
+        $this->assertSame('DirectAction', $actual->values['action']);
+
+        // should get the basepath in place
+        $expect = '/path/to/sub/foo/bar';
+        $actual = $this->router->generate('foo.bar');
+        $this->assertSame($expect, $actual);
+    }
 }