Added recursive option that enables processing only level of components. Default is true.

ivopetkov · ivopetkov · commit 059cba136140 · 2016-08-29T07:10:00.000+03:00
diff --git a/src/HTMLServerComponentsCompiler.php b/src/HTMLServerComponentsCompiler.php
@@ -39,10 +39,14 @@ function addAlias($alias, $original)
     /**
      * Process (merge) components
      * @param string $html
+     * @param array $options
      * @return string
      */
-    public function process($html)
+    public function process($html, $options = [])
     {
+        if (isset($options['_internal_process_components']) && $options['_internal_process_components'] === false) {
+            return $html;
+        }
         $domDocument = new \IvoPetkov\HTML5DOMDocument();
         $domDocument->loadHTML($html);
         $componentElements = $domDocument->getElementsByTagName('component');
@@ -60,10 +64,14 @@ public function process($html)
                     }
                     if (sizeof($sourceParts) === 2) {
                         $scheme = $sourceParts[0];
+                        if (isset($options['recursive']) && $options['recursive'] === false && ($scheme === 'data' || $scheme === 'file')) {
+                            $componentOptions = array_values($options);
+                            $componentOptions['_internal_process_components'] = false;
+                        }
                         if ($scheme === 'data') {
-                            $componentHTML = $this->processData($sourceParts[1]);
+                            $componentHTML = $this->processData($sourceParts[1], isset($componentOptions) ? $componentOptions : $options);
                         } elseif ($scheme === 'file') {
-                            $componentHTML = $this->processFile(urldecode($sourceParts[1]), $attributes, $component->innerHTML);
+                            $componentHTML = $this->processFile(urldecode($sourceParts[1]), $attributes, $component->innerHTML, isset($componentOptions) ? $componentOptions : $options);
                         } else {
                             throw new \Exception('URI scheme not valid!' . $domDocument->saveHTML($component));
                         }
@@ -101,28 +109,30 @@ public function process($html)
     /**
      * 
      * @param string $data
+     * @param array $options
      * @return string
      */
-    public function processData($data)
+    public function processData($data, $options = [])
     {
         $html = $data;
         if (substr($data, 0, 7) === 'base64,') {
             $html = base64_decode(substr($data, 7));
         }
-        return $this->process($html);
+        return $this->process($html, $options);
     }
 
     /**
      * 
      * @param string $file
      * @param array $attributes
      * @param string $innerHTML
+     * @param array $options
      * @return string
      */
-    public function processFile($file, $attributes = [], $innerHTML = '')
+    public function processFile($file, $attributes = [], $innerHTML = '', $options = [])
     {
         $component = $this->constructComponent($attributes, $innerHTML);
-        return $this->process($this->getComponentFileContent($file, $component));
+        return $this->process($this->getComponentFileContent($file, $component), $options);
     }
 
     /**
diff --git a/tests/Test.php b/tests/Test.php
@@ -39,4 +39,23 @@ public function testProccessHTML()
         $this->assertTrue($result === $expectedResult);
     }
 
+    /**
+     * 
+     */
+    public function testProccessRecursion()
+    {
+        $fullFilename1 = $this->createFile('component1.php', '<html><head><meta custom="value1"></head><body>text1</body></html>');
+        $fullFilename2 = $this->createFile('component1.php', '<html><head><meta custom="value2"></head><body><component src="file:' . urlencode($fullFilename1) . '"></component>text2</body></html>');
+        $fullFilename3 = $this->createFile('component1.php', '<html><head><meta custom="value3"></head><body><component src="file:' . urlencode($fullFilename2) . '"></component>text3</body></html>');
+
+        $compiler = new \IvoPetkov\HTMLServerComponentsCompiler();
+        $result = $compiler->process('<component src="file:' . $fullFilename3 . '"/>');
+        $expectedResult = '<!DOCTYPE html><html><head><meta custom="value3"><meta custom="value2"><meta custom="value1"></head><body>text1text2text3</body></html>';
+        $this->assertTrue($result === $expectedResult);
+
+        $result = $compiler->process('<component src="file:' . $fullFilename3 . '"/>', ['recursive' => false]);
+        $expectedResult = '<!DOCTYPE html><html><head><meta custom="value3"></head><body><component src="file:' . urlencode($fullFilename2) . '"></component>text3</body></html>';
+        $this->assertTrue($result === $expectedResult);
+    }
+
 }
