fable 3.0.61 → 3.0.63

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fable",
-    "version": "3.0.61",
+    "version": "3.0.63",
     "description": "An entity behavior management and API bundling library.",
     "main": "source/Fable.js",
     "scripts": {
@@ -49,7 +49,7 @@
     },
     "homepage": "https://github.com/stevenvelozo/fable",
     "devDependencies": {
-        "quackage": "^1.0.11"
+        "quackage": "^1.0.13"
     },
     "dependencies": {
         "async.eachlimit": "^0.5.2",
@@ -58,7 +58,7 @@
         "cookie": "^0.5.0",
         "data-arithmatic": "^1.0.7",
         "fable-log": "^3.0.10",
-        "fable-serviceproviderbase": "^3.0.5",
+        "fable-serviceproviderbase": "^3.0.6",
         "fable-settings": "^3.0.6",
         "fable-uuid": "^3.0.5",
         "manyfest": "^1.0.24",

package/source/Fable-ServiceManager.js

@@ -16,10 +16,10 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 		this.serviceTypes = [];
 
 		// A map of instantiated services
-		this.services = {};
+		this.serviceMap = {};
 
 		// A map of the default instantiated service by type
-		this.defaultServices = {};
+		this.services = {};
 
 		// A map of class constructors for services
 		this.serviceClasses = {};
@@ -34,7 +34,7 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 		this.serviceTypes.push(pServiceType);
 
 		// Add the container for instantiated services to go in
-		this.services[pServiceType] = {};
+		this.serviceMap[pServiceType] = {};
 
 		// Using the static member of the class is a much more reliable way to check if it is a service class than instanceof
 		if ((typeof(pServiceClass) == 'function') && (pServiceClass.isFableService))
@@ -69,10 +69,10 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 		}
 
 		// Add the service to the service map
-		this.services[pServiceType][tmpService.Hash] = tmpService;
+		this.serviceMap[pServiceType][tmpService.Hash] = tmpService;
 
 		// If this is the first service of this type, make it the default
-		if (!this.defaultServices.hasOwnProperty(pServiceType))
+		if (!this.services.hasOwnProperty(pServiceType))
 		{
 			this.setDefaultServiceInstantiation(pServiceType, tmpService.Hash)
 		}
@@ -87,10 +87,10 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 		let tmpService = this.instantiateServiceProviderWithoutRegistration(pServiceType, pOptions, pCustomServiceHash);
 
 		// Add the service to the service map
-		this.services[pServiceType][tmpService.Hash] = tmpService;
+		this.serviceMap[pServiceType][tmpService.Hash] = tmpService;
 
 		// If this is the first service of this type, make it the default
-		if (!this.defaultServices.hasOwnProperty(pServiceType))
+		if (!this.services.hasOwnProperty(pServiceType))
 		{
 			this.setDefaultServiceInstantiation(pServiceType, tmpService.Hash)
 		}
@@ -119,17 +119,17 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 		// The service should already be instantiated, so just connect it to fable
 		pServiceInstance.connectFable(this.fable);
 
-		if (!this.services.hasOwnProperty(tmpServiceType))
+		if (!this.serviceMap.hasOwnProperty(tmpServiceType))
 		{
 			// If the core service hasn't registered itself yet, create the service container for it.
 			// This means you couldn't register another with this type unless it was later registered with a constructor class.
 			this.services[tmpServiceType] = {};
 		}
 		// Add the service to the service map
-		this.services[tmpServiceType][tmpServiceHash] = pServiceInstance;
+		this.serviceMap[tmpServiceType][tmpServiceHash] = pServiceInstance;
 
 		// If this is the first service of this type, make it the default
-		if (!this.defaultServices.hasOwnProperty(tmpServiceType))
+		if (!this.services.hasOwnProperty(tmpServiceType))
 		{
 			this.setDefaultServiceInstantiation(tmpServiceType, tmpServiceHash)
 		}
@@ -139,10 +139,10 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 
 	setDefaultServiceInstantiation(pServiceType, pServiceHash)
 	{
-		if (this.services[pServiceType].hasOwnProperty(pServiceHash))
+		if (this.serviceMap[pServiceType].hasOwnProperty(pServiceHash))
 		{
-			this.fable[pServiceType] = this.services[pServiceType][pServiceHash];
-			this.defaultServices[pServiceType] = this.services[pServiceType][pServiceHash];
+			this.fable[pServiceType] = this.serviceMap[pServiceType][pServiceHash];
+			this.services[pServiceType] = this.serviceMap[pServiceType][pServiceHash];
 			return true;
 		}
 

package/source/Fable.js

@@ -84,7 +84,7 @@ class Fable
 
 	get defaultServices()
 	{
-		return this._coreServices.ServiceManager.defaultServices;
+		return this._coreServices.ServiceManager.services;
 	}
 
 	getUUID()

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

@@ -33,7 +33,7 @@ class FableServiceDataGeneration extends libFableServiceBase
 		let tmpLength = (typeof(pLength) === 'undefined') ? 10 : pLength;
 		let tmpMaxNumber = (typeof(pMaxNumber) === 'undefined') ? ((10 ** tmpLength) - 1) : pMaxNumber;
 
-		return this.defaultServices.DataFormat.stringPadStart(this.randomIntegerUpTo(tmpMaxNumber), pLength, '0');
+		return this.services.DataFormat.stringPadStart(this.randomIntegerUpTo(tmpMaxNumber), pLength, '0');
 	}
 
 

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

@@ -20,7 +20,7 @@ class FableServiceMetaTemplate extends libFableServiceBase
 		this.WordTree = new libWordTree();
 
 		// In order to allow asynchronous template processing we need to use the async.eachLimit function
-		this.StringParser = new libStringParser(this.fable.defaultServices.Utility.eachLimit);
+		this.StringParser = new libStringParser(this.fable.services.Utility.eachLimit);
 
 		this.ParseTree = this.WordTree.ParseTree;
 	}

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

@@ -15,7 +15,7 @@ class FableServiceRestClient extends libFableServiceBase
 			this.TraceLog = true;
 		}
 
-		this.dataFormat = this.fable.defaultServices.DataFormat;
+		this.dataFormat = this.fable.services.DataFormat;
 
 		this.serviceType = 'RestClient';
 

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

@@ -28,9 +28,20 @@ class FableServiceUtility extends libFableServiceBase
 
 	// Underscore and lodash have a behavior, _.extend, which merges objects.
 	// Now that es6 gives us this, use the native thingy.
+	// Nevermind, the native thing is not stable enough across environments
+	// Basic shallow copy
 	extend(pDestinationObject, ...pSourceObjects)
 	{
-		return Object.assign(pDestinationObject, ...pSourceObjects);
+		for (let i = 0; i < pSourceObjects.length; i++)
+		{
+			let tmpSourceObject = pSourceObjects[i];
+			let tmpObjectProperties = Object.keys(tmpSourceObject);
+			for (let k = 0; k < tmpObjectProperties.length; k++)
+			{
+				pDestinationObject[tmpObjectProperties[k]] = tmpSourceObject[tmpObjectProperties[k]];
+			}
+		}
+		return pDestinationObject;
 	}
 
 	// Underscore and lodash have a behavior, _.template, which compiles a
@@ -92,10 +103,15 @@ class FableServiceUtility extends libFableServiceBase
 	{
 
 		// Split the string into an array based on the digit groups.
-		var tmpDateParts = pISOString.split( /\D+/ );
+		let tmpDateParts = pISOString.split( /\D+/ );
 
 		// Set up a date object with the current time.
-		var tmpReturnDate = new Date();
+		let tmpReturnDate = new Date();
+
+		// Track the number of hours we need to adjust the date by based on the timezone.
+		let tmpTimeZoneOffsetInHours = 0;
+		// Track the number of minutes we need to adjust the date by based on the timezone.
+		let tmpTimeZoneOffsetInMinutes = 0;
 
 		// Manually parse the parts of the string and set each part for the
 		// date. Note: Using the UTC versions of these functions is necessary
@@ -114,16 +130,9 @@ class FableServiceUtility extends libFableServiceBase
 		tmpReturnDate.setUTCSeconds( parseInt( tmpDateParts[ 5 ] ) );
 		tmpReturnDate.setUTCMilliseconds( parseInt( tmpDateParts[ 6 ] ) );
 
-		// Track the number of hours we need to adjust the date by based on the timezone.
-		var tmpTimeZoneOffsetInHours = 0;
-
 		// If there's a value for either the hours or minutes offset.
 		if (tmpDateParts[ 7 ] || tmpDateParts[ 8 ])
 		{
-
-			// Track the number of minutes we need to adjust the date by based on the timezone.
-			var tmpTimeZoneOffsetInMinutes = 0;
-
 			// If there's a value for the minutes offset.
 			if (tmpDateParts[8])
 			{

package/test/DataFormat-StringDateFormatting_tests.js

@@ -29,7 +29,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.formatTimeSpan(1000))
 							.to.equal('00:00:01.000');
@@ -51,7 +51,7 @@ suite
 					(fTestComplete) =>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.formatTimeDelta(1000, 2000))
 							.to.equal('00:00:01.000');
@@ -73,7 +73,7 @@ suite
 					(fTestComplete) =>
 					{
 						let testFable = new libFable();
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.getMonthFromDate(new Date('10/20/1988')))
 							.to.equal('October');
@@ -96,7 +96,7 @@ suite
 					(fTestComplete) =>
 					{
 						let testFable = new libFable();
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.formatSortableStringFromDate(new Date('10/20/1986')))
 							.to.equal('19860920');

package/test/DataFormat-StringManipulation_tests.js

@@ -29,7 +29,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.stringReverse('Dogs'))
 							.to.equal('sgoD');
@@ -45,7 +45,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.insecureStringHash('Dogs'))
 							.to.equal('HSH2135767');
@@ -68,7 +68,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat.cleanNonAlphaCharacters('Dogs'))
 							.to.equal('Dogs');
 						Expect(_DataFormat.cleanNonAlphaCharacters('Dogs1'))
@@ -84,7 +84,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat.capitalizeEachWord('Dogs-with-guns 12321'))
 							.to.equal('Dogs-With-Guns 12321');
 						Expect(_DataFormat.cleanNonAlphaCharacters(_DataFormat.capitalizeEachWord('meadow-endpoints')))
@@ -99,7 +99,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						// Test the enclosure cleaning function
 						Expect(_DataFormat
 							.cleanEnclosureWrapCharacters('`', '`Dogs`'))
@@ -133,7 +133,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.stringStartsWith('Dogs', 'Do'))
 							.to.equal(true);
@@ -155,7 +155,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						_DataFormat._UseEngineStringStartsWith = false;
 						Expect(_DataFormat
 							.stringStartsWith('Dogs', 'Do'))
@@ -178,7 +178,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.stringEndsWith('Dogs', 'gs'))
 							.to.equal(true);
@@ -200,7 +200,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						_DataFormat._UseEngineStringEndsWith = false;
 						Expect(_DataFormat
 							.stringEndsWith('Dogs', 'gs'))
@@ -230,7 +230,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.cleanNonAlphaCharacters('Dogs'))
 							.to.equal('Dogs');
@@ -254,7 +254,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						// The usual use case (e.g. for zero padding dates)
 						Expect(_DataFormat.stringPadStart('9', 2, '0'))
 							.to.equal('09');
@@ -282,7 +282,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						// The usual use case (e.g. for left justifying text in fixed-width scenarios)
 						Expect(_DataFormat.stringPadEnd('Bob', 10, ' '))
 							.to.equal('Bob       ');

package/test/DataFormat-StringNumberFormatting_tests.js

@@ -29,7 +29,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.formatterAddCommasToNumber(1000))
 							.to.equal('1,000');
@@ -54,7 +54,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.formatterDollars(1000))
 							.to.equal('$1,000.00');
@@ -82,7 +82,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.formatterRoundNumber(1000, 2))
 							.to.equal('1000.00');

package/test/DataFormat-StringTokenization_tests.js

@@ -29,7 +29,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.stringBeforeMatch('Dogs are cool', 'are'))
 							.to.equal('Dogs ');
@@ -48,7 +48,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.stringAfterMatch('Dogs are cool', 'are'))
 							.to.equal(' cool');
@@ -67,7 +67,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.stringCountEnclosures('Dogs (are) cool'))
 							.to.equal(1);
@@ -100,7 +100,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.stringGetEnclosureValueByIndex('Dogs (are) cool', 0))
 							.to.equal('are');
@@ -135,7 +135,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataFormat = testFable.defaultServices.DataFormat;
+						let _DataFormat = testFable.services.DataFormat;
 						Expect(_DataFormat
 							.stringRemoveEnclosureByIndex('Dogs (are) cool', 0))
 							.to.equal('Dogs  cool');

package/test/FableOperation_tests.js

@@ -29,9 +29,9 @@ suite
 						let testFable = new libFable();
 						let tmpOperation = testFable.serviceManager.instantiateServiceProvider('Operation', {Name: 'Big Complex Integration Operation'}, 'INTEGRATION-123');
 						Expect(tmpOperation).to.be.an('object');
-						Expect(testFable.services.Operation['INTEGRATION-123']).to.equal(tmpOperation);
-						Expect(testFable.services.Operation['BADHASH']).to.be.undefined;
-						Expect(testFable.services.Operation.hasOwnProperty('INTEGRATION-123')).to.equal(true);
+						Expect(testFable.serviceMap.Operation['INTEGRATION-123']).to.equal(tmpOperation);
+						Expect(testFable.serviceMap.Operation['BADHASH']).to.be.undefined;
+						Expect(testFable.serviceMap.Operation.hasOwnProperty('INTEGRATION-123')).to.equal(true);
 						tmpOperation.log.info(`Operation GUID ${tmpOperation.GUID} ---- Test 123`);
 						Expect(tmpOperation.state.Log.length).to.equal(1);
 						Expect(tmpOperation.state.Log[0]).to.contain('Test 123');
@@ -51,7 +51,7 @@ suite
 						Expect(tmpCollisionOperation).to.be.an('object');
 						Expect(tmpCollisionOperation.name).to.equal('Another Big Complex Integration Operation with Colliding Name');
 
-						Expect(testFable.services.Operation['INTEGRATION-123']).to.equal(tmpCollisionOperation);
+						Expect(testFable.serviceMap.Operation['INTEGRATION-123']).to.equal(tmpCollisionOperation);
 
 					}
 				);
@@ -63,7 +63,7 @@ suite
 						let testFable = new libFable();
 						let tmpOperation = testFable.serviceManager.instantiateServiceProvider('Operation', {Name:'Another Big Complex Integration Operation'});
 						Expect(tmpOperation).to.be.an('object');
-						Expect(testFable.services.Operation.hasOwnProperty(tmpOperation.Hash)).to.equal(true);
+						Expect(testFable.serviceMap.Operation.hasOwnProperty(tmpOperation.Hash)).to.equal(true);
 						Expect(tmpOperation.state.Log.length).to.equal(0);
 						let tmpText = `Operation ${tmpOperation.Hash} starting up...`;
 						tmpOperation.log.info(tmpText);

package/test/FableServiceManager_tests.js

@@ -107,9 +107,9 @@ suite
 									}
 									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'TheBestOne');
 
-									Expect(testFable.serviceManager.defaultServices.SimpleService).to.be.an('object');
-									Expect(testFable.serviceManager.defaultServices.SimpleService.MyFancyProperty).to.equal('Fancy');
-									Expect(testFable.serviceManager.services.SimpleService.TheBestOne.MyFancyProperty).to.equal('Fancy');
+									Expect(testFable.serviceManager.services.SimpleService).to.be.an('object');
+									Expect(testFable.serviceManager.services.SimpleService.MyFancyProperty).to.equal('Fancy');
+									Expect(testFable.serviceManager.serviceMap.SimpleService.TheBestOne.MyFancyProperty).to.equal('Fancy');
 								}
 							);
 						test
@@ -123,11 +123,11 @@ suite
 
 									Expect(testFable.serviceManager.services['SimpleService']['SimpleService-123']).to.be.an('object');
 
-									Expect(testFable.serviceManager.defaultServices['SimpleService']).to.be.an('object');
+									Expect(testFable.serviceManager.services['SimpleService']).to.be.an('object');
 
-									testFable.serviceManager.defaultServices.SimpleService.doSomething();
+									testFable.serviceManager.services.SimpleService.doSomething();
 
-									Expect(testFable.serviceManager.defaultServices['SimpleService'].Hash).to.equal('SimpleService-123');
+									Expect(testFable.serviceManager.services['SimpleService'].Hash).to.equal('SimpleService-123');
 								}
 							);
 						test
@@ -159,8 +159,8 @@ suite
 									let tmpService = testFable.serviceManager.instantiateServiceProviderWithoutRegistration('SimpleService', { SomeOption: true }, 'SimpleService-99');
 									let tmpServiceFromPrototype = testFable.serviceManager.instantiateServiceProviderFromPrototype('SimpleService', { SomeOption: true }, 'SimpleService-100', SimpleService);
 
-									Expect(testFable.services.SimpleService['SimpleService-99']).to.be.an('undefined');
-									Expect(testFable.services.SimpleService['SimpleService-100']).to.be.an('object');
+									Expect(testFable.serviceMap.SimpleService['SimpleService-99']).to.be.an('undefined');
+									Expect(testFable.serviceMap.SimpleService['SimpleService-100']).to.be.an('object');
 									Expect(tmpServiceFromPrototype).to.be.an('object');
 
 									Expect(tmpService).to.be.an('object');
@@ -178,25 +178,25 @@ suite
 									testFable.serviceManager.addServiceType('DatabaseService', MockDatabaseService);
 
 									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true });
-									testFable.serviceManager.defaultServices.SimpleService.doSomething();
+									testFable.serviceManager.services.SimpleService.doSomething();
 
 									testFable.serviceManager.instantiateServiceProvider('DatabaseService', { ConnectionString: 'mongodb://localhost:27017/test' }, 'PrimaryConnection');
 
-									Expect(testFable.serviceManager.defaultServices.DatabaseService.Hash).to.equal('PrimaryConnection');
+									Expect(testFable.serviceManager.services.DatabaseService.Hash).to.equal('PrimaryConnection');
 
 									testFable.serviceManager.instantiateServiceProvider('DatabaseService', { ConnectionString: 'mongodb://localhost:27017/test' }, 'SecondaryConnection');
 
-									Expect(testFable.serviceManager.defaultServices.DatabaseService.Hash).to.equal('PrimaryConnection');
+									Expect(testFable.serviceManager.services.DatabaseService.Hash).to.equal('PrimaryConnection');
 
-									testFable.serviceManager.defaultServices.DatabaseService.connect();
-									testFable.serviceManager.defaultServices.DatabaseService.commit('Test Record');
+									testFable.serviceManager.services.DatabaseService.connect();
+									testFable.serviceManager.services.DatabaseService.commit('Test Record');
 
 									testFable.serviceManager.setDefaultServiceInstantiation('DatabaseService', 'SecondaryConnection');
 
-									testFable.serviceManager.defaultServices.DatabaseService.connect();
-									testFable.serviceManager.defaultServices.DatabaseService.commit('Another Test Record');
+									testFable.serviceManager.services.DatabaseService.connect();
+									testFable.serviceManager.services.DatabaseService.commit('Another Test Record');
 
-									Expect(testFable.serviceManager.defaultServices.DatabaseService.Hash).to.equal('SecondaryConnection');
+									Expect(testFable.serviceManager.services.DatabaseService.Hash).to.equal('SecondaryConnection');
 								}
 							);
 
@@ -241,10 +241,10 @@ suite
 
 									testFable.serviceManager.connectPreinitServiceProviderInstance(tmpCoreService);
 
-									Expect(testFable.services.MockCoreService['MockCoreService-2']).to.be.an('object');
-									Expect(testFable.defaultServices.MockCoreService).to.be.an('object');
+									Expect(testFable.serviceMap.MockCoreService['MockCoreService-2']).to.be.an('object');
+									Expect(testFable.services.MockCoreService).to.be.an('object');
 
-									Expect(testFable.defaultServices.MockCoreService.fable.log).to.be.an('object');
+									Expect(testFable.services.MockCoreService.fable.log).to.be.an('object');
 								}
 							)
 
@@ -259,25 +259,25 @@ suite
 									testFable.serviceManager.addServiceType('DatabaseService', MockDatabaseService);
 
 									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true });
-									testFable.serviceManager.defaultServices.SimpleService.doSomething();
+									testFable.serviceManager.services.SimpleService.doSomething();
 
 									testFable.serviceManager.instantiateServiceProvider('DatabaseService', { ConnectionString: 'mongodb://localhost:27017/test' }, 'PrimaryConnection');
 
-									Expect(testFable.serviceManager.defaultServices.DatabaseService.Hash).to.equal('PrimaryConnection');
+									Expect(testFable.serviceManager.services.DatabaseService.Hash).to.equal('PrimaryConnection');
 
 									testFable.serviceManager.instantiateServiceProvider('DatabaseService', { ConnectionString: 'mongodb://localhost:27017/test' }, 'SecondaryConnection');
 
-									Expect(testFable.serviceManager.defaultServices.DatabaseService.Hash).to.equal('PrimaryConnection');
+									Expect(testFable.serviceManager.services.DatabaseService.Hash).to.equal('PrimaryConnection');
 
-									testFable.serviceManager.defaultServices.DatabaseService.connect();
-									testFable.serviceManager.defaultServices.DatabaseService.commit('Test Record');
+									testFable.serviceManager.services.DatabaseService.connect();
+									testFable.serviceManager.services.DatabaseService.commit('Test Record');
 
 									Expect(testFable.serviceManager.setDefaultServiceInstantiation('DatabaseService', 'TertiaryConnection')).to.be.false;
 
-									testFable.serviceManager.defaultServices.DatabaseService.connect();
-									testFable.serviceManager.defaultServices.DatabaseService.commit('Another Test Record');
+									testFable.serviceManager.services.DatabaseService.connect();
+									testFable.serviceManager.services.DatabaseService.commit('Another Test Record');
 
-									Expect(testFable.serviceManager.defaultServices.DatabaseService.Hash).to.equal('PrimaryConnection');
+									Expect(testFable.serviceManager.services.DatabaseService.Hash).to.equal('PrimaryConnection');
 								}
 							);
 					}

package/test/Fable_tests.js

@@ -106,7 +106,7 @@ suite
 							.to.equal('ApplicationNameHere');
 						Expect(testFable.settings.ProductVersion)
 							.to.equal('0.0.0');
-						testFable.defaultServices.SettingsManager.merge({Product:'TestProduct'});
+						testFable.services.SettingsManager.merge({Product:'TestProduct'});
 						Expect(testFable.settings.Product)
 							.to.equal('TestProduct');
 						Expect(testFable.settings.ProductVersion)