added; support Model.count(fn)

andrewjstone · Sep 2, 2011 · 937f1b4 · 937f1b4
1 parent 574529a
commit 937f1b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/model.js b/lib/model.js
@@ -719,6 +719,9 @@ Model.findOne = function findOne (conditions, fields, options, callback) {
  */
 
 Model.count = function count (conditions, callback) {
+  if ('function' === typeof conditions)
+    callback = conditions, conditions = {};
+
   var query = new Query(conditions).bind(this, 'count');
   if ('undefined' == typeof callback)
     return query;

diff --git a/test/model.querying.test.js b/test/model.querying.test.js
@@ -176,13 +176,16 @@ module.exports = {
 
   'test that count Query executes when you pass a callback': function () {
     var db = start()
-      , BlogPostB = db.model('BlogPostB', collection);
+      , BlogPostB = db.model('BlogPostB', collection)
+      , pending = 2
 
     function fn () {
+      if (--pending) return;
       db.close();
     };
 
     BlogPostB.count({}, fn).should.be.an.instanceof(Query);
+    BlogPostB.count(fn).should.be.an.instanceof(Query);
   },
 
   'test that distinct returns a Query': function () {