Adds test coverage

cammanderson · Sep 24, 2014 · 379d6a4 · 379d6a4
1 parent e85f772
commit 379d6a4
Show file tree

Hide file tree

Showing 15 changed files with 165 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ composer.phar
 vendor/
 composer.lock
 build/
+phpunit.xml
 
 # Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file

diff --git a/README.md b/README.md
@@ -34,6 +34,7 @@ require_once __DIR__.'/../vendor/autoload.php';
 // Use standard HttpFoundation
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 // Create a silex application
 $app = new Silex\Application();
@@ -43,9 +44,9 @@ $app->register(new Silex\Provider\TwigServiceProvider(), array('twig.path' => __
     ->register(new Silex\Provider\MonologServiceProvider(), array('monolog.logfile' => __DIR__.'/../app/logs/development.log'));
 
 // Add in phruts to organise your controllers
-$app->register(new \Phruts\PhrutsServiceProvider(), array(
+$app->register(new Phruts\Provider\PhrutsServiceProvider(), array(
         // Register our modules and configs
-        \Phruts\Util\Globals::ACTION_KERNEL_CONFIG => array(
+        Phruts\Util\Globals::ACTION_KERNEL_CONFIG => array(
             'config' => '../app/config/web-config.xml', // Supports multiple modules/configurations
         )
     ));
@@ -58,7 +59,7 @@ $app->get('{path}', function($path) use ($app) {
 
 // Add routes to be matched by Phruts
 $app->get('{path}', function (Request $request) use ($app) {
-        return $app[\Phruts\Util\Globals::ACTION_KERNEL]->handle($request, \Symfony\Component\HttpKernel\HttpKernelInterface::SUB_REQUEST, false);
+        return $app[\Phruts\Util\Globals::ACTION_KERNEL]->handle($request, HttpKernelInterface::SUB_REQUEST, false);
     })
     ->assert('path', '.*')
     ->value('path', '/'); // Set the welcome path

diff --git a/composer.json b/composer.json
@@ -26,7 +26,9 @@
     "require-dev": {
         "phpunit/phpunit": "~4.1",
         "satooshi/php-coveralls": "dev-master",
-        "mikey179/vfsStream" : "1.*"
+        "mikey179/vfsStream" : "1.*",
+        "symfony/browser-kit": ">=2.3,<2.4-dev",
+        "symfony/css-selector": ">=2.3,<2.4-dev"
     },
     "suggest": {
     },

diff --git a/src/Action/ActionKernel.php b/src/Action/ActionKernel.php
@@ -2,6 +2,7 @@
 namespace Phruts\Action;
 
 use Phruts\Util\PropertyMessageResources;
+use Phruts\Util\RequestUtils;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -18,11 +19,6 @@ class ActionKernel implements HttpKernelInterface
      */
     protected $application;
 
-    /**
-     * @var \Phruts\Action\RequestProcessor
-     */
-    protected $processor;
-
     /**
      * @var \Psr\Log\LoggerInterface
      */
@@ -99,6 +95,7 @@ protected function handleException(\Exception $e, Request $request, $type)
     protected function process(Request $request, Response $response)
     {
         $this->init();
+        RequestUtils::selectModule($request, $this->application);
         $this->getRequestProcessor($this->getModuleConfig($request))->process($request, $response);
     }
 
@@ -121,8 +118,11 @@ protected function init()
 
         // Get the configured modules
         foreach ($this->application[\Phruts\Util\Globals::ACTION_KERNEL_CONFIG] as $prefixParam => $config) {
-            if(strlen($prefixParam) > 7 && substr($prefixParam, 0, 7) == 'config/') continue;
-            $prefix = substr($prefixParam, 7);
+            // Only read in the config params
+            if(strlen($prefixParam) < 6 || substr($prefixParam, 0, 6) != 'config') continue;
+
+            // Strip the config element
+            $prefix = preg_replace('#config/?#', '', $prefixParam);
 
             // Get the module config
             $moduleConfig = $moduleConfigProvider->getModuleConfig($prefix, $config);

diff --git a/src/Action/RequestProcessor.php b/src/Action/RequestProcessor.php
@@ -185,21 +185,22 @@ protected function processPath(\Symfony\Component\HttpFoundation\Request $reques
         if ($path == null) {
             $path = $request->getPathInfo();
         }
-        if (($path != null) && (strlen($path) > 0)) {
-            return ($path);
-        }
 
         // For extension matching, strip the module prefix and extension
         $prefix = $this->moduleConfig->getPrefix();
-        if (substr($path, 0, strlen($prefix)) != $prefix) {
-            $msg = $this->getInternal()->getMessage("processPath", $request->getRequestURI());
-            if (!empty($this->log)) {
-                $this->log->error($msg);
+        if (!empty($prefix)) {
+            if (!preg_match('#^/?' . $prefix . '/.+#', $path)) {
+                $msg = $this->getInternal()->getMessage("processPath", $request->getRequestURI());
+                if (!empty($this->log)) {
+                    $this->log->error($msg);
+                }
+                throw new BadRequestHttpException($msg);
             }
-            throw new BadRequestHttpException($msg);
+            // Strip module
+            $path = preg_replace('#^/?' . $prefix . '#', '', $path);
         }
 
-        return ($path);
+        return $path;
     }
 
     /**

diff --git a/src/PhrutsServiceProvider.php → src/Provider/PhrutsServiceProvider.php b/src/PhrutsServiceProvider.php → src/Provider/PhrutsServiceProvider.php
@@ -1,5 +1,5 @@
 <?php
-namespace Phruts;
+namespace Phruts\Provider;
 
 use Phigester\Digester;
 use Phruts\Config\ConfigRuleSet;

diff --git a/src/Util/RequestUtils.php b/src/Util/RequestUtils.php
@@ -52,6 +52,9 @@ public static function getModuleName(\Symfony\Component\HttpFoundation\Request $
 
         $path = $request->getPathInfo();
 
+        // Clear the first forward slash /module/path
+        if(substr($path, 0, 1) == '/') $path = substr($path, 1);
+
         $prefixes = $application[\Phruts\Util\Globals::PREFIXES_KEY];
         if (is_null($prefixes)) {
             $prefix = '';

diff --git a/tests/ActionTest/ActionKernelTest.php b/tests/ActionTest/ActionKernelTest.php
@@ -2,7 +2,7 @@
 namespace ActionTest;
 
 use Phruts\Action\ActionKernel;
-use Phruts\PhrutsServiceProvider;
+use Phruts\Provider\PhrutsServiceProvider;
 use Phruts\Util\ModuleProvider\FileCacheModuleProvider;
 use Phruts\Util\RequestUtils;
 use Silex\Application;

diff --git a/tests/BehavioursTest.php b/tests/BehavioursTest.php
@@ -3,8 +3,43 @@
  * Created by Cam MANDERSON <cameronmanderson@gmail.com>
  */
 
-class BehavioursTest extends PHPUnit_Framework_TestCase 
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use org\bovigo\vfs\vfsStream;
+use org\bovigo\vfs\vfsStreamDirectory;
+use org\bovigo\vfs\vfsStreamWrapper;
+use Phruts\Util\ModuleProvider\FileCacheModuleProvider;
+
+class BehavioursTest extends \Silex\WebTestCase
 {
+
+    public function testConfigPaths()
+    {
+        $client = $this->createClient();
+
+        // Welcome path
+        $client->request('GET', '');
+        $this->assertTrue($client->getResponse()->isOk());
+
+        $client->request('GET', '/resourceA');
+        $this->assertTrue($client->getResponse()->isOk());
+
+        $client->request('GET', '/resourceB');
+        $this->assertTrue($client->getResponse()->isOk());
+
+        $client->request('GET', '/resourceC');
+        $this->assertTrue($client->getResponse()->isOk());
+
+        $client->request('GET', '/module/resourceA');
+        $this->assertTrue($client->getResponse()->isOk());
+
+        $client->request('GET', '/module/resourceD');
+        $this->assertTrue($client->getResponse()->isOk());
+
+        $client->request('GET', '/module/resourceE');
+        $this->assertTrue($client->getResponse()->isOk());
+    }
+
     public function testGlobalForwards()
     {
 
@@ -51,7 +86,7 @@ public function testDataSource()
 
     }
 
-    public function testActionRoles()
+    public function testRoles()
     {
 
     }
@@ -71,8 +106,53 @@ public function testCustomActionConfig()
         // Test that properties can be set from the action config
     }
 
+    public function testTwigExtensions()
+    {
 
+    }
 
-
+    public function createApplication()
+    {
+        // Create a silex application
+        $app = new Silex\Application();
+
+        // Configure
+        $app['debug'] = true;
+        $app['exception_handler']->disable();
+        $app['session.test'] = true;
+
+        // Add in phruts to organise your controllers
+        $app->register(new Phruts\Provider\PhrutsServiceProvider(), array(
+                // Register our modules and configs
+                Phruts\Util\Globals::ACTION_KERNEL_CONFIG => array(
+                    'config' => __DIR__  . '/Resources/module1-config.xml',
+                    'config/module' => __DIR__ . '/Resources/module2-config.xml'
+                )
+            ));
+
+        // Setup the mock file system for caching
+        vfsStreamWrapper::register();
+        vfsStreamWrapper::setRoot(new vfsStreamDirectory('cacheDir'));
+        $app[Phruts\Util\Globals::MODULE_CONFIG_PROVIDER] = $app->share(function () use ($app) {
+                $provider = new FileCacheModuleProvider($app);
+                $provider->setCachePath(vfsStream::url('cacheDir'));
+                return $provider;
+            });
+
+        // Add a relevant html
+        $app->get('{path}', function($path) use ($app) {
+                return new \Symfony\Component\HttpFoundation\Response(file_get_contents(__DIR__ . '/Resources/' . $path));
+            })
+            ->assert('path', '.+\.html');
+
+        // Add routes to be matched by Phruts
+        $app->get('{path}', function (Request $request) use ($app) {
+                return $app[Phruts\Util\Globals::ACTION_KERNEL]->handle($request, HttpKernelInterface::SUB_REQUEST, false);
+            })
+            ->assert('path', '.*')
+            ->value('path', '/'); // Set the welcome path
+
+        return $app;
+    }
 }
 
diff --git a/tests/PhrutsServiceProviderTest.php b/tests/PhrutsServiceProviderTest.php
@@ -9,7 +9,7 @@ public function testInstantiate()
     {
         $application = new \Silex\Application();
 
-        $service = new \Phruts\PhrutsServiceProvider();
+        $service = new \Phruts\Provider\PhrutsServiceProvider();
         $service->register($application);
         $service->boot($application);
         $this->assertNotEmpty($application[\Phruts\Util\Globals::ACTION_KERNEL]);

diff --git a/tests/Resources/example-config.xml b/tests/Resources/example-config.xml
@@ -8,12 +8,12 @@
     </data-sources>
 
     <form-beans>
-        <form-bean name="bean1" type="\\Example\\FormBeanOne"/>
-        <form-bean name="bean2" type="\\Example\\FormBeanTwo"/>
+        <form-bean name="bean1" type="\Example\FormBeanOne"/>
+        <form-bean name="bean2" type="\Example\FormBeanTwo"/>
     </form-beans>
 
     <global-exceptions>
-        <exception type="\\Example\\SomeException"
+        <exception type="\Example\SomeException"
                    key="some.exception.key"
                    path="error.html.twig"/>
     </global-exceptions>
@@ -51,11 +51,6 @@
     <controller>
         <set-property  property="noCache" value="true"/>
     </controller>
-    <!--<plug-in className="\\Example\\MyExamplePlugin">-->
-        <!--<set-property-->
-                <!--property="config"-->
-                <!--value="somewhere.yaml"/>-->
-    <!--</plug-in>-->
-
-    <message-resources parameter="\\Action\\MessageResources"/>
-</phruts-config>
+
+    <message-resources parameter="\Action\MessageResources"/>
+</phruts-config>
diff --git a/tests/Resources/module1-config.xml b/tests/Resources/module1-config.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phruts-config>
+
+    <global-forwards>
+        <forward name="resource" path="/resource.html" />
+        <forward name="welcome" path="/welcome.html" />
+    </global-forwards>
+
+    <action-mappings>
+        <action path="/"
+                type="\Phruts\Actions\ForwardAction"
+                parameter="welcome"/>
+        <action path="/resourceA"
+                type="\Phruts\Actions\ForwardAction"
+                parameter="resource"/>
+        <action path="/resourceB"
+                type="\Phruts\Actions\ForwardAction"
+                parameter="resource"/>
+        <action path="/resourceC"
+                type="\Phruts\Actions\ForwardAction"
+                parameter="resource"/>
+    </action-mappings>
+
+</phruts-config>
diff --git a/tests/Resources/module2-config.xml b/tests/Resources/module2-config.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phruts-config>
+
+    <global-forwards>
+        <forward name="resource" path="/resource.html" />
+    </global-forwards>
+
+    <action-mappings>
+        <action path="/resourceA"
+                type="\Phruts\Actions\ForwardAction"
+                parameter="resource"/>
+        <action path="/resourceD"
+                type="\Phruts\Actions\ForwardAction"
+                parameter="resource"/>
+        <action path="/resourceE"
+                type="\Phruts\Actions\ForwardAction"
+                parameter="resource"/>
+    </action-mappings>
+</phruts-config>
diff --git a/tests/Resources/resource.html b/tests/Resources/resource.html
@@ -0,0 +1 @@
+<h1>Resource</h1>
diff --git a/tests/Resources/welcome.html b/tests/Resources/welcome.html
@@ -0,0 +1 @@
+<h1>Welcome</h1>