Fix invalid callback in .write and callbacks invoked synchronously (#1)

* add hyperdrive to devDependencies

* add failing test for .create with non writable archive

* fix failing test with non async callback in .create

* add failing test for .write (key/value) with non writable archive

* fix failing test with non async callback in .write (key/value)

* add failing test for .write (data object) with non writable archive

* fix failing test with invalid callback in .write (data object)

* remove unnecessary archive.writable check in writeAll (checked in .write)

* fix travis badges ✨

Author: ralphtheninja

README.md

@@ -74,7 +74,7 @@ Read the current `dat.json`.
 
 [npm-image]: https://img.shields.io/npm/v/dat-json.svg?style=flat-square
 [npm-url]: https://www.npmjs.com/package/dat-json
-[travis-image]: https://img.shields.io/travis/joehand/dat-json.svg?style=flat-square
-[travis-url]: https://travis-ci.org/joehand/dat-json
+[travis-image]: https://img.shields.io/travis/datproject/dat-json.svg?style=flat-square
+[travis-url]: https://travis-ci.org/datproject/dat-json
 [standard-image]: https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square
 [standard-url]: http://npm.im/standard

index.js

@@ -17,8 +17,11 @@ module.exports = function (archive, opts) {
       })
     },
     write: function (key, val, cb) {
-      if (!archive.writable) return cb(new Error('Archive not writable'))
-      if (typeof key === 'object') return writeAll(key, val) // assume val = cb
+      if (typeof val === 'function') cb = val
+      if (!archive.writable) {
+        return process.nextTick(cb, new Error('Archive not writable'))
+      }
+      if (typeof key === 'object') return writeAll(key, cb)
       // TODO: validate things
       if (!fileDb) return db.write(key, val, cb)
 
@@ -33,7 +36,9 @@ module.exports = function (archive, opts) {
     delete: db.delete,
     create: function (data, cb) {
       if (typeof data === 'function') return that.create(null, data)
-      if (!archive.writable) return cb(new Error('Archive not writable'))
+      if (!archive.writable) {
+        return process.nextTick(cb, new Error('Archive not writable'))
+      }
       data = xtend(getdefaults(), data)
       that.write(data, cb)
     }
@@ -50,7 +55,6 @@ module.exports = function (archive, opts) {
   }
 
   function writeAll (data, cb) {
-    if (!archive.writable) return cb(new Error('Archive not writable'))
     var keys = Object.keys(data)
     var pending = keys.length
     keys.map(function (key) {

package.json

@@ -7,6 +7,7 @@
     "url": "https://github.com/joehand/dat-json/issues"
   },
   "devDependencies": {
+    "hyperdrive": "^9.12.3",
     "random-access-memory": "^2.4.0",
     "standard": "*",
     "tap-spec": "^4.0.2",

test/index.js

@@ -48,6 +48,42 @@ test('Write dat.json to archive', function (t) {
   })
 })
 
+test('.create with no writable archive errors', function (t) {
+  var archive = { writable: false }
+  var datjson = datJSON(archive)
+  var async = false
+  datjson.create(function (err) {
+    t.is(err.message, 'Archive not writable', 'should error')
+    t.is(async, true, 'callback is asyncronous')
+    t.end()
+  })
+  async = true
+})
+
+test('.write with key/value and no writable archive errors', function (t) {
+  var archive = { writable: false }
+  var datjson = datJSON(archive)
+  var async = false
+  datjson.write('key', 'value', function (err) {
+    t.is(err.message, 'Archive not writable', 'should error')
+    t.is(async, true, 'callback is asyncronous')
+    t.end()
+  })
+  async = true
+})
+
+test('.write with data object and no writable archive errors', function (t) {
+  var archive = { writable: false }
+  var datjson = datJSON(archive)
+  var async = false
+  datjson.write({specialVal: 'cat'}, function (err) {
+    t.is(err.message, 'Archive not writable', 'should error')
+    t.is(async, true, 'callback is asyncronous')
+    t.end()
+  })
+  async = true
+})
+
 test('Write dat.json to file and archive', function (t) {
   var archive = hyperdrive(ram)
   var file = path.join(__dirname, 'dat.json')