upgrade test modules, fix tests

.travis.yml

@@ -1,4 +1,13 @@
+# Use Node.js configuration.
 language: node_js
+
 node_js:
-  - 0.6
-  - 0.8
+  - 10
+  - 12
+  - node # latest
+
+os:
+  - linux
+  - osx
+  - windows
+

index.js

@@ -10,6 +10,7 @@ module.exports = function (version, opts) {
   if(!isObject(opts)) throw new Error('flumeview-query: expected opts as second arg')
   return function (log, name) {
     if(!log.filename) return require('./memory')(log, name)
+
     var _view = Indexes(version, opts)(log, name)
     var view = Inject(log, _view.indexes())
 

indexes.js

@@ -9,7 +9,6 @@ function clone (obj) {
   return o
 }
 
-
 module.exports = function (version, opts) {
   var filter = opts.filter || function () { return true }
   var map = opts.map || function (item) { return item }

inject.js

@@ -1,42 +1,35 @@
 'use strict'
-var pull = require('pull-stream')
+// var pull = require('pull-stream')
 var Explain = require('./explain')
 var Filter = require('./filter')
 
 var isArray = Array.isArray
 function isFunction (f) { return 'function' == typeof f }
 
-function clone (obj) {
-  var o = {}
-  for(var k in obj)
-    o[k] = obj[k]
-  return o
-}
-
 //sorted index.
 
 //split this into TWO modules. flumeview-links and flumeview-query
 module.exports = function (log, indexes) {
   if(!Array.isArray(indexes)) throw new Error('indexes should be an array')
   //answer this query by reading the entire log.
   //not efficient, but still returns the correct answer
-  function fullScan (log, opts) {
-    return log.stream({
-      values: true, seqs: false,
-      //TODO test coverage for live/old - the tests arn't right for live when the log starts as empty
-      old: (opts.old !== false),
-      live: (opts.live === true || opts.old === false),
-      reverse: opts.reverse
-    })
-  }
+  // function fullScan (log, opts) {
+  //   return log.stream({
+  //     values: true, seqs: false,
+  //     //TODO test coverage for live/old - the tests arn't right for live when the log starts as empty
+  //     old: (opts.old !== false),
+  //     live: (opts.live === true || opts.old === false),
+  //     reverse: opts.reverse
+  //   })
+  // }
 
-  function createFilter(source, opts) {
-    return pull(
-      source,
-      isArray(opts.query) ? mfr(opts.query) : pull.through(),
-      opts.limit && pull.take(opts.limit)
-    )
-  }
+  // function createFilter(source, opts) {
+  //   return pull(
+  //     source,
+  //     isArray(opts.query) ? mfr(opts.query) : pull.through(),
+  //     opts.limit && pull.take(opts.limit)
+  //   )
+  // }
 
   var view
   return view = {

memory.js

@@ -1,10 +1,11 @@
 var pull = require('pull-stream')
 var Filter = require('./filter')
 
-module.exports =  function createMemoryIndex (log, name) {
+module.exports = function createMemoryIndex (log, name) {
   function fullScan (log, opts) {
     return log.stream({
-      values: true, seqs: false,
+      values: true,
+      seqs: false,
       //TODO test coverage for live/old - the tests arn't right for live when the log starts as empty
       old: (opts.old !== false),
       live: (opts.live === true || opts.old === false),
@@ -13,13 +14,15 @@ module.exports =  function createMemoryIndex (log, name) {
   }
 
   console.error('flumeview-query:', name, 'in memory log or no indexes defined, will always use full scan, queries will likely be slow')
- return {
+  return {
     since: log.since,
     get: log.get,
-    methods: { get: 'async', read: 'source'},
+    methods: { get: 'async', read: 'source' },
     read: function (opts) {
       return Filter(fullScan(log, opts), opts)
     },
-    createSink: function (cb) {return pull.onEnd(cb) }
+    createSink: function (cb) {return pull.onEnd(cb) },
+    close: done => done(),
+    destroy: done => done()
   }
 }