sharedb 7.0.2 → 7.0.3

package/lib/backend.js

@@ -809,10 +809,9 @@ Backend.prototype.fetchSnapshot = function(agent, index, id, version, callback)
 
   this._fetchSnapshot(collection, id, version, function(error, snapshot) {
     if (error) return callback(error);
-    var snapshotProjection = backend._getSnapshotProjection(backend.db, projection);
     var snapshots = [snapshot];
     var snapshotType = backend.SNAPSHOT_TYPES.byVersion;
-    backend._sanitizeSnapshots(agent, snapshotProjection, collection, snapshots, snapshotType, function(error) {
+    backend._sanitizeSnapshots(agent, projection, collection, snapshots, snapshotType, function(error) {
       if (error) return callback(error);
       backend.emit('timing', 'fetchSnapshot', Date.now() - start, request);
       callback(null, snapshot);
@@ -875,10 +874,9 @@ Backend.prototype.fetchSnapshotByTimestamp = function(agent, index, id, timestam
 
   this._fetchSnapshotByTimestamp(collection, id, timestamp, function(error, snapshot) {
     if (error) return callback(error);
-    var snapshotProjection = backend._getSnapshotProjection(backend.db, projection);
     var snapshots = [snapshot];
     var snapshotType = backend.SNAPSHOT_TYPES.byTimestamp;
-    backend._sanitizeSnapshots(agent, snapshotProjection, collection, snapshots, snapshotType, function(error) {
+    backend._sanitizeSnapshots(agent, projection, collection, snapshots, snapshotType, function(error) {
       if (error) return callback(error);
       backend.emit('timing', 'fetchSnapshot', Date.now() - start, request);
       callback(null, snapshot);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sharedb",
-  "version": "7.0.2",
+  "version": "7.0.3",
   "description": "JSON OT database backend",
   "main": "lib/index.js",
   "dependencies": {

package/test/client/projections.js

@@ -26,6 +26,26 @@ module.exports = function(options) {
       });
     });
 
+    [null, 1].forEach(function(version) {
+      it('snapshot fetchSnapshot at version ' + version, function(done) {
+        this.backend.connect().fetchSnapshot('dogs_summary', 'fido', version, function(err, snapshot) {
+          if (err) return done(err);
+          expect(snapshot.data).eql({age: 3, owner: {name: 'jim'}});
+          expect(snapshot.v).eql(1);
+          done();
+        });
+      });
+    });
+
+    it('snapshot fetchSnapshotByTimestamp', function(done) {
+      this.backend.connect().fetchSnapshotByTimestamp('dogs_summary', 'fido', null, function(err, snapshot) {
+        if (err) return done(err);
+        expect(snapshot.data).eql({age: 3, owner: {name: 'jim'}});
+        expect(snapshot.v).eql(1);
+        done();
+      });
+    });
+
     if (getQuery) {
       ['createFetchQuery', 'createSubscribeQuery'].forEach(function(method) {
         it('snapshot ' + method, function(done) {

package/test/client/snapshot-timestamp-request.js

@@ -411,6 +411,23 @@ describe('SnapshotTimestampRequest', function() {
           done();
         });
       });
+
+      describe('when the database projects snapshots', function() {
+        beforeEach(function() {
+          backend.db.projectsSnapshots = true;
+        });
+
+        [null, day2].forEach(function(timestamp) {
+          it('applies the projection to a snapshot at timestamp ' + timestamp, function(done) {
+            var connection = backend.connect();
+            connection.fetchSnapshotByTimestamp('bookTitles', 'time-machine', timestamp, function(error, snapshot) {
+              if (error) return done(error);
+              expect(snapshot.data).to.eql({title: 'The Time Machine'});
+              done();
+            });
+          });
+        });
+      });
     });
   });
 

package/test/client/snapshot-version-request.js

@@ -351,6 +351,22 @@ describe('SnapshotVersionRequest', function() {
           done();
         });
       });
+
+      describe('when the database projects snapshots', function() {
+        beforeEach(function() {
+          backend.db.projectsSnapshots = true;
+        });
+
+        [null, 2].forEach(function(version) {
+          it('applies the projection to a snapshot at version ' + version, function(done) {
+            backend.connect().fetchSnapshot('bookTitles', 'don-quixote', version, function(error, snapshot) {
+              if (error) return done(error);
+              expect(snapshot.data).to.eql({title: 'Don Quixote'});
+              done();
+            });
+          });
+        });
+      });
     });
   });