refactor remove-duplicate-attr

src/cli/cms/data/index.js

@@ -0,0 +1,5 @@
+import removeDuplicateAttr from './remove-duplicate-attr'
+
+export {
+	removeDuplicateAttr
+}

src/cli/cms/data/abe-remove-duplicate-attr.js → src/cli/cms/data/remove-duplicate-attr.js

@@ -28,8 +28,6 @@ function recurseDeleteKey(currentLevel, arrayKeyAttr) {
 export default function removeDuplicateAttr(text, json) {
   var regAbe = /{{abe[\S\s].*?duplicate=['|"]([\S\s].*?['|"| ]}})/g
   var matches = text.match(regAbe)
-  var requiredValue = 0
-  var complete = 0
   if(typeof matches !== 'undefined' && matches !== null){
 
     Array.prototype.forEach.call(matches, (match) => {

src/cli/cms/operations/abe-create.js

@@ -8,7 +8,7 @@ import {
   save,
   config,
   Hooks,
-  removeDuplicateAttr,
+  cmsData,
   Manager
 } from '../../'
 
@@ -29,7 +29,7 @@ var create = function(template, pathCreate, name, req, forceJson = {}, duplicate
         var tpl = templatePath
         var text = getTemplate(tpl)
         if (duplicate) {
-          json = removeDuplicateAttr(text, json)
+          json = cmsData.removeDuplicateAttr(text, json)
         }
         text = Util.removeDataList(text)
         var resHook = Hooks.instance.trigger('beforeFirstSave', filePath, req.query, json, text)

src/cli/cms/templates/abe-get-select-template-keys.js

@@ -11,7 +11,6 @@ import {
   save,
   config,
   Hooks,
-  removeDuplicateAttr,
   Manager
 } from '../../'
 

src/cli/index.js

@@ -50,7 +50,7 @@ import Create from './cms/Create'
 import config from './core/config/config'
 
 import {getAttr, getEnclosingTags, escapeTextToRegex} from './cms/data/regex-helper'
-import removeDuplicateAttr from './cms/data/abe-remove-duplicate-attr'
+
 import Sql from './cms/data/abe-sql'
 
 import abeCreate from './cms/operations/abe-create'
@@ -61,11 +61,14 @@ import abeProcess from './extend/abe-process'
 import Hooks from './extend/abe-hooks'
 import Plugins from './extend/abe-plugins'
 
-
 import getSelectTemplateKeys from './cms/templates/abe-get-select-template-keys'
 
+import * as cmsData from './cms/data'
+
 export {
-	fileAttr
+	cmsData
+
+	,fileAttr
 	,moment
 	,fse
 	,Handlebars
@@ -103,7 +106,6 @@ export {
 	,escapeTextToRegex
 	,config
 	,getTemplate
-	,removeDuplicateAttr
 	,save
 	,Hooks
 	,Plugins

test/attributes.js

@@ -0,0 +1,33 @@
+var chai = require('chai');
+
+var config = require('../src/cli').config
+config.set({root: __dirname + '/fixtures'})
+
+var cmsData = require('../src/cli').cmsData;
+var Manager = require('../src/cli').Manager;
+var fse = require('fs-extra');
+
+describe('Request', function() {
+  before( function(done) {
+    Manager.instance.init()
+      .then(function () {
+        Manager.instance._whereKeys = ['title', 'priority', 'abe_meta', 'articles']
+        Manager.instance.updateList()
+
+        this.fixture = {
+          html: fse.readFileSync(__dirname + '/fixtures/templates/article.html', 'utf8'),
+          json: fse.readJsonSync(__dirname + '/fixtures/data/article-1.json')
+        }
+        done()
+
+      }.bind(this))
+  });
+  /**
+   * getAbeImport
+   * 
+   */
+  it('cmsData.removeDuplicateAttr', function() {
+  	var newJson = cmsData.removeDuplicateAttr(this.fixture.html, this.fixture.json)
+  	chai.expect(newJson.title).to.be.undefined;
+  });
+});

test/fixtures/templates/article.html

@@ -1,4 +1,4 @@
-{{abe type='data' key='title' desc='select title' source='select title,abe_meta from ./' editable='false'}}
+{{abe type='data' key='title' desc='select title' source='select title,abe_meta from ./' editable='false' duplicate="false"}}
 
 {{abe type='import' file='title.html'}}