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

Jump to bottom

[ready] create missing $ prefixed aliases for pop, shift and unshift #884

Merged
merged 1 commit into from May 16, 2012
Merged

[ready] create missing $ prefixed aliases for pop, shift and unshift #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions lib/types/array.js
View file
Open in desktop
Expand Up @@ -193,9 +193,10 @@ MongooseArray.prototype.$pushAll = function (value) {
* @api public * @api public
*/ */


MongooseArray.prototype.pop =
MongooseArray.prototype.$pop = function () { MongooseArray.prototype.$pop = function () {
this._registerAtomic('$pop', 1); this._registerAtomic('$pop', 1);
return this.pop(); return [].pop.call(this)
}; };


/** /**
Expand All @@ -208,9 +209,10 @@ MongooseArray.prototype.$pop = function () {
* @api public * @api public
*/ */


MongooseArray.prototype.$shift = function () { MongooseArray.prototype.shift =
MongooseArray.prototype.$shift = function $shift () {
this._registerAtomic('$pop', -1); this._registerAtomic('$pop', -1);
return this.shift(); return [].shift.call(this)
}; };


/** /**
Expand Down Expand Up @@ -323,6 +325,7 @@ MongooseArray.prototype.splice = function () {
* @api public * @api public
*/ */


MongooseArray.prototype.$unshift =
MongooseArray.prototype.unshift = function () { MongooseArray.prototype.unshift = function () {
var values = [].map.call(arguments, this._cast, this); var values = [].map.call(arguments, this._cast, this);
[].unshift.apply(this, values); [].unshift.apply(this, values);
Expand All @@ -331,6 +334,7 @@ MongooseArray.prototype.unshift = function () {
}; };


/** /**
MongooseArray.prototype.$shift =
* Adds values to the array if not already present. * Adds values to the array if not already present.
* @api public * @api public
*/ */
Expand Down
32 changes: 32 additions & 0 deletions test/types.array.test.js
View file
Open in desktop
Expand Up @@ -63,6 +63,38 @@ module.exports = {


}, },


'$push is push': function() {
var db = start()
var User = db.model('User')
var tj = new User({ name: 'tj', pets: []})
tj.pets.push.should.equal(tj.pets.$push)
db.close()
},

'$pop is pop': function() {
var db = start()
var User = db.model('User')
var tj = new User({ name: 'tj', pets: []})
tj.pets.pop.should.equal(tj.pets.$pop)
db.close()
},

'$shift is shift': function() {
var db = start()
var User = db.model('User')
var tj = new User({ name: 'tj', pets: []})
tj.pets.shift.should.equal(tj.pets.$shift)
db.close()
},

'$unshift is unshift': function() {
var db = start()
var User = db.model('User')
var tj = new User({ name: 'tj', pets: []})
tj.pets.unshift.should.equal(tj.pets.$unshift)
db.close()
},

'test indexOf()': function(){ 'test indexOf()': function(){
var db = start() var db = start()
, User = db.model('User', 'users_' + random()) , User = db.model('User', 'users_' + random())
Expand Down