Prepare for 3.0.0-beta.6

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,8 @@
+##### 3.0.0-beta.6 - 17 May 2016
+
+###### Backwards compatible changes
+- Added support for grouped "where" clauses
+
 ##### 3.0.0-beta.5 - 10 May 2016
 
 ###### Breaking changes

mocha.start.js

@@ -5,7 +5,7 @@
 import 'babel-polyfill'
 
 import * as JSData from 'js-data'
-import JSDataAdapterTests from 'js-data-adapter-tests'
+import JSDataAdapterTests from './node_modules/js-data-adapter/dist/js-data-adapter-tests'
 import * as JSDataRethinkDB from './src/index'
 
 const assert = global.assert = JSDataAdapterTests.assert

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data-rethinkdb",
   "description": "RethinkDB adapter for js-data.",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.6",
   "homepage": "https://github.com/js-data/js-data-rethinkdb",
   "repository": {
     "type": "git",
@@ -59,22 +59,14 @@
     "release": "npm test && npm run doc && repo-tools updates && repo-tools changelog && repo-tools authors"
   },
   "dependencies": {
-    "js-data-adapter": "~0.6.1",
+    "js-data-adapter": "~0.7.2",
     "mout": "1.0.0"
   },
   "peerDependencies": {
-    "js-data": "^3.0.0-beta.5",
+    "js-data": "^3.0.0-beta.6",
     "rethinkdbdash": ">=2.0.0"
   },
   "devDependencies": {
-    "babel-polyfill": "6.8.0",
-    "babel-preset-es2015-rollup": "1.1.1",
-    "js-data-adapter-tests": "^2.0.0-alpha.20",
-    "js-data-repo-tools": "0.5.1",
-    "nyc": "6.4.4",
-    "rollup": "0.26.2",
-    "rollup-plugin-babel": "2.4.0",
-    "source-map-support": "0.4.0",
-    "watch": "0.18.0"
+    "js-data-repo-tools": "0.5.2"
   }
 }

src/index.js

@@ -28,6 +28,7 @@ const notEqual = function (r, row, field, value) {
  * Default predicate functions for the filtering operators.
  *
  * @name module:js-data-rethinkdb.OPERATORS
+ * @property {Function} = Equality operator.
  * @property {Function} == Equality operator.
  * @property {Function} != Inequality operator.
  * @property {Function} > "Greater than" operator.
@@ -48,6 +49,7 @@ const notEqual = function (r, row, field, value) {
  * contain the provided value.
  */
 export const OPERATORS = {
+  '=': equal,
   '==': equal,
   '===': equal,
   '!=': notEqual,
@@ -493,12 +495,95 @@ utils.addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
       })
   },
 
-  selectDb (opts) {
-    return this.r.db(utils.isUndefined(opts.db) ? this.rOpts.db : opts.db)
+  _applyWhereFromObject (where) {
+    const fields = []
+    const ops = []
+    const predicates = []
+    utils.forOwn(where, (clause, field) => {
+      if (!utils.isObject(clause)) {
+        clause = {
+          '==': clause
+        }
+      }
+      utils.forOwn(clause, (expr, op) => {
+        fields.push(field)
+        ops.push(op)
+        predicates.push(expr)
+      })
+    })
+    return {
+      fields,
+      ops,
+      predicates
+    }
   },
 
-  selectTable (mapper, opts) {
-    return this.selectDb(opts).table(mapper.table || underscore(mapper.name))
+  _applyWhereFromArray (where) {
+    const groups = []
+    where.forEach((_where, i) => {
+      if (utils.isString(_where)) {
+        return
+      }
+      const prev = where[i - 1]
+      const parser = utils.isArray(_where) ? this._applyWhereFromArray : this._applyWhereFromObject
+      const group = parser.call(this, _where)
+      if (prev === 'or') {
+        group.isOr = true
+      }
+      groups.push(group)
+    })
+    groups.isArray = true
+    return groups
+  },
+
+  _testObjectGroup (rql, group, row, opts) {
+    let i
+    const r = this.r
+    const fields = group.fields
+    const ops = group.ops
+    const predicates = group.predicates
+    const len = ops.length
+    for (i = 0; i < len; i++) {
+      let op = ops[i]
+      const isOr = op.charAt(0) === '|'
+      op = isOr ? op.substr(1) : op
+      const predicateFn = this.getOperator(op, opts)
+      if (predicateFn) {
+        const predicateResult = predicateFn(r, row, fields[i], predicates[i])
+        if (isOr) {
+          rql = rql ? rql.or(predicateResult) : predicateResult
+        } else {
+          rql = rql ? rql.and(predicateResult) : predicateResult
+        }
+      } else {
+        throw new Error(`Operator ${op} not supported!`)
+      }
+    }
+    return rql
+  },
+
+  _testArrayGroup (rql, groups, row, opts) {
+    let i
+    const len = groups.length
+    for (i = 0; i < len; i++) {
+      const group = groups[i]
+      let subQuery
+      if (group.isArray) {
+        subQuery = this._testArrayGroup(rql, group, row, opts)
+      } else {
+        subQuery = this._testObjectGroup(null, group, row, opts)
+      }
+      if (groups[i - 1]) {
+        if (group.isOr) {
+          rql = rql.or(subQuery)
+        } else {
+          rql = rql.and(subQuery)
+        }
+      } else {
+        rql = rql ? rql.and(subQuery) : subQuery
+      }
+    }
+    return rql
   },
 
   /**
@@ -546,37 +631,16 @@ utils.addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
     let rql = sequence
 
     // Filter
-    if (Object.keys(query.where).length !== 0) {
-      // Filter sequence using filter function
-      rql = rql.filter((row) => {
-        let subQuery
-        // Apply filter for each field
-        utils.forOwn(query.where, (criteria, field) => {
-          if (!utils.isObject(criteria)) {
-            criteria = { '==': criteria }
-          }
-          // Apply filter for each operator
-          utils.forOwn(criteria, (value, operator) => {
-            let isOr = false
-            if (operator && operator[0] === '|') {
-              operator = operator.substr(1)
-              isOr = true
-            }
-            let predicateFn = this.getOperator(operator, opts)
-            if (predicateFn) {
-              const predicateResult = predicateFn(r, row, field, value)
-              if (isOr) {
-                subQuery = subQuery ? subQuery.or(predicateResult) : predicateResult
-              } else {
-                subQuery = subQuery ? subQuery.and(predicateResult) : predicateResult
-              }
-            } else {
-              throw new Error(`Operator ${operator} not supported!`)
-            }
-          })
-        })
-        return subQuery || true
-      })
+    let groups
+
+    if (utils.isObject(query.where) && Object.keys(query.where).length !== 0) {
+      groups = this._applyWhereFromArray([query.where])
+    } else if (utils.isArray(query.where)) {
+      groups = this._applyWhereFromArray(query.where)
+    }
+
+    if (groups) {
+      rql = rql.filter((row) => this._testArrayGroup(null, groups, row, opts) || true)
     }
 
     // Sort
@@ -607,6 +671,14 @@ utils.addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
     return rql
   },
 
+  selectDb (opts) {
+    return this.r.db(utils.isUndefined(opts.db) ? this.rOpts.db : opts.db)
+  },
+
+  selectTable (mapper, opts) {
+    return this.selectDb(opts).table(mapper.table || underscore(mapper.name))
+  },
+
   waitForDb (opts) {
     opts || (opts = {})
     const db = utils.isUndefined(opts.db) ? this.rOpts.db : opts.db