[init][s]: normalize dataset name property accoring to specs - refs d…

…atahubio/datahub-v2-pm#141
datopian · Apr 24, 2018 · a36b72c · a36b72c
1 parent 7a6e7a8
commit a36b72c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/lib/init.js b/lib/init.js
@@ -55,6 +55,10 @@ class Init extends EventEmitter {
     // Guess default name from cwd name:
     const fullPath = path.resolve('', this.path_)
     let datasetName = path.basename(fullPath)
+      .toLowerCase()
+      .trim()
+      .replace(/&/g, '-and-')
+      .replace(/[^a-z0-9-._]+/g, '-')
     // Make unslugified version for title:
     let datasetTitle = datasetName.replace(/-+/g, ' ')
     datasetTitle = datasetTitle.charAt(0).toUpperCase() + datasetTitle.slice(1)

diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "cli-table": "^0.3.1",
     "csv-parse": "^2.0.0",
     "csv-stringify": "^2.0.0",
-    "data.js": "^0.11.3",
+    "data.js": "^0.11.4",
     "events": "^1.1.1",
     "form-data": "^2.3.1",
     "inquirer": "4.0.2",

diff --git a/test/fixtures/readdir-test/README.md → test/fixtures/readdir test/README.md b/test/fixtures/readdir-test/README.md → test/fixtures/readdir test/README.md
diff --git a/...xtures/readdir-test/dir/dir2/sample3.json → ...xtures/readdir test/dir/dir2/sample3.json b/...xtures/readdir-test/dir/dir2/sample3.json → ...xtures/readdir test/dir/dir2/sample3.json
diff --git a/test/fixtures/readdir-test/dir/sample2 → test/fixtures/readdir test/dir/sample2 b/test/fixtures/readdir-test/dir/sample2 → test/fixtures/readdir test/dir/sample2
diff --git a/test/fixtures/readdir-test/sample1.csv → test/fixtures/readdir test/sample1.csv b/test/fixtures/readdir-test/sample1.csv → test/fixtures/readdir test/sample1.csv
diff --git a/test/init.test.js b/test/init.test.js
@@ -5,7 +5,7 @@ const {Init} = require('../lib/init')
 
 const initializer = new Init({
   interactive: false,
-  path_: 'test/fixtures/readdir-test/'
+  path_: 'test/fixtures/readdir test/'
 })
 
 test('createDataset', async t => {
@@ -25,7 +25,7 @@ test('createDataset', async t => {
         format: "csv",
         mediatype: "text/csv",
         name: "sample1",
-        path: "test/fixtures/readdir-test/sample1.csv",
+        path: "test/fixtures/readdir test/sample1.csv",
         pathType: "local",
         schema: {
           fields: [
@@ -52,15 +52,15 @@ test('createDataset', async t => {
         encoding: "ISO-8859-9",
         format: "",
         name: "sample2",
-        path: "test/fixtures/readdir-test/dir/sample2",
+        path: "test/fixtures/readdir test/dir/sample2",
         pathType: "local"
       },
       {
         encoding: "UTF-8",
         format: "json",
         mediatype: "application/json",
         name: "sample3",
-        path: "test/fixtures/readdir-test/dir/dir2/sample3.json",
+        path: "test/fixtures/readdir test/dir/dir2/sample3.json",
         pathType: "local",
       }
     ],