Merge pull request #167 from strongloop/feature/allow-default-model

Allows default model class to be configured
This commit is contained in:
Raymond Feng 2014-07-09 08:36:55 -07:00
commit 2dfef8cc7f
2 changed files with 35 additions and 1 deletions

View File

@ -37,6 +37,7 @@ function ModelBuilder() {
// create blank models pool // create blank models pool
this.models = {}; this.models = {};
this.definitions = {}; this.definitions = {};
this.defaultModelBaseClass = DefaultModelBaseClass;
} }
// Inherit from EventEmitter // Inherit from EventEmitter
@ -131,7 +132,7 @@ ModelBuilder.prototype.define = function defineClass(className, properties, sett
} }
// Set up the base model class // Set up the base model class
var ModelBaseClass = parent || DefaultModelBaseClass; var ModelBaseClass = parent || this.defaultModelBaseClass;
var baseClass = settings.base || settings['super']; var baseClass = settings.base || settings['super'];
if (baseClass) { if (baseClass) {
if (isModelClass(baseClass)) { if (isModelClass(baseClass)) {

View File

@ -1285,6 +1285,39 @@ describe('Load models from json', function () {
} }
}); });
it('should allow customization of default model base class', function () {
var modelBuilder = new ModelBuilder();
var User = modelBuilder.define('User', {
name: String,
bio: ModelBuilder.Text,
approved: Boolean,
joinedAt: Date,
age: Number
});
modelBuilder.defaultModelBaseClass = User;
var Customer = modelBuilder.define('Customer', {customerId: {type: String, id: true}});
assert(Customer.prototype instanceof User);
});
it('should allow model base class', function () {
var modelBuilder = new ModelBuilder();
var User = modelBuilder.define('User', {
name: String,
bio: ModelBuilder.Text,
approved: Boolean,
joinedAt: Date,
age: Number
});
var Customer = modelBuilder.define('Customer',
{customerId: {type: String, id: true}}, {}, User);
assert(Customer.prototype instanceof User);
});
it('should be able to extend models', function (done) { it('should be able to extend models', function (done) {
var modelBuilder = new ModelBuilder(); var modelBuilder = new ModelBuilder();