ABE-170

AdFabConnect · Sep 4, 2016 · ab245d0 · ab245d0
1 parent 7d23620
commit ab245d0
Show file tree

Hide file tree

Showing 8 changed files with 152 additions and 225 deletions.
diff --git a/src/cli/Builder.js b/src/cli/Builder.js
@@ -36,7 +36,7 @@ class Builder {
 
         Util.getDataList(fileUtils.removeLast(json.abe_meta.link), text, json)
           .then(() => {
-            var page = new Page(json.abe_meta.link, text, json, true)
+            var page = new Page(json.abe_meta.template, text, json, true)
             saveHtml(fileUtils.concatPath(root, dest + json.abe_meta.link), page.html)
             if(files[index + 1]) build(index + 1)
           }).catch(function(e) {
@@ -50,7 +50,7 @@ class Builder {
 
         Util.getDataList(fileUtils.removeLast(json.abe_meta.link), text, json)
           .then(() => {
-            var page = new Page(json.abe_meta.link, text, json, true)
+            var page = new Page(json.abe_meta.template, text, json, true)
             saveHtml(fileUtils.concatPath(root, dest + json.abe_meta.link), page.html)
             if(files[index + 1]) build(index + 1)
           }).catch(function(e) {

diff --git a/src/cli/config/abe-config.js b/src/cli/config/abe-config.js
@@ -68,7 +68,8 @@ var config = {
     templates: {
       extension: 'html',
       assets: '_files',
-      check: /\.hbs|\.shtml|\.html|\.htm/
+      check: /\.hbs|\.shtml|\.html|\.htm/,
+      precompile: false
     }
   },
   log: {

diff --git a/src/cli/models/Manager.js b/src/cli/models/Manager.js
@@ -1,5 +1,11 @@
+import Handlebars from 'handlebars'
+import fse from 'fs-extra'
+import mkdirp from 'mkdirp'
 import {
-  FileParser
+  config,
+  FileParser,
+  fileUtils,
+  folderUtils
 } from '../../cli'
 
 let singleton = Symbol()
@@ -8,10 +14,13 @@ let singletonEnforcer = Symbol()
 class Manager {
 
   constructor(enforcer) {
+
     if(enforcer != singletonEnforcer) throw "Cannot construct Json singleton"
 
-    this._list = FileParser.getAllFiles();
-    this._list[0].files.sort(FileParser.predicatBy('date',-1));
+    Handlebars.templates = Handlebars.templates || {};
+    this.loadHbsTemplates();
+
+    this.updateList()    
   }
 
   static get instance() {
@@ -33,6 +42,21 @@ class Manager {
 
     return this
   }
+
+  loadHbsTemplates() {
+    const path = fileUtils.concatPath(config.root, config.templates.url, 'hbs');
+
+    if(!folderUtils.isFolder(path)) {
+      mkdirp.sync(path)
+    }
+
+    fse.readdirSync(path).forEach(function (file) {
+      if (file.indexOf(".hbs") > -1) {
+        var tmpl = eval("(function(){return " + fse.readFileSync(fileUtils.concatPath(path, file)) + "}());");
+        Handlebars.templates[file.replace('.hbs', '')] = Handlebars.template(tmpl);
+      }
+    })
+  }
 }
 
 export default Manager