Stable Version 2.0.0

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,7 @@
+##### 2.0.0 - 02 July 2015
+
+Stable Version 2.0.0
+
 ##### 1.1.0 - 27 March 2015
 
 ###### Backwards compatible API changes

Gruntfile.js

@@ -47,9 +47,7 @@ module.exports = function (grunt) {
         externals: [
           'mout/string/underscore',
           'mout/random/guid',
-          'mout/object/omit',
           'js-data',
-          'js-data-schema',
           'redis'
         ],
         module: {

README.md

@@ -39,6 +39,8 @@ store.registerAdapter('redis', adapter, { default: true });
 [CHANGELOG.md](https://github.com/js-data/js-data-redis/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-redis/issues) - Found a bug? Feature request? Submit an issue!
 - [GitHub](https://github.com/js-data/js-data-redis) - View the source code for js-data.

dist/js-data-redis.js

@@ -6,6 +6,7 @@ var mocha = require('mocha');
 var sinon = require('sinon');
 var DSRedisAdapter = require('./');
 var JSData = require('js-data');
+JSData.DSUtils.Promise = require('bluebird');
 
 var adapter, store, DSUtils, DSErrors, User, Post, Comment;
 

mocha.start.js

@@ -1,7 +1,7 @@
 {
   "name": "js-data-redis",
   "description": "Redis adapter for js-data.",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "homepage": "http://www.js-data.io/docs/dsredisadapter",
   "repository": {
     "type": "git",
@@ -27,21 +27,21 @@
     "redis"
   ],
   "devDependencies": {
-    "babel-core": "4.7.16",
-    "babel-loader": "4.2.0",
-    "chai": "2.1.1",
+    "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.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.15.4",
+    "time-grunt": "1.2.1",
+    "webpack-dev-server": "1.10.1"
   },
   "scripts": {
     "test": "grunt test"
@@ -50,7 +50,7 @@
     "mout": "0.11.0"
   },
   "peerDependencies": {
-    "js-data": ">=1.5.7",
+    "js-data": ">=2.0.0",
     "redis": ">=0.12.1"
   }
 }

package.json

@@ -1,10 +1,9 @@
-import JSData from 'js-data';
-import redis from 'redis';
-import underscore from 'mout/string/underscore';
-import guid from 'mout/random/guid';
-import omit from 'mout/object/omit';
+let JSData = require('js-data');
+let redis = require('redis');
+let underscore = require('mout/string/underscore');
+let guid = require('mout/random/guid');
 let { DSUtils } = JSData;
-let { Promise: P, deepMixIn, removeCircular, forEach, contains } = DSUtils;
+let { deepMixIn, removeCircular, forEach, contains, omit } = DSUtils;
 let emptyStore = new JSData.DS();
 let filter = emptyStore.defaults.defaultFilter;
 
@@ -27,20 +26,20 @@ class DSRedisAdapter {
   }
 
   getIds(resourceConfig) {
-    return new P((resolve, reject) => {
+    return new DSUtils.Promise((resolve, reject) => {
       return this.client.SMEMBERS(getPath(resourceConfig), (err, ids) => err ? reject(err) : resolve(ids));
     });
   }
 
   GET(path) {
-    return new P((resolve, reject) => {
+    return new DSUtils.Promise((resolve, reject) => {
       return this.client.GET(path, (err, value) => err ? reject(err) : resolve(JSON.parse(value)));
     });
   }
 
   find(resourceConfig, id, options) {
     let fields = [];
-    return new P((resolve, reject) => {
+    return new DSUtils.Promise((resolve, reject) => {
       options = options || {};
       return this.client.GET(`${getPath(resourceConfig)}-${id}`, (err, item) => {
         if (err) {
@@ -91,7 +90,7 @@ class DSRedisAdapter {
           }
         });
         if (tasks.length) {
-          return P.all(tasks).then(loadedRelations => {
+          return DSUtils.Promise.all(tasks).then(loadedRelations => {
             forEach(fields, (field, index) => {
               instance[field] = loadedRelations[index];
             });
@@ -108,7 +107,7 @@ class DSRedisAdapter {
       let tasks = [];
       let path = getPath(resourceConfig);
       forEach(ids, id => tasks.push(this.GET(`${path}-${id}`)));
-      return P.all(tasks);
+      return DSUtils.Promise.all(tasks);
     })
       .then(items => filter.call(emptyStore, items, resourceConfig.name, params, { allowSimpleWhere: true }))
       .then(items => {
@@ -154,7 +153,7 @@ class DSRedisAdapter {
             }
           });
           if (tasks.length) {
-            topTasks.push(P.all(tasks).then(loadedRelations => {
+            topTasks.push(DSUtils.Promise.all(tasks).then(loadedRelations => {
               forEach(fields, (field, index) => {
                 instance[field] = loadedRelations[index];
               });
@@ -163,14 +162,14 @@ class DSRedisAdapter {
           }
         });
         if (topTasks.length) {
-          return P.all(topTasks);
+          return DSUtils.Promise.all(topTasks);
         }
         return items;
       });
   }
 
   create(resourceConfig, attrs) {
-    return new P((resolve, reject) => {
+    return new DSUtils.Promise((resolve, reject) => {
       attrs = removeCircular(omit(attrs, resourceConfig.relationFields || []));
       attrs[resourceConfig.idAttribute] = attrs[resourceConfig.idAttribute] || guid();
       return this.client
@@ -182,7 +181,7 @@ class DSRedisAdapter {
   }
 
   update(resourceConfig, id, attrs) {
-    return new P((resolve, reject) => {
+    return new DSUtils.Promise((resolve, reject) => {
       attrs = removeCircular(omit(attrs, resourceConfig.relationFields || []));
       let path = `${getPath(resourceConfig)}-${id}`;
       return this.client.GET(path, (err, value) => {
@@ -203,12 +202,12 @@ class DSRedisAdapter {
     return this.findAll(resourceConfig, params).then(items => {
       let tasks = [];
       forEach(items, item => tasks.push(this.update(resourceConfig, item[resourceConfig.idAttribute], attrs)));
-      return P.all(tasks);
+      return DSUtils.Promise.all(tasks);
     });
   }
 
   destroy(resourceConfig, id) {
-    return new P((resolve, reject) => {
+    return new DSUtils.Promise((resolve, reject) => {
       let path = getPath(resourceConfig);
       return this.client
         .multi()
@@ -222,7 +221,7 @@ class DSRedisAdapter {
     return this.findAll(resourceConfig, params).then(items => {
       let tasks = [];
       forEach(items, item => tasks.push(this.destroy(resourceConfig, item[resourceConfig.idAttribute])));
-      return P.all(tasks);
+      return DSUtils.Promise.all(tasks);
     });
   }
 }

src/index.js

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