reverted some changes and changed to file system safe naming

package-lock.json

@@ -1190,7 +1190,7 @@
       "dependencies": {
         "jsesc": {
           "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+          "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
           "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s="
         },
         "source-map": {
@@ -15665,12 +15665,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -15690,7 +15692,8 @@
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
@@ -15838,6 +15841,7 @@
           "version": "3.0.4",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -17750,7 +17754,7 @@
     },
     "jsesc": {
       "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
       "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
       "dev": true
     },
@@ -19631,7 +19635,8 @@
             "buffer-shims": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-              "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
+              "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
+              "optional": true
             },
             "caseless": {
               "version": "0.12.0",
@@ -19648,12 +19653,14 @@
             "code-point-at": {
               "version": "1.1.0",
               "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-              "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+              "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+              "optional": true
             },
             "combined-stream": {
               "version": "1.0.5",
               "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
               "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+              "optional": true,
               "requires": {
                 "delayed-stream": "~1.0.0"
               }
@@ -19666,12 +19673,14 @@
             "console-control-strings": {
               "version": "1.1.0",
               "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-              "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+              "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-              "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+              "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+              "optional": true
             },
             "cryptiles": {
               "version": "2.0.5",
@@ -19716,7 +19725,8 @@
             "delayed-stream": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-              "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+              "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+              "optional": true
             },
             "delegates": {
               "version": "1.0.0",
@@ -19748,7 +19758,8 @@
             "extsprintf": {
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-              "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA="
+              "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
+              "optional": true
             },
             "forever-agent": {
               "version": "0.6.1",
@@ -19918,6 +19929,7 @@
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
               "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -19931,7 +19943,8 @@
             "isarray": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+              "optional": true
             },
             "isstream": {
               "version": "0.1.2",
@@ -20004,12 +20017,14 @@
             "mime-db": {
               "version": "1.27.0",
               "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-              "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE="
+              "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
+              "optional": true
             },
             "mime-types": {
               "version": "2.1.15",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
               "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
+              "optional": true,
               "requires": {
                 "mime-db": "~1.27.0"
               }
@@ -20085,7 +20100,8 @@
             "number-is-nan": {
               "version": "1.0.1",
               "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-              "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+              "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+              "optional": true
             },
             "oauth-sign": {
               "version": "0.8.2",
@@ -20143,7 +20159,8 @@
             "process-nextick-args": {
               "version": "1.0.7",
               "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-              "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+              "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+              "optional": true
             },
             "punycode": {
               "version": "1.4.1",
@@ -20181,6 +20198,7 @@
               "version": "2.2.9",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
               "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
+              "optional": true,
               "requires": {
                 "buffer-shims": "~1.0.0",
                 "core-util-is": "~1.0.0",
@@ -20289,6 +20307,7 @@
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
               "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -20299,6 +20318,7 @@
               "version": "1.0.1",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
               "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.0.1"
               }
@@ -20382,7 +20402,8 @@
             "util-deprecate": {
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-              "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+              "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+              "optional": true
             },
             "uuid": {
               "version": "3.0.1",
@@ -22726,7 +22747,8 @@
                   "version": "2.0.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
                   "integrity": "sha1-xQYbbg74qBd15Q9dZhUb9r83EQc=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "ansi-styles": {
                   "version": "2.2.1",
@@ -22836,6 +22858,7 @@
                   "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
                   "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "hoek": "2.x.x"
                   }
@@ -23305,6 +23328,7 @@
                   "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-4.0.0.tgz",
                   "integrity": "sha1-qvVwsqsL+w3abW6TKR1UswsffSI=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "lodash.tostring": "^4.0.0"
                   }
@@ -29053,9 +29077,9 @@
       "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
     },
     "slugify": {
-      "version": "1.2.9",
+      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.2.9.tgz",
+      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.3.4.tgz",
-      "integrity": "sha512-n0cdJ+kN3slJu8SbZXt/EHjljBqF6MxvMGSg/NPpBzoY7yyXoH38wp/ox20a1JaG1KgmdTN5Lf3aS9+xB2Y2aQ=="
+      "integrity": "sha512-KP0ZYk5hJNBS8/eIjGkFDCzGQIoZ1mnfQRYS5WM3273z+fxGWXeN0fkwf2ebEweydv9tioZIHGZKoF21U07/nw=="
     },
     "snapdragon": {
       "version": "0.8.2",

package.json

@@ -134,6 +134,7 @@
         "sass-extract-js": "^0.4.0",
         "sass-extract-loader": "^1.1.0",
         "shortid": "^2.2.6",
+        "slugify": "^1.3.4",
         "srcdoc-polyfill": "^0.2.0",
         "url": "^0.11.0",
         "webpack": "^3.1.0",

server/controllers/project.controller.js

@@ -2,8 +2,9 @@ import archiver from 'archiver';
 import request from 'request';
 import moment from 'moment';
 import isUrl from 'is-url';
+import slugify from 'slugify';
 import jsdom, { serializeDocument } from 'jsdom';
-import generateSlug from '../utils/generateSlug';
+import generateFileSystemSafeName from '../utils/generateFileSystemSafeName';
 import Project from '../models/project';
 import User from '../models/user';
 import { deleteObjectsFromS3, getObjectKey } from './aws.controller';
@@ -294,8 +295,8 @@ function buildZip(project, req, res) {
   });
 
   const currentTime = moment().format('YYYY_MM_DD_HH_mm_ss');
-  project.slug = generateSlug(project.name, '_');
+  project.slug = slugify(project.name, '_');
-  res.attachment(`${project.slug}_${currentTime}.zip`);
+  res.attachment(`${generateFileSystemSafeName(project.slug)}_${currentTime}.zip`);
   zip.pipe(res);
 
   function addFileToZip(file, path) {

server/models/project.js

@@ -1,6 +1,6 @@
 import mongoose from 'mongoose';
 import shortid from 'shortid';
-import generateSlug from '../utils/generateSlug';
+import slugify from 'slugify';
 
 const { Schema } = mongoose;
 
@@ -44,9 +44,9 @@ projectSchema.set('toJSON', {
   virtuals: true
 });
 
-projectSchema.pre('save', function slugGenerator(next) {
+projectSchema.pre('save', function generateSlug(next) {
   const project = this;
-  project.slug = generateSlug(project.name, '_');
+  project.slug = slugify(project.name, '_');
   return next();
 });
 

server/utils/generateFileSystemSafeName.js

@@ -1,11 +1,11 @@
 /**
- * generate short slug for a given string
+ * generate file system safe string for a given string
  * that can be used as a valid file name
  * in all operating systems
  * @param {String} string
  * @param {String} replacer (optional) character to replace invalid characters
  */
-function generateSlug(string, replacer) {
+function generateFileSystemSafeName(string, replacer) {
   // from here  https://serverfault.com/a/242134
   const INVALID_CHARS_REGEX = /[*/?:\\<>|"\u0000-\u001F]/g;
   const slug = string.replace(INVALID_CHARS_REGEX, replacer || '');
@@ -13,4 +13,4 @@ function generateSlug(string, replacer) {
   return slug;
 }
 
-export default generateSlug;
+export default generateFileSystemSafeName;