Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions lib/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ app.model = function(Model, config) {
Model.on('remoteMethodDisabled', function(model, methodName) {
self.emit('remoteMethodDisabled', model, methodName);
});
Model.on('remoteMethodAdded', function(model) {
self.emit('remoteMethodAdded', model);
});

Model.shared = isPublic;
Model.app = this;
Expand Down
3 changes: 3 additions & 0 deletions lib/model.js
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,7 @@ module.exports = function(registry) {
}

this.sharedClass.defineMethod(name, options);
this.emit('remoteMethodAdded', this.sharedClass);
};

function setupOptionsArgs(accepts) {
Expand Down Expand Up @@ -970,6 +971,8 @@ module.exports = function(registry) {
}
});

this.emit('remoteMethodAdded', this.sharedClass);

if (options.hooks === false) return; // don't inherit before/after hooks

self.once('mounted', function(app, sc, remotes) {
Expand Down
27 changes: 27 additions & 0 deletions test/app.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,33 @@ describe('app', function() {
expect(disabledRemoteMethod).to.eql('findOne');
});

it('emits a `remoteMethodAdded` event', function() {
app.dataSource('db', {connector: 'memory'});
var Book = app.registry.createModel(
'Book',
{name: 'string'},
{plural: 'books'}
);
app.model(Book, {dataSource: 'db'});

var Page = app.registry.createModel(
'Page',
{name: 'string'},
{plural: 'pages'}
);
app.model(Page, {dataSource: 'db'});

Book.hasMany(Page);

var remoteMethodAddedClass;
app.on('remoteMethodAdded', function(sharedClass) {
remoteMethodAddedClass = sharedClass;
});
Book.nestRemoting('pages');
expect(remoteMethodAddedClass).to.exist();
expect(remoteMethodAddedClass).to.eql(Book.sharedClass);
});

it.onServer('updates REST API when a new model is added', function(done) {
app.use(loopback.rest());
request(app).get('/colors').expect(404, function(err, res) {
Expand Down
36 changes: 36 additions & 0 deletions test/model.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,42 @@ describe.onServer('Remote Methods', function() {

expect(callbackSpy).to.have.been.calledWith(TestModel.sharedClass, 'findOne');
});

it('emits a `remoteMethodAdded` event', function() {
var app = loopback();
app.dataSource('db', {connector: 'memory'});

var User = app.registry.getModel('User');
app.model(User, {dataSource: 'db'});

var Token = app.registry.getModel('AccessToken');
app.model(Token, {dataSource: 'db'});

var callbackSpy = require('sinon').spy();
var TestModel = app.models.User;
TestModel.on('remoteMethodAdded', callbackSpy);
TestModel.nestRemoting('accessTokens');

expect(callbackSpy).to.have.been.calledWith(TestModel.sharedClass);
});
});

it('emits a `remoteMethodAdded` event from remoteMethod', function() {
var app = loopback();
var model = PersistedModel.extend('TestModelForAddingRemoteMethod');
app.dataSource('db', {connector: 'memory'});
app.model(model, {dataSource: 'db'});

var callbackSpy = require('sinon').spy();
var TestModel = app.models.TestModelForAddingRemoteMethod;
TestModel.on('remoteMethodAdded', callbackSpy);
TestModel.remoteMethod('getTest', {
accepts: {arg: 'options', type: 'object', http: 'optionsFromRequest'},
returns: {arg: 'test', type: 'object'},
http: {verb: 'GET', path: '/test'},
});

expect(callbackSpy).to.have.been.calledWith(TestModel.sharedClass);
});

describe('Model.getApp(cb)', function() {
Expand Down