fable 3.1.3 → 3.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fable",
-    "version": "3.1.3",
+    "version": "3.1.4",
     "description": "A service dependency injection, configuration and logging library.",
     "main": "source/Fable.js",
     "scripts": {
@@ -50,7 +50,7 @@
     },
     "homepage": "https://github.com/stevenvelozo/fable",
     "devDependencies": {
-        "quackage": "^1.0.38"
+        "quackage": "^1.0.41"
     },
     "dependencies": {
         "async.eachlimit": "^0.5.2",

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-FunctionMap.json

@@ -4,6 +4,16 @@
 		"Address": "fable.Math.sqrtPrecise"
 	},
 
+	"percent": {
+		"Name": "Compute Percent (in IS over OF format)",
+		"Address": "fable.Math.percentagePrecise"
+	},
+
+	"compare": {
+		"Name": "Compare",
+		"Address": "fable.Math.comparePrecise"
+	},
+
 	"abs": {
 		"Name": "Absolute Value",
 		"Address": "fable.Math.absPrecise"
@@ -26,6 +36,11 @@
 		"Name": "Pi",
 		"Address": "fable.Math.piPrecise"
 	},
+	"euler": {
+		"Name": "Euler",
+		"Address": "fable.Math.eulerPrecise"
+	},
+
 	"sin": {
 		"Name": "Sine",
 		"Address": "fable.Math.sin"
@@ -43,7 +58,10 @@
 		"Name": "Count Set Elements",
 		"Address": "fable.Math.countSetElements"
 	},
-
+	"countset": {
+		"Name": "Count Set Elements",
+		"Address": "fable.Math.countSetElements"
+	},
 	"sortset": {
 		"Name": "Sort Set",
 		"Address": "fable.Math.sortSetPrecise"
@@ -91,6 +109,10 @@
 		"Name": "Round",
 		"Address": "fable.Math.roundPrecise"
 	},
+	"tofixed": {
+		"Name": "To Fixed",
+		"Address": "fable.Math.toFixedPrecise"
+	},
 
 	"cumulativesummation": {
 		"Name": "Count Set Elements in a Histogram or Value Map",
@@ -107,6 +129,19 @@
 		"Address": "fable.Utility.getInternalValueByHash"
 	},
 
+	"entryinset": {
+		"Name": "Entry in Set",
+		"Address": "fable.Math.entryInSet"
+	},
+	"smallestInSet": {
+		"Name": "Smallest in Set",
+		"Address": "fable.Math.smallestInSet"
+	},
+	"largestInSet": {
+		"Name": "Largest in Set",
+		"Address": "fable.Math.largestInSet"
+	},
+
 	"aggregationhistogram": {
 		"Name": "Generate a Histogram by Exact Value Aggregation",
 		"Address": "fable.Math.histogramAggregationByExactValueFromInternalState"
@@ -116,6 +151,11 @@
 		"Address": "fable.Math.histogramDistributionByExactValueFromInternalState"
 	},
 
+	"setconcatenate": {
+		"Name": "Set Concatenate",
+		"Address": "fable.Math.setConcatenate"
+	},
+
 	"getvaluearray": {
 		"Name": "Get Value Array from Application State or Services (AppData, etc.)",
 		"Address": "fable.Utility.createValueArrayByHashParametersFromInternal"
@@ -174,5 +214,10 @@
 	"dateyeardifference": {
 		"Name": "Date Difference in Years",
 		"Address": "fable.Dates.dateYearDifference"
+	},
+
+	"createValueObjectByHashes": {
+		"Name": "Create Value Object by Hashes",
+		"Address": "fable.Utility.createValueObjectByHashes"
 	}
 }

package/source/services/Fable-Service-Math.js

@@ -22,6 +22,8 @@ class FableServiceMath extends libFableServiceBase
 		this.serviceType = 'Math';
 
 		this.pi = '3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679';
+		// From NASA: https://apod.nasa.gov/htmltest/gifcity/e.2mil
+		this.euler = '2.7182818284590452353602874713526624977572470936999595749669676277240766303535475945713821785251664';
 
 //		this.manifest = this.fable.newManyfest();
 	}
@@ -428,6 +430,24 @@ class FableServiceMath extends libFableServiceBase
 		}
 	}
 
+	/**
+	 * Calculates the value of euler with the specified precision.
+	 *
+	 * @param {number} [pPrecision] - The precision to use for calculating E.
+	 * @returns {number} - The calculated value of E.
+	 */
+	eulerPrecise(pPrecision)
+	{
+		if (typeof (pPrecision) === 'undefined')
+		{
+			return this.euler;
+		}
+		else
+		{
+			return this.roundPrecise(this.euler, pPrecision);
+		}
+	}
+
 	/**
 	 * Calculates the sine of the given angle in radians.
 	 *

package/source/services/Fable-Service-Utility.js

@@ -217,7 +217,7 @@ class FableServiceUtility extends libFableServiceBase
 	 * @param {object} pObject - The object to get the value from
 	 * @param {string} pValueAddress - The manyfest hash/address of the value to get
 	 * @param {object} [pManifest] - The manyfest object to use; constructs one inline if not provided
-	 * @returns {Array} - The value object built from the hash list
+	 * @returns {object} - The value object built from the hash list
 	 */
 	createValueObjectByHashes(pObject, pValueHashes, pManifest)
 	{
@@ -338,6 +338,70 @@ class FableServiceUtility extends libFableServiceBase
 			return false;
 		}
 	}
+
+	/**
+	 * Find the first value in an object that contains a specific value
+	 * @param {array} pObjectArray - The array of objects to search
+	 * @param {string} pValueToMatchAddress - The manyfest hash/address of the value to match
+	 * @param {string} pValueToMatch - The value to match
+	 * @param {string} pValueAddress - The manyfest hash/address of the value to return
+	 * @returns {any} - The value from the object
+	 */
+	findFirstValueByStringIncludes(pObjectArray, pValueToMatchAddress, pValueToMatch, pValueAddress)
+	{
+		// Lazily create a manifest if it doesn't exist
+		if (!this.manifest)
+		{
+			this.manifest = this.fable.newManyfest();
+		}
+
+		if (!Array.isArray(pObjectArray))
+		{
+			return undefined;
+		}
+		for (let i = 0; i < pObjectArray.length; i++)
+		{
+			let tmpValueToMatch = this.manifest.getValueByHash(pObjectArray[i], pValueToMatchAddress);
+			if (tmpValueToMatch && (tmpValueToMatch.includes(pValueToMatch)))
+			{
+				return this.manifest.getValueByHash(pObjectArray[i], pValueAddress);
+			}
+		}
+
+		return undefined;
+	}
+
+	/**
+	 * Find the first value in an object that contains a specific value
+	 * @param {array} pObjectArray - The array of objects to search
+	 * @param {string} pValueToMatchAddress - The manyfest hash/address of the value to match
+	 * @param {string} pValueToMatch - The value to match
+	 * @param {string} pValueAddress - The manyfest hash/address of the value to return
+	 * @returns {any} - The value from the object
+	 */
+	findFirstValueByExactMatch(pObjectArray, pValueToMatchAddress, pValueToMatch, pValueAddress)
+	{
+		// Lazily create a manifest if it doesn't exist
+		if (!this.manifest)
+		{
+			this.manifest = this.fable.newManyfest();
+		}
+
+		if (!Array.isArray(pObjectArray))
+		{
+			return undefined;
+		}
+		for (let i = 0; i < pObjectArray.length; i++)
+		{
+			let tmpValueToMatch = this.manifest.getValueByHash(pObjectArray[i], pValueToMatchAddress);
+			if (tmpValueToMatch && (tmpValueToMatch == pValueToMatch))
+			{
+				return this.manifest.getValueByHash(pObjectArray[i], pValueAddress);
+			}
+		}
+
+		return undefined;
+	}
 }
 
 module.exports = FableServiceUtility;

package/test/Math_test.js

@@ -116,6 +116,7 @@ suite
 						return fDone();
 					}
 				);
+
 				test
 				(
 					'Parse Numbers',
@@ -132,6 +133,18 @@ suite
 					}
 				);
 
+				test
+				(
+					'Eulers Number',
+					function(fDone)
+					{
+						let testFable = new libFable();
+
+						Expect(testFable.Math.eulerPrecise()).to.equal('2.7182818284590452353602874713526624977572470936999595749669676277240766303535475945713821785251664');
+						return fDone();
+					}
+				);
+
 				test
 				(
 					'Histograms by Count',

package/test/RestClient_test.js

@@ -35,10 +35,10 @@ suite
 								{
 									let testFable = new libFable();
 									// Instantiate the RestClient Service Provider
-									let tmpRestClient = testFable.instantiateServiceProvider('RestClient', { TraceLog: true }, 'RestClient-99');
+									testFable.instantiateServiceProvider('RestClient', { TraceLog: true });
 
 									// Download the wiktionary entry for dog!
-									tmpRestClient.getJSON('http://localhost:8086/1.0/Author/1',
+									testFable.RestClient.getJSON('http://localhost:8086/1.0/Author/1',
 										(pError, pResponse, pBody) =>
 										{
 											Expect(pBody).to.be.an('object');

package/test/Utility_tests.js

@@ -343,6 +343,74 @@ suite
 							})
 					}
 				);
+				test
+				(
+					'findFirstValueByStringIncludes returns values from an array of objects',
+					function(fDone)
+					{
+						testFable = new libFable();
+
+						let tmpState = [
+							{ "Name":"The Pixies", "Type":"Band", "AlbumCount":5, "SongCount": 103, "MarketValue":"83500011.24", "Studios": { "Primary": { "Name":"Swamp Record Studios", "Location":"Boston"} } },
+							{ "Name":"The Beatles", "Type":"Band", "AlbumCount":35, "SongCount": 876, "MarketValue":"183942892.24", "Studios": { "Primary": { "Name":"Swamp Record Studios", "Location":"Boston"} } },
+							{ "Name":"Modest Mouse", "Type":"Band", "AlbumCount":9, "SongCount": 299, "MarketValue":"332432324.99", "Studios": { "Primary": { "Name":"Swamp Record Studios", "Location":"Boston"} } },
+							{ "Name":"The Doors", "Type":"Band", "AlbumCount":6, "SongCount": 133, "MarketValue":"324783294732.32", "Studios": { "Primary": { "Name":"Swamp Record Studios", "Location":"Boston"} } },
+							{ "Name":"The Who", "Type":"Band", "AlbumCount":7, "SongCount": 110, "MarketValue":"7500.30", "Studios": { "Primary": { "Name":"Swamp Record Studios", "Location":"Boston"} } },
+							{ "Name":"The Cure", "Type":"Band", "AlbumCount":13, "SongCount": 213, "MarketValue":"34230.10", "Studios": { "Primary": { "Name":"Swamp Record Studios", "Location":"Boston"} } }
+							];
+						let tmpResult = testFable.services.Utility.findFirstValueByStringIncludes(tmpState, 'Name', 'The', 'SongCount');
+						Expect(tmpResult).to.be.a('number');
+						Expect(tmpResult).to.equal(103);
+
+						tmpResult = testFable.services.Utility.findFirstValueByStringIncludes(tmpState, 'Name', 'The Cure', 'SongCount');
+						Expect(tmpResult).to.be.a('number');
+						Expect(tmpResult).to.equal(213);
+
+						// Missing Key
+						tmpResult = testFable.services.Utility.findFirstValueByStringIncludes(tmpState, 'Name', 'The Fleet Foxes', 'SongCount');
+						Expect(tmpResult).to.be.a('undefined');
+
+						// Missing Value
+						tmpResult = testFable.services.Utility.findFirstValueByStringIncludes(tmpState, 'Name', 'The Cure', 'No good Value');
+						Expect(tmpResult).to.be.a('undefined');
+
+						return fDone();
+					}
+				);
+				test
+				(
+					'findFirstValueByExactMatch returns values from an array of objects',
+					function(fDone)
+					{
+						testFable = new libFable();
+
+						let tmpState = [
+							{ "Name":"The Pixies", "Type":"Band", "AlbumCount":5, "SongCount": 103, "MarketValue":"83500011.24", "Studios": { "Primary": { "Name":"Swamp Record Studios", "Location":"Boston"} } },
+							{ "Name":"The Beatles", "Type":"Band", "AlbumCount":35, "SongCount": 876, "MarketValue":"183942892.24", "Studios": { "Primary": { "Name":"Swamp Record Studios", "Location":"Boston"} } },
+							{ "Name":"Modest Mouse", "Type":"Band", "AlbumCount":9, "SongCount": 299, "MarketValue":"332432324.99", "Studios": { "Primary": { "Name":"Swamp Record Studios", "Location":"Boston"} } },
+							{ "Name":"The Doors", "Type":"Band", "AlbumCount":6, "SongCount": 133, "MarketValue":"324783294732.32", "Studios": { "Primary": { "Name":"Swamp Record Studios", "Location":"Boston"} } },
+							{ "Name":"The Who", "Type":"Band", "AlbumCount":7, "SongCount": 110, "MarketValue":"7500.30", "Studios": { "Primary": { "Name":"Swamp Record Studios", "Location":"Boston"} } },
+							{ "Name":"The Cure", "Type":"Band", "AlbumCount":13, "SongCount": 213, "MarketValue":"34230.10", "Studios": { "Primary": { "Name":"Swamp Record Studios", "Location":"Boston"} } }
+							];
+						let tmpResult = testFable.services.Utility.findFirstValueByExactMatch(tmpState, 'Name', 'The Who', 'SongCount');
+						Expect(tmpResult).to.be.a('number');
+						Expect(tmpResult).to.equal(110);
+
+						tmpResult = testFable.services.Utility.findFirstValueByExactMatch(tmpState, 'SongCount', 133, 'MarketValue');
+						Expect(tmpResult).to.be.a('string');
+						Expect(tmpResult).to.equal('324783294732.32');
+
+						// Missing Key
+						tmpResult = testFable.services.Utility.findFirstValueByExactMatch(tmpState, 'Name', 'The Fleet Foxes', 'SongCount');
+						Expect(tmpResult).to.be.a('undefined');
+
+						// Missing Value
+						tmpResult = testFable.services.Utility.findFirstValueByExactMatch(tmpState, 'Name', 'The Cure', 'No good Value');
+						Expect(tmpResult).to.be.a('undefined');
+
+						return fDone();
+					}
+				);
 			}
 		);
 	}