Merge branch 'master' into release

Author: jmdobry

.babelrc

@@ -1,3 +1,7 @@
+##### 3.0.0-beta.3 - 30 April 2016
+
+- Upgraded to `js-data-adapter` v0.6.1
+
 ##### 3.0.0-beta.2 - 29 April 2016
 
 ###### Breaking changes

CHANGELOG.md

@@ -3,13 +3,6 @@ import {Adapter} from 'js-data-adapter'
 interface IDict {
   [key: string]: any;
 }
-interface IActionOpts {
-  adapter?: string,
-  pathname?: string,
-  request?: Function,
-  response?: Function,
-  responseError?: Function
-}
 interface IBaseAdapter extends IDict {
   debug?: boolean,
   raw?: boolean
@@ -20,19 +13,19 @@ interface IBaseRethinkDBAdapter extends IBaseAdapter {
   db?: string
   deleteOpts?: IDict
   host?: string
-  insertOpts?: IDICT
+  insertOpts?: IDict
   max?: number
   min?: number
-  operators?: IDICT
+  operators?: IDict
   port?: number
-  runOpts?: IDICT
-  updateOpts?: IDICT
+  runOpts?: IDict
+  updateOpts?: IDict
 }
 export class RethinkDBAdapter extends Adapter {
   static extend(instanceProps?: IDict, classProps?: IDict): typeof RethinkDBAdapter
   constructor(opts?: IBaseRethinkDBAdapter)
 }
-export const OPERATORS = {
+export interface OPERATORS {
   '==': Function
   '===': Function
   '!=': Function
@@ -48,11 +41,11 @@ export const OPERATORS = {
   'contains': Function
   'notContains': Function
 }
-export const version = {
-  full?: string
-  minor?: string
-  major?: string
-  patch?: string
-  alpha?: string | boolean
-  beta?: string | boolean
+export interface version {
+  full: string
+  minor: string
+  major: string
+  patch: string
+  alpha: string | boolean
+  beta: string | boolean
 }

dist/js-data-rethinkdb.d.ts

@@ -1,7 +1,7 @@
 {
   "name": "js-data-rethinkdb",
   "description": "RethinkDB adapter for js-data.",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.3",
   "homepage": "https://github.com/js-data/js-data-rethinkdb",
   "repository": {
     "type": "git",
@@ -40,6 +40,9 @@
     ],
     "ignore": ["dist/"]
   },
+  "babel": {
+    "presets": ["es2015-rollup"]
+  },
   "scripts": {
     "lint": "repo-tools lint \"**/*.js\"",
     "bundle": "rollup -c rollup.config.js -f cjs -o dist/js-data-rethinkdb.js -m dist/js-data-rethinkdb.js.map src/index.js && repo-tools write-version dist/js-data-rethinkdb.js",
@@ -53,7 +56,7 @@
     "ci": "npm run test && cat coverage/lcov.info | codecov"
   },
   "dependencies": {
-    "js-data-adapter": "~0.6.0",
+    "js-data-adapter": "~0.6.1",
     "mout": "1.0.0"
   },
   "peerDependencies": {
@@ -64,7 +67,7 @@
     "babel-polyfill": "6.7.4",
     "babel-preset-es2015-rollup": "1.1.1",
     "istanbul": "0.4.3",
-    "js-data-adapter-tests": "^2.0.0-alpha.15",
+    "js-data-adapter-tests": "^2.0.0-alpha.16",
     "js-data-repo-tools": "0.5.0",
     "rollup": "0.26.1",
     "rollup-plugin-babel": "2.4.0",

package.json

@@ -1,8 +1,7 @@
 import {utils} from 'js-data'
 import {
   Adapter,
-  reserved,
-  withoutRelations
+  reserved
 } from 'js-data-adapter'
 import rethinkdbdash from 'rethinkdbdash'
 import underscore from 'mout/string/underscore'
@@ -434,7 +433,7 @@ utils.addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
 
     return self.selectTable(mapper, opts)
       .get(id)
-      .update(withoutRelations(mapper, props), updateOpts)
+      .update(props, updateOpts)
       .run(self.getOpt('runOpts', opts)).then(function (cursor) {
         let record
         self._handleErrors(cursor)
@@ -457,7 +456,7 @@ utils.addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
     updateOpts.returnChanges = true
 
     return self.filterSequence(self.selectTable(mapper, opts), query)
-      .update(withoutRelations(mapper, props), updateOpts)
+      .update(props, updateOpts)
       .run(self.getOpt('runOpts', opts)).then(function (cursor) {
         let records = []
         self._handleErrors(cursor)