Navigation Menu

Skip to content

Commit

Permalink
more strict lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@TrejGun
TrejGun committed Jan 31, 2016
1 parent afe374d commit 94b4a0f
Show file tree
Hide file tree
Showing 171 changed files with 13,137 additions and 12,237 deletions.
1 change: 0 additions & 1 deletion CONTRIBUTING.md
View file
Expand Up @@ -23,7 +23,6 @@ If you have a question about Mongoose (not a bug report) please post it to eithe
- Follow the general coding style of the rest of the project:
- 2 space tabs
- no trailing whitespace
- comma first
- inline documentation for new methods, class members, etc.
- 1 space between conditionals/functions, and their parenthesis and curly braces
- `if (..) {`
Expand Down
31 changes: 15 additions & 16 deletions benchmarks/benchjs/casting.js
View file
@@ -1,4 +1,3 @@

var mongoose = require('../../lib');
var Benchmark = require('benchmark');

Expand Down Expand Up @@ -62,7 +61,7 @@ var blogData = {
mixed: {
thisIsRandom: true
},
numbers: [1,2,7,10,23432],
numbers: [1, 2, 7, 10, 23432],
tags: ['test', 'BENCH', 'things', 'more things'],
def: 'THANGS!!!',
comments: []
Expand All @@ -85,58 +84,58 @@ for (i = 0; i < 10000; i++) {
blogData10000.comments.push(commentData);
}
var commentData = {
title : 'test comment',
date : new Date(),
body : 'this be some crazzzyyyyy text that would go in a comment',
comments : [{ title : 'second level', date : new Date(), body : 'texttt'}]
title: 'test comment',
date: new Date(),
body: 'this be some crazzzyyyyy text that would go in a comment',
comments: [{title: 'second level', date: new Date(), body: 'texttt'}]
};
BlogPost = mongoose.model('BlogPost', BlogPost);

suite.add('Casting - Embedded Docs - 0 Docs', {
fn : function() {
fn: function () {
var BlogPost = mongoose.model('BlogPost');
var bp = new BlogPost();
bp.init(blogData);
}
}).add('Casting - Embedded Docs - 10 Docs', {
fn : function() {
fn: function () {
var BlogPost = mongoose.model('BlogPost');
var bp = new BlogPost();
bp.init(blogData10);
}
}).add('Casting - Embedded Docs - 100 Docs', {
fn : function() {
fn: function () {
var BlogPost = mongoose.model('BlogPost');
var bp = new BlogPost();
bp.init(blogData100);
}
}).add('Casting - Embedded Docs - 1000 Docs', {
fn : function() {
fn: function () {
var BlogPost = mongoose.model('BlogPost');
var bp = new BlogPost();
bp.init(blogData1000);
}
}).add('Casting - Embedded Docs - 10000 Docs', {
fn : function() {
fn: function () {
var BlogPost = mongoose.model('BlogPost');
var bp = new BlogPost();
bp.init(blogData10000);
}
})
.on('cycle', function(evt) {
.on('cycle', function (evt) {
if (process.env.MONGOOSE_DEV || process.env.PULL_REQUEST) {
console.log(String(evt.target));
}
}).on('complete', function() {
}).on('complete', function () {
if (!process.env.MONGOOSE_DEV && !process.env.PULL_REQUEST) {
var outObj = {};
this.forEach(function(item) {
this.forEach(function (item) {
var out = {};
out.stats = item.stats;
delete out.stats.sample;
out.ops = item.hz;
outObj[item.name.replace(/\s/g, "")] = out;
outObj[item.name.replace(/\s/g, '')] = out;
});
console.log(JSON.stringify(outObj));
}
}).run({ async : true });
}).run({async: true});
73 changes: 42 additions & 31 deletions benchmarks/benchjs/delete.js
View file
@@ -1,4 +1,3 @@

var mongoose = require('../../lib');
var Benchmark = require('benchmark');

Expand All @@ -18,12 +17,16 @@ var mongo = require('mongodb');
*/


mongoose.connect('mongodb://localhost/mongoose-bench', function(err) {
if (err) throw err;
mongo.connect('mongodb://localhost/mongoose-bench', function(err, db) {
if (err) throw err;
mongoose.connect('mongodb://localhost/mongoose-bench', function (err) {
if (err) {
throw err;
}
mongo.connect('mongodb://localhost/mongoose-bench', function (err, db) {
if (err) {
throw err;
}
var UserSchema = new Schema({
name : String,
name: String,
age: Number,
likes: [String],
address: String
Expand All @@ -36,17 +39,19 @@ mongoose.connect('mongodb://localhost/mongoose-bench', function(err) {
var dIds = [];

var data = {
name : "name",
age : 0,
likes : ["dogs", "cats", "pizza"],
address : " Nowhere-ville USA"
name: 'name',
age: 0,
likes: ['dogs', 'cats', 'pizza'],
address: ' Nowhere-ville USA'
};

// insert all of the data here
var count = 1000;
for (var i = 0; i < 500; i++) {
User.create(data, function(err, u) {
if (err) throw err;
User.create(data, function (err, u) {
if (err) {
throw err;
}
mIds.push(u.id);
--count || next();
});
Expand All @@ -55,65 +60,71 @@ mongoose.connect('mongodb://localhost/mongoose-bench', function(err) {
nData.age = data.age;
nData.likes = data.likes;
nData.address = data.address;
user.insert(nData, function(err, res) {
user.insert(nData, function (err, res) {
dIds.push(res[0]._id);
--count || next();
});
}

function closeDB() {
User.count(function(err, res) {
User.count(function (err, res) {
if (res != 0) {
console.log("Still mongoose entries left...");
console.log('Still mongoose entries left...');
}
mongoose.disconnect();
});
user.count({}, function(err, res) {
user.count({}, function (err, res) {
if (res != 0) {
console.log("Still driver entries left...");
console.log('Still driver entries left...');
}
if (err) {
throw err;
}
if (err) throw err;
db.close();
});
}

suite.add('Delete - Mongoose', {
defer : true,
fn : function(deferred) {
User.remove({ _id : mIds.pop()}, function(err) {
if (err) throw err;
defer: true,
fn: function (deferred) {
User.remove({_id: mIds.pop()}, function (err) {
if (err) {
throw err;
}
deferred.resolve();
});
}
}).add('Delete - Driver', {
defer : true,
fn : function(deferred) {
user.remove({ _id : dIds.pop()}, function(err) {
if (err) throw err;
defer: true,
fn: function (deferred) {
user.remove({_id: dIds.pop()}, function (err) {
if (err) {
throw err;
}
deferred.resolve();
});
}
})
.on('cycle', function(evt) {
.on('cycle', function (evt) {
if (process.env.MONGOOSE_DEV || process.env.PULL_REQUEST) {
console.log(String(evt.target));
}
}).on('complete', function() {
}).on('complete', function () {
closeDB();
if (!process.env.MONGOOSE_DEV && !process.env.PULL_REQUEST) {
var outObj = {};
this.forEach(function(item) {
this.forEach(function (item) {
var out = {};
out.stats = item.stats;
delete out.stats.sample;
out.ops = item.hz;
outObj[item.name.replace(/\s/g, "")] = out;
outObj[item.name.replace(/\s/g, '')] = out;
});
console.log(JSON.stringify(outObj));
}
});
function next() {
suite.run({ async : true });
suite.run({async: true});
}
});
});
82 changes: 46 additions & 36 deletions benchmarks/benchjs/insert.js
View file
@@ -1,4 +1,3 @@

var mongoose = require('../../lib');
var Benchmark = require('benchmark');

Expand All @@ -20,10 +19,14 @@ var ObjectId = Schema.Types.ObjectId;
*/


mongoose.connect('mongodb://localhost/mongoose-bench', function(err) {
if (err) throw err;
mongo.connect('mongodb://localhost/mongoose-bench', function(err, db) {
if (err) throw err;
mongoose.connect('mongodb://localhost/mongoose-bench', function (err) {
if (err) {
throw err;
}
mongo.connect('mongodb://localhost/mongoose-bench', function (err, db) {
if (err) {
throw err;
}

var Comments = new Schema;
Comments.add({
Expand Down Expand Up @@ -59,10 +62,10 @@ mongoose.connect('mongodb://localhost/mongoose-bench', function(err) {
author: 'somebody',
slug: 'test.post',
date: new Date(),
meta: { date : new Date(), visitors: 9001},
meta: {date: new Date(), visitors: 9001},
published: true,
mixed: { thisIsRandom : true },
numbers: [1,2,7,10,23432],
mixed: {thisIsRandom: true},
numbers: [1, 2, 7, 10, 23432],
tags: ['test', 'BENCH', 'things', 'more things'],
def: 'THANGS!!!',
comments: []
Expand All @@ -81,14 +84,14 @@ mongoose.connect('mongodb://localhost/mongoose-bench', function(err) {
blogData.comments.push(commentData);
}
var data = {
name : "name",
age : 0,
likes : ["dogs", "cats", "pizza"],
address : " Nowhere-ville USA"
name: 'name',
age: 0,
likes: ['dogs', 'cats', 'pizza'],
address: ' Nowhere-ville USA'
};

var UserSchema = new Schema({
name : String,
name: String,
age: Number,
likes: [String],
address: String
Expand All @@ -100,67 +103,74 @@ mongoose.connect('mongodb://localhost/mongoose-bench', function(err) {
var blogpost = db.collection('blogpost');

function closeDB() {
mongoose.connection.db.dropDatabase(function() {
mongoose.connection.db.dropDatabase(function () {
mongoose.disconnect();
process.exit();
});
}

suite.add('Insert - Mongoose - Basic', {
defer : true,
fn : function(deferred) {
defer: true,
fn: function (deferred) {
var nData = utils.clone(data);
User.create(nData, function(err) {
if (err) throw err;
User.create(nData, function (err) {
if (err) {
throw err;
}
deferred.resolve();
});
}
}).add('Insert - Driver - Basic', {
defer : true,
fn : function(deferred) {
defer: true,
fn: function (deferred) {
var nData = utils.clone(data);
user.insert(nData, function(err) {
if (err) throw err;
user.insert(nData, function (err) {
if (err) {
throw err;
}
deferred.resolve();
});
}
}).add('Insert - Mongoose - Embedded Docs', {
defer : true,
fn : function(deferred) {
defer: true,
fn: function (deferred) {
var bp = utils.clone(blogData);
BlogPost.create(bp, function(err) {
if (err) throw err;
BlogPost.create(bp, function (err) {
if (err) {
throw err;
}
deferred.resolve();
});
}
}).add('Insert - Driver - Embedded Docs', {
defer : true,
fn : function(deferred) {

defer: true,
fn: function (deferred) {
var bp = utils.clone(blogData);
blogpost.insert(bp, function(err) {
if (err) throw err;
blogpost.insert(bp, function (err) {
if (err) {
throw err;
}
deferred.resolve();
});
}
})
.on('cycle', function(evt) {
.on('cycle', function (evt) {
if (process.env.MONGOOSE_DEV || process.env.PULL_REQUEST) {
console.log(String(evt.target));
}
}).on('complete', function() {
}).on('complete', function () {
closeDB();
if (!process.env.MONGOOSE_DEV && !process.env.PULL_REQUEST) {
var outObj = {};
this.forEach(function(item) {
this.forEach(function (item) {
var out = {};
out.stats = item.stats;
delete out.stats.sample;
out.ops = item.hz;
outObj[item.name.replace(/\s/g, "")] = out;
outObj[item.name.replace(/\s/g, '')] = out;
});
console.log(JSON.stringify(outObj));
}
}).run({ async : true });
}).run({async: true});
});
});

0 comments on commit 94b4a0f

Please sign in to comment.