bug unknow file include + unit test get template

src/cli/helpers/abe-template.js

@@ -15,7 +15,7 @@ import {
   ,Plugins
 } from '../../cli'
 
-function addOrder(text) {
+export function addOrder(text) {
   var regAbe = /{{abe[\S\s].*?key=['|"]([\S\s].*?['|"| ]}})/g
   var matches = text.match(regAbe)
   var order = 0
@@ -38,19 +38,31 @@ function addOrder(text) {
   return text
 }
 
-function partials(text) {
-  var importReg = /({{abe.*type=[\'|\"]import.*}})/g
+export function getAbeImport(text) {
+  var partials = []
+  let listReg = /({{abe.*?type=[\'|\"]import.*?}})/g
   var match
+  while (match = listReg.exec(text)) {
+    partials.push(match[0])
+  }
+
+  return partials
+}
 
-  while (match = importReg.exec(text)) {
-    var file = getAttr(match[0], 'file')
+export function includePartials(text) {
+  var abeImports = getAbeImport(text)
+
+  Array.prototype.forEach.call(abeImports, (abeImport) => {
+    var obj = Util.getAllAttributes(abeImport, {})
+
+    var file = obj.file
     var partial = ''
     file = path.join(config.root, config.partials, file)
     if(fileUtils.isFile(file)) {
       partial = fse.readFileSync(file, 'utf8')
     }
-    text = text.replace(escapeTextToRegex(match[0], 'g'), partial)
-  }
+    text = text.replace(escapeTextToRegex(abeImport, 'g'), partial)
+  })
 
   return text
 }
@@ -114,7 +126,7 @@ export function getTemplate (file) {
   file = path.join(config.root, config.templates.url, file + '.' + config.files.templates.extension)
   if(fileUtils.isFile(file)) {
     text = fse.readFileSync(file, 'utf8')
-    text = partials(text)
+    text = includePartials(text)
     text = translate(text)
     text = addOrder(text)
   }else {

src/cli/helpers/abe-utils.js

@@ -564,6 +564,7 @@ export default class Utils {
       tab: 'default',
       type: 'text',
       value: '',
+      file: '',
       visible: true
     }
 

test/fixtures/templates/article.html

@@ -1 +1,6 @@
-"{{abe type='data' key='top_things_slider_highlight' desc='Automatic slider' source='select abe_meta from ./' editable='false'}}"
+{{abe type='data' key='top_things_slider_highlight' desc='Automatic slider' source='select abe_meta from ./' editable='false'}}
+
+{{abe type='import' file='title.html'}}
+
+<div>{{abe type='import' file='test.html'}}</div>{{abe type='import' file='test.html'}}
+			{{abe type='import' file='test.html'}}

test/fixtures/templates/partials/test.html

@@ -0,0 +1 @@
+test

test/fixtures/templates/partials/title.html

@@ -0,0 +1 @@
+{{abe type='text' key='title' desc='titre' tab='default'}}

test/template.js

@@ -0,0 +1,50 @@
+var chai = require('chai');
+
+var config = require('../src/cli').config
+config.set({root: __dirname + '/fixtures'})
+
+var getTemplate = require('../src/cli').getTemplate
+var includePartials = require('../src/cli/helpers/abe-template').includePartials
+var getAbeImport = require('../src/cli/helpers/abe-template').getAbeImport
+var Manager = require('../src/cli').Manager;
+var fse = require('fs-extra');
+
+describe('Template', function() {
+  before( function(done) {
+    Manager.instance.init()
+      .then(function () {
+        this.fixture = {
+          template: fse.readFileSync(__dirname + '/fixtures/templates/article.html', 'utf-8')
+        }
+        done()
+
+      }.bind(this))
+  });
+
+  /**
+   * getAbeImport
+   * 
+   */
+  it('getAbeImport()', function() {
+    var res = getAbeImport(this.fixture.template)
+    chai.expect(res).to.have.length(4);
+  });
+
+  /**
+   * includePartials
+   * 
+   */
+  it('includePartials()', function() {
+    var template = includePartials(this.fixture.template)
+    chai.expect(template).to.contain("{{abe type='text' key='title' desc='titre' tab='default'}}");
+  });
+
+  /**
+   * getTemplate
+   * 
+   */
+  it('getTemplate()', function() {
+    var template = getTemplate('article')
+    chai.expect(template).to.contain("{{abe type='text' key='title' desc='titre' tab='default' order='1'}}");
+  });
+});