Merged branch master into master

src/server/routes/post-upload.js

@@ -1,11 +1,11 @@
 import path from 'path'
 import fse from 'fs-extra'
 import mkdirp from 'mkdirp'
+import limax from 'limax'
 
 import {
   config,
-  Hooks,
-  cleanSlug
+  Hooks
 } from '../../cli'
 
 var route = function(req, res, next){
@@ -52,7 +52,8 @@ var route = function(req, res, next){
       var ext = filename.split('.')
       ext = ext[ext.length - 1]
       var randID = '-' + (((1+Math.random())*0x100000)|0).toString(16).substring(2)
-      var cleanFileName = cleanSlug(filename).replace(`.${config.files.templates.extension}`, `${randID}.${ext}`)
+
+      var cleanFileName = limax(filename, {separateNumbers: false}).replace(`.${ext}`, `${randID}.${ext}`)
 
       filePath = path.join(folderFilePath, cleanFileName)
       var createImage = function () {

test/fixtures/string/urls.json

@@ -0,0 +1,3 @@
+{
+	"template name with à, é, û, UPPERCASE; @": "template-name-with-a-e-u-uppercase."
+}

test/url.js

@@ -0,0 +1,22 @@
+var chai = require('chai');
+
+var cleanSlug = require('../src/cli').cleanSlug
+var fse = require('fs-extra')
+var config = require('../src/cli').config
+config.set({root: __dirname + '/fixtures'})
+
+describe('Url', function() {
+
+  var urls = fse.readJsonSync(__dirname + '/fixtures/string/urls.json', 'utf8')
+
+  /**
+   * getAbeImport
+   * 
+   */
+  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')
+    }
+  });
+
+});