Updated to support MongoDB Node driver v2.0

lib/Cursor.ts

@@ -16,7 +16,7 @@ class Cursor<TDocument extends { _id?: any }, TInstance> {
      * @constructor
      */
     constructor(private model: Model<TDocument, TInstance>, private conditions: any, public cursor: MongoDB.Cursor) {
-        
+
     }
 
     /**
@@ -39,13 +39,14 @@ class Cursor<TDocument extends { _id?: any }, TInstance> {
      * @param {function(Error)} callback A callback which is triggered when all operations have been dispatched
      * @return {Promise} A promise which is resolved when all operations have been dispatched
      */
-    each(handler: (instance: TInstance) => void, callback?: General.Callback<void>): Bluebird<void> {
+    forEach(handler: (instance: TInstance) => void, callback?: General.Callback<void>): Bluebird<void> {
         var helpers = this.model.helpers;
         return new Bluebird<void>((resolve, reject) => {
-            this.cursor.each((err, item: TDocument) => {
-                if (err) return reject(err);
-                if (!item) return resolve(null);
+            this.cursor.forEach((item: TDocument) => {
                 this.model.handlers.documentReceived(this.conditions, item, function () { return helpers.wrapDocument.apply(helpers, arguments); }).then(handler);
+            },(err) => {
+                if (err) return reject(err);
+                return resolve(null);
             });
         }).nodeify(callback);
     }
@@ -60,11 +61,12 @@ class Cursor<TDocument extends { _id?: any }, TInstance> {
         var helpers = this.model.helpers;
         return new Bluebird<TResult[]>((resolve, reject) => {
             var promises: Bluebird<TResult>[] = [];
-            this.cursor.each((err, item: TDocument) => {
-                if (err) return reject(err);
-                if (!item) return resolve(Bluebird.all(promises));
+            this.cursor.forEach((item: TDocument) => {
                 promises.push(this.model.handlers.documentReceived(this.conditions, item, function () { return helpers.wrapDocument.apply(helpers, arguments); })
                     .then(<(instance) => TResult>transform));
+            },(err) => {
+                if (err) return reject(err);
+                return resolve(Bluebird.all(promises));
             });
         }).nodeify(callback);
     }
@@ -93,7 +95,7 @@ class Cursor<TDocument extends { _id?: any }, TInstance> {
      */
     next(callback?: General.Callback<TInstance>): Bluebird<TInstance> {
         return new Bluebird<TDocument>((resolve, reject) => {
-            this.cursor.nextObject((err, result: any) => {
+            this.cursor.next((err, result: any) => {
                 if (err) return reject(err);
                 return resolve(<any>result);
             });
@@ -107,7 +109,8 @@ class Cursor<TDocument extends { _id?: any }, TInstance> {
      * @return {Cursor} The new cursor which starts at the beginning of the results
      */
     rewind(): Cursor<TDocument, TInstance> {
-        return new Cursor(this.model, this.conditions, this.cursor.rewind());
+        this.cursor.rewind();
+        return this;
     }
 
     /**

lib/Model.ts

@@ -453,9 +453,9 @@ class Model<TDocument extends { _id?: any }, TInstance> implements ModelInterfac
             else
                 return this._handlers.creatingDocuments(objects).then((objects) => {
                     return new Bluebird<any[]>((resolve, reject) => {
-                        this.collection.insert(objects, queryOptions,(err, results) => {
+                        this.collection.insert(objects, queryOptions,(err, result) => {
                             if (err) return reject(err);
-                            return resolve(results);
+                            return resolve(result.ops);
                         });
                     });
                 });
@@ -504,9 +504,9 @@ class Model<TDocument extends { _id?: any }, TInstance> implements ModelInterfac
                 conditions['_id'] = this.options.identifier.reverse(conditions['_id']);
 
             return new Bluebird<number>((resolve, reject) => {
-                this.collection.update(conditions, changes, options,(err, changes) => {
+                this.collection.update(conditions, changes, options,(err, result) => {
                     if (err) return reject(err);
-                    return resolve(changes);
+                    return resolve(result.result.nModified);
                 });
             })
         }).nodeify(callback);
@@ -580,9 +580,9 @@ class Model<TDocument extends { _id?: any }, TInstance> implements ModelInterfac
                 conditions['_id'] = this.options.identifier.reverse(conditions['_id']);
 
             return new Bluebird<number>((resolve, reject) => {
-                this.collection.remove(conditions,(err, results) => {
+                this.collection.remove(conditions,(err, response) => {
                     if (err) return reject(err);
-                    return resolve(results);
+                    return resolve(response.result.n);
                 });
             });
         }).then((count) => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "iridium",
-  "version": "4.0.1",
+  "version": "5.0.0-alpha",
   "author": "Benjamin Pannell <admin@sierrasoftworks.com>",
   "description": "A custom lightweight ORM for MongoDB designed for power-users",
   "homepage": "https://sierrasoftworks.com/iridium",
@@ -27,14 +27,10 @@
     "node": ">= 0.8"
   },
   "dependencies": {
-    "async": "~0.9",
-    "bluebird": "2.x",
-    "concoction": "~1.0",
-    "debug": "^1.0.4",
-    "functionality": "2.x",
-    "lodash": "*",
-    "mongodb": "^1.4.35",
-    "skmatc": "1.x"
+    "bluebird": "^2.9.24",
+    "lodash": "^3.7.0",
+    "mongodb": "^2.0.28",
+    "skmatc": "^1.1.2"
   },
   "devDependencies": {
     "mocha": "2.x",
@@ -54,7 +50,6 @@
     "odm",
     "iridium",
     "validation",
-    "transformation",
     "preprocessing"
   ]
 }