[v0.11.2]: bug fixes for 'parseDatasetIdentifier' function when provi…

…ded path is `datapackage.json` in cwd - refs datopian/data-cli#337

lib/index.js

@@ -262,11 +262,11 @@ const parseDatasetIdentifier = async (path_) => {
   if (path_ === null || path_ === '') return out
 
   out.type = isUrl(path_) ? 'url' : 'local'
-  let normalizedPath = path_.replace('/datapackage.json', '')
+  let normalizedPath = path_.replace(/\/?datapackage\.json/, '')
   normalizedPath = normalizedPath.replace(/\/$/, '')
   if (out.type === 'local') {
     out.path = path.posix.resolve(normalizedPath)
-    out.name = path.basename(normalizedPath)
+    out.name = path.basename(out.path)
   } else if (out.type === 'url') {
     const urlparts = url.parse(normalizedPath)
     const parts = urlparts.pathname.split('/')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "data.js",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "",
   "main": "lib/index.js",
   "directories": {

test/index.test.js

@@ -64,17 +64,26 @@ test('isDataset function works', t => {
 // parseDatasetIdentifier
 
 test('parseDatasetIdentifier function with local path', async t => {
-  const path_ = '../dir/dataset/'
-  const res = await data.parseDatasetIdentifier(path_)
-  const exp = {
-    name: 'dataset',
-    owner: null,
-    path: path.posix.resolve(path_),
-    type: 'local',
-    original: path_,
-    version: ''
-  }
-  t.deepEqual(res, exp)
+  const paths = [
+    '../dir/dataset/',
+    './',
+    './datapackage.json',
+    '../datapackage.json',
+    'datapackage.json'
+  ]
+  paths.forEach(async path_ => {
+    const res = await data.parseDatasetIdentifier(path_)
+    const normalizedPath = path.posix.resolve(path_).replace(/\/?datapackage\.json/, '')
+    const exp = {
+      name: path.basename(normalizedPath),
+      owner: null,
+      path: normalizedPath,
+      type: 'local',
+      original: path_,
+      version: ''
+    }
+    t.deepEqual(res, exp)
+  })
 })
 
 test('parseDatasetIdentifier function with random url', async t => {