diff --git a/lib/model.js b/lib/model.js index 5e33c16d..44ccec16 100644 --- a/lib/model.js +++ b/lib/model.js @@ -26,6 +26,7 @@ var _extend = util._extend; var utils = require('./utils'); var fieldsToArray = utils.fieldsToArray; var uuid = require('node-uuid'); +var shortid = require('shortid'); // Set up an object for quick lookup var BASE_TYPES = { @@ -308,6 +309,9 @@ ModelBaseClass.prototype._initProperties = function(data, options) { case 'now': propVal = new Date(); break; + case 'shortid': + propVal = shortid.generate(); + break; default: // TODO Support user-provided functions via a registry of functions g.warn('Unknown default value provider %s', defn); diff --git a/package.json b/package.json index 9bb51eb0..bbc92ba4 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "minimatch": "^3.0.3", "node-uuid": "^1.4.2", "qs": "^3.1.0", + "shortid": "^2.2.6", "strong-globalize": "^2.6.2", "traverse": "^0.6.6" }, diff --git a/test/manipulation.test.js b/test/manipulation.test.js index afd10d5a..d0e37277 100644 --- a/test/manipulation.test.js +++ b/test/manipulation.test.js @@ -1703,6 +1703,27 @@ describe('manipulation', function() { }); }); + describe('shortid defaultFn', function() { + var ModelWithShortId; + before(createModelWithShortId); + + it('should generate a new id when "defaultFn" is "shortid"', function(done) { + var SHORTID_REGEXP = /^[0-9a-z_\-]{7,14}$/i; + ModelWithShortId.create(function(err, modelWithShortId) { + if (err) return done(err); + modelWithShortId.shortid.should.match(SHORTID_REGEXP); + done(); + }); + }); + + function createModelWithShortId(cb) { + ModelWithShortId = db.define('ModelWithShortId', { + shortid: {type: String, defaultFn: 'shortid'}, + }); + db.automigrate('ModelWithShortId', cb); + } + }); + // it('should work when constructor called as function', function() { // var p = Person({name: 'John Resig'}); // p.should.be.an.instanceOf(Person);