Merge branch 'release/0.6.33'

Author: ljonesfl

.gitignore

@@ -9,3 +9,4 @@ public_html/
 build/
 .phpunit.result.cache
 /examples/test.log
+/examples/bad/test.log

.version.json

@@ -2,6 +2,6 @@
   "strategy": "semver",
   "major": 0,
   "minor": 6,
-  "patch": 32,
+  "patch": 33,
   "build": 0
 }

composer.json

@@ -16,7 +16,8 @@
       "neuron-php/application": "0.6.*",
       "neuron-php/routing": "^0.6.8",
       "symfony/yaml": "^6.4",
-      "league/commonmark": "^2.6"
+      "league/commonmark": "^2.6",
+      "mikey179/vfsstream": "^1.6"
     },
     "require-dev": {
         "phpunit/phpunit": "9.*",

examples/bad/config.yaml

@@ -0,0 +1,13 @@
+logging:
+  destination: \Neuron\Log\Destination\File
+  format: \Neuron\Log\Format\PlainText
+  file: test.log
+  level: debug
+
+views:
+  path: views
+
+system:
+  timezone: US/Eastern
+  base_path: examples/bad
+

examples/bad/config/routes.yaml

@@ -0,0 +1,3 @@
+invalid_yaml:
+  key1: value1
+    key2: val

examples/config/config.yaml

@@ -10,3 +10,4 @@ views:
 system:
   timezone: US/Eastern
   base_path: examples
+  routes_path: examples/config

examples/config/routes.yaml

@@ -4,12 +4,29 @@ routes:
     method: POST
     controller: App\Controllers\AuthController@login
     request: login
+
   test:
     route: /test
     method: POST
     controller: Mvc\TestController@test
     request: test
+
+  put:
+    route: /test_put
+    method: PUT
+    controller: Mvc\TestController@test
+
+  delete:
+    route: /test_delete
+    method: DELETE
+    controller: Mvc\TestController@test
+
   no_request:
     route: /no_request
     method: GET
     controller: Mvc\TestController@no_request
+
+  bad_request:
+    route: /bad_request
+    method: GET
+    controller: Mvc\TestController@bad_request

src/Mvc/Application.php

@@ -7,6 +7,7 @@
 use Neuron\Core\Exceptions\BadRequestMethod;
 use Neuron\Core\Exceptions\MissingMethod;
 use Neuron\Core\Exceptions\NotFound;
+use Neuron\Core\Exceptions\Validation;
 use Neuron\Data\Setting\Source\ISettingSource;
 use Neuron\Log\Log;
 use Neuron\Mvc\Controllers\Factory;
@@ -28,6 +29,8 @@ class Application extends Base
 	private string $_RoutesPath;
 	private Router $_Router;
 	private array $_Requests = [];
+	private bool $_CaptureOutput = false;
+	private ?string $_Output = '';
 
 	/**
 	 * Application constructor.
@@ -43,7 +46,7 @@ public function __construct( string $Version, ?ISettingSource $Source = null )
 
 		Registry::getInstance()->set( 'BasePath', $this->getBasePath() );
 
-		$RoutesPath = $this->getSetting( 'routes_path', 'paths' );
+		$RoutesPath = $this->getSetting( 'routes_path', 'system' );
 		if( $RoutesPath )
 		{
 			$this->setRoutesPath( $RoutesPath );
@@ -53,6 +56,32 @@ public function __construct( string $Version, ?ISettingSource $Source = null )
 		$this->loadRoutes();
 	}
 
+	/**
+	 * @param bool $CaptureOutput
+	 * @return $this
+	 */
+	public function setCaptureOutput( bool $CaptureOutput ): Application
+	{
+		$this->_CaptureOutput = $CaptureOutput;
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getCaptureOutput(): bool
+	{
+		return $this->_CaptureOutput;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getOutput(): ?string
+	{
+		return $this->_Output;
+	}
+
 	/**
 	 * @return string
 	 */
@@ -191,7 +220,16 @@ protected function onStart(): bool
 	 */
 	protected function onRun() : void
 	{
-		echo $this->_Router->run( $this->getParameters() );
+		$Output = $this->_Router->run( $this->getParameters() );
+
+		if( !$this->_CaptureOutput )
+		{
+			echo $Output;
+		}
+		else
+		{
+			$this->_Output = $Output;
+		}
 	}
 
 	/**
@@ -270,7 +308,7 @@ protected function loadRoutes(): void
 		catch( ParseException $exception )
 		{
 			Log::error( "Failed to load routes: ".$exception->getMessage() );
-			return;
+			throw new Validation( $exception->getMessage(), [] );
 		}
 
 		foreach( $Data[ 'routes' ] as $Route )

src/Mvc/Views/Markdown.php

@@ -9,6 +9,7 @@
 use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
 use League\CommonMark\Extension\Footnote\FootnoteExtension;
 use League\CommonMark\MarkdownConverter;
+use Neuron\Core\Exceptions\NotFound;
 use Neuron\Patterns\Registry;
 
 /**
@@ -36,11 +37,13 @@ public function render( array $Data ): string
 			$Path = "$BasePath/resources/views";
 		}
 
-		$View = "$Path/{$this->getController()}/{$this->getPage()}.md";
+		$cwd = getcwd();
+		$ControllerPath = "$Path/{$this->getController()}";
+		$View = $this->findMarkdownFile( $ControllerPath, $this->getPage() );
 
-		if( !file_exists( $View ) )
+		if( !$View )
 		{
-			throw new NotFound( "View notfound: $View" );
+			throw new NotFound( "View notfound: {$this->getPage()}.md in $ControllerPath" );
 		}
 
 		extract( $Data );
@@ -62,6 +65,48 @@ public function render( array $Data ): string
 		return $Page;
 	}
 
+	/**
+	 * Find markdown file in controller directory or nested subdirectories
+	 *
+	 * @param string $BasePath
+	 * @param string $PageName
+	 * @return string|null
+	 */
+	protected function findMarkdownFile( string $BasePath, string $PageName ): ?string
+	{
+		if( !is_dir( $BasePath ) )
+		{
+			return null;
+		}
+
+		// First check direct path
+		$DirectPath = "$BasePath/$PageName.md";
+		if( file_exists( $DirectPath ) )
+		{
+			return $DirectPath;
+		}
+
+		// Search recursively in subdirectories
+		$Iterator = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator( $BasePath, \RecursiveDirectoryIterator::SKIP_DOTS ),
+			\RecursiveIteratorIterator::SELF_FIRST
+		);
+
+		foreach( $Iterator as $File )
+		{
+			if( $File->isFile() && $File->getExtension() === 'md' )
+			{
+				$FileName = $File->getBasename( '.md' );
+				if( $FileName === $PageName )
+				{
+					return $File->getPathname();
+				}
+			}
+		}
+
+		return null;
+	}
+
 	/**
 	 * @return MarkdownConverter
 	 */

tests/Mvc/ApplicationTest.php

@@ -4,6 +4,7 @@
 
 use Neuron\Application\CrossCutting\Event;
 use Neuron\Core\Exceptions\BadRequestMethod;
+use Neuron\Core\Exceptions\MissingMethod;
 use Neuron\Core\Exceptions\NotFound;
 use Neuron\Data\Setting\Source\Yaml;
 use Neuron\Mvc\Application;
@@ -277,4 +278,112 @@ public function testControllerNoRequest()
 
 		$this->assertTrue( $ControllerState );
 	}
+
+	public function testCaptureOutput()
+	{
+		$this->App->setCaptureOutput( true );
+
+		$this->assertTrue( $this->App->getCaptureOutput() );
+
+		$this->App->setRegistryObject( 'Requests.Path', $this->App->getBasePath().'/config/requests' );
+
+		$this->App->run(
+			[
+				"type"  => "GET",
+				"route" => "/test"
+			]
+		);
+
+		$Output = $this->App->getOutput();
+
+		$this->assertStringContainsString(
+			"<html>",
+			$Output
+		);
+
+		$this->assertStringContainsString(
+			"Resource Not Found",
+			$Output
+		);
+
+		$this->assertStringContainsString(
+			"does not exist",
+			$Output
+		);
+
+		global $ControllerState;
+
+		if( $ControllerState )
+			return;
+
+		throw new \Exception( "Controller state is not false." );
+
+	}
+
+	/**
+	 * @throws \Exception
+	 */
+	public function testPut()
+	{
+		$this->App->run(
+			[
+				"type"  => "PUT",
+				"route" => "/test_put"
+			]
+		);
+
+		global $ControllerState;
+		$this->assertTrue( $ControllerState );
+	}
+
+	/**
+	 * @throws \Exception
+	 */
+	public function testDelete()
+	{
+		$this->App->run(
+			[
+				"type"  => "DELETE",
+				"route" => "/test_delete"
+			]
+		);
+
+		global $ControllerState;
+		$this->assertTrue( $ControllerState );
+	}
+
+	public function testRoutesPath()
+	{
+		$this->App->setRoutesPath( 'test');
+		$this->assertEquals(
+			"test",
+			$this->App->getRoutesPath()
+		);
+	}
+
+	public function testBadRoutes()
+	{
+		$this->expectException( \Neuron\Core\Exceptions\Validation::class );
+		$Ini = new Yaml( './examples/bad/config.yaml' );
+		$App = new Application( "1.0.0", $Ini );
+	}
+
+	public function testGetRequest()
+	{
+		$Request = $this->App->getRequest("" );
+
+		$this->assertNull( $Request );
+	}
+
+	public function testMissingControllerMethod()
+	{
+		$this->App->run(
+			[
+				"type"  => "GET",
+				"route" => "/bad_request"
+			]
+		);
+
+		$this->assertTrue( $this->App->getCrashed() );
+	}
 }