Revising parameters of join() to support two WHERE clause descrip…

…tors, adding a test

README.md

@@ -489,11 +489,12 @@ var store = haro();
 store.get('keyValue');
 ```
 
-**join(other, on[, type="inner"])**
+**join(other, on[, type="inner", where=[]])**
 _Array_
 
-Joins `this` instance of `Haro` with another, on a field/property. Supports "inner", "left", & "right" joins. Resulting 
-composite records implement a `storeId_field` convention for fields/properties.
+Joins `this` instance of `Haro` with another, on a field/property. Supports "inner", "left", & "right" JOINs. Resulting 
+composite records implement a `storeId_field` convention for fields/properties. The optional forth parameter is an Array 
+which can be used for WHERE clauses, similar to `find()`, `[store1, store2]`. 
 
 ```javascript
 var store1 = haro([{id: "abc", name: "jason", age: 35}, {id: "def", name: "jen", age: 31}], {id: 'users', key: 'id', index: ['name', 'age']});

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "haro",
-  "version": "1.8.0",
+  "version": "1.9.2",
   "homepage": "http://haro.rocks",
   "authors": [
     "Jason Mulligan <jason.mulligan@avoidwork.com>"

lib/haro.es6.js

@@ -5,7 +5,7 @@
  * @copyright 2015
  * @license BSD-3-Clause
  * @link http://haro.rocks
- * @version 1.9.1
+ * @version 1.9.2
  */
 "use strict";
 
@@ -607,34 +607,28 @@ class Haro {
 		return this.data.has(key);
 	}
 
-	join (other, on = this.key, type = "inner", where = {}) {
-		let defer = deferred();
+	join (other, on = this.key, type = "inner", where = []) {
+		let defer = deferred(),
+			promise;
 
 		if (other.total > 0) {
-			if (Object.keys(where).length > 0) {
-				Promise.all([
-					this.find(where, true),
-					other.find(where, true)
-				]).then(data => {
-					return data[0].length > 0 && data[1].length > 1 ? this.offload([[this.id, other.id], data[0], data[1], this.key, on, type], "join") : [];
-				}, function (e) {
-					throw e;
-				}).then(function (result) {
-					if (typeof result === "string") {
-						defer.reject(new Error(result));
-					} else {
-						defer.resolve(result);
-					}
-				}, defer.reject);
+			if (where.length > 0) {
+				if (!where[1]) {
+					promise = this.offload([[this.id, other.id], this.find(where[0], true), other.toArray(null, true), this.key, on, type], "join");
+				} else {
+					promise = this.offload([[this.id, other.id], this.find(where, true), other.find(where, true), this.key, on, type], "join");
+				}
 			} else {
-				this.offload([[this.id, other.id], this.toArray(null, true), other.toArray(null, true), this.key, on, type], "join").then(function (result) {
-					if (typeof result === "string") {
-						defer.reject(new Error(result));
-					} else {
-						defer.resolve(result);
-					}
-				}, defer.reject);
+				promise = this.offload([[this.id, other.id], this.toArray(null, true), other.toArray(null, true), this.key, on, type], "join");
 			}
+
+			promise.then(function (result) {
+				if (typeof result === "string") {
+					defer.reject(new Error(result));
+				} else {
+					defer.resolve(result);
+				}
+			}, defer.reject);
 		} else {
 			defer.resolve([]);
 		}
@@ -1272,7 +1266,7 @@ function factory (data = null, config = {}, indexes = []) {
 }
 
 factory.transform = cast;
-factory.version = "1.9.1";
+factory.version = "1.9.2";
 
 // Node, AMD & window supported
 if (typeof exports !== "undefined") {