2.1.1 - make sure to store Uint8Arrays

Author: max-mapper

index.js

@@ -42,8 +42,14 @@ Level.prototype._get = function (key, options, callback) {
       // 'NotFound' error, consistent with LevelDOWN API
       return callback(new Error('NotFound'))
     }
-    if (options.asBuffer !== false && !Buffer.isBuffer(value))
-      value = new Buffer(String(value))
+    // by default return buffers, unless explicitly told not to
+    var asBuffer = true
+    if (options.asBuffer === false) asBuffer = false
+    if (options.raw) asBuffer = false
+    if (asBuffer) {
+      if (value instanceof Uint8Array) value = new Buffer(value)
+      else value = new Buffer(String(value))
+    }
     return callback(null, value, key)
   }, callback)
 }
@@ -54,21 +60,27 @@ Level.prototype._del = function(id, options, callback) {
 
 Level.prototype._put = function (key, value, options, callback) {
   if (value instanceof ArrayBuffer) {
-    value = String.fromCharCode.apply(null, new Uint16Array(value))
+    value = new Buffer(new Uint8Array(value))
   }
   var obj = this.convertEncoding(key, value, options)
+  if (Buffer.isBuffer(obj.value)) {
+    obj.value = new Uint8Array(value.toArrayBuffer())
+  }
   this.idb.put(obj.key, obj.value, function() { callback() }, callback)
 }
 
 Level.prototype.convertEncoding = function(key, value, options) {
+  if (options.raw) return {key: key, value: value}
   if (value) {
     var stringed = value.toString()
     if (stringed === 'NaN') value = 'NaN'
   }
   var valEnc = options.valueEncoding
   var obj = {key: key, value: value}
   if (value && (!valEnc || valEnc !== 'binary')) {
-    if (typeof obj.value !== 'object') obj.value = stringed
+    if (typeof obj.value !== 'object') {
+      obj.value = stringed
+    }
   }
   return obj
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "level-js",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "leveldown/leveldb library for browsers using IndexedDB",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "xtend": "~2.1.2",
     "tape": "~2.10.2",
     "browserify": "~3.32.0",
-    "abstract-leveldown": "~0.11.4"
+    "abstract-leveldown": "~0.12.0"
   },
   "testling": {
     "files": "test/test.js",

test/custom-tests.js

@@ -1,11 +1,37 @@
 var levelup = require('levelup')
 
+module.exports.setUp = function (leveldown, test, testCommon) {
+  test('setUp common', testCommon.setUp)
+  test('setUp db', function (t) {
+    db = leveldown(testCommon.location())
+    db.open(t.end.bind(t))
+  })
+}
+
 module.exports.all = function(leveljs, tape, testCommon) {
 
+  module.exports.setUp(leveljs, tape, testCommon)
+  
+  tape('store native JS types with raw = true', function(t) {
+    var level = leveljs(testCommon.location())
+    level.open(function(err) {
+      t.notOk(err, 'no error')
+      level.put('key', true, { raw: true },  function (err) {
+        t.notOk(err, 'no error')
+        level.get('key', { raw: true }, function(err, value) {
+          t.notOk(err, 'no error')
+          t.ok(typeof value === 'boolean', 'is boolean type')
+          t.ok(value, 'is truthy')
+          t.end()
+        })
+      })
+    })
+  })
+  
   // NOTE: in chrome (at least) indexeddb gets buggy if you try and destroy a db,
   // then create it again, then try and destroy it again. these avoid doing that
 
-  tape('test .destroy w/ string', function(t) {
+  tape('test levelup .destroy w/ string', function(t) {
     var level = levelup('destroy-test', {db: leveljs})
     level.put('key', 'value', function (err) {
       t.notOk(err, 'no error')
@@ -27,7 +53,7 @@ module.exports.all = function(leveljs, tape, testCommon) {
     })
   })
 
-  tape('test .destroy w/ db instance', function(t) {
+  tape('test levelup .destroy w/ db instance', function(t) {
     var level = levelup('destroy-test-2', {db: leveljs})
     level.put('key', 'value', function (err) {
       t.notOk(err, 'no error')

test/test.js

@@ -5,15 +5,7 @@ var testCommon = require('./testCommon')
 // load IndexedDBShim in the tests
 require('./idb-shim.js')()
 
-var str = 'foo'
-var testBuffer = new ArrayBuffer(str.length * 2)
-var bufView = new Uint16Array(testBuffer);
-for (var i = 0, strLen = str.length; i < strLen; i++) {
-  bufView[i] = str.charCodeAt(i)
-}
-
-// non abstract-leveldown tests:
-require('./custom-tests.js').all(leveljs, tape, testCommon)
+var testBuffer = new Buffer('foo')
 
 /*** compatibility with basic LevelDOWN API ***/
 require('abstract-leveldown/abstract/leveldown-test').args(leveljs, tape, testCommon)
@@ -27,3 +19,6 @@ require('abstract-leveldown/abstract/chained-batch-test').all(leveljs, tape, tes
 require('abstract-leveldown/abstract/close-test').close(leveljs, tape, testCommon)
 require('abstract-leveldown/abstract/iterator-test').all(leveljs, tape, testCommon)
 require('abstract-leveldown/abstract/ranges-test').all(leveljs, tape, testCommon)
+
+// non abstract-leveldown tests:
+require('./custom-tests.js').all(leveljs, tape, testCommon)

test/testCommon.js

@@ -10,16 +10,18 @@ var dbidx = 0
 
   , cleanup = function (callback) {
       var list = []
+      if (dbidx === 0) return callback()
       for (var i = 0; i < dbidx; i++) {
         list.push('_leveldown_test_db_' + i)
       }
-      var ret = 0
-      function done (e) {
-        if (++ret == list.length) callback()
+      
+      function destroy() {
+        var f = list.pop()
+        if (list.length === 0) return callback()
+        leveljs.destroy(f, destroy)
       }
-      list.forEach(function (f) {
-        leveljs.destroy(f, done)
-      })
+      
+      destroy()
     }
 
   , setUp = function (t) {