Stable Version 0.7.0

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,7 @@
+##### 0.7.0 - 02 July 2015
+
+Stable Version 0.7.0
+
 ##### 0.6.1 - 24 June 2015
 
 ###### Backwards compatible bug fixes

Gruntfile.js

@@ -49,14 +49,9 @@ module.exports = function (grunt) {
         },
         externals: [
           'mout/array/map',
-          'mout/object/keys',
-          'mout/lang/isEmpty',
           'mout/lang/toString',
-          'mout/string/upperCase',
           'mout/string/underscore',
-          'mout/object/omit',
           'js-data',
-          'js-data-schema',
           'knex'
         ],
         module: {

README.md

@@ -45,6 +45,8 @@ store.registerAdapter('sql', adapter, { default: true });
 [CHANGELOG.md](https://github.com/js-data/js-data-sql/blob/master/CHANGELOG.md)
 
 ### Community
+- [Gitter Channel](https://gitter.im/js-data/js-data) - Better than IRC!
+- [Announcements](http://www.js-data.io/blog)
 - [Mailing List](https://groups.io/org/groupsio/jsdata) - Ask your questions!
 - [Issues](https://github.com/js-data/js-data-sql/issues) - Found a bug? Feature request? Submit an issue!
 - [GitHub](https://github.com/js-data/js-data-sql) - View the source code for js-data.

dist/js-data-sql.js

@@ -51,48 +51,18 @@ module.exports =
 
 	var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
 
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
-
 	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
 
-	var _knex = __webpack_require__(1);
-
-	var _knex2 = _interopRequireDefault(_knex);
-
-	var _jsData = __webpack_require__(2);
-
-	var _jsData2 = _interopRequireDefault(_jsData);
-
-	var _moutArrayMap = __webpack_require__(3);
-
-	var _moutArrayMap2 = _interopRequireDefault(_moutArrayMap);
-
-	var _moutObjectKeys = __webpack_require__(4);
-
-	var _moutObjectKeys2 = _interopRequireDefault(_moutObjectKeys);
-
-	var _moutObjectOmit = __webpack_require__(5);
-
-	var _moutObjectOmit2 = _interopRequireDefault(_moutObjectOmit);
-
-	var _moutLangIsEmpty = __webpack_require__(6);
-
-	var _moutLangIsEmpty2 = _interopRequireDefault(_moutLangIsEmpty);
-
-	var _moutStringUpperCase = __webpack_require__(7);
-
-	var _moutStringUpperCase2 = _interopRequireDefault(_moutStringUpperCase);
-
-	var _moutStringUnderscore = __webpack_require__(8);
-
-	var _moutStringUnderscore2 = _interopRequireDefault(_moutStringUnderscore);
-
-	var _moutLangToString = __webpack_require__(9);
-
-	var _moutLangToString2 = _interopRequireDefault(_moutLangToString);
-
-	var DSUtils = _jsData2['default'].DSUtils;
-	var P = DSUtils.Promise;
+	var knex = __webpack_require__(1);
+	var JSData = __webpack_require__(2);
+	var map = __webpack_require__(3);
+	var underscore = __webpack_require__(4);
+	var toString = __webpack_require__(5);
+	var DSUtils = JSData.DSUtils;
+	var keys = DSUtils.keys;
+	var isEmpty = DSUtils.isEmpty;
+	var upperCase = DSUtils.upperCase;
+	var omit = DSUtils.omit;
 	var contains = DSUtils.contains;
 	var forOwn = DSUtils.forOwn;
 	var deepMixIn = DSUtils.deepMixIn;
@@ -104,13 +74,13 @@ module.exports =
 	var reserved = ['orderBy', 'sort', 'limit', 'offset', 'skip', 'where'];
 
 	function filterQuery(resourceConfig, params) {
-	  var query = this.query.select('*').from(resourceConfig.table || (0, _moutStringUnderscore2['default'])(resourceConfig.name));
+	  var query = this.query.select('*').from(resourceConfig.table || underscore(resourceConfig.name));
 	  params = params || {};
 	  params.where = params.where || {};
 	  params.orderBy = params.orderBy || params.sort;
 	  params.skip = params.skip || params.offset;
 
-	  forEach((0, _moutObjectKeys2['default'])(params), function (k) {
+	  forEach(keys(params), function (k) {
 	    var v = params[k];
 	    if (!contains(reserved, k)) {
 	      if (isObject(v)) {
@@ -124,7 +94,7 @@ module.exports =
 	    }
 	  });
 
-	  if (!(0, _moutLangIsEmpty2['default'])(params.where)) {
+	  if (!isEmpty(params.where)) {
 	    forOwn(params.where, function (criteria, field) {
 	      if (!isObject(criteria)) {
 	        params.where[field] = {
@@ -189,7 +159,7 @@ module.exports =
 	      if (isString(params.orderBy[i])) {
 	        params.orderBy[i] = [params.orderBy[i], 'asc'];
 	      }
-	      query = (0, _moutStringUpperCase2['default'])(params.orderBy[i][1]) === 'DESC' ? query.orderBy(params.orderBy[i][0], 'desc') : query.orderBy(params.orderBy[i][0], 'asc');
+	      query = upperCase(params.orderBy[i][1]) === 'DESC' ? query.orderBy(params.orderBy[i][0], 'desc') : query.orderBy(params.orderBy[i][0], 'asc');
 	    }
 	  }
 
@@ -213,7 +183,7 @@ module.exports =
 	    if (options.__knex__) {
 	      this.query = options;
 	    } else {
-	      this.query = (0, _knex2['default'])(options);
+	      this.query = knex(options);
 	    }
 	    deepMixIn(this.defaults, options);
 	  }
@@ -227,9 +197,9 @@ module.exports =
 	      var fields = [];
 	      options = options || {};
 	      options['with'] = options['with'] || [];
-	      return this.query.select('*').from(resourceConfig.table || (0, _moutStringUnderscore2['default'])(resourceConfig.name)).where(resourceConfig.idAttribute, (0, _moutLangToString2['default'])(id)).then(function (rows) {
+	      return this.query.select('*').from(resourceConfig.table || underscore(resourceConfig.name)).where(resourceConfig.idAttribute, toString(id)).then(function (rows) {
 	        if (!rows.length) {
-	          return P.reject(new Error('Not Found!'));
+	          return DSUtils.Promise.reject(new Error('Not Found!'));
 	        } else {
 	          var _ret = (function () {
 	            instance = rows[0];
@@ -271,7 +241,7 @@ module.exports =
 	            });
 
 	            return {
-	              v: P.all(tasks)
+	              v: DSUtils.Promise.all(tasks)
 	            };
 	          })();
 
@@ -294,8 +264,8 @@ module.exports =
 	    value: function create(resourceConfig, attrs) {
 	      var _this2 = this;
 
-	      attrs = removeCircular((0, _moutObjectOmit2['default'])(attrs, resourceConfig.relationFields || []));
-	      return this.query(resourceConfig.table || (0, _moutStringUnderscore2['default'])(resourceConfig.name)).insert(attrs, resourceConfig.idAttribute).then(function (ids) {
+	      attrs = removeCircular(omit(attrs, resourceConfig.relationFields || []));
+	      return this.query(resourceConfig.table || underscore(resourceConfig.name)).insert(attrs, resourceConfig.idAttribute).then(function (ids) {
 	        if (attrs[resourceConfig.idAttribute]) {
 	          return _this2.find(resourceConfig, attrs[resourceConfig.idAttribute]);
 	        } else if (ids.length) {
@@ -310,8 +280,8 @@ module.exports =
 	    value: function update(resourceConfig, id, attrs) {
 	      var _this3 = this;
 
-	      attrs = removeCircular((0, _moutObjectOmit2['default'])(attrs, resourceConfig.relationFields || []));
-	      return this.query(resourceConfig.table || (0, _moutStringUnderscore2['default'])(resourceConfig.name)).where(resourceConfig.idAttribute, (0, _moutLangToString2['default'])(id)).update(attrs).then(function () {
+	      attrs = removeCircular(omit(attrs, resourceConfig.relationFields || []));
+	      return this.query(resourceConfig.table || underscore(resourceConfig.name)).where(resourceConfig.idAttribute, toString(id)).update(attrs).then(function () {
 	        return _this3.find(resourceConfig, id);
 	      });
 	    }
@@ -320,9 +290,9 @@ module.exports =
 	    value: function updateAll(resourceConfig, attrs, params, options) {
 	      var _this4 = this;
 
-	      attrs = removeCircular((0, _moutObjectOmit2['default'])(attrs, resourceConfig.relationFields || []));
+	      attrs = removeCircular(omit(attrs, resourceConfig.relationFields || []));
 	      return filterQuery.call(this, resourceConfig, params, options).then(function (items) {
-	        return (0, _moutArrayMap2['default'])(items, function (item) {
+	        return map(items, function (item) {
 	          return item[resourceConfig.idAttribute];
 	        });
 	      }).then(function (ids) {
@@ -338,7 +308,7 @@ module.exports =
 	  }, {
 	    key: 'destroy',
 	    value: function destroy(resourceConfig, id) {
-	      return this.query(resourceConfig.table || (0, _moutStringUnderscore2['default'])(resourceConfig.name)).where(resourceConfig.idAttribute, (0, _moutLangToString2['default'])(id)).del().then(function () {
+	      return this.query(resourceConfig.table || underscore(resourceConfig.name)).where(resourceConfig.idAttribute, toString(id)).del().then(function () {
 	        return undefined;
 	      });
 	    }
@@ -377,36 +347,12 @@ module.exports =
 
 /***/ },
 /* 4 */
-/***/ function(module, exports) {
-
-	module.exports = require("mout/object/keys");
-
-/***/ },
-/* 5 */
-/***/ function(module, exports) {
-
-	module.exports = require("mout/object/omit");
-
-/***/ },
-/* 6 */
-/***/ function(module, exports) {
-
-	module.exports = require("mout/lang/isEmpty");
-
-/***/ },
-/* 7 */
-/***/ function(module, exports) {
-
-	module.exports = require("mout/string/upperCase");
-
-/***/ },
-/* 8 */
 /***/ function(module, exports) {
 
 	module.exports = require("mout/string/underscore");
 
 /***/ },
-/* 9 */
+/* 5 */
 /***/ function(module, exports) {
 
 	module.exports = require("mout/lang/toString");

mocha.start.js

@@ -4,8 +4,9 @@
 var assert = require('chai').assert;
 var mocha = require('mocha');
 var sinon = require('sinon');
-var DSSqlAdapter = require('./');
 var JSData = require('js-data');
+JSData.DSUtils.Promise = require('bluebird');
+var DSSqlAdapter = require('./');
 
 var adapter, store, DSUtils, DSErrors, User, Post, Comment;
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data-sql",
   "description": "Postgres/MySQL/MariaDB/SQLite3 adapter for js-data.",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "homepage": "http://www.js-data.io/docs/dssqladapter",
   "repository": {
     "type": "git",
@@ -31,21 +31,21 @@
     "sqlite"
   ],
   "devDependencies": {
-    "babel-core": "5.6.5",
-    "babel-loader": "5.1.4",
+    "babel-core": "5.6.15",
+    "babel-loader": "5.2.2",
+    "bluebird": "2.9.30",
     "chai": "3.0.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",
+    "grunt-webpack": "1.0.11",
     "jit-grunt": "0.9.1",
     "jshint": "2.8.0",
     "jshint-loader": "0.8.3",
-    "sinon": "1.15.3",
+    "sinon": "1.15.4",
     "time-grunt": "1.2.1",
-    "webpack": "1.9.11",
-    "webpack-dev-server": "1.9.0"
+    "webpack-dev-server": "1.10.1"
   },
   "scripts": {
     "test": "grunt test"
@@ -54,7 +54,7 @@
     "mout": "0.11.0"
   },
   "peerDependencies": {
-    "js-data": ">=1.5.7",
+    "js-data": ">=2.0.0",
     "knex": ">=0.7.4",
     "mariasql": ">=0.1.21",
     "mysql": ">=2.5.5",

src/index.js

@@ -1,14 +1,10 @@
-import knex from 'knex';
-import JSData from 'js-data';
-import map from 'mout/array/map';
-import keys from 'mout/object/keys';
-import omit from 'mout/object/omit';
-import isEmpty from 'mout/lang/isEmpty';
-import upperCase from 'mout/string/upperCase';
-import underscore from 'mout/string/underscore';
-import toString from 'mout/lang/toString';
+let knex = require('knex');
+let JSData = require('js-data');
+let map = require('mout/array/map');
+let underscore = require('mout/string/underscore');
+let toString = require('mout/lang/toString');
 let { DSUtils } = JSData;
-let { Promise: P, contains, forOwn, deepMixIn, forEach, isObject, isString, removeCircular } = DSUtils;
+let { keys, isEmpty, upperCase, omit, contains, forOwn, deepMixIn, forEach, isObject, isString, removeCircular } = DSUtils;
 
 let reserved = [
   'orderBy',
@@ -145,7 +141,7 @@ class DSSqlAdapter {
       .where(resourceConfig.idAttribute, toString(id))
       .then(rows => {
         if (!rows.length) {
-          return P.reject(new Error('Not Found!'));
+          return DSUtils.Promise.reject(new Error('Not Found!'));
         } else {
           instance = rows[0];
           let tasks = [];
@@ -185,7 +181,7 @@ class DSSqlAdapter {
             }
           });
 
-          return P.all(tasks);
+          return DSUtils.Promise.all(tasks);
         }
       })
       .then(loadedRelations => {

test/find.spec.js

@@ -1,3 +1,4 @@
+var Promise = require('bluebird');
 describe('DSSqlAdapter#find', function () {
   it('should find a user in a Sql db', function () {
     var id, id2, _user, _post, _comments;