viewdb 0.5.11 → 0.6.0

package/lib/observe.js

@@ -1,53 +1,53 @@
 var _ = require('lodash');
 var merge = require('./merger');
 
-var logger = {
-	added: function() { console.log("added: "); console.log(arguments); },
-	removed: function() { console.log("removed: "); console.log(arguments); },
-	changed: function() { console.log("changed: "); console.log(arguments); },
-	moved: function() { console.log("moved: "); console.log(arguments); },
-}
+var Observer = function (query, queryOptions, collection, options) {
+  this._query = query;
+  this._queryOptions = queryOptions;
 
-var Observer = function(query, queryOptions, collection, options) {
-	this._query = query;
-	this._queryOptions = queryOptions;
-
-	this._options = options;
-//this._options = logger;
-	this._collection = collection;
-	this._cache = [];
-	var self = this;
-	var listener = function() {
-		self.refresh();
-	};
-	collection.on("change", listener);
-	this.refresh(true);
-	return {
-		stop: function() {
-			this._cache = null;
-			collection.removeListener("change", listener);
-		}
-	}
-}
+  this._options = options;
+  //this._options = logger;
+  this._collection = collection;
+  this._cache = [];
+  var self = this;
+  var listener = function () {
+    self.refresh();
+  };
+  collection.on('change', listener);
+  this.refresh(true);
+  return {
+    stop: function () {
+      self._cache = null;
+      collection.removeListener('change', listener);
+    }
+  };
+};
 
-Observer.prototype.refresh = function(initial) {
-	var self = this;
+Observer.prototype.refresh = function (initial) {
+  var self = this;
 
-	this._collection._getDocuments(this._query, function(err, result) {
-		if(initial && self._options.init) {
-			self._cache = result;
-			self._options.init(result);
-		} else {
+  this._collection._getDocuments(this._query, function (err, result) {
+    if (initial && self._options.init) {
+      self._cache = result;
+      self._options.init(result);
+    } else {
       var old = self._cache;
 
-      self._cache = merge(old, result, _.defaults({
-        comparatorId: function (a, b) {
-					return _.get(a, '_id') === _.get(b, '_id')
-        }
-      }, self._options));
+      self._cache = merge(
+        old,
+        result,
+        _.defaults(
+          {
+            comparatorId: function (a, b) {
+              return _.get(a, '_id') === _.get(b, '_id');
+            }
+          },
+          self._options
+        )
+      );
       //rewind cursor for next query...
     }
-	});
-}
+  });
+};
 
 module.exports = Observer;

package/lib/plugins/viewdb_timestamp_plugin.js

@@ -59,10 +59,10 @@ var ViewDBTimestampPlugin = function (viewDb) {
         }
         clonedUpdate.$set = set;
         oldFindAndModify.apply(this, [query, sort, clonedUpdate, options, cb]);
-      }
+      };
     }
     return coll;
-  }
+  };
 };
 
 module.exports = ViewDBTimestampPlugin;

package/lib/plugins/viewdb_versioning_plugin.js

@@ -10,8 +10,7 @@ var ViewDBVersioningPlugin = function (viewDb) {
       var oldSave = coll.save;
       coll.save = function (docs, options) {
         var newdocs = docs;
-        if (!(options && options.skipVersioning))
-        {
+        if (!(options && options.skipVersioning)) {
           if (!_.isArray(docs)) {
             newdocs = [docs];
           }
@@ -25,8 +24,7 @@ var ViewDBVersioningPlugin = function (viewDb) {
 
       var oldInsert = coll.insert;
       coll.insert = function (docs, options) {
-        if (!(options && options.skipVersioning))
-        {
+        if (!(options && options.skipVersioning)) {
           if (!_.isArray(docs)) {
             docs = [docs];
           }
@@ -36,7 +34,7 @@ var ViewDBVersioningPlugin = function (viewDb) {
           }
         }
         oldInsert.apply(this, arguments);
-      }
+      };
 
       var oldFindAndModify = coll.findAndModify;
       coll.findAndModify = function (query, sort, update, options, cb) {
@@ -49,11 +47,11 @@ var ViewDBVersioningPlugin = function (viewDb) {
           }
         }
         oldFindAndModify.apply(this, arguments);
-      }
+      };
     }
     return coll;
-  }
-}
+  };
+};
 
 function _getVersion(version) {
   var newVersion;
@@ -66,4 +64,4 @@ function _getVersion(version) {
   return newVersion;
 }
 
-module.exports = ViewDBVersioningPlugin;
+module.exports = ViewDBVersioningPlugin;

package/lib/viewdb.js

@@ -1,23 +1,22 @@
 var Promise = require('bluebird');
 var InMemoryStore = require('./inmemory/store');
 
-var ViewDB = function(store) {
-	this._store = store || new InMemoryStore();
+var ViewDB = function (store) {
+  this._store = store || new InMemoryStore();
 };
 
-ViewDB.prototype.open = function() {
-	if(this._store.open) {
-		return this._store.open().then(function() {
-			return this
-		});
-	}
-	else {
-		return Promise.resolve(this);
-	}
+ViewDB.prototype.open = function () {
+  if (this._store.open) {
+    return this._store.open().then(function () {
+      return this;
+    });
+  } else {
+    return Promise.resolve(this);
+  }
 };
 
-ViewDB.prototype.collection = function(collectionName, callback) {
-	return this._store.collection(collectionName, callback);
+ViewDB.prototype.collection = function (collectionName, callback) {
+  return this._store.collection(collectionName, callback);
 };
 
 module.exports = ViewDB;

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "viewdb",
-  "version": "0.5.11",
+  "version": "0.6.0",
   "description": "",
   "main": "index.js",
   "directories": {
     "test": "test"
   },
   "scripts": {
-    "test": "mocha test --recursive",
-    "test.watch": "mocha test --recursive --watch",
-    "coverage": "istanbul cover node_modules/mocha/bin/_mocha -- --recursive test -u exports -R spec",
-    "coverage-start": "istanbul cover node_modules/mocha/bin/_mocha test --recursive -- -u exports -R spec && start coverage/lcov-report/index.html",
+    "test": "jest test",
+    "test.watch": "jest test --watch",
+    "coverage": "jest test --collectCoverage",
+    "coverage-start": "npm run coverage && start coverage/lcov-report/index.html",
+    "format": "prettier --write lib test",
     "jshint": "jshint ./lib",
     "jscs": "jscs -p google ./lib"
   },
@@ -22,15 +23,16 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "istanbul": "^0.3.2",
+    "es-jest": "^2.1.0",
+    "jest": "^29.5.0",
     "jshint": "^2.5.10",
-    "mocha": "^2.0.1",
-    "should": "^4.1.0"
+    "prettier": "^2.8.7",
+    "prettier-config-surikaterna": "^1.0.1"
   },
   "dependencies": {
     "bluebird": "^2.9.30",
-    "kuery": "^0.5.3",
-    "lodash": "^4.13.1",
+    "kuery": "^0.5.5",
+    "lodash": "^4.17.21",
     "node-uuid": "^1.4.3"
   }
 }

package/test/cursor.js

@@ -1,86 +1,101 @@
 var Cursor = require('../lib/cursor');
-var should = require('should');
 var ViewDB = require('..');
 
-describe('Cursor', function () {
-  it('#toArray', function (done) {
+describe('Cursor', () => {
+  it('#toArray', (done) => {
     var cursor = new Cursor(null, {}, null, function (query, callback) {
       callback(null, [1, 2, 3, 4]);
     });
     cursor.toArray(function (err, result) {
-      result.length.should.equal(4);
+      expect(result.length).toBe(4);
       done();
     });
   });
-  it('#forEach', function (done) {
+  it('#forEach', (done) => {
     var cursor = new Cursor(null, {}, null, function (query, callback) {
       callback(null, [1, 2, 3, 4]);
     });
     var calls = 0;
     cursor.forEach(function (result) {
-      result.should.be.ok;
+      expect(result).toBeTruthy();
       calls++;
     });
     setTimeout(function () {
-      calls.should.equal(4);
+      expect(calls).toBe(4);
       done();
     }, 0);
   });
-  it('#skip', function (done) {
+  it('#skip', (done) => {
     var db = new ViewDB();
     var collection = db.collection('documents');
     for (var i = 0; i < 10; i++) {
       collection.insert({ a: 'a', id: i });
     }
-    collection.find({ a: 'a' }).skip(5).toArray(function (err, res) {
-      res.length.should.equal(5);
-      done();
-    });
+    collection
+      .find({ a: 'a' })
+      .skip(5)
+      .toArray(function (err, res) {
+        expect(res.length).toBe(5);
+        done();
+      });
   });
-  it('#limit', function (done) {
+  it('#limit', (done) => {
     var db = new ViewDB();
     var collection = db.collection('documents');
     for (var i = 0; i < 10; i++) {
       collection.insert({ a: 'a', id: i });
     }
-    collection.find({ a: 'a' }).limit(9).toArray(function (err, res) {
-      res[8].id.should.equal(8);
-      res.length.should.equal(9);
-      done();
-    });
+    collection
+      .find({ a: 'a' })
+      .limit(9)
+      .toArray(function (err, res) {
+        expect(res[8].id).toBe(8);
+        expect(res.length).toBe(9);
+        done();
+      });
   });
-  it('#sort', function (done) {
+  it('#sort', (done) => {
     var db = new ViewDB();
     var collection = db.collection('documents');
     for (var i = 0; i < 10; i++) {
       collection.insert({ a: 'a', id: i });
     }
-    collection.find({}).sort({id: 1}).toArray(function (err, res) {
-      res[0].id.should.equal(0);
-      done();
-    });
+    collection
+      .find({})
+      .sort({ id: 1 })
+      .toArray(function (err, res) {
+        expect(res[0].id).toBe(0);
+        done();
+      });
   });
-  it('#sort desc', function (done) {
+  it('#sort desc', (done) => {
     var db = new ViewDB();
     var collection = db.collection('documents');
     for (var i = 0; i < 10; i++) {
       collection.insert({ a: 'a', id: i });
     }
-    collection.find({}).sort({id: -1}).toArray(function (err, res) {
-      res[0].id.should.equal(9);
-      done();
-    });
+    collection
+      .find({})
+      .sort({ id: -1 })
+      .toArray(function (err, res) {
+        expect(res[0].id).toBe(9);
+        done();
+      });
   });
-  it('#skip/limit', function (done) {
+  it('#skip/limit', (done) => {
     var db = new ViewDB();
     var collection = db.collection('documents');
     for (var i = 0; i < 10; i++) {
       collection.insert({ a: 'a', id: i });
     }
-    collection.find({ a: 'a' }).skip(8).limit(10).toArray(function (err, res) {
-      res[1].id.should.equal(9);
-      res.length.should.equal(2); // only 2 left after skipping 8/10
-      done();
-    });
+    collection
+      .find({ a: 'a' })
+      .skip(8)
+      .limit(10)
+      .toArray(function (err, res) {
+        expect(res[1].id).toBe(9);
+        expect(res.length).toBe(2); // only 2 left after skipping 8/10
+        done();
+      });
   });
-})
+});