FFFF Add rubberduck args to service events parameters by loris · Pull Request #148 · feathersjs/feathers · GitHub
[go: up one dir, main page]
Skip to content

Add rubberduck args to service events parameters #148

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

Merged
daffl merged 6 commits into from
Oct 25, 2015
Merged

Add rubberduck args to service events parameters #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
294b37b
Merge remote-tracking branch 'feathersjs/master' into patch-1
loris Oct 3, 2015
9959f30
Merge remote-tracking branch 'feathersjs/master'
loris Oct 3, 2015
1263285
Merge branch 'patch-1'
loris Oct 3, 2015
7d93967
Add rubberduck args to service events parameters
loris Oct 3, 2015
705c9fb
Refactor using hookObject method from feathers-common
loris Oct 6, 2015
a1bd93b
Merge remote-tracking branch 'upstream/master'
loris Oct 23, 2015
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
6 changes: 4 additions & 2 deletions lib/mixins/event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
var _ = require('lodash');
var rubberduck = require('rubberduck');
var EventEmitter = require('events').EventEmitter;
var hookObject = require('feathers-commons').hooks.hookObject;
var eventMappings = {
create: 'created',
update: 'updated',
Expand Down Expand Up @@ -38,9 +39,10 @@ var EventMixin = {
// Punch the given method
emitter.punch(method, -1);
// Pass the event and error event through
emitter.on(eventName, function (results) {
emitter.on(eventName, function (results, args) {
if (!results[0]) { // callback without error
self.emit(event, results[1]);
var hook = hookObject(method, 'after', args);
self.emit(event, results[1], hook);
} else {
self.emit('serviceError', results[0]);
}
Expand Down
25 changes: 19 additions & 6 deletions test/mixins/event.test.js
View file
Open in desktop
51B3
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,19 @@ describe('Event mixin', function () {
var instance = create.call(FixtureService);
instance.setup();

instance.on('created', function (data) {
instance.on('created', function (data, args) {
assert.equal(data.id, 10);
assert.equal(data.name, 'Tester');
assert.equal(args.data.name, 'Tester');
assert.equal(args.params.custom, 'value');
done();
});

instance.create({
name: 'Tester'
}, {}, function (error, data) {
}, {
custom: 'value'
}, function (error, data) {
assert.equal(data.id, 10);
});
});
Expand All @@ -114,15 +118,20 @@ describe('Event mixin', function () {
var instance = create.call(FixtureService);
instance.setup();

instance.on('updated', function (data) {
instance.on('updated', function (data, args) {
assert.equal(data.id, 12);
assert.equal(data.name, 'Updated tester');
assert.equal(args.id, 12);
assert.equal(args.data.name, 'Updated tester');
assert.equal(args.params.custom, 'value');
done();
});

instance.update(12, {
name: 'Updated tester'
}, {}, function (error, data) {
}, {
custom: 'value'
}, function (error, data) {
assert.equal(data.id, 12);
});
});
Expand All @@ -143,12 +152,16 @@ describe('Event mixin', function () {
var instance = create.call(FixtureService);
instance.setup();

instance.on('removed', function (data) {
instance.on('removed', function (data, args) {
assert.equal(data.id, 27);
assert.equal(args.id, 27);
assert.equal(args.params.custom, 'value');
done();
});

instance.remove(27, {}, function (error, data) {
instance.remove(27, {
custom: 'value'
}, function (error, data) {
assert.equal(data.id, 27);
});
});
Expand Down
0