refactoring: remove replaceUnwantedChar from abe-util

src/cli/cms/data/attributes.js

@@ -49,4 +49,26 @@ export function getAll(str, json) {
   attrs = Hooks.instance.trigger('afterAbeAttributes', attrs, str, json)
 
   return attrs
+}
+
+
+export function sanitizeSourceAttribute(obj, jsonPage){
+  if(typeof obj.sourceString !== 'undefined' && obj.sourceString !== null && obj.sourceString.indexOf('{{') > -1) {
+    var matches = obj.sourceString.match(/({{[a-zA-Z._]+}})/g)
+    if(matches !== null) {
+      Array.prototype.forEach.call(matches, (match) => {
+        var val = match.replace('{{', '')
+        val = val.replace('}}', '')
+
+        try {
+          val = eval('jsonPage.' + val)
+        }catch(e) {
+          val = ''
+        }
+        obj.sourceString = obj.sourceString.replace(match, val)
+      })
+    }
+  }
+
+  return obj
 }

src/cli/cms/data/source.js

@@ -154,7 +154,7 @@ export function nextDataList(tplPath, jsonPage, match) {
     }
 
     var obj = cmsData.attributes.getAll(match, jsonPage)
-    obj = Util.sanitizeSourceAttribute(obj, jsonPage)
+    obj = cmsData.attributes.sanitizeSourceAttribute(obj, jsonPage)
 
     var type = cmsData.sql.getSourceType(obj.sourceString)
 

src/cli/cms/templates/handlebars/cleanTab.js

@@ -1,7 +1,7 @@
-import {Util} from '../../../'
+import {coreUtils} from '../../../'
 
 export default function cleanTab(obj) {
-  obj = Util.replaceUnwantedChar(obj.replace(/ |&/g, '_'))
+  obj = coreUtils.text.replaceUnwantedChar(obj.replace(/ |&/g, '_'))
 
   return obj
 }

src/cli/core/utils/abe-utils.js

@@ -89,31 +89,4 @@ export default class Utils {
     this._key[obj.key] = true // save key for dontHaveKey()
     this._form[obj.tab].item.push(obj)
   }
-
-  static sanitizeSourceAttribute(obj, jsonPage){
-    if(typeof obj.sourceString !== 'undefined' && obj.sourceString !== null && obj.sourceString.indexOf('{{') > -1) {
-      var matches = obj.sourceString.match(/({{[a-zA-Z._]+}})/g)
-      if(matches !== null) {
-        Array.prototype.forEach.call(matches, (match) => {
-          var val = match.replace('{{', '')
-          val = val.replace('}}', '')
-
-          try {
-            val = eval('jsonPage.' + val)
-          }catch(e) {
-            val = ''
-          }
-          obj.sourceString = obj.sourceString.replace(match, val)
-        })
-      }
-    }
-
-    return obj
-  }
-
-  static replaceUnwantedChar(str) {
-    var chars = {'’': '', '\'': '', '"': '', 'Š': 'S', 'š': 's', 'Ž': 'Z', 'ž': 'z', 'À': 'A', 'Á': 'A', 'Â': 'A', 'Ã': 'A', 'Ä': 'A', 'Å': 'A', 'Æ': 'A', 'Ç': 'C', 'È': 'E', 'É': 'E', 'Ê': 'E', 'Ë': 'E', 'Ì': 'I', 'Í': 'I', 'Î': 'I', 'Ï': 'I', 'Ñ': 'N', 'Ò': 'O', 'Ó': 'O', 'Ô': 'O', 'Õ': 'O', 'Ö': 'O', 'Ø': 'O', 'Ù': 'U', 'Ú': 'U', 'Û': 'U', 'Ü': 'U', 'Ý': 'Y', 'Þ': 'B', 'ß': 'Ss', 'à': 'a', 'á': 'a', 'â': 'a', 'ã': 'a', 'ä': 'a', 'å': 'a', 'æ': 'a', 'ç': 'c', 'è': 'e', 'é': 'e', 'ê': 'e', 'ë': 'e', 'œ': 'oe', 'ì': 'i', 'í': 'i', 'î': 'i', 'ï': 'i', 'ð': 'o', 'ñ': 'n', 'ò': 'o', 'ó': 'o', 'ô': 'o', 'õ': 'o', 'ö': 'o', 'ø': 'o', 'ù': 'u', 'ú': 'u', 'û': 'u', 'ý': 'y', 'þ': 'b', 'ÿ': 'y'}
-    for(var prop in chars) str = str.replace(new RegExp(prop, 'g'), chars[prop])
-    return str
-  }
 }

src/cli/core/utils/index.js

@@ -1,5 +1,7 @@
 import * as sort from './sort'
+import * as text from './text'
 
 export {
 	sort
+	,text
 }

test/attributes.js

@@ -7,7 +7,7 @@ var cmsData = require('../src/cli').cmsData;
 var Manager = require('../src/cli').Manager;
 var fse = require('fs-extra');
 
-describe('Request', function() {
+describe('attributes', function() {
   before( function(done) {
     Manager.instance.init()
       .then(function () {
@@ -22,12 +22,21 @@ describe('Request', function() {
 
       }.bind(this))
   });
+
   /**
-   * getAbeImport
+   * cmsData.values.removeDuplicate
    * 
    */
   it('cmsData.values.removeDuplicate', function() {
-  	var newJson = cmsData.values.removeDuplicate(this.fixture.html, this.fixture.json)
-  	chai.expect(newJson.title).to.be.undefined;
+    var newJson = cmsData.values.removeDuplicate(this.fixture.html, this.fixture.json)
+    chai.expect(newJson.title).to.be.undefined;
+  });
+
+  /**
+   * cmsData.attributes.sanitizeSourceAttribute
+   * 
+   */
+  it('cmsData.attributes.sanitizeSourceAttribute', function() {
+  	// not sure what it does
   });
 });

test/util.js

@@ -0,0 +1,14 @@
+var chai = require('chai');
+var coreUtils = require('../src/cli').coreUtils
+
+describe('Util', function() {
+
+  /**
+   * coreUtils.text.replaceUnwantedChar
+   * 
+   */
+  it('coreUtils.text.replaceUnwantedChar', function() {
+  	var list = coreUtils.text.replaceUnwantedChar('Š')
+  	chai.expect(list.indexOf('Š')).to.equal(-1);
+  });
+});