Stable Version 0.2.0.

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,7 @@
+##### 0.2.0 - 25 February 2015
+
+- Upgraded dependencies
+
 ##### 0.1.0 - 05 February 2015
 
 - Initial Release

README.md

@@ -11,7 +11,7 @@ Postgres/MySQL/MariaDB/SQLite3 adapter for [js-data](http://www.js-data.io/).
 
 | Branch | Master |
 | ------ | ------ |
-| NPM | [![NPM version](https://badge.fury.io/js/js-data-sql.png)](http://badge.fury.io/js/js-data-sql) |
+| NPM | [![NPM](https://nodei.co/npm/js-data-sql.png?downloads=true&stars=true)](https://nodei.co/npm/js-data-sql/) |
 | Build Status | [![Circle CI](https://circleci.com/gh/js-data/js-data-sql.svg?style=svg)](https://circleci.com/gh/js-data/js-data-sql) |
 | Code Climate | [![Code Climate](https://codeclimate.com/github/js-data/js-data-sql.png)](https://codeclimate.com/github/js-data/js-data-sql) |
 | Dependency Status | [![Dependency Status](https://gemnasium.com/js-data/js-data-sql.png)](https://gemnasium.com/js-data/js-data-sql) |

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data-sql",
   "description": "Postgres/MySQL/MariaDB/SQLite3 adapter for js-data.",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "homepage": "http://www.js-data.io/docs/dssqladapter",
   "repository": {
     "type": "git",
@@ -31,26 +31,26 @@
     "sqlite"
   ],
   "devDependencies": {
-    "chai": "1.10.0",
+    "chai": "2.1.0",
     "grunt": "0.4.5",
     "grunt-contrib-jshint": "0.11.0",
     "grunt-contrib-watch": "0.6.1",
     "grunt-karma-coveralls": "2.5.3",
-    "grunt-mocha-test": "0.12.6",
+    "grunt-mocha-test": "0.12.7",
     "jit-grunt": "0.9.1",
     "sinon": "1.12.2",
-    "time-grunt": "1.0.0"
+    "time-grunt": "1.1.0"
   },
   "scripts": {
     "test": "grunt test"
   },
   "dependencies": {
     "js-data": ">=1.2.0",
-    "knex": "^0.7.3",
+    "knex": "^0.7.4",
     "mariasql": "^0.1.21",
     "mout": "0.11.0",
-    "mysql": "^2.5.4",
-    "pg": "^4.2.0",
-    "sqlite3": "^3.0.4"
+    "mysql": "^2.5.5",
+    "pg": "^4.3.0",
+    "sqlite3": "^3.0.5"
   }
 }

src/index.js

@@ -1,5 +1,6 @@
 var knex = require('knex');
 var JSData = require('js-data');
+var P = JSData.DSUtils.Promise;
 var contains = require('mout/array/contains');
 var forOwn = require('mout/object/forOwn');
 var keys = require('mout/object/keys');
@@ -146,7 +147,7 @@ dsSqlAdapterPrototype.find = function find(resourceConfig, id, options) {
     .where(resourceConfig.idAttribute, toString(id))
     .then(function (rows) {
       if (!rows.length) {
-        throw new Error('Not Found!');
+        return P.reject(new Error('Not Found!'));
       } else {
         instance = rows[0];
         var tasks = [];
@@ -186,7 +187,7 @@ dsSqlAdapterPrototype.find = function find(resourceConfig, id, options) {
           }
         });
 
-        return JSData.DSUtils.Promise.all(tasks);
+        return P.all(tasks);
       }
     })
     .then(function (loadedRelations) {

test/create.spec.js

@@ -1,7 +1,7 @@
 describe('DSSqlAdapter#create', function () {
-  it('should create a user in a sql db', function (done) {
+  it('should create a user in a sql db', function () {
     var id;
-    adapter.create(User, { name: 'John' }).then(function (user) {
+    return adapter.create(User, { name: 'John' }).then(function (user) {
       id = user.id;
       assert.equal(user.name, 'John');
       assert.isDefined(user.id);
@@ -18,11 +18,10 @@ describe('DSSqlAdapter#create', function () {
         return adapter.find(User, id);
       })
       .then(function () {
-        done('Should not have reached here!');
+        throw new Error('Should not have reached here!');
       })
       .catch(function (err) {
         assert.equal(err.message, 'Not Found!');
-        done();
       });
   });
 });

test/destroy.spec.js

@@ -1,7 +1,7 @@
 describe('DSSqlAdapter#destroy', function () {
-  it('should destroy a user from a Sql db', function (done) {
+  it('should destroy a user from a Sql db', function () {
     var id;
-    adapter.create(User, { name: 'John' })
+    return adapter.create(User, { name: 'John' })
       .then(function (user) {
         id = user.id;
         return adapter.destroy(User, user.id);
@@ -11,11 +11,10 @@ describe('DSSqlAdapter#destroy', function () {
         return adapter.find(User, id);
       })
       .then(function () {
-        done('Should not have reached here!');
+        throw new Error('Should not have reached here!');
       })
       .catch(function (err) {
         assert.equal(err.message, 'Not Found!');
-        done();
       });
   });
 });

test/destroyAll.spec.js

@@ -1,7 +1,7 @@
 describe('DSSqlAdapter#destroyAll', function () {
-  it('should destroy all items', function (done) {
+  it('should destroy all items', function () {
     var id;
-    adapter.create(User, { name: 'John' })
+    return adapter.create(User, { name: 'John' })
       .then(function (user) {
         id = user.id;
         return adapter.findAll(User, {
@@ -19,7 +19,6 @@ describe('DSSqlAdapter#destroyAll', function () {
         });
       }).then(function (users) {
         assert.equal(users.length, 0);
-        done();
-      }).catch(done);
+      });
   });
 });

test/find.spec.js

@@ -1,7 +1,7 @@
 describe('DSSqlAdapter#find', function () {
-  it('should find a user in a Sql db', function (done) {
+  it('should find a user in a Sql db', function () {
     var id, id2, _user, _post, _comments;
-    adapter.create(User, { name: 'John' })
+    return adapter.create(User, { name: 'John' })
       .then(function (user) {
         _user = user;
         id = user.id;
@@ -63,11 +63,10 @@ describe('DSSqlAdapter#find', function () {
         return adapter.find(User, id);
       })
       .then(function () {
-        done('Should not have reached here!');
+        throw new Error('Should not have reached here!');
       })
       .catch(function (err) {
         assert.equal(err.message, 'Not Found!');
-        done();
       });
   });
 });

test/findAll.spec.js

@@ -1,8 +1,8 @@
 describe('DSSqlAdapter#findAll', function () {
-  it('should filter users', function (done) {
+  it('should filter users', function () {
     var id;
 
-    adapter.findAll(User, {
+    return adapter.findAll(User, {
       age: 30
     }).then(function (users) {
       assert.equal(users.length, 0);
@@ -18,10 +18,9 @@ describe('DSSqlAdapter#findAll', function () {
       return adapter.destroy(User, id);
     }).then(function (destroyedUser) {
       assert.isFalse(!!destroyedUser);
-      done();
-    }).catch(done);
+    });
   });
-  it('should filter users using the "in" operator', function (done) {
+  it('should filter users using the "in" operator', function () {
     var id;
 
     adapter.findAll(User, {
@@ -44,7 +43,6 @@ describe('DSSqlAdapter#findAll', function () {
       return adapter.destroy(User, id);
     }).then(function (destroyedUser) {
       assert.isFalse(!!destroyedUser);
-      done();
-    }).catch(done);
+    });
   });
 });

test/update.spec.js

@@ -1,7 +1,7 @@
 describe('DSSqlAdapter#update', function () {
-  it('should update a user in a Sql db', function (done) {
+  it('should update a user in a Sql db', function () {
     var id;
-    adapter.create(User, { name: 'John' })
+    return adapter.create(User, { name: 'John' })
       .then(function (user) {
         id = user.id;
         assert.equal(user.name, 'John');
@@ -31,11 +31,10 @@ describe('DSSqlAdapter#update', function () {
         return adapter.find(User, id);
       })
       .then(function () {
-        done('Should not have reached here!');
+        throw new Error('Should not have reached here!');
       })
       .catch(function (err) {
         assert.equal(err.message, 'Not Found!');
-        done();
       });
   });
 });

test/updateAll.spec.js

@@ -1,7 +1,7 @@
 describe('DSSqlAdapter#updateAll', function () {
-  it('should update all items', function (done) {
+  it('should update all items', function () {
     var id, id2;
-    adapter.create(User, { name: 'John', age: 20 })
+    return adapter.create(User, { name: 'John', age: 20 })
       .then(function (user) {
         id = user.id;
         return adapter.create(User, { name: 'John', age: 30 });
@@ -42,7 +42,6 @@ describe('DSSqlAdapter#updateAll', function () {
         return adapter.destroyAll(User);
       }).then(function (destroyedUser) {
         assert.isFalse(!!destroyedUser);
-        done();
-      }).catch(done);
+      });
   });
 });