#16 - Unit tested

Author: technicalguru

.gitignore

@@ -5,3 +5,4 @@ composer.phar
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
 # composer.lock
 /composer.lock
+/nbproject/private/

src/TgUtils/Templating/DateFormatter.php

@@ -21,7 +21,7 @@ public function format($value, $params, Processor $processor) {
 			switch ($params[0]) {
 			case 'unix': return $value->toUnix();
 			case 'iso8601': return $value->toISO8601(TRUE);
-			case 'rfc8601': return $value->toRFC822(TRUE);
+			case 'rfc822': return $value->toRFC822(TRUE);
 			}
 			return $value->format(\TgI18n\I18N::_($params[0]), TRUE, TRUE, $processor->language);
 		}

src/TgUtils/Templating/Processor.php

@@ -2,6 +2,8 @@
 
 namespace TgUtils\Templating;
 
+use TgI18n\I18N;
+
 /** Provides some basic templating mechanism */
 class Processor {
 
@@ -89,13 +91,13 @@ public function getObject($name) {
 	 * Returns the formatter with the given key or NULL.
 	 */
 	public function getFormatter($name) {
-		return isset($this->formatter[$name]) ? $this->formatter[$name] : NULL; 
+		return isset($this->formatters[$name]) ? $this->formatters[$name] : NULL; 
 	}
 
 	/**
 	 * Returns the snippet with the given key or NULL.
 	 */
-	protected function getSnippet($name) {
+	public function getSnippet($name) {
 		return isset($this->snippets[$name]) ? $this->snippets[$name] : NULL; 
 	}
 
@@ -105,7 +107,7 @@ protected function getSnippet($name) {
 	  * The formatter "datetime" will be used then.
 	  * More arguments for the formatter can follow, separated with : again
 	  */
-	protected function getAttribute($objName, $attr) {
+	public function getAttribute($objName, $attr) {
 		$object = $this->getObject($objName);
 		$rc = '';
 		if ($object != null) {
@@ -120,13 +122,13 @@ protected function getAttribute($objName, $attr) {
 				if ($attrFormat != 'plain') {
 					$formatter = $this->getFormatter($attrFormat);
 					if ($formatter != NULL) {
-						$rc = $formatter->format($object->$attrName, $attrDef, $this);
+						$rc = $formatter->format($value, $attrDef, $this);
 					}
 				} else if (is_object($value)) {
 					if (is_a($value, 'TgUtils\\Date')) {
 						$formatter = $this->getFormatter('date');
 						if ($formatter == NULL) $formatter = new DateFormatter();
-						$rc = $formatter->format($object->$attrName, $attrDef, $this);
+						$rc = $formatter->format($value, $attrDef, $this);
 					} else {
 						$rc = $value->__toString();
 					}

tests/TgUtils/Templating/ProcessorTest.php

@@ -0,0 +1,66 @@
+<?php declare(strict_types=1);
+
+namespace TgUtils\Templating;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test the templating
+ * @author ralph
+ *        
+ */
+class ProcessorTest extends TestCase {
+
+    public function testSnippetWithString(): void {
+        $processor = self::createProcessor();
+        $template  = 'This is the output: {{textSnippet}}';
+        $result    = $processor->process($template);
+        $this->assertEquals('This is the output: This is text snippet.', $result);
+    }
+
+    public function testSnippetWithSnippet(): void {
+        $processor = self::createProcessor();
+        $template  = 'This is the output: {{mySnippet}}';
+        $result    = $processor->process($template);
+        $this->assertEquals('This is the output: This is my-snippet.', $result);
+    }
+
+    public function testSimpleAttribute(): void {
+        $processor = self::createProcessor();
+        $template  = 'This is the output: {{testObject.name}}';
+        $result    = $processor->process($template);
+        $this->assertEquals('This is the output: testObjectName', $result);
+    }
+
+    public function testFormatter(): void {
+        $processor = self::createProcessor();
+        $template  = 'This is the output: {{testObject.aDate:date:rfc822}}';
+        $result    = $processor->process($template);
+        $this->assertEquals('This is the output: Fri, 01 Jan 2021 00:00:00 +0000', $result);
+    }
+
+    protected static function createProcessor(): Processor {
+        $testObject = new \stdClass;
+        $testObject->name  = 'testObjectName';
+        $testObject->aDate = new \TgUtils\Date(1609459200, 'UTC');
+        
+        $objects    = array(
+            'testObject' => $testObject,
+        );
+        $snippets   = array(
+            'textSnippet' => 'This is text snippet.',
+            'mySnippet'   => new TestSnippet(),
+        );
+        $formatters = array(
+            'date' => new DateFormatter(),
+        );
+        return new Processor($objects, $snippets, $formatters, 'en');
+    }
+}
+
+class TestSnippet implements Snippet {
+
+    public function getOutput($processor) {
+        return 'This is my-snippet.';
+    }
+}