Stable Version 0.3.0.

jmdobry · jmdobry · commit 6eaf1131e435 · 2015-06-02T21:42:28.000-06:00
diff --git a/dist/js-data-mongodb.js b/dist/js-data-mongodb.js
diff --git a/mocha.start.js b/mocha.start.js
@@ -49,14 +49,15 @@ test.globals(testGlobals);
 
 beforeEach(function () {
   store = new JSData.DS({
+    idAttribute: '_id',
     log: false
   });
   adapter = new DSMongoDBAdapter('mongodb://localhost:27017');
+  store.registerAdapter('mongo', adapter, { 'default': true });
   DSUtils = JSData.DSUtils;
   DSErrors = JSData.DSErrors;
   globals.User = global.User = User = store.defineResource({
     name: 'user',
-    idAttribute: '_id',
     relations: {
       hasMany: {
         post: {
@@ -68,7 +69,6 @@ beforeEach(function () {
   });
   globals.Post = global.Post = Post = store.defineResource({
     name: 'post',
-    idAttribute: '_id',
     relations: {
       belongsTo: {
         user: {
@@ -86,7 +86,6 @@ beforeEach(function () {
   });
   globals.Comment = global.Comment = Comment = store.defineResource({
     name: 'comment',
-    idAttribute: '_id',
     relations: {
       belongsTo: {
         post: {
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-data-mongodb",
   "description": "MongoDB adapter for js-data.",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "homepage": "http://www.js-data.io/docs/dsmongodbadapter",
   "repository": {
     "type": "git",
@@ -27,31 +27,31 @@
     "mongodb"
   ],
   "devDependencies": {
-    "babel-core": "4.7.16",
-    "babel-loader": "4.2.0",
-    "chai": "2.1.1",
+    "babel-core": "5.4.7",
+    "babel-loader": "5.1.3",
+    "chai": "2.3.0",
     "grunt": "0.4.5",
     "grunt-contrib-watch": "0.6.1",
     "grunt-karma-coveralls": "2.5.3",
     "grunt-mocha-test": "0.12.7",
     "grunt-webpack": "1.0.8",
     "jit-grunt": "0.9.1",
-    "jshint": "2.6.3",
+    "jshint": "2.8.0",
     "jshint-loader": "0.8.3",
-    "sinon": "1.13.0",
-    "time-grunt": "1.1.0",
-    "webpack": "1.7.3",
-    "webpack-dev-server": "1.7.0"
+    "sinon": "1.14.1",
+    "time-grunt": "1.2.1",
+    "webpack": "1.9.10",
+    "webpack-dev-server": "1.9.0"
   },
   "scripts": {
     "test": "grunt test"
   },
   "dependencies": {
-    "bson": "^0.3.2",
+    "bson": "0.3.2",
     "mout": "0.11.0"
   },
   "peerDependencies": {
     "js-data": ">=1.5.7",
-    "mongodb": ">= 1.3.x <= 2.x"
+    "mongodb": ">= 1.3.x"
   }
 }
diff --git a/src/index.js b/src/index.js
@@ -18,10 +18,21 @@ let reserved = [
   'where'
 ];
 
+class Defaults {
+
+}
+
+Defaults.prototype.translateId = true;
+
 class DSMongoDBAdapter {
   constructor(uri) {
+    if (typeof uri === 'string') {
+      uri = {uri};
+    }
+    this.defaults = new Defaults();
+    deepMixIn(this.defaults, uri);
     this.client = new DSUtils.Promise((resolve, reject) => {
-      MongoClient.connect(uri, (err, db) => err ? reject(err) : resolve(db));
+      MongoClient.connect(uri.uri, (err, db) => err ? reject(err) : resolve(db));
     });
   }
 
@@ -174,51 +185,73 @@ class DSMongoDBAdapter {
     return queryOptions;
   }
 
-  find(resourceConfig, id, options) {
+  translateId(r, options) {
+    options = options || {};
+    if (typeof options.translateId === 'boolean' ? options.translateId : this.defaults.translateId) {
+      if (Array.isArray(r)) {
+        r.forEach(_r => {
+          let __id = _r._id ? _r._id.toString() : _r._id;
+          _r._id = typeof __id === 'string' ? __id : _r._id;
+        });
+      } else if (DSUtils.isObject(r)) {
+        let __id = r._id ? r._id.toString() : r._id;
+        r._id = typeof __id === 'string' ? __id : r._id;
+      }
+    }
+    return r;
+  }
+
+  origify(options) {
     options = options || {};
+    if (typeof options.orig === 'function') {
+      return options.orig();
+    }
+    return options;
+  }
+
+  find(resourceConfig, id, options) {
+    options = this.origify(options);
     return this.getClient().then(client => {
       return new DSUtils.Promise((resolve, reject) => {
         let params = {};
         params[resourceConfig.idAttribute] = id;
         if (resourceConfig.idAttribute === '_id' && typeof id === 'string' && ObjectID.isValid(id)) {
-            params[resourceConfig.idAttribute] = ObjectID.createFromHexString(id);
+          params[resourceConfig.idAttribute] = ObjectID.createFromHexString(id);
         }
+        options.fields = options.fields || {};
         client.collection(resourceConfig.table || underscore(resourceConfig.name)).findOne(params, options, (err, r) => {
           if (err) {
             reject(err);
           } else if (!r) {
             reject(new Error('Not Found!'));
           } else {
-            r._id = r._id.valueOf();
-            resolve(r);
+            resolve(this.translateId(r, options));
           }
         });
       });
     });
   }
 
   findAll(resourceConfig, params, options) {
-    options = options ? copy(options) : {};
+    options = this.origify(options ? copy(options) : {});
     deepMixIn(options, this.getQueryOptions(resourceConfig, params));
     let query = this.getQuery(resourceConfig, params);
     return this.getClient().then(client => {
       return new DSUtils.Promise((resolve, reject) => {
+        options.fields = options.fields || {};
         client.collection(resourceConfig.table || underscore(resourceConfig.name)).find(query, options).toArray((err, r) => {
           if (err) {
             reject(err);
           } else {
-            r.forEach(_r => {
-              _r._id = _r._id.valueOf();
-            });
-            resolve(r);
+            resolve(this.translateId(r, options));
           }
         });
       });
     });
   }
 
   create(resourceConfig, attrs, options) {
-    options = options || {};
+    options = this.origify(options);
     attrs = removeCircular(omit(attrs, resourceConfig.relationFields || []));
     return this.getClient().then(client => {
       return new DSUtils.Promise((resolve, reject) => {
@@ -229,9 +262,7 @@ class DSMongoDBAdapter {
             reject(err);
           } else {
             r = r.ops ? r.ops : r;
-            r.forEach(_r => {
-              _r._id = _r._id.valueOf();
-            });
+            this.translateId(r, options);
             resolve(DSUtils.isArray(attrs) ? r : r[0]);
           }
         });
@@ -241,37 +272,46 @@ class DSMongoDBAdapter {
 
   update(resourceConfig, id, attrs, options) {
     attrs = removeCircular(omit(attrs, resourceConfig.relationFields || []));
-    options = options || {};
+    options = this.origify(options);
     return this.find(resourceConfig, id, options).then(() => {
-      return this.getClient().then(client => {
-        return new DSUtils.Promise((resolve, reject) => {
-          let params = {};
-          params[resourceConfig.idAttribute] = id;
-          let collection = client.collection(resourceConfig.table || underscore(resourceConfig.name));
-          collection[collection.updateOne ? 'updateOne' : 'update'](params, { $set: attrs }, options, err => {
-            if (err) {
-              reject(err);
-            } else {
-              resolve();
-            }
-          });
-        }).then(() => this.find(resourceConfig, id, options));
+      return this.getClient();
+    }).then(client => {
+      return new DSUtils.Promise((resolve, reject) => {
+        let params = {};
+        params[resourceConfig.idAttribute] = id;
+        if (resourceConfig.idAttribute === '_id' && typeof id === 'string' && ObjectID.isValid(id)) {
+          params[resourceConfig.idAttribute] = ObjectID.createFromHexString(id);
+        }
+        let collection = client.collection(resourceConfig.table || underscore(resourceConfig.name));
+        collection[collection.updateOne ? 'updateOne' : 'update'](params, {$set: attrs}, options, err => {
+          if (err) {
+            reject(err);
+          } else {
+            resolve();
+          }
+        });
       });
-    });
+    }).then(() => this.find(resourceConfig, id, options));
   }
 
   updateAll(resourceConfig, attrs, params, options) {
     let ids = [];
     attrs = removeCircular(omit(attrs, resourceConfig.relationFields || []));
-    options = options ? copy(options) : {};
+    options = this.origify(options ? copy(options) : {});
     let _options = copy(options);
     _options.multi = true;
     return this.getClient().then(client => {
       let queryOptions = this.getQueryOptions(resourceConfig, params);
       queryOptions.$set = attrs;
       let query = this.getQuery(resourceConfig, params);
       return this.findAll(resourceConfig, params, options).then(items => {
-        ids = map(items, item => item[resourceConfig.idAttribute]);
+        ids = map(items, item => {
+          let id = item[resourceConfig.idAttribute];
+          if (resourceConfig.idAttribute === '_id' && typeof id === 'string' && ObjectID.isValid(id)) {
+            return ObjectID.createFromHexString(id);
+          }
+          return id;
+        });
         return new DSUtils.Promise((resolve, reject) => {
           let collection = client.collection(resourceConfig.table || underscore(resourceConfig.name));
           collection[collection.updateMany ? 'updateMany' : 'update'](query, queryOptions, _options, err => {
@@ -293,11 +333,14 @@ class DSMongoDBAdapter {
   }
 
   destroy(resourceConfig, id, options) {
-    options = options || {};
+    options = this.origify(options);
     return this.getClient().then(client => {
       return new DSUtils.Promise((resolve, reject) => {
         let params = {};
         params[resourceConfig.idAttribute] = id;
+        if (resourceConfig.idAttribute === '_id' && typeof id === 'string' && ObjectID.isValid(id)) {
+          params[resourceConfig.idAttribute] = ObjectID.createFromHexString(id);
+        }
         let collection = client.collection(resourceConfig.table || underscore(resourceConfig.name));
         collection[collection.deleteOne ? 'deleteOne' : 'remove'](params, options, err => {
           if (err) {
@@ -311,7 +354,7 @@ class DSMongoDBAdapter {
   }
 
   destroyAll(resourceConfig, params, options) {
-    options = options ? copy(options) : {};
+    options = this.origify(options ? copy(options) : {});
     return this.getClient().then(client => {
       deepMixIn(options, this.getQueryOptions(resourceConfig, params));
       let query = this.getQuery(resourceConfig, params);
diff --git a/test/find.spec.js b/test/find.spec.js
@@ -6,32 +6,32 @@ describe('DSMongoDBAdapter#find', function () {
       name: 'John'
     }).then(function (users) {
       assert.equal(users.length, 0);
-      return adapter.create(User, { name: 'John' });
+      return adapter.create(User, {name: 'John'});
     }).then(function (user) {
       id = user._id;
       return adapter.find(User, id.toString());
     }).then(function (user) {
-      assert.deepEqual(user, { _id: id, name: 'John' });
+      assert.deepEqual(user, {_id: id, name: 'John'});
       return adapter.destroy(User, id);
     }).then(function (destroyedUser) {
       assert.isFalse(!!destroyedUser);
     });
   });
 
-  it('should not convert id if it is not a valid bson ObjectId hex string', function() {
+  it('should not convert id if it is not a valid bson ObjectId hex string', function () {
     var id;
 
     return adapter.findAll(User, {
       name: 'John'
     }).then(function (users) {
       assert.equal(users.length, 0);
-      return adapter.create(User, { _id: 1, name: 'John' });
+      return adapter.create(User, {_id: '1', name: 'John'});
     }).then(function (user) {
       id = user._id;
-      assert.equal(typeof id, 'number');
+      assert.equal(typeof id, 'string');
       return adapter.find(User, id);
     }).then(function (user) {
-      assert.deepEqual(user, { _id: id, name: 'John' });
+      assert.deepEqual(user, {_id: id, name: 'John'});
       return adapter.destroy(User, id);
     }).then(function (destroyedUser) {
       assert.isFalse(!!destroyedUser);
diff --git a/test/store/create.spec.js b/test/store/create.spec.js
@@ -0,0 +1,23 @@
+describe('DS#create', function () {
+  it('should create a user in MongoDB and inject it into the store', function () {
+    var id;
+    return User.create({name: 'John'}, {cacheResponse: true}).then(function (user) {
+      id = user._id;
+      assert.equal(user.name, 'John');
+      assert.isDefined(user._id);
+      assert.isTrue(user === User.get(user._id));
+      return User.find(user._id, {bypassCache: true, cacheResponse: true});
+    })
+      .then(function (user) {
+        assert.equal(user.name, 'John');
+        assert.isDefined(user._id);
+        assert.strictEqual(user, User.get(user._id));
+        return User.destroy(user._id);
+      })
+      .then(function () {
+        return User.find(id, {bypassCache: true}).catch(function (err) {
+          assert.equal(err.message, 'Not Found!');
+        });
+      });
+  });
+});
diff --git a/test/store/destroy.spec.js b/test/store/destroy.spec.js
@@ -0,0 +1,19 @@
+describe('DS#destroy', function () {
+  it('should destroy a user from MongoDB and eject it from the store', function () {
+    var id;
+    return User.create({name: 'John'}, {cacheResponse: true})
+      .then(function (user) {
+        id = user._id;
+        assert.equal(user.name, 'John');
+        assert.isDefined(user._id);
+        assert.isTrue(user === User.get(user._id));
+        return User.destroy(user._id);
+      })
+      .then(function () {
+        assert.isUndefined(User.get(id));
+        return User.find(id, {bypassCache: true}).catch(function (err) {
+          assert.equal(err.message, 'Not Found!');
+        });
+      });
+  });
+});
diff --git a/test/store/update.spec.js b/test/store/update.spec.js
