Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

transforms deleted docs if handleDeleted: true (rebased) #26

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

transforms deleted docs if handleDeleted: true (rebased) #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98e6468
test: fix "skips deleted docs" test
gr2m Mar 16, 2016
757c5a0
test: transforms deleted docs if `handleDeleted: true`
gr2m Mar 16, 2016
8830b84
feat: transforms deleted docs if `handleDeleted: true`
gr2m Mar 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
var utils = require('./pouch-utils');
var wrappers = require('pouchdb-wrappers');

function isUntransformable(doc) {
function isUntransformable(doc, config) {
var isLocal = typeof doc._id === 'string' && utils.isLocalId(doc._id);
return isLocal || doc._deleted;
return isLocal || doc._deleted ? !config.handleDeleted : false;
}

// api.filter provided for backwards compat with the old "filter-pouch"
exports.transform = exports.filter = function transform(config) {
var db = this;

var incoming = function (doc) {
if (!isUntransformable(doc) && config.incoming) {
if (!isUntransformable(doc, config) && config.incoming) {
return config.incoming(utils.clone(doc));
}
return doc;
};
var outgoing = function (doc) {
if (!isUntransformable(doc) && config.outgoing) {
if (!isUntransformable(doc, config) && config.outgoing) {
return config.outgoing(utils.clone(doc));
}
return doc;
Expand Down
38 changes: 31 additions & 7 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,19 +140,43 @@ function tests(dbName, dbType) {
});

it('skips deleted docs', function () {
db.transform({
incoming: function (doc) {
doc.foo.baz = 'baz';
return doc;
}
var doc = {_id: 'foo', foo: {}};
return db.put(doc).then(function (res) {
doc._rev = res.rev;
return db.get('foo');
}).then(function (doc) {
var transformCalledOnDelete = false;
db.transform({
incoming: function (doc) {
transformCalledOnDelete = true;
return doc;
}
});

return db.remove(doc).then(function () {
transformCalledOnDelete.should.equal(false);
});
});
});

it('transforms deleted docs if `handleDeleted: true` #18', function () {
var doc = {_id: 'foo', foo: {}};
return db.put(doc).then(function (res) {
doc._rev = res.rev;
return db.get('foo');
}).then(function (doc) {
doc.foo.baz.should.equal('baz');
return db.remove(doc);
var transformCalledOnDelete = false;
db.transform({
incoming: function (doc) {
transformCalledOnDelete = true;
return doc;
},
handleDeleted: true
});

return db.remove(doc).then(function () {
transformCalledOnDelete.should.equal(true);
});
});
});

Expand Down