Updated extend to apply plugins before render

src/SurfStack/Templating/Template_Engine.php

@@ -58,6 +58,8 @@ function __construct($path, $template)
 
         $this->setTemplateDir($path);
         $this->setTemplate($template);
+
+        $this->setInternal('engine', $this);
     }
 
     /**
@@ -787,7 +789,8 @@ protected function dynamicPluginReplacement($matches)
 \$class->store('arrEngineVariables', \$this->variables);
 \$class->store('arrEngineInternals', \$this->internal);
 \$class->store('arrPluginVariables', $sPassed);
-echo \$class->render($pluginContent); ?>";
+echo \$class->render($pluginContent); ?>
+";
     }
 
     /**
@@ -801,6 +804,48 @@ protected function parsePlugins($content)
         return preg_replace_callback(array_values($this->loadPlugins()), array($this, 'dynamicPluginReplacement') , $content);
     }
 
+    /**
+     * Return the rendered outpu of a string run through the plugins 
+     * @param string $content
+     * @return string
+     */
+    function getRenderPlugins($content)
+    {
+        $file = tempnam($this->getCompileDir(), 'tmp');
+
+        file_put_contents($file, $this->parsePlugins($content));
+
+        ob_start();
+        require $file;
+        $output = ob_get_contents();
+        ob_end_clean();
+
+        unlink($file);
+
+        return $output;
+    }
+
+    /**
+     * Return the rendered output of a string run through the entire process
+     * @param string $content
+     * @return string
+     */
+    function getRenderString($content)
+    {
+        $file = tempnam($this->getCompileDir(), 'tmp');
+
+        file_put_contents($file, $this->modifyTemplateRegex($content));
+
+        ob_start();
+        require $file;
+        $output = ob_get_contents();
+        ob_end_clean();
+
+        unlink($file);
+
+        return $output;
+    }
+
     /**
      * Replace custom tags with standard PHP tags
      * @param string $content

src/SurfStack/Templating/plugin/Extend.php

@@ -11,6 +11,7 @@
 
 namespace SurfStack\Templating\Plugin;
 use SurfStack\Templating\Core\Slice;
+use SurfStack\Templating\Template_Engine;
 
 /**
  * SurfStack Template Extend Block
@@ -97,8 +98,8 @@ function render()
                 }
             }
             while ($this->parents);
-            
-            return $this->overlayTemplate();
+
+            return $this->arrEngineInternals['engine']->getRenderPlugins($this->overlayTemplate());
         }
         else
         {

tests/SurfStack/Templating/Template_Engine_Test.php

@@ -397,7 +397,7 @@ public function testExtend()
 
         $content = str_replace("\r\n","\n", $this->output);
 
-        $this->assertSame($content, "<p>Hello world!</p>\n\n<div>\nTest from grandparent\nTest from parent\n</div>\n\n<div>\nSafe from child\nSafe from grandparent\n</div>");
+        $this->assertSame($content, "<p>Hello world!</p>\n\n<div>\nTest from grandparent\nTest from parent\n</div>\n\n<div>\nSafe from child ".date('Y')."\nSafe from grandparent\n</div>");
     }
 
     public function testNoCacheTemplates()

tests/SurfStack/Templating/plugin/Extend.php

@@ -11,6 +11,7 @@
 
 namespace SurfStack\Templating\Plugin;
 use SurfStack\Templating\Core\Slice;
+use SurfStack\Templating\Template_Engine;
 
 /**
  * SurfStack Template Extend Block
@@ -97,8 +98,8 @@ function render()
                 }
             }
             while ($this->parents);
-            
-            return $this->overlayTemplate();
+
+            return $this->arrEngineInternals['engine']->getRenderPlugins($this->overlayTemplate());
         }
         else
         {

tests/SurfStack/Templating/template/child.tpl

@@ -1,6 +1,6 @@
 {extend file='parent.tpl'}
 
 {section name='safe'}
-Safe from child
+Safe from child {Time}
 {parent}
 {/section}