viewdb 0.5.12 → 0.7.0

package/test/merger.js

@@ -1,163 +1,196 @@
-var should = require('should');
 var _ = require('lodash');
 var merge = require('../lib/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); },
-}
-
-describe('Merger', function() {
-	it('#merge with remove element', function(done) {
-		var l1 = [{a:1}, 'b', 'd'];
-		var l2 = [{a:1}, 'b'];
-
-		var res = merge(l1,l2, {
-			removed: function(e) {
-				e.should.equal('d');
-				done();
-			},
-			comparatorId: _.isEqual,
-			comparator: _.isEqual
-		});
-		_.isEqual(l2, res).should.be.true;
-
-//		console.log(_.difference(l1,l2));
-	});
-	it('#merge with remove complex element', function(done) {
-		var l1 = [{a:1}, 'b', 'd', {e:1}];
-		var l2 = [{a:1}, 'b'];
-		var removed = [];
-		var res = merge(l1,l2, {
-			removed: function(e) {
-				removed.push(e);
-			},
-			comparatorId: _.isEqual,
-			comparator: _.isEqual
-		});
-		removed.length.should.equal(2);
-		_.isEqual(l2, res).should.be.true;
-		done();
-
-//		console.log(_.difference(l1,l2));
-	});
-
-	it('#merge with objects instead of arrays', function(done) {
-		var l1 = {"0":{a:1}, "1":'b', "2":'d', "3":{e:1}};
-		var l2 = [{a:1}, 'b'];
-		var removed = [];
-		var res = merge(l1,l2, {
-			removed: function(e) {
-				removed.push(e);
-			},
-			comparatorId: _.isEqual,
-			comparator: _.isEqual
-		});
-		removed.length.should.equal(2);
-		_.isEqual(l2, res).should.be.true;
-		done();
-
-//		console.log(_.difference(l1,l2));
-	});
-
-
-	it('#merge with one add element', function(done) {
-		var l1 = [{a:1}, 'b'];
-		var l2 = [{a:1}, 'b', 'c'];
-
-		var res = merge(l1,l2, {
-			added: function(e) {
-				e.should.equal('c');
-				done();
-			},
-			removed: function(e) {
-				done(new Error('should not be called'));
-			}
-		});
-		_.isEqual(l2, res).should.be.true;
-	});
-	it('#merge with one complex add element', function(done) {
-		var l1 = [{a:1}, 'b'];
-		var l2 = [{a:1}, 'b', {c:1}];
-
-		var res = merge(l1,l2, {
-			added: function(e) {
-				_.isEqual(e,{c:1}).should.be.true;
-				done();
-			},
-			removed: function(e) {
-				done(new Error('should not be called'));
-			}
-		});
-		_.isEqual(l2, res).should.be.true;
-	});
-	it('#merge with one move element', function(done) {
-		var l1 = [{a:1}, 'b', {c:1}];
-		var l2 = [{a:1}, {c:1}, 'b'];
-		var moved = [];
-		var res = merge(l1,l2, {
-			added: function(e) {
-				done(new Error('should not be called'));
-			},
-			removed: function(e) {
-				done(new Error('should not be called'));
-			},
-			moved: function(e, oldIndex, newIndex) {
-				moved.push(arguments);
-			}
-		});
-		moved.length.should.equal(1);
-
-		_.isEqual(l2, res).should.be.true;
-
-		done();
-	});
-	it('#merge with one changing elements', function(done) {
-		var l1 = [{_id:1, a:'Hello'}];
-		var l2 = [{_id:1, a:'Hej'}];
-		var res = merge(l1,l2, {
-			added: function(e) {
-				done(new Error('should not be called'));
-			},
-			removed: function(e) {
-				done(new Error('should not be called'));
-			},
-			moved: function(e, oldIndex, newIndex) {
-				done(new Error('should not be called'));
-			},
-			changed: function(o, n, index) {
-			},
-			comparatorId: function(a,b) {return a._id === b._id}
-		});
-		_.isEqual(l2, res).should.be.true;
-		done();
-	});
-
-	it('#merge true and false array', function(done) {
-		var l1 = [true, false];
-		var l2 = [false, true];
-		var res = merge(l1,l2);
-		_.isEqual(l2, res).should.be.true;
-		done();
-	});
-	it('#merge complex moves', function(done) {
-		var l1 = [{_id:1, a:'Hello1'}, {_id:2, a:'Hello2'}, {_id:3, a:'Hello3'}, {_id:4, a:'Hello4'}];
-		var l2 = [{_id:4, a:'Hej4'}, {_id:3, a:'Hej3'}, {_id:2, a:'Hej2'}, {_id:1, a:'Hej1'}];
-
-		var res = merge(l1,l2, _.defaults({comparatorId:  function(a,b) {return a._id === b._id}}, {}));
-		_.isEqual(l2, res).should.be.true;
-		done();
-	});
-	it('#merge complex moves and add and remove', function(done) {
-		var l1 = [{_id:1, a:'Hello1'}, {_id:2, a:'Hello2'}, {_id:3, a:'Hello3'}, {_id:4, a:'Hello4'}];
-		var l2 = [{_id:4, a:'Hej4'}, {_id:99, a:'Hej99'}, {_id:2, a:'Hej2'}, {_id:1, a:'Hej1'}, {_id:100, a:'Hej100'}];
-
-		var res = merge(l1,l2, _.defaults({comparatorId:  function(a,b) {return a._id === b._id}}, {}));
-		_.isEqual(l2, res).should.be.true;
-		done();
-	});
-
-})
-
+describe('Merger', () => {
+  it('#merge with remove element', (done) => {
+    var l1 = [{ a: 1 }, 'b', 'd'];
+    var l2 = [{ a: 1 }, 'b'];
+
+    var res = merge(l1, l2, {
+      removed: function (e) {
+        expect(e).toBe('d');
+        done();
+      },
+      comparatorId: _.isEqual,
+      comparator: _.isEqual
+    });
+    expect(_.isEqual(l2, res)).toBe(true);
+
+    //		console.log(_.difference(l1,l2));
+  });
+  it('#merge with remove complex element', (done) => {
+    var l1 = [{ a: 1 }, 'b', 'd', { e: 1 }];
+    var l2 = [{ a: 1 }, 'b'];
+    var removed = [];
+    var res = merge(l1, l2, {
+      removed: function (e) {
+        removed.push(e);
+      },
+      comparatorId: _.isEqual,
+      comparator: _.isEqual
+    });
+    expect(removed.length).toBe(2);
+    expect(_.isEqual(l2, res)).toBe(true);
+    done();
+
+    //		console.log(_.difference(l1,l2));
+  });
+
+  it('#merge with objects instead of arrays', (done) => {
+    var l1 = { 0: { a: 1 }, 1: 'b', 2: 'd', 3: { e: 1 } };
+    var l2 = [{ a: 1 }, 'b'];
+    var removed = [];
+    var res = merge(l1, l2, {
+      removed: function (e) {
+        removed.push(e);
+      },
+      comparatorId: _.isEqual,
+      comparator: _.isEqual
+    });
+    expect(removed.length).toBe(2);
+    expect(_.isEqual(l2, res)).toBe(true);
+    done();
+
+    //		console.log(_.difference(l1,l2));
+  });
+
+  it('#merge with one add element', (done) => {
+    var l1 = [{ a: 1 }, 'b'];
+    var l2 = [{ a: 1 }, 'b', 'c'];
+
+    var res = merge(l1, l2, {
+      added: function (e) {
+        expect(e).toBe('c');
+        done();
+      },
+      removed: function () {
+        done(new Error('should not be called'));
+      }
+    });
+    expect(_.isEqual(l2, res)).toBe(true);
+  });
+  it('#merge with one complex add element', (done) => {
+    var l1 = [{ a: 1 }, 'b'];
+    var l2 = [{ a: 1 }, 'b', { c: 1 }];
+
+    var res = merge(l1, l2, {
+      added: function (e) {
+        expect(_.isEqual(e, { c: 1 })).toBe(true);
+        done();
+      },
+      removed: function () {
+        done(new Error('should not be called'));
+      }
+    });
+    expect(_.isEqual(l2, res)).toBe(true);
+  });
+  it('#merge with one move element', (done) => {
+    var l1 = [{ a: 1 }, 'b', { c: 1 }];
+    var l2 = [{ a: 1 }, { c: 1 }, 'b'];
+    var moved = [];
+    var res = merge(l1, l2, {
+      added: function () {
+        done(new Error('should not be called'));
+      },
+      removed: function () {
+        done(new Error('should not be called'));
+      },
+      moved: function (e, oldIndex, newIndex) {
+        moved.push(arguments);
+      }
+    });
+    expect(moved.length).toBe(1);
+
+    expect(_.isEqual(l2, res)).toBe(true);
+
+    done();
+  });
+  it('#merge with one changing elements', (done) => {
+    var l1 = [{ _id: 1, a: 'Hello' }];
+    var l2 = [{ _id: 1, a: 'Hej' }];
+    var res = merge(l1, l2, {
+      added: function () {
+        done(new Error('should not be called'));
+      },
+      removed: function () {
+        done(new Error('should not be called'));
+      },
+      moved: function () {
+        done(new Error('should not be called'));
+      },
+      changed: function (o, n, index) {},
+      comparatorId: function (a, b) {
+        return a._id === b._id;
+      }
+    });
+    expect(_.isEqual(l2, res)).toBe(true);
+    done();
+  });
+
+  it('#merge true and false array', (done) => {
+    var l1 = [true, false];
+    var l2 = [false, true];
+    var res = merge(l1, l2);
+    expect(_.isEqual(l2, res)).toBe(true);
+    done();
+  });
+  it('#merge complex moves', (done) => {
+    var l1 = [
+      { _id: 1, a: 'Hello1' },
+      { _id: 2, a: 'Hello2' },
+      { _id: 3, a: 'Hello3' },
+      { _id: 4, a: 'Hello4' }
+    ];
+    var l2 = [
+      { _id: 4, a: 'Hej4' },
+      { _id: 3, a: 'Hej3' },
+      { _id: 2, a: 'Hej2' },
+      { _id: 1, a: 'Hej1' }
+    ];
+
+    var res = merge(
+      l1,
+      l2,
+      _.defaults(
+        {
+          comparatorId: function (a, b) {
+            return a._id === b._id;
+          }
+        },
+        {}
+      )
+    );
+    expect(_.isEqual(l2, res)).toBe(true);
+    done();
+  });
+  it('#merge complex moves and add and remove', (done) => {
+    var l1 = [
+      { _id: 1, a: 'Hello1' },
+      { _id: 2, a: 'Hello2' },
+      { _id: 3, a: 'Hello3' },
+      { _id: 4, a: 'Hello4' }
+    ];
+    var l2 = [
+      { _id: 4, a: 'Hej4' },
+      { _id: 99, a: 'Hej99' },
+      { _id: 2, a: 'Hej2' },
+      { _id: 1, a: 'Hej1' },
+      { _id: 100, a: 'Hej100' }
+    ];
+
+    var res = merge(
+      l1,
+      l2,
+      _.defaults(
+        {
+          comparatorId: function (a, b) {
+            return a._id === b._id;
+          }
+        },
+        {}
+      )
+    );
+    expect(_.isEqual(l2, res)).toBe(true);
+    done();
+  });
+});

package/test/observe.js

@@ -1,16 +1,14 @@
-var should = require('should');
-
 var ViewDb = require('..');
 var _ = require('lodash');
 
-describe('Observe', function () {
-  it('#observe with insert', function (done) {
+describe('Observe', () => {
+  it('#observe with insert', (done) => {
     var store = new ViewDb();
     store.open().then(function () {
       var cursor = store.collection('dollhouse').find({});
       var handle = cursor.observe({
         added: function (x) {
-          x._id.should.equal('echo');
+          expect(x._id).toBe('echo');
           handle.stop();
           done();
         }
@@ -18,31 +16,32 @@ describe('Observe', function () {
       store.collection('dollhouse').insert({ _id: 'echo' });
     });
   });
-  it('#observe with query and insert', function (done) {
+  it('#observe with query and insert', (done) => {
     var store = new ViewDb();
     store.open().then(function () {
       store.collection('dollhouse').insert({ _id: 'echo' });
       var cursor = store.collection('dollhouse').find({ _id: 'echo2' });
-      var handle = cursor.observe({
+      cursor.observe({
         added: function (x) {
-          x._id.should.equal('echo2');
+          expect(x._id).toBe('echo2');
           done();
         }
       });
       store.collection('dollhouse').insert({ _id: 'echo2' });
     });
   });
-  it('#observe with query and update', function (done) {
+  it('#observe with query and update', (done) => {
     var store = new ViewDb();
     store.open().then(function () {
       var cursor = store.collection('dollhouse').find({ _id: 'echo' });
       var handle = cursor.observe({
         added: function (x) {
-          x.age.should.equal(10);
-          x._id.should.equal('echo');
-        }, changed: function (o, n) {
-          o.age.should.equal(10);
-          n.age.should.equal(100);
+          expect(x.age).toBe(10);
+          expect(x._id).toBe('echo');
+        },
+        changed: function (o, n) {
+          expect(o.age).toBe(10);
+          expect(n.age).toBe(100);
           handle.stop();
           done();
         }
@@ -53,7 +52,7 @@ describe('Observe', function () {
       });
     });
   });
-  it('#observe with query and skip', function (done) {
+  it('#observe with query and skip', (done) => {
     var store = new ViewDb();
     store.open().then(function () {
       store.collection('dollhouse').insert({ _id: 'echo' });
@@ -64,40 +63,40 @@ describe('Observe', function () {
       cursor.limit(1);
       var realDone = _.after(3, function () {
         cursor.toArray(function (err, res) {
-          res.length.should.equal(0);
+          expect(res.length).toBe(0);
           handle.stop();
           done();
-        })
+        });
       });
       var handle = cursor.observe({
-        added: function (x) {
+        added: function () {
           cursor.skip(++skip);
           realDone();
         }
       });
     });
   });
-  it('#observe with no results', function (done) {
+  it('#observe with no results', (done) => {
     var store = new ViewDb();
     store.open().then(function () {
       var cursor = store.collection('dollhouse').find({});
       var handle = cursor.observe({
         init: function (coll) {
-          coll.length.should.equal(0);
+          expect(coll.length).toBe(0);
           handle.stop();
           done();
         }
       });
     });
   });
-  it('#observe with init after one insert', function (done) {
+  it('#observe with init after one insert', (done) => {
     var store = new ViewDb();
     store.collection('dollhouse').insert({ _id: 'echo' }, function () {
       store.open().then(function () {
         var cursor = store.collection('dollhouse').find({});
         var handle = cursor.observe({
           init: function (coll) {
-            coll.length.should.equal(1);
+            expect(coll.length).toBe(1);
             handle.stop();
             done();
           }
@@ -105,16 +104,16 @@ describe('Observe', function () {
       });
     });
   });
-  it('#observe with one insert after init', function (done) {
+  it('#observe with one insert after init', (done) => {
     var store = new ViewDb();
     store.open().then(function () {
       var cursor = store.collection('dollhouse').find({});
       var handle = cursor.observe({
         init: function (coll) {
-          coll.length.should.equal(0);
+          expect(coll.length).toBe(0);
         },
         added: function (a) {
-          a._id.should.equal('echo');
+          expect(a._id).toBe('echo');
           handle.stop();
           done();
         }
@@ -124,4 +123,43 @@ describe('Observe', function () {
       store.collection('dollhouse').insert({ _id: 'echo' });
     }, 5);
   });
+  it('#observe with query update', (done) => {
+    const store = new ViewDb();
+    store.open().then(() => {
+      const cursor = store.collection('dollhouse').find({});
+      const handle = cursor.observe({
+        init: (docs) => {
+          expect(docs.length).toBe(0);
+        },
+        added: (doc) => {
+          expect(doc._id).toMatch(/^echo/);
+        },
+        changed: (found, e) => {
+          expect(found).toEqual({ _id: 'echo1', name: 'marco' });
+          expect(e).toEqual({ _id: 'echo1', name: 'marco', data: 'changed' });
+
+          handle.stop();
+          done();
+        },
+        removed: (doc) => {
+          expect(doc).toEqual({ _id: 'echo3', name: 'polo' });
+
+          store.collection('dollhouse').save([{ _id: 'echo3', name: 'polo', data: 'changed' }], () => {
+            store.collection('dollhouse').save([{ _id: 'echo1', name: 'marco', data: 'changed' }]);
+          });
+        }
+      });
+
+      store.collection('dollhouse').insert(
+        [
+          { _id: 'echo1', name: 'marco' },
+          { _id: 'echo2', name: 'marco' },
+          { _id: 'echo3', name: 'polo' }
+        ],
+        () => {
+          cursor.updateQuery({ name: 'marco' });
+        }
+      );
+    });
+  });
 });