From a36b72c852d7f50dc7a69ffb12f32a66e54e3d9a Mon Sep 17 00:00:00 2001 From: anuveyatsu Date: Wed, 25 Apr 2018 01:42:35 +0600 Subject: [PATCH] [init][s]: normalize dataset name property accoring to specs - refs https://github.com/datahq/pm/issues/141 --- lib/init.js | 4 ++++ package.json | 2 +- test/fixtures/{readdir-test => readdir test}/README.md | 0 .../{readdir-test => readdir test}/dir/dir2/sample3.json | 0 test/fixtures/{readdir-test => readdir test}/dir/sample2 | 0 test/fixtures/{readdir-test => readdir test}/sample1.csv | 0 test/init.test.js | 8 ++++---- 7 files changed, 9 insertions(+), 5 deletions(-) rename test/fixtures/{readdir-test => readdir test}/README.md (100%) rename test/fixtures/{readdir-test => readdir test}/dir/dir2/sample3.json (100%) rename test/fixtures/{readdir-test => readdir test}/dir/sample2 (100%) rename test/fixtures/{readdir-test => readdir test}/sample1.csv (100%) diff --git a/lib/init.js b/lib/init.js index 8a7a6f4..314797e 100644 --- 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 index 426d48b..c3ddb80 100644 --- 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 b/test/fixtures/readdir test/README.md similarity index 100% rename from test/fixtures/readdir-test/README.md rename to test/fixtures/readdir test/README.md diff --git a/test/fixtures/readdir-test/dir/dir2/sample3.json b/test/fixtures/readdir test/dir/dir2/sample3.json similarity index 100% rename from test/fixtures/readdir-test/dir/dir2/sample3.json rename to test/fixtures/readdir test/dir/dir2/sample3.json diff --git a/test/fixtures/readdir-test/dir/sample2 b/test/fixtures/readdir test/dir/sample2 similarity index 100% rename from test/fixtures/readdir-test/dir/sample2 rename to test/fixtures/readdir test/dir/sample2 diff --git a/test/fixtures/readdir-test/sample1.csv b/test/fixtures/readdir test/sample1.csv similarity index 100% rename from test/fixtures/readdir-test/sample1.csv rename to test/fixtures/readdir test/sample1.csv diff --git a/test/init.test.js b/test/init.test.js index b78068c..7f9d445 100644 --- 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,7 +52,7 @@ 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" }, { @@ -60,7 +60,7 @@ test('createDataset', async t => { 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", } ],