Stable Version 2.1.0

Author: jmdobry

.jshintrc

@@ -0,0 +1,37 @@
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# Commenting this out is preferred by some people, see
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
+node_modules
+
+# Users Environment Variables
+.lock-wscript
+
+.idea/
+*.iml
+coverage/
+src/
+test/
+mocha.start.js
+webpack.config.js
+rethinkdb_data

.npmignore

@@ -1,3 +1,12 @@
+##### 2.1.0 - 26 October 2015
+
+###### Backwards compatible bug fixes
+- #16 - Handle cursor errors by @BBB
+
+###### Other
+- Removed Grunt
+- Tests now use yield and generators
+
 ##### 2.0.3 - 13 October 2015
 
 ###### Backwards compatible bug fixes

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Contributing Guide
 
-First, support is handled via the [Gitter Channel](https://gitter.im/js-data/js-data) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
+First, support is handled via the [Slack Channel](http://slack.js-data.io) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
 
 When submitting issues on GitHub, please include as much detail as possible to make debugging quick and easy.
 
@@ -22,3 +22,17 @@ When submitting issues on GitHub, please include as much detail as possible to m
 1. The `dist/` folder & files will be generated, do NOT commit `dist/*`! They will be committed when a release is cut.
 1. Submit your PR and we'll review!
 1. Thanks!
+
+#### Have write access?
+
+Here's how to make a release on the `master` branch:
+
+1. Bump `package.json` to the appropriate version.
+1. `npm test` must succeed.
+1. This time, the built `dist/js-data-rethinkdb.js` file _will_ be committed, so stage its changes.
+1. Mention the release version in the commit message, e.g. `Stable Version 1.2.3`
+1. Push to master.
+1. Create a git tag. Name it the version of the release, e.g. `1.2.3`
+  - Easiest way is to just create a GitHub Release, which will create the tag for you. Name the Release and the git tag the same thing.
+1. `git fetch origin` if you tagged it via GitHub Release, so you can get the tag on your local machine.
+1. `npm publish .` (Make sure you got the version bumped correctly!)

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 <img src="https://raw.githubusercontent.com/js-data/js-data/master/js-data.png" alt="js-data logo" title="js-data" align="right" width="64" height="64" />
 
-## js-data-rethinkdb [![npm version](https://img.shields.io/npm/v/js-data-rethinkdb.svg?style=flat-square)](https://www.npmjs.org/package/js-data-rethinkdb) [![Travis CI](https://img.shields.io/travis/js-data/js-data-rethinkdb.svg?style=flat-square)](https://travis-ci.org/js-data/js-data-rethinkdb) [![npm downloads](https://img.shields.io/npm/dm/js-data-rethinkdb.svg?style=flat-square)](https://www.npmjs.org/package/js-data-rethinkdb) [![License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/js-data/js-data-rethinkdb/blob/master/LICENSE)
+## js-data-rethinkdb [![Slack Status][sl_b]][sl_l] [![npm version][npm_b]][npm_l] [![Circle CI][circle_b]][circle_l] [![npm downloads][dn_b]][dn_l] [![Coverage Status][cov_b]][cov_l] [![Codacy][cod_b]][cod_l]
 
 RethinkDB adapter for [js-data](http://www.js-data.io/).
 
@@ -10,12 +10,8 @@ RethinkDB adapter for [js-data](http://www.js-data.io/).
 ### Example App
 [js-data-examples/server/rethinkdb](https://github.com/js-data/js-data-examples/tree/master/server/rethinkdb)
 
-### Project Status
-
-__Latest Release:__ [![Latest Release](https://img.shields.io/github/release/js-data/js-data-rethinkdb.svg?style=flat-square)](https://github.com/js-data/js-data-rethinkdb/releases)
-
 ### Quick Start
-`npm install --save js-data js-data-rethinkdb`.
+`npm install --save js-data js-data-rethinkdb rethinkdbdash`.
 
 ```js
 var JSData = require('js-data');
@@ -44,7 +40,7 @@ store.registerAdapter('rethinkdb', adapter, { default: true });
 
 ### Contributing
 
-First, support is handled via the [Gitter Channel](https://gitter.im/js-data/js-data) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
+First, support is handled via the [Slack Channel](http://slack.js-data.io/) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
 
 When submitting issues on GitHub, please include as much detail as possible to make debugging quick and easy.
 
@@ -90,3 +86,16 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+[sl_b]: http://slack.js-data.io/badge.svg
+[sl_l]: http://slack.js-data.io
+[npm_b]: https://img.shields.io/npm/v/js-data-rethinkdb.svg?style=flat
+[npm_l]: https://www.npmjs.org/package/js-data-rethinkdb
+[circle_b]: https://img.shields.io/circleci/project/js-data/js-data-rethinkdb/master.svg?style=flat
+[circle_l]: https://circleci.com/gh/js-data/js-data-rethinkdb/tree/master
+[dn_b]: https://img.shields.io/npm/dm/js-data-rethinkdb.svg?style=flat
+[dn_l]: https://www.npmjs.org/package/js-data-rethinkdb
+[cov_b]: https://img.shields.io/coveralls/js-data/js-data-rethinkdb/master.svg?style=flat
+[cov_l]: https://coveralls.io/github/js-data/js-data-rethinkdb?branch=master
+[cod_b]: https://img.shields.io/codacy/69206fcb0df6462ca559610af32fd1fb.svg
+[cod_l]: https://www.codacy.com/app/jasondobry/js-data-rethinkdb/dashboard

Gruntfile.js

@@ -0,0 +1,19 @@
+machine:
+  node:
+    version: 4.1.0
+
+dependencies:
+  pre:
+    - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
+    - wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
+    - sudo apt-get update -qq
+    - sudo apt-get install rethinkdb -y --force-yes
+  post:
+    - sudo rethinkdb --io-threads 2048 --daemon
+    - ulimit -S -n 2048
+    - sleep 10
+test:
+  override:
+    - npm run ci
+  post:
+    - killall rethinkdb

README.md

@@ -430,6 +430,7 @@ module.exports =
 	      return this.waitForTable(resourceConfig.table || underscore(resourceConfig.name), options).then(function () {
 	        return _this5.r.db(options.db || _this5.defaults.db).table(resourceConfig.table || underscore(resourceConfig.name)).insert(attrs, { returnChanges: true }).run();
 	      }).then(function (cursor) {
+	        _this5._handleErrors(cursor);
 	        return cursor.changes[0].new_val;
 	      });
 	    }
@@ -443,6 +444,7 @@ module.exports =
 	      return this.waitForTable(resourceConfig.table || underscore(resourceConfig.name), options).then(function () {
 	        return _this6.r.db(options.db || _this6.defaults.db).table(resourceConfig.table || underscore(resourceConfig.name)).get(id).update(attrs, { returnChanges: true }).run();
 	      }).then(function (cursor) {
+	        _this6._handleErrors(cursor);
 	        if (cursor.changes && cursor.changes.length && cursor.changes[0].new_val) {
 	          return cursor.changes[0].new_val;
 	        } else {
@@ -461,6 +463,7 @@ module.exports =
 	      return this.waitForTable(resourceConfig.table || underscore(resourceConfig.name), options).then(function () {
 	        return _this7.filterSequence(_this7.selectTable(resourceConfig, options), params).update(attrs, { returnChanges: true }).run();
 	      }).then(function (cursor) {
+	        _this7._handleErrors(cursor);
 	        if (cursor && cursor.changes && cursor.changes.length) {
 	          var _ret = (function () {
 	            var items = [];
@@ -503,6 +506,16 @@ module.exports =
 	        return undefined;
 	      });
 	    }
+	  }, {
+	    key: '_handleErrors',
+	    value: function _handleErrors(cursor) {
+	      if (cursor && cursor.errors > 0) {
+	        if (cursor.first_error) {
+	          throw new Error(cursor.first_error);
+	        }
+	        throw new Error('Unknown RethinkDB Error');
+	      }
+	    }
 	  }]);
 
 	  return DSRethinkDBAdapter;

circle.yml

@@ -2,7 +2,12 @@
 'use strict';
 
 var assert = require('chai').assert;
+assert.equalObjects = function (a, b, m) {
+  assert.deepEqual(JSON.parse(JSON.stringify(a)), JSON.parse(JSON.stringify(b)), m || 'Objects should be equal!');
+};
 var mocha = require('mocha');
+var coMocha = require('co-mocha');
+coMocha(mocha);
 var DSRethinkDBAdapter = require('./');
 var JSData = require('js-data');
 JSData.DSUtils.Promise = require('bluebird');
@@ -111,11 +116,11 @@ beforeEach(function () {
   global.DSErrors = globals.DSErrors;
 });
 
-afterEach(function (done) {
+afterEach(function* () {
   globals.adapter = null;
   global.adapter = null;
 
-  adapter.destroyAll(User, {}).then(function () {
-    done();
-  }, done);
+  yield adapter.destroyAll(Comment);
+  yield adapter.destroyAll(Post);
+  yield adapter.destroyAll(User);
 });

dist/js-data-rethinkdb.js

@@ -1,7 +1,7 @@
 {
   "name": "js-data-rethinkdb",
   "description": "RethinkDB adapter for js-data.",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "homepage": "http://www.js-data.io/docs/dsrethinkdbadapter",
   "repository": {
     "type": "git",
@@ -11,12 +11,7 @@
     "name": "Jason Dobry",
     "email": "[email protected]"
   },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://github.com/js-data/js-data-rethinkdb/blob/master/LICENSE"
-    }
-  ],
+  "license": "MIT",
   "main": "./dist/js-data-rethinkdb.js",
   "keywords": [
     "data",
@@ -33,21 +28,26 @@
     "babel-loader": "5.3.2",
     "bluebird": "2.10.2",
     "chai": "3.3.0",
-    "grunt": "0.4.5",
-    "grunt-mocha-test": "0.12.7",
-    "grunt-webpack": "1.0.11",
-    "jit-grunt": "0.9.1",
-    "jshint": "2.8.0",
-    "jshint-loader": "0.8.3",
+    "co": "4.6.0",
+    "co-mocha": "1.1.2",
+    "codacy-coverage": "1.1.3",
+    "coveralls": "2.11.4",
+    "istanbul": "0.4.0",
+    "mocha": "2.3.3",
     "standard": "5.3.1",
-    "time-grunt": "1.2.1"
+    "webpack": "1.12.2"
+  },
+  "scripts": {
+    "lint": "standard src/index.js",
+    "build": "webpack --config webpack.config.js --colors",
+    "mocha": "mocha --timeout 20000 --reporter dot mocha.start.js test/*.spec.js",
+    "cover": "istanbul cover --hook-run-in-context node_modules/mocha/bin/_mocha -- --timeout 20000 --reporter dot mocha.start.js test/*.spec.js",
+    "test": "npm run lint && npm run build && npm run cover",
+    "ci": "npm run test && cat coverage/lcov.info | coveralls || true && cat ./coverage/lcov.info | codacy-coverage || true"
   },
   "standard": {
     "parser": "babel-eslint"
   },
-  "scripts": {
-    "test": "grunt test"
-  },
   "dependencies": {
     "mout": "0.11.0"
   },