v2

Signed-off-by: Bruno Meilick <[email protected]>
bnomei · Jan 8, 2019 · dc4c9cf · dc4c9cf
1 parent bd2a6ea
commit dc4c9cf
Show file tree

Hide file tree

Showing 7 changed files with 151 additions and 263 deletions.
diff --git a/classes/Handlebars.php b/classes/Handlebars.php
@@ -1,4 +1,8 @@
 <?php
+
+namespace Bnomei;
+
+use LightnCandy\LightnCandy;
 use Kirby\Toolkit\F;
 use Kirby\Toolkit\Dir;
 
@@ -28,7 +32,7 @@ private static function compileOptions()
         }
 
         $flags = LightnCandy::FLAG_ELSE;
-        if (option('bnomei.handlebars.escape')) {
+        if (option('bnomei.handlebars.no-escape')) {
             $flags |= LightnCandy::FLAG_NOESCAPE;
         }
         // NOTE: current will not notice change between debug and not. l'n'c debug is not supported here yet.
@@ -118,7 +122,9 @@ private static function templateOutput($filename, $isPartial = false)
         if ($isPartial) {
             $filename = '@' . $filename;
         }
-        return kirby()->roots()->templates() . DIRECTORY_SEPARATOR . $filename . '.' .option('bnomei.handlebars.extension.output');
+        return kirby()->roots()->cache() . DIRECTORY_SEPARATOR .
+            'bnomei' . DIRECTORY_SEPARATOR . 'handlebars' . DIRECTORY_SEPARATOR . 'lnc' . DIRECTORY_SEPARATOR .
+            $filename . '.' .option('bnomei.handlebars.extension.output');
     }
 
     private static $templates = [];
@@ -195,7 +201,6 @@ public static function r($name, array $data = [], $root = null, $file = null): s
                 return '';
             }
 
-
             if (!$result || $loadTemplate['needsUpdate']) {
                 // NOTE: since LightnCandy returns a Closure and
                 // these can not be packed into a var as string
@@ -204,7 +209,7 @@ public static function r($name, array $data = [], $root = null, $file = null): s
                 $result = snippet('handlebars/render', [
                     'precompiledTemplate' => $php,
                     'data' => $data,
-                    ]);
+                ], true);
 
                 if ($renderCacheId) {
                     $renderCache->set($renderCacheId, $result);

diff --git a/composer.json b/composer.json
@@ -45,14 +45,15 @@
     ],
     "require": {
         "php": ">=7.1.0",
-        "zordius/lightncandy": "1.2.2",
-        "getkirby/cms": "^3.0.0-RC-2.0"
+        "getkirby/cms": "^3.0.0-RC-2.0",
+        "zordius/lightncandy": "1.2.2"
     },
     "conflict": {
         "getkirby/kirby": "<3.0"
     },
     "scripts": {
         "zip": [
+            "touch kirby3-handlebars.zip",
             "rm kirby3-handlebars.zip",
             "composer install --no-dev",
             "composer remove getkirby/cms",