Add Route::allowAll().

FrontController uses Routes.
letsdrink · Sep 26, 2013 · f445361 · f445361
1 parent 450c818
commit f445361
Show file tree

Hide file tree

Showing 9 changed files with 161 additions and 72 deletions.
diff --git a/lib/Ouzo/ControllerResolver.php b/lib/Ouzo/ControllerResolver.php
@@ -1,6 +1,8 @@
 <?php
 namespace Ouzo;
 
+use Ouzo\Utilities\Strings;
+
 class ControllerResolver
 {
     function __construct($controllerPath = "\\Controller\\")
@@ -11,19 +13,14 @@ function __construct($controllerPath = "\\Controller\\")
         $this->_uri = new Uri();
     }
 
-    public function getCurrentController()
+    public function  getController($controller, $action)
     {
-        $controllerName = $this->_uri->getController();
+        $controllerName = Strings::underscoreToCamelCase($controller);
         $controller = $this->controllerPath . $controllerName . "Controller";
 
         $this->_validateControllerExists($controller);
 
-        return new $controller($this->_getCurrentAction());
-    }
-
-    private function _getCurrentAction()
-    {
-        return $this->_uri->getAction() ? : $this->_defaultAction;
+        return new $controller($action);
     }
 
     private function _validateControllerExists($controller)

diff --git a/lib/Ouzo/FrontController.php b/lib/Ouzo/FrontController.php
@@ -3,16 +3,17 @@
 
 use Exception;
 use Ouzo\Logger\Logger;
+use Ouzo\Routing\Router;
 
 class FrontController
 {
     public static $requestId;
     public static $userId;
 
-    private $_uri;
-    private $_uriAction;
     private $_defaults;
+    private $_currentAction;
     private $_currentController;
+    private $_currentControllerObject;
 
     public $redirectHandler;
     public $sessionInitializer;
@@ -23,7 +24,6 @@ public function __construct()
     {
         self::$requestId = uniqid();
 
-        $this->_uri = new Uri();
         $this->_defaults = Config::getValue('global');
 
         $this->redirectHandler = new RedirectHandler();
@@ -35,12 +35,18 @@ public function __construct()
 
     public function init()
     {
-        $this->_uriAction = $this->_uri->getAction();
+        $uri = new Uri();
 
-        if ($this->_isNoController()) {
+        $router = new Router($uri->getPathWithoutPrefix());
+        $routeRule = $router->findRoute();
+
+        $this->_currentController = $routeRule->getController();
+        $this->_currentAction = $routeRule->isRequireAction() ? $routeRule->getAction() : $uri->getAction();
+
+        if (!$routeRule->getController()) {
             $this->_redirectToDefault();
         } else {
-            $this->_currentController = $this->controllerResolver->getCurrentController();
+            $this->_currentControllerObject = $this->controllerResolver->getController($this->_currentController, $this->_currentAction);
 
             $this->sessionInitializer->startSession();
 
@@ -58,14 +64,9 @@ public function init()
         }
     }
 
-    public function getCurrentController()
-    {
-        return $this->_currentController;
-    }
-
-    private function _isNoController()
+    public function getCurrentControllerObject()
     {
-        return !$this->_uri->getRawController();
+        return $this->_currentControllerObject;
     }
 
     private function _redirectToDefault()
@@ -82,15 +83,15 @@ private function _redirect($url)
 
     private function _invokeInit()
     {
-        if (method_exists($this->_currentController, 'init')) {
-            $this->_currentController->init();
+        if (method_exists($this->_currentControllerObject, 'init')) {
+            $this->_currentControllerObject->init();
         }
     }
 
     private function _invokeBeforeMethods()
     {
-        foreach ($this->_currentController->before as $method) {
-            if (!$this->_currentController->$method()) {
+        foreach ($this->_currentControllerObject->before as $method) {
+            if (!$this->_currentControllerObject->$method()) {
                 return false;
             }
 
@@ -103,24 +104,24 @@ private function _invokeBeforeMethods()
 
     private function _invokeAfterMethods()
     {
-        foreach ($this->_currentController->after as $method) {
-            $this->_currentController->$method();
+        foreach ($this->_currentControllerObject->after as $method) {
+            $this->_currentControllerObject->$method();
         }
     }
 
     private function _invokeAction()
     {
-        $currentAction = $this->_currentController->currentAction;
-        if (method_exists($this->_currentController, $currentAction)) {
-            $this->_currentController->$currentAction();
+        $currentAction = $this->_currentControllerObject->currentAction;
+        if (method_exists($this->_currentControllerObject, $currentAction)) {
+            $this->_currentControllerObject->$currentAction();
         } else {
-            throw new FrontControllerException('No action [' . $currentAction . '] defined in controller [' . get_class($this->_currentController) . '].');
+            throw new FrontControllerException('No action [' . $currentAction . '] defined in controller [' . get_class($this->_currentControllerObject) . '].');
         }
     }
 
     private function _doActionOnResponse()
     {
-        $controller = $this->_currentController;
+        $controller = $this->_currentControllerObject;
         switch ($controller->getStatusResponse()) {
             case 'show':
                 $controller->display();
@@ -156,12 +157,12 @@ private function _showOutputBuffer()
     private function _logRequest()
     {
         self::$userId = isset($_SESSION['id_user_ses']) ? $_SESSION['id_user_ses'] : null;
-        Logger::getLogger(__CLASS__)->info('[Request:/%s/%s]', array($this->_uri->getRawController(), $this->_uriAction));
+        Logger::getLogger(__CLASS__)->info('[Request:/%s/%s]', array($this->_currentController, $this->_currentAction));
     }
 
     private function _isRedirect()
     {
-        return in_array($this->_currentController->getStatusResponse(), array('redirect', 'redirectOld'));
+        return in_array($this->_currentControllerObject->getStatusResponse(), array('redirect', 'redirectOld'));
     }
 }
 

diff --git a/lib/Ouzo/Routing/RouteRule.php b/lib/Ouzo/Routing/RouteRule.php
@@ -81,6 +81,10 @@ private function _isEqualOrAnyMethod()
 
     private function _matches($uri)
     {
+        preg_match('#/.+?/(.+?)(/|$)#', $uri, $matches);
+        if ($this->isInExceptActions(Arrays::getValue($matches, 1, ''))) {
+            return false;
+        }
         if ($this->getUri() == $uri) {
             return true;
         }

diff --git a/lib/Ouzo/Tests/ControllerTestCase.php b/lib/Ouzo/Tests/ControllerTestCase.php
@@ -2,6 +2,7 @@
 namespace Ouzo\Tests;
 
 use Ouzo\Config;
+use Ouzo\FrontController;
 
 class ControllerTestCase extends DbTransactionalTestCase
 {
@@ -20,7 +21,7 @@ public function __construct()
         $this->_sessionInitializer = new MockSessionInitializer();
         $this->_downloadHandler = new MockDownloadHandler();
 
-        $this->_frontController = new \Ouzo\FrontController();
+        $this->_frontController = new FrontController();
         $this->_frontController->redirectHandler = $this->_redirectHandler;
         $this->_frontController->sessionInitializer = $this->_sessionInitializer;
         $this->_frontController->downloadHandler = $this->_downloadHandler;
@@ -30,6 +31,7 @@ public function __construct()
     public function get($url)
     {
         $_SERVER['REQUEST_URI'] = $this->_prefixSystem . $url;
+        $_SERVER['REQUEST_METHOD'] = 'GET';
         $_GET = $this->_parseUrlParams($_SERVER['REQUEST_URI']);
 
         $this->_initFrontController();
@@ -77,17 +79,17 @@ private function _removePrefix($string)
 
     public function assertRenders($string)
     {
-        $statusResponse = $this->_frontController->getCurrentController()->getStatusResponse();
-        $location = $this->_frontController->getCurrentController()->getRedirectLocation();
+        $statusResponse = $this->_frontController->getCurrentControllerObject()->getStatusResponse();
+        $location = $this->_frontController->getCurrentControllerObject()->getRedirectLocation();
         if ($statusResponse != 'show') {
             $this->fail("Expected render $string but was $statusResponse $location");
         }
-        $this->assertEquals($string, $this->_frontController->getCurrentController()->view->getViewName());
+        $this->assertEquals($string, $this->_frontController->getCurrentControllerObject()->view->getViewName());
     }
 
     public function assertAssignsModel($variable, $modelObject)
     {
-        $modelVariable = $this->_frontController->getCurrentController()->view->$variable;
+        $modelVariable = $this->_frontController->getCurrentControllerObject()->view->$variable;
         $this->assertNotNull($modelVariable);
         $this->assertEquals($modelObject->attributes(), $modelVariable->attributes());
     }
@@ -99,13 +101,13 @@ public function assertDownloadFile($file)
 
     public function assertAssignsValue($variable, $value)
     {
-        $this->assertNotNull($this->_frontController->getCurrentController()->view->$variable);
-        $this->assertEquals($value, $this->_frontController->getCurrentController()->view->$variable);
+        $this->assertNotNull($this->_frontController->getCurrentControllerObject()->view->$variable);
+        $this->assertEquals($value, $this->_frontController->getCurrentControllerObject()->view->$variable);
     }
 
     public function assertRendersContent($content)
     {
-        $this->assertEquals($content, $this->_frontController->getCurrentController()->layout->layoutContent());
+        $this->assertEquals($content, $this->_frontController->getCurrentControllerObject()->layout->layoutContent());
     }
 
     public function assertRenderedJsonAttributeEquals($attribute, $equals)
@@ -116,7 +118,7 @@ public function assertRenderedJsonAttributeEquals($attribute, $equals)
 
     public function getAssigned($name)
     {
-        return $this->_frontController->getCurrentController()->view->$name;
+        return $this->_frontController->getCurrentControllerObject()->view->$name;
     }
 
     public function assertAttributesEquals($expected, $actual)
@@ -126,6 +128,6 @@ public function assertAttributesEquals($expected, $actual)
 
     public function getRenderedJsonAsArray()
     {
-        return json_decode($this->_frontController->getCurrentController()->layout->layoutContent(), true);
+        return json_decode($this->_frontController->getCurrentControllerObject()->layout->layoutContent(), true);
     }
 }
diff --git a/lib/Ouzo/Uri.php b/lib/Ouzo/Uri.php
@@ -50,6 +50,17 @@ private function _parseParams($params)
         return $paramsArray;
     }
 
+    public function getPath()
+    {
+        return $this->_pathProvider->getPath();
+    }
+
+    public function getPathWithoutPrefix()
+    {
+        $defaults = Config::getValue('global');
+        return Strings::removePrefix($this->getPath(), $defaults['prefix_system']);
+    }
+
     public function getParam($param)
     {
         $params = $this->getParams();

diff --git a/test/lib/Ouzo/BeforeFilterTest.php b/test/lib/Ouzo/BeforeFilterTest.php
@@ -1,5 +1,6 @@
 <?php
 use Ouzo\Controller;
+use Ouzo\Routing\Route;
 use Ouzo\Tests\ControllerTestCase;
 
 class SampleControllerException extends Exception
@@ -31,7 +32,7 @@ public function action()
 
 class MockControllerResolver
 {
-    public function getCurrentController()
+    public function getController()
     {
         return new SampleController();
     }
@@ -44,13 +45,17 @@ public function setUp()
         parent::setUp();
         $this->_frontController->controllerResolver = new MockControllerResolver();
         $this->_frontController->redirectHandler = $this->getMock('\Ouzo\RedirectHandler', array('redirect'));
+        Route::$routes = array();
     }
 
     /**
      * @test
      */
     public function shouldNotInvokeActionWhenBeforeFilterReturnFalse()
     {
+        //given
+        Route::any('/sample/action', 'sample#action');
+
         //when
         try {
             $this->get('/sample/action');

diff --git a/test/lib/Ouzo/ControllerResolverTest.php b/test/lib/Ouzo/ControllerResolverTest.php
@@ -22,27 +22,9 @@ public function shouldResolveAction()
         $_SERVER['REQUEST_URI'] = "{$config['prefix_system']}/simple_test/action1";
 
         //when
-        $currentController = $controllerResolver->getCurrentController();
+        $currentController = $controllerResolver->getController('simple_test', 'action1');
 
         //then
         $this->assertEquals('action1', $currentController->currentAction);
     }
-
-    /**
-     * @test
-     */
-    public function shouldUseDefaultActionIfNoActionInUrl()
-    {
-        //given
-        $controllerResolver = new ControllerResolver('\\Ouzo\\');
-
-        $config = Config::getValue('global');
-        $_SERVER['REQUEST_URI'] = "{$config['prefix_system']}/simple_test";
-
-        //when
-        $currentController = $controllerResolver->getCurrentController();
-
-        //then
-        $this->assertEquals($config['action'], $currentController->currentAction);
-    }
 }