merge

.travis.yml

@@ -21,3 +21,4 @@ notifications:
     - pedro.teixeira@gmail.com
     - mail@substack.net
 script: npm run-script alltests
+

LICENSE.md

@@ -0,0 +1,13 @@
+The MIT License (MIT)
+=====================
+
+Copyright (c) 2014 LevelUP contributors
+---------------------------------------
+
+*LevelUP contributors listed at <https://github.com/rvagg/node-levelup#contributors>*
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -388,11 +388,13 @@ The standard `pause()`, `resume()` and `destroy()` methods are implemented on th
 
 Additionally, you can supply an options object as the first parameter to `createReadStream()` with the following options:
 
-* `'start'`: the key you wish to start the read at. By default it will start at the beginning of the store. Note that the *start* doesn't have to be an actual key that exists, LevelDB will simply find the *next* key, greater than the key you provide.
+* `'gt'` (greater than), `'gte'` (greater than or equal) define the lower bound of the range to be streamed. Only records where the key is greater than (or equal to) this option will be included in the range. When `reverse=true` the order will be reversed, but the records streamed will be the same.
 
-* `'end'`: the key you wish to end the read on. By default it will continue until the end of the store. Again, the *end* doesn't have to be an actual key as an (inclusive) `<=`-type operation is performed to detect the end. You can also use the `destroy()` method instead of supplying an `'end'` parameter to achieve the same effect.
+* `'lt'` (less than), `'lte'` (less than or equal) define the higher bound of the range to be streamed. Only key/value pairs where the key is less than (or equal to) this option will be included in the range. When `reverse=true` the order will be reversed, but the records streamed will be the same.
 
-* `'reverse'` *(boolean, default: `false`)*: a boolean, set to true if you want the stream to go in reverse order. Beware that due to the way LevelDB works, a reverse seek will be slower than a forward seek.
+* `'start', 'end'` legacy ranges - instead use `'gte', 'lte'`
+
+* `'reverse'` *(boolean, default: `false`)*: a boolean, set true and the stream output will be reversed. Beware that due to the way LevelDB works, a reverse seek will be slower than a forward seek.
 
 * `'keys'` *(boolean, default: `true`)*: whether the `'data'` event should contain keys. If set to `true` and `'values'` set to `false` then `'data'` events will simply be keys, rather than objects with a `'key'` property. Used internally by the `createKeyStream()` method.
 
@@ -652,13 +654,11 @@ A custom encoding may be provided by passing in an object as an value for `keyEn
 {
     encode : function (val) { ... }
   , decode : function (val) { ... }
-  , buffer : boolean // encode returns a buffer-like and decode accepts a buffer
+  , buffer : boolean // encode returns a buffer and decode accepts a buffer
   , type   : String  // name of this encoding type.
 }
 ```
 
-*"buffer-like"* means either a `Buffer` if running in Node, or a Uint8Array if in a browser. Use [bops](https://github.com/chrisdickinson/bops) to get portable binary operations.
-
 <a name="extending"></a>
 Extending LevelUP
 -----------------
@@ -720,13 +720,13 @@ LevelUP is only possible due to the excellent work of the following contributors
 A large portion of the Windows support comes from code by [Krzysztof Kowalczyk](http://blog.kowalczyk.info/) [@kjk](https://twitter.com/kjk), see his Windows LevelDB port [here](http://code.google.com/r/kkowalczyk-leveldb/). If you're using LevelUP on Windows, you should give him your thanks!
 
 
-<a name="licence"></a>
-Licence &amp; copyright
+<a name="license"></a>
+License &amp; copyright
 -------------------
 
-Copyright (c) 2012-2013 LevelUP contributors (listed above).
+Copyright (c) 2012-2014 LevelUP contributors (listed above).
 
-LevelUP is licensed under an MIT +no-false-attribs license. All rights not explicitly granted in the MIT license are reserved. See the included LICENSE file for more details.
+LevelUP is licensed under the MIT license. All rights not explicitly granted in the MIT license are reserved. See the included LICENSE.md file for more details.
 
 =======
 *LevelUP builds on the excellent work of the LevelDB and Snappy teams from Google and additional contributors. LevelDB and Snappy are both issued under the [New BSD Licence](http://opensource.org/licenses/BSD-3-Clause).*

lib/batch.js

@@ -1,7 +1,7 @@
-/* Copyright (c) 2012-2013 LevelUP contributors
+/* Copyright (c) 2012-2014 LevelUP contributors
  * See list at <https://github.com/rvagg/node-levelup#contributing>
- * MIT +no-false-attribs License
- * <https://github.com/rvagg/node-levelup/blob/master/LICENSE>
+ * MIT License
+ * <https://github.com/rvagg/node-levelup/blob/master/LICENSE.md>
  */
 
 var util          = require('./util')

lib/encodings.js

@@ -37,6 +37,17 @@ module.exports = (function () {
     , buffer : false
     , type   : 'json'
   }
+  encodings.binary = {
+      encode : function (data) {
+        return isBinary(data) ? data : new Buffer(data)
+      }
+    , decode : function (data) {
+        return data
+      }
+    , buffer : true
+    , type   : 'binary'
+  }
+
   encodingNames.forEach(function (type) {
     if (encodings[type])
       return
@@ -45,7 +56,7 @@ module.exports = (function () {
           return isBinary(data) ? data : new Buffer(data, type)
         }
       , decode : function (buffer) {
-          return new Buffer(buffer, type)
+          return buffer.toString(type)
         }
       , buffer : true
       , type   : type // useful for debugging purposes

lib/errors.js

@@ -1,7 +1,7 @@
-/* Copyright (c) 2012-2013 LevelUP contributors
+/* Copyright (c) 2012-2014 LevelUP contributors
  * See list at <https://github.com/rvagg/node-levelup#contributing>
- * MIT +no-false-attribs License
- * <https://github.com/rvagg/node-levelup/blob/master/LICENSE>
+ * MIT License
+ * <https://github.com/rvagg/node-levelup/blob/master/LICENSE.md>
  */
 
 var createError   = require('errno').create
@@ -19,4 +19,4 @@ module.exports = {
   , WriteError          : createError('WriteError', LevelUPError)
   , NotFoundError       : NotFoundError
   , EncodingError       : createError('EncodingError', LevelUPError)
-}
+}

lib/levelup.js

@@ -1,7 +1,7 @@
-/* Copyright (c) 2012-2013 LevelUP contributors
+/* Copyright (c) 2012-2014 LevelUP contributors
  * See list at <https://github.com/rvagg/node-levelup#contributing>
- * MIT +no-false-attribs License
- * <https://github.com/rvagg/node-levelup/blob/master/LICENSE>
+ * MIT License
+ * <https://github.com/rvagg/node-levelup/blob/master/LICENSE.md>
  */
 
 var EventEmitter   = require('events').EventEmitter

lib/read-stream.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2012-2013 LevelUP contributors
+/* Copyright (c) 2012-2014 LevelUP contributors
  * See list at <https://github.com/rvagg/node-levelup#contributing>
- * MIT +no-false-attribs License <https://github.com/rvagg/node-levelup/blob/master/LICENSE>
+ * MIT License <https://github.com/rvagg/node-levelup/blob/master/LICENSE.md>
  */
 
 // NOTE: we are fixed to readable-stream@1.0.x for now

lib/util.js

@@ -1,7 +1,7 @@
-/* Copyright (c) 2012-2013 LevelUP contributors
+/* Copyright (c) 2012-2014 LevelUP contributors
  * See list at <https://github.com/rvagg/node-levelup#contributing>
- * MIT +no-false-attribs License
- * <https://github.com/rvagg/node-levelup/blob/master/LICENSE>
+ * MIT License
+ * <https://github.com/rvagg/node-levelup/blob/master/LICENSE.md>
  */
 
 var extend        = require('xtend')
@@ -16,7 +16,6 @@ var extend        = require('xtend')
     }
 
   , leveldown
-
   , encodingOpts = (function () {
       var eo = {}
       for(var e in encodings)

lib/write-stream.js

@@ -1,13 +1,13 @@
-/* Copyright (c) 2012-2013 LevelUP contributors
+/* Copyright (c) 2012-2014 LevelUP contributors
  * See list at <https://github.com/rvagg/node-levelup#contributing>
- * MIT +no-false-attribs License
- * <https://github.com/rvagg/node-levelup/blob/master/LICENSE>
+ * MIT License
+ * <https://github.com/rvagg/node-levelup/blob/master/LICENSE.md>
  */
 
 var Stream       = require('stream').Stream
   , inherits     = require('util').inherits
   , extend       = require('xtend')
-  , concatStream = require('concat-stream')
+  , bl           = require('bl')
 
   , setImmediate = global.setImmediate || process.nextTick
 
@@ -157,7 +157,7 @@ WriteStream.prototype._write = function (entry) {
   if (!key)
     return
 
-  entry.pipe(concatStream(function (err, data) {
+  entry.pipe(bl(function (err, data) {
     if (err) {
       self.writable = false
       return self.emit('error', err)
@@ -167,7 +167,7 @@ WriteStream.prototype._write = function (entry) {
         key.indexOf(self._options.fstreamRoot) > -1)
       key = key.substr(self._options.fstreamRoot.length + 1)
 
-    self.write({ key: key, value: data })
+    self.write({ key: key, value: data.slice(0) })
   }))
 }
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "levelup",
   "description": "Fast & simple storage - a Node.js-style LevelDB wrapper",
-  "version": "0.18.3",
+  "version": "0.18.6",
   "contributors": [
     "Rod Vagg <r@va.gg> (https://github.com/rvagg)",
     "John Chesley <john@chesl.es> (https://github.com/chesles/)",
@@ -33,13 +33,13 @@
   ],
   "main": "lib/levelup.js",
   "dependencies": {
-    "concat-stream": "~0.1.1",
+    "bl": "~0.8.1",
     "deferred-leveldown": "~0.2.0",
-    "errno": "~0.1.0",
+    "errno": "~0.1.1",
     "prr": "~0.0.0",
-    "readable-stream": "~1.0.17",
-    "semver": "~2.2.1",
-    "xtend": "~2.1.1"
+    "readable-stream": "~1.0.26",
+    "semver": "~2.3.1",
+    "xtend": "~3.0.0"
   },
   "devDependencies": {
     "leveldown": "~0.10.0",

test/approximate-size-test.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2012-2013 LevelUP contributors
+/* Copyright (c) 2012-2014 LevelUP contributors
  * See list at <https://github.com/rvagg/node-levelup#contributing>
- * MIT +no-false-attribs License <https://github.com/rvagg/node-levelup/blob/master/LICENSE>
+ * MIT License <https://github.com/rvagg/node-levelup/blob/master/LICENSE.md>
  */
 
 var levelup = require('../lib/levelup.js')
@@ -77,4 +77,4 @@ buster.testCase('approximateSize()', {
         , done
       )
     }
-})
+})

test/argument-checking-test.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2012-2013 LevelUP contributors
+/* Copyright (c) 2012-2014 LevelUP contributors
  * See list at <https://github.com/rvagg/node-levelup#contributing>
- * MIT +no-false-attribs License <https://github.com/rvagg/node-levelup/blob/master/LICENSE>
+ * MIT License <https://github.com/rvagg/node-levelup/blob/master/LICENSE.md>
  */
 
 var common  = require('./common')

test/batch-test.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2012-2013 LevelUP contributors
+/* Copyright (c) 2012-2014 LevelUP contributors
  * See list at <https://github.com/rvagg/node-levelup#contributing>
- * MIT +no-false-attribs License <https://github.com/rvagg/node-levelup/blob/master/LICENSE>
+ * MIT License <https://github.com/rvagg/node-levelup/blob/master/LICENSE.md>
  */
 
 var errors  = require('../lib/errors.js')
@@ -369,4 +369,4 @@ buster.testCase('batch()', {
             }
         }
     }
-})
+})

test/benchmarks/engines/index.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2012-2013 LevelUP contributors
+/* Copyright (c) 2012-2014 LevelUP contributors
  * See list at <https://github.com/rvagg/node-levelup#contributing>
- * MIT +no-false-attribs License <https://github.com/rvagg/node-levelup/blob/master/LICENSE>
+ * MIT License <https://github.com/rvagg/node-levelup/blob/master/LICENSE.md>
  */
 
 module.exports.LevelUP = require('./levelup')
@@ -16,4 +16,4 @@ module.exports.Leveled = require('./leveled')
 module.exports.Leveled.color = 'cyan'
 
 module.exports.SQLite3 = require('./sqlite3')
-module.exports.SQLite3.color = 'blue'
+module.exports.SQLite3.color = 'blue'

test/benchmarks/engines/leveled.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2012-2013 LevelUP contributors
+/* Copyright (c) 2012-2014 LevelUP contributors
  * See list at <https://github.com/rvagg/node-levelup#contributing>
- * MIT +no-false-attribs License <https://github.com/rvagg/node-levelup/blob/master/LICENSE>
+ * MIT License <https://github.com/rvagg/node-levelup/blob/master/LICENSE.md>
  */
 
 var leveled = require('leveled')
@@ -18,4 +18,4 @@ var leveled = require('leveled')
 module.exports = {
     createDb : createDb
   , closeDb  : closeDb
-}
+}

test/benchmarks/engines/levelup-nosnappy.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2012-2013 LevelUP contributors
+/* Copyright (c) 2012-2014 LevelUP contributors
  * See list at <https://github.com/rvagg/node-levelup#contributing>
- * MIT +no-false-attribs License <https://github.com/rvagg/node-levelup/blob/master/LICENSE>
+ * MIT License <https://github.com/rvagg/node-levelup/blob/master/LICENSE.md>
  */
 
 var levelup = require('../../../')
@@ -18,4 +18,4 @@ var levelup = require('../../../')
 module.exports = {
     createDb : createDb
   , closeDb  : closeDb
-}
+}

test/benchmarks/engines/levelup-release.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2012-2013 LevelUP contributors
+/* Copyright (c) 2012-2014 LevelUP contributors
  * See list at <https://github.com/rvagg/node-levelup#contributing>
- * MIT +no-false-attribs License <https://github.com/rvagg/node-levelup/blob/master/LICENSE>
+ * MIT License <https://github.com/rvagg/node-levelup/blob/master/LICENSE.md>
  */
 
 var levelup = require('levelup')
@@ -18,4 +18,4 @@ var levelup = require('levelup')
 module.exports = {
     createDb : createDb
   , closeDb  : closeDb
-}
+}

test/benchmarks/engines/levelup.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2012-2013 LevelUP contributors
+/* Copyright (c) 2012-2014 LevelUP contributors
  * See list at <https://github.com/rvagg/node-levelup#contributing>
- * MIT +no-false-attribs License <https://github.com/rvagg/node-levelup/blob/master/LICENSE>
+ * MIT License <https://github.com/rvagg/node-levelup/blob/master/LICENSE.md>
  */
 
 var levelup = require('../../../')
@@ -18,4 +18,4 @@ var levelup = require('../../../')
 module.exports = {
     createDb : createDb
   , closeDb  : closeDb
-}
+}