Refactor to decouple from Twig

Author: aleksip

src/aleksip/DataTransformPlugin/DataTransformer.php

@@ -2,20 +2,24 @@
 
 namespace aleksip\DataTransformPlugin;
 
+use aleksip\DataTransformPlugin\Renderer;
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\Url;
 use PatternLab\Data;
 use PatternLab\PatternData;
 
 class PatternNotFoundException extends \Exception {}
 
+/**
+ * @author Aleksi Peebles <[email protected]>
+ */
 class DataTransformer
 {
     protected static $processed = array();
 
     protected $reservedKeys;
     protected $patternDataStore;
-    protected $env;
+    protected $renderer;
     protected $hasRun;
 
     public function __construct()
@@ -25,12 +29,12 @@ public function __construct()
         $this->patternDataStore = PatternData::get();
     }
 
-    public function run(\Twig_Environment $env)
+    public function run(Renderer $renderer)
     {
-        $this->env = $env;
         if ($this->hasRun) {
             return;
         }
+        $this->renderer = $renderer;
         // Process global data.
         $dataStore = $this->processData(Data::get());
         Data::replaceStore($dataStore);
@@ -158,7 +162,7 @@ protected function renderPattern($pattern, $data)
             foreach (array_keys($data) as $key) {
                 $data = $this->cloneObjects($data, $key);
             }
-            $pattern = $this->env->render(
+            $pattern = $this->renderer->render(
                 $this->patternDataStore[$pattern]['patternRaw'],
                 $data
             );

src/aleksip/DataTransformPlugin/PatternLabListener.php

@@ -5,34 +5,60 @@
 use aleksip\DataTransformPlugin\Twig\PatternDataNodeVisitor;
 use PatternLab\Config;
 use PatternLab\Listener;
+use PatternLab\PatternEngine;
 use PatternLab\PatternEngine\Twig\TwigUtil;
 
+/**
+ * @author Aleksi Peebles <[email protected]>
+ */
 class PatternLabListener extends Listener
 {
-    protected $dt;
-    protected $nv;
+    /**
+     * @var DataTransformer
+     */
+    protected $dataTransformer;
 
     public function __construct()
     {
-        $this->addListener(
-            'twigPatternLoader.customize',
-            'twigPatternLoaderCustomize'
-        );
+        $this->addListener('patternData.codeHelperStart', 'dataTransformer');
+        $this->addListener('twigPatternLoader.customize', 'addNodeVisitor');
     }
 
-    public function twigPatternLoaderCustomize()
+    public function dataTransformer()
     {
-        $enabled = Config::getOption('plugins.dataTransform.enabled');
-        if (!is_null($enabled) && !((bool)$enabled)) {
+        if (!$this->isEnabled()) {
             return;
         }
 
-        $this->dt ?: $this->dt = new DataTransformer();
-        $this->nv ?: $this->nv = new PatternDataNodeVisitor($this->dt);
+        $this->dataTransformer = new DataTransformer();
+
+        if (Config::getOption('patternExtension') !== 'twig') {
+            $patternEngineBasePath = PatternEngine::getInstance()->getBasePath();
+            $patternLoaderClass = $patternEngineBasePath.'\Loaders\PatternLoader';
+            $patternLoader = new $patternLoaderClass(array());
+            $this->dataTransformer->run(new Renderer($patternLoader));
+        }
+    }
+
+    public function addNodeVisitor()
+    {
+        if (!$this->isEnabled()) {
+            return;
+        }
+
+        $nodeVisitor = new PatternDataNodeVisitor($this->dataTransformer);
 
         $env = TwigUtil::getInstance();
-        $env->addNodeVisitor($this->nv);
+        $env->addNodeVisitor($this->nodeVisitor);
         TwigUtil::setInstance($env);
-        $this->dt->run($env);
+
+        $this->dataTransformer->run(new Renderer($env));
+    }
+
+    protected function isEnabled()
+    {
+        $enabled = Config::getOption('plugins.dataTransform.enabled');
+
+        return (is_null($enabled) || (bool)$enabled);
     }
 }

src/aleksip/DataTransformPlugin/Renderer.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace aleksip\DataTransformPlugin;
+
+/**
+ * @author Aleksi Peebles <[email protected]>
+ */
+class Renderer
+{
+    protected $renderer;
+
+    public function __construct($renderer)
+    {
+        $this->renderer = $renderer;
+    }
+
+    public function render($pattern, $data = array())
+    {
+        if ($this->renderer instanceof \Twig_Environment) {
+            return $this->renderer->render($pattern, $data);
+        }
+        else {
+            return $this->renderer->render(array(
+                'pattern' => $pattern,
+                'data' => $data,
+            ));
+        }
+    }
+}