Merge pull request #34 from JoshuaCarter/1.2

Adds back child html functionality, add test, and fixes json strings
symbiote · Nov 17, 2018 · ad801e1 · ad801e1
2 parents 12fac66 + decd377
commit ad801e1
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 1 deletion.
diff --git a/src/SilbinaryWolf/Components/ComponentService.php b/src/SilbinaryWolf/Components/ComponentService.php
@@ -63,7 +63,7 @@ public function generateTemplateCode(array $data, $parser)
                     }
                 default:
                     {
-                    // restricted name error
+                        // restricted name error
                         if ($propName[0] === '_') {
                             throw new SSTemplateParseException('Invalid special property type: "' . $propName . '", properties that start with a _ are reserved for special functionality. Available special property types are: "_json".', $parser);
                             break;
@@ -73,6 +73,9 @@ public function generateTemplateCode(array $data, $parser)
                     }
             }
         }
+
+        // handle child html
+        $php .= self::handleChildHTML($data, $properties, $parser);
 
         // final render call for output php
         $php .= "\$val .= Injector::inst()->get('SilbinaryWolf\\Components\\ComponentService')->renderComponent('$componentName', \$_props, \$scope);\nunset(\$_props);\n";
@@ -139,12 +142,35 @@ private static function handlePropertyJSON($propValue, $parser)
             if (is_array($value)) {
                 $value = self::exportNestedDataForTemplates($value);
             }
+            // handle strings
+            else if (is_string($value)) {
+                $value = '"' . $value . '"';
+            }
             $buffer .= self::Prop2PHP($name, $value);
         }
 
         return $buffer;
     }
 
+    private static function handleChildHTML($data, $properties, $parser)
+    {
+        if (isset($data['Children']['php'])) {
+            // handle children property collision
+            if (isset($properties['children'])) {
+                throw new SSTemplateParseException('Cannot use "children" as a property name and have inner HTML.', $parser);
+            }
+
+            // construct php
+            $value = $data['Children']['php'];
+            $php = "\$_props['children'] = '';\n" . $value;
+            $php = str_replace("\$val .=", "\$_props['children'] .=", $php);
+            $php .= "\$_props['children'] = DBField::create_field('HTMLText', \$_props['children']);\n";
+
+            return $php;
+        }
+        return '';
+    }
+
     private static function Prop2PHP($name, $value)
     {
         // turns a value into php code

diff --git a/tests/ComponentTest.php b/tests/ComponentTest.php
@@ -635,6 +635,41 @@ public function testJSONDeeplyNested()
         $this->assertEqualIgnoringWhitespace($expectedHTML, $resultHTML, 'Unexpected output');
     }
 
+    /**
+     * Test iterating multiple root level properties in templates
+     */
+    public function testJSONMultiRoot()
+    {
+        $template = <<<SSTemplate
+<:JSONRootTest
+    _json='{
+        "Title": "Root Test",
+        "Root1": [
+            {"Title": "one"},
+            {"Title": "two"}
+        ],
+        "Root2": [
+            {"Title": "three"},
+            {"Title": "four"}
+        ]
+    }'
+/>
+SSTemplate;
+        $expectedHTML = <<<HTML
+    <h1>Root Test</h1>
+    <div>
+        <h2>one</h2>        
+        <h2>two</h2>
+    </div>
+    <div>
+        <h2>three</h2>
+        <h2>four</h2>        
+    </div>
+HTML;
+        $resultHTML = SSViewer::fromString($template)->process(null);
+        $this->assertEqualIgnoringWhitespace($expectedHTML, $resultHTML, 'Unexpected output');
+    }
+
     /**
      * Taken from "framework\tests\view\SSViewerTest.php"
      */

diff --git a/tests/templates/components/JSONRootTest.ss b/tests/templates/components/JSONRootTest.ss
@@ -0,0 +1,18 @@
+
+<% if $Title %>
+  <h1>$Title</h1>
+<% end_if %>
+<% if $Root1 %>
+  <div>
+    <% loop $Root1 %>
+      <h2>$Title</h2>
+    <% end_loop %>
+  </div>
+<% end_if %>
+<% if $Root2 %>
+  <div>
+    <% loop $Root2 %>
+      <h2>$Title</h2>
+    <% end_loop %>
+  </div>
+<% end_if %>