Merge branch 'master' into release

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,8 @@
+##### 3.0.0-beta.4 - 10 May 2016
+
+###### Breaking changes
+- Moved `rethinkdbdash` options to `RethinkDBAdapter#rOpts`.
+
 ##### 3.0.0-beta.3 - 30 April 2016
 
 - Upgraded to `js-data-adapter` v0.6.1

circle.yml

@@ -1,9 +1,13 @@
+general:
+  branches:
+    ignore:
+      - gh-pages
 machine:
   node:
     version: 4.1.0
-
 dependencies:
   pre:
+    - npm i js-data@^3.0.0-beta.3 rethinkdbdash
     - 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

dist/js-data-rethinkdb.d.ts

@@ -8,16 +8,10 @@ interface IBaseAdapter extends IDict {
   raw?: boolean
 }
 interface IBaseRethinkDBAdapter extends IBaseAdapter {
-  authKey?: string
-  bufferSize?: number
-  db?: string
   deleteOpts?: IDict
-  host?: string
   insertOpts?: IDict
-  max?: number
-  min?: number
   operators?: IDict
-  port?: number
+  rOpts?: IDict
   runOpts?: IDict
   updateOpts?: IDict
 }

mocha.start.js

@@ -7,21 +7,19 @@ require('babel-polyfill')
 var JSData = require('js-data')
 var JSDataAdapterTests = require('js-data-adapter-tests')
 var JSDataRethinkDB = require('./')
-var version = JSDataRethinkDB.version
-var OPERATORS = JSDataRethinkDB.OPERATORS
-var RethinkDBAdapter = JSDataRethinkDB.RethinkDBAdapter
 
 var assert = global.assert = JSDataAdapterTests.assert
 global.sinon = JSDataAdapterTests.sinon
 
 JSDataAdapterTests.init({
   debug: false,
   JSData: JSData,
-  Adapter: RethinkDBAdapter,
+  Adapter: JSDataRethinkDB.RethinkDBAdapter,
   adapterConfig: {
-    min: 1,
-    max: 5,
-    bufferSize: 5
+    rOpts: {
+      buffer: 1,
+      max: 5
+    }
   },
   // js-data-rethinkdb does NOT support these features
   xfeatures: [
@@ -33,8 +31,13 @@ JSDataAdapterTests.init({
 require('./test/handleErrors.test')
 
 describe('exports', function () {
-  assert(OPERATORS)
-  assert(OPERATORS['=='])
-  assert(version)
-  assert(version.full)
+  it('should have correct exports', function () {
+    assert(JSDataRethinkDB.default)
+    assert(JSDataRethinkDB.RethinkDBAdapter)
+    assert(JSDataRethinkDB.RethinkDBAdapter === JSDataRethinkDB.default)
+    assert(JSDataRethinkDB.OPERATORS)
+    assert(JSDataRethinkDB.OPERATORS['=='])
+    assert(JSDataRethinkDB.version)
+    assert(JSDataRethinkDB.version.full)
+  })
 })

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data-rethinkdb",
   "description": "RethinkDB adapter for js-data.",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.4",
   "homepage": "https://github.com/js-data/js-data-rethinkdb",
   "repository": {
     "type": "git",
@@ -60,16 +60,16 @@
     "mout": "1.0.0"
   },
   "peerDependencies": {
-    "js-data": "^3.0.0-beta.3",
-    "rethinkdbdash": ">=1.15.0"
+    "js-data": "^3.0.0-beta.5",
+    "rethinkdbdash": ">=2.0.0"
   },
   "devDependencies": {
-    "babel-polyfill": "6.7.4",
+    "babel-polyfill": "6.8.0",
     "babel-preset-es2015-rollup": "1.1.1",
     "istanbul": "0.4.3",
-    "js-data-adapter-tests": "^2.0.0-alpha.16",
-    "js-data-repo-tools": "0.5.0",
-    "rollup": "0.26.1",
+    "js-data-adapter-tests": "^2.0.0-alpha.20",
+    "js-data-repo-tools": "0.5.1",
+    "rollup": "0.26.2",
     "rollup-plugin-babel": "2.4.0",
     "source-map-support": "0.4.0",
     "watch": "0.18.0"

rollup.config.js

@@ -1,6 +1,12 @@
 var babel = require('rollup-plugin-babel')
 
 module.exports = {
+  external: [
+    'rethinkdbdash',
+    'js-data',
+    'js-data-adapter',
+    'mout/string/underscore'
+  ],
   plugins: [
     babel({
       exclude: 'node_modules/**'