Merge branch 'release/0.1.9'

FreeAllMedia · Jul 7, 2016 · 95da7b6 · 95da7b6
2 parents c7def0d + 8c4cede
commit 95da7b6
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 8 deletions.
diff --git a/es5/lib/chainLink/parameterCollection.js b/es5/lib/chainLink/parameterCollection.js
@@ -164,17 +164,27 @@ var ParameterCollection = function () {
 
 				_.parentLink[parameterName] = function (valueCollection) {
 					if (valueCollection) {
-						for (var valueKey in valueCollection) {
+						var _loop = function _loop(valueKey) {
 							var value = valueCollection[valueKey];
 
+							_.filters.forEach(function (filter) {
+								value = filter(value);
+							});
+
 							parameterValues[valueKey] = value;
+						};
+
+						for (var valueKey in valueCollection) {
+							_loop(valueKey);
 						}
 						return _.parentLink;
 					} else {
 						return parameterValues;
 					}
 				};
 			});
+
+			return this;
 		}
 	}]);
 

diff --git a/es5/spec/chainLink/chainLink.parameters.filter.spec.js b/es5/spec/chainLink/chainLink.parameters.filter.spec.js
@@ -29,6 +29,15 @@ var Numbers = function (_ChainLink) {
 			this.returnValue = this.parameters("values").aggregate.filter(function (value) {
 				return parseInt(value);
 			});
+
+			this.parameters("memoryStore").mergeKeyValues.filter(function (value) {
+				var newValue = parseInt(value);
+				if (newValue) {
+					return newValue;
+				} else {
+					return value;
+				}
+			});
 		}
 	}]);
 
@@ -46,7 +55,19 @@ describe(".parameters.filter(filterFunction)", function () {
 		numbers.returnValue.should.eql(numbers.parameterCollections()[0]);
 	});
 
-	it("should transform values based upon the filter function return value", function () {
+	it("should transform raw values", function () {
 		numbers.values("1").values("2").values("3").values().should.have.members([1, 2, 3]);
 	});
+
+	it("should transform parameters with merged key values", function () {
+		numbers.memoryStore({
+			"1": "2",
+			"3": "4",
+			"bob": "belcher"
+		}).memoryStore().should.eql({
+			"1": 2,
+			"3": 4,
+			"bob": "belcher"
+		});
+	});
 });
diff --git a/es5/spec/chainLink/chainLink.parameters.mergeKeyValues.spec.js b/es5/spec/chainLink/chainLink.parameters.mergeKeyValues.spec.js
@@ -26,7 +26,7 @@ var Person = function (_ChainLink) {
 	_createClass(Person, [{
 		key: "initialize",
 		value: function initialize() {
-			this.parameters("answers").mergeKeyValues;
+			this.returnValue = this.parameters("answers").mergeKeyValues;
 		}
 	}]);
 
@@ -56,7 +56,7 @@ describe(".parameters.mergeKeyValues", function () {
 	});
 
 	it("should return this to enable chaining after setting a value", function () {
-		person.answers(answersOne).should.equal(person);
+		person.returnValue.should.eql(person.parameterCollections()[0]);
 	});
 
 	it("should save aggregate the values of multiple calls", function () {

diff --git a/es6/lib/chainLink/parameterCollection.js b/es6/lib/chainLink/parameterCollection.js
@@ -124,6 +124,10 @@ export default class ParameterCollection {
 					for (let valueKey in valueCollection) {
 						let value = valueCollection[valueKey];
 
+						_.filters.forEach(filter => {
+							value = filter(value);
+						});
+
 						parameterValues[valueKey] = value;
 					}
 					return _.parentLink;
@@ -132,5 +136,7 @@ export default class ParameterCollection {
 				}
 			};
 		});
+
+		return this;
 	}
 }
diff --git a/es6/spec/chainLink/chainLink.parameters.filter.spec.js b/es6/spec/chainLink/chainLink.parameters.filter.spec.js
@@ -5,6 +5,17 @@ class Numbers extends ChainLink {
 		this.returnValue = this.parameters("values")
 			.aggregate
 			.filter(value => parseInt(value));
+
+		this.parameters("memoryStore")
+			.mergeKeyValues
+			.filter(value => {
+				const newValue = parseInt(value);
+				if (newValue) {
+					return newValue;
+				} else {
+					return value;
+				}
+			});
 	}
 }
 
@@ -19,12 +30,27 @@ describe(".parameters.filter(filterFunction)", () => {
 		numbers.returnValue.should.eql(numbers.parameterCollections()[0]);
 	});
 
-	it("should transform values based upon the filter function return value", () => {
+	it("should transform raw values", () => {
 		numbers
 		.values("1")
 		.values("2")
 		.values("3")
 		.values()
 		.should.have.members([1, 2, 3]);
 	});
+
+	it("should transform parameters with merged key values", () => {
+		numbers
+		.memoryStore({
+			"1": "2",
+			"3": "4",
+			"bob": "belcher"
+		})
+		.memoryStore()
+		.should.eql({
+			"1": 2,
+			"3": 4,
+			"bob": "belcher"
+		});
+	});
 });
diff --git a/es6/spec/chainLink/chainLink.parameters.mergeKeyValues.spec.js b/es6/spec/chainLink/chainLink.parameters.mergeKeyValues.spec.js
@@ -2,7 +2,7 @@ import ChainLink from "../../lib/chainLink/chainLink.js";
 
 class Person extends ChainLink {
 	initialize() {
-		this.parameters("answers").mergeKeyValues;
+		this.returnValue = this.parameters("answers").mergeKeyValues;
 	}
 }
 
@@ -29,7 +29,7 @@ describe(".parameters.mergeKeyValues", () => {
 	});
 
 	it("should return this to enable chaining after setting a value", () => {
-		person.answers(answersOne).should.equal(person);
+		person.returnValue.should.eql(person.parameterCollections()[0]);
 	});
 
 	it("should save aggregate the values of multiple calls", () => {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mrt",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Build complex interfaces with ease.",
   "main": "index.js",
   "scripts": {