refactoring: lint

src/cli/cms/data/revision.js

@@ -107,7 +107,7 @@ export function getDocumentRevision(docPath) {
   return result
 }
 
-export function getStatusAndDateToFileName(date, file) {
+export function getStatusAndDateToFileName(date) {
   var res = date.substring(0, 4) + '-'
             + date.substring(4, 6) + '-'
             + date.substring(6, 11) + ':'

src/cli/cms/operations/create.js

@@ -2,7 +2,7 @@ import path from 'path'
 import {
   fileUtils,
   FileParser,
-  cleanSlug,
+  coreUtils,
   cmsTemplate,
   cmsOperations,
   config,
@@ -17,7 +17,7 @@ var create = function(template, pathCreate, name, req, forceJson = {}, duplicate
 
     var templatePath = fileUtils.getTemplatePath(template.replace(config.root, ''))
     var filePath = path.join(pathCreate, name)
-    filePath = cleanSlug(filePath)
+    filePath = coreUtils.slug.clean(filePath)
     filePath = fileUtils.getFilePath(filePath)
 
     if(templatePath !== null && filePath !== null) {

src/cli/cms/operations/save.js

@@ -6,16 +6,15 @@ import {Promise} from 'es6-promise'
 import path from 'path'
 
 import {
-  Util
-  ,abeProcess
+  abeProcess
   ,FileParser
   ,cmsData
   ,config
   ,fileUtils
   ,Page
   ,cmsTemplate
   ,Hooks
-  ,cleanSlug
+  ,coreUtils
 } from '../../'
 
 export function checkRequired(text, json) {
@@ -55,7 +54,7 @@ export function checkRequired(text, json) {
 export function save(url, tplPath, json = null, text = '', type = '', previousSave = null, realType = 'draft', publishAll = false) {
   var dateStart = new Date()
 
-  url = cleanSlug(url)
+  url = coreUtils.slug.clean(url)
 
   var p = new Promise((resolve) => {
     var isRejectedDoc = false

src/cli/core/utils/index.js

@@ -1,9 +1,11 @@
 import * as sort from './sort'
 import * as text from './text'
 import locales from './locales'
+import * as slug from './slug'
 
 export {
 	sort
 	,text
 	,locales
+	,slug
 }

src/cli/core/utils/slugify.js → src/cli/core/utils/slug.js

@@ -5,7 +5,7 @@ import {
   fileUtils
 } from '../../'
 
-function cleanSlug(str) {
+export function clean(str) {
 
   if (typeof str === 'undefined' || str === null) return null
   if (str.indexOf('.') === -1) { // no extension add one
@@ -21,7 +21,4 @@ function slugify(str) {
   str = slug(str, {separateNumbers: false})
   str = `${str}.${config.files.templates.extension}`
   return str.toLowerCase()
-}
-
-export {cleanSlug as cleanSlug}
-export default slugify
+}

src/cli/index.js

@@ -37,8 +37,6 @@ import Page from './cms/Page'
 import FileParser from './core/utils/file-parser'
 import fileUtils from './core/utils/file-utils'
 import folderUtils from './core/utils/folder-utils'
-import slugify from './core/utils/slugify'
-import {cleanSlug} from './core/utils/slugify'
 
 // import {getTemplate} from './cms/templates/abe-template'
 import Create from './cms/Create'
@@ -66,8 +64,6 @@ export {
 	,fse
 	,Handlebars
 	,clc
-	,slugify
-	,cleanSlug
 	,FileParser
 	,folderUtils
 	,fileUtils

src/server/controllers/index.js

@@ -38,7 +38,6 @@ import {
   Hooks,
   Plugins,
   Handlebars,
-  cleanSlug
 } from '../../cli'
 
 import locale from '../helpers/abe-locale'

src/server/helpers/page.js

@@ -6,11 +6,11 @@ import {
   config,
   Page,
   cmsTemplate,
-  cleanSlug
+  coreUtils
 } from '../../cli'
 
 var page = function (req, res, next) {
-  var filePath = cleanSlug(req.query.filePath)
+  var filePath = coreUtils.slug.clean(req.query.filePath)
   filePath = fileUtils.getFilePath(filePath)
   var html = (req.query.html) ? true : false
   var json = null

src/server/middlewares/website.js

@@ -19,8 +19,7 @@ import {
   abeProcess,
   Hooks,
   Plugins,
-  Handlebars,
-  cleanSlug
+  Handlebars
 } from '../../cli'
 
 import locale from '../helpers/abe-locale'

src/server/routes/get-create.js

@@ -1,7 +1,6 @@
 import {
   fileUtils,
   FileParser,
-  cleanSlug,
   config,
   cmsOperations,
   Hooks

src/server/routes/get-delete.js

@@ -1,14 +1,13 @@
 import {
   FileParser,
-  Hooks,
-  cleanSlug
+  Hooks
 } from '../../cli'
 
 var route = function(req, res, next){
   Hooks.instance.trigger('beforeRoute', req, res, next)
   if(typeof res._header !== 'undefined' && res._header !== null) return
 
-  var filePath = cleanSlug(req.query.filePath)
+  var filePath = coreUtils.slug.clean(req.query.filePath)
   var dirPath = FileParser.deleteFile(filePath)
 
   var result = {

src/server/routes/get-list-hooks.js

@@ -4,7 +4,6 @@ import hooksDefault from '../../hooks/hooks'
 import {
   fileUtils,
   FileParser,
-  cleanSlug,
   config,
   Hooks,
   Plugins

src/server/routes/get-list-url.js

@@ -3,7 +3,6 @@ import Handlebars from 'handlebars'
 import {
   fileUtils,
   FileParser,
-  cleanSlug,
   config,
   save,
   Hooks

src/server/routes/get-unpublish.js

@@ -1,5 +1,5 @@
 import {
-  cleanSlug
+  coreUtils
   ,FileParser
   ,Hooks
 } from '../../cli'
@@ -8,7 +8,7 @@ var route = function(req, res, next){
   Hooks.instance.trigger('beforeRoute', req, res, next)
   if(typeof res._header !== 'undefined' && res._header !== null) return
 
-  var filePath = cleanSlug(req.query.filePath)
+  var filePath = coreUtils.slug.clean(req.query.filePath)
   FileParser.unpublishFile(filePath)
 
   var result = {

src/server/routes/post-publish.js

@@ -1,7 +1,7 @@
 import {
   fileUtils,
   cmsOperations,
-  cleanSlug,
+  coreUtils,
   Hooks,
   Manager
 } from '../../cli'
@@ -10,7 +10,7 @@ var route = function(req, res, next){
   Hooks.instance.trigger('beforeRoute', req, res, next)
   if(typeof res._header !== 'undefined' && res._header !== null) return
 
-  var filePath = cleanSlug(req.body.filePath)
+  var filePath = coreUtils.slug.clean(req.body.filePath)
   var p = new Promise((resolve) => {
     cmsOperations.save.save(
       fileUtils.getFilePath(filePath),

test/url.js

@@ -1,6 +1,6 @@
 var chai = require('chai');
 
-var cleanSlug = require('../src/cli').cleanSlug
+var coreUtils = require('../src/cli').coreUtils
 var fse = require('fs-extra')
 var config = require('../src/cli').config
 config.set({root: __dirname + '/fixtures'})
@@ -15,7 +15,7 @@ describe('Url', function() {
    */
   it('configuration file', function() {
     for(var key in urls){
-      chai.assert.equal(cleanSlug(key), urls[key] + config.files.templates.extension, key + 'slugified url did not match')
+      chai.assert.equal(coreUtils.slug.clean(key), urls[key] + config.files.templates.extension, key + 'slugified url did not match')
     }
   });