fable 3.0.65 → 3.0.67

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fable",
-    "version": "3.0.65",
+    "version": "3.0.67",
     "description": "An entity behavior management and API bundling library.",
     "main": "source/Fable.js",
     "scripts": {
@@ -49,19 +49,19 @@
     },
     "homepage": "https://github.com/stevenvelozo/fable",
     "devDependencies": {
-        "quackage": "^1.0.13"
+        "quackage": "^1.0.14"
     },
     "dependencies": {
         "async.eachlimit": "^0.5.2",
         "async.waterfall": "^0.5.2",
-        "cachetrax": "^1.0.3",
+        "cachetrax": "^1.0.4",
         "cookie": "^0.5.0",
         "data-arithmatic": "^1.0.7",
         "fable-log": "^3.0.10",
-        "fable-serviceproviderbase": "^3.0.7",
+        "fable-serviceproviderbase": "^3.0.8",
         "fable-settings": "^3.0.6",
         "fable-uuid": "^3.0.5",
-        "manyfest": "^1.0.24",
+        "manyfest": "^1.0.25",
         "simple-get": "^4.0.1"
     }
 }

package/source/Fable-ServiceManager.js

@@ -16,7 +16,7 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 		this.serviceTypes = [];
 
 		// A map of instantiated services
-		this.serviceMap = {};
+		this.servicesMap = {};
 
 		// A map of the default instantiated service by type
 		this.services = {};
@@ -30,7 +30,7 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 
 	addServiceType(pServiceType, pServiceClass)
 	{
-		if (this.serviceMap.hasOwnProperty(pServiceType))
+		if (this.servicesMap.hasOwnProperty(pServiceType))
 		{
 			// TODO: Check if any services are running?
 			this.fable.log.warn(`Adding a service type [${pServiceType}] that already exists.`);
@@ -38,7 +38,7 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 		else
 		{
 			// Add the container for instantiated services to go in
-			this.serviceMap[pServiceType] = {};
+			this.servicesMap[pServiceType] = {};
 
 			// Add the type to the list of types
 			this.serviceTypes.push(pServiceType);
@@ -77,7 +77,7 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 		}
 
 		// Add the service to the service map
-		this.serviceMap[pServiceType][tmpService.Hash] = tmpService;
+		this.servicesMap[pServiceType][tmpService.Hash] = tmpService;
 
 		// If this is the first service of this type, make it the default
 		if (!this.services.hasOwnProperty(pServiceType))
@@ -95,7 +95,7 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 		let tmpService = this.instantiateServiceProviderWithoutRegistration(pServiceType, pOptions, pCustomServiceHash);
 
 		// Add the service to the service map
-		this.serviceMap[pServiceType][tmpService.Hash] = tmpService;
+		this.servicesMap[pServiceType][tmpService.Hash] = tmpService;
 
 		// If this is the first service of this type, make it the default
 		if (!this.services.hasOwnProperty(pServiceType))
@@ -127,14 +127,14 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 		// The service should already be instantiated, so just connect it to fable
 		pServiceInstance.connectFable(this.fable);
 
-		if (!this.serviceMap.hasOwnProperty(tmpServiceType))
+		if (!this.servicesMap.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.serviceMap[tmpServiceType] = {};
+			this.servicesMap[tmpServiceType] = {};
 		}
 		// Add the service to the service map
-		this.serviceMap[tmpServiceType][tmpServiceHash] = pServiceInstance;
+		this.servicesMap[tmpServiceType][tmpServiceHash] = pServiceInstance;
 
 		// If this is the first service of this type, make it the default
 		if (!this.services.hasOwnProperty(tmpServiceType))
@@ -147,10 +147,10 @@ class FableService extends libFableServiceBase.CoreServiceProviderBase
 
 	setDefaultServiceInstantiation(pServiceType, pServiceHash)
 	{
-		if (this.serviceMap[pServiceType].hasOwnProperty(pServiceHash))
+		if (this.servicesMap[pServiceType].hasOwnProperty(pServiceHash))
 		{
-			this.fable[pServiceType] = this.serviceMap[pServiceType][pServiceHash];
-			this.services[pServiceType] = this.serviceMap[pServiceType][pServiceHash];
+			this.fable[pServiceType] = this.servicesMap[pServiceType][pServiceHash];
+			this.services[pServiceType] = this.servicesMap[pServiceType][pServiceHash];
 			return true;
 		}
 

package/source/Fable.js

@@ -82,9 +82,9 @@ class Fable
 		return this._coreServices.ServiceManager.services;
 	}
 
-	get serviceMap()
+	get servicesMap()
 	{
-		return this._coreServices.ServiceManager.serviceMap;
+		return this._coreServices.ServiceManager.servicesMap;
 	}
 
 	getUUID()

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.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);
+						Expect(testFable.servicesMap.Operation['INTEGRATION-123']).to.equal(tmpOperation);
+						Expect(testFable.servicesMap.Operation['BADHASH']).to.be.undefined;
+						Expect(testFable.servicesMap.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.serviceMap.Operation['INTEGRATION-123']).to.equal(tmpCollisionOperation);
+						Expect(testFable.servicesMap.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.serviceMap.Operation.hasOwnProperty(tmpOperation.Hash)).to.equal(true);
+						Expect(testFable.servicesMap.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

@@ -90,7 +90,7 @@ suite
 									testFable.serviceManager.addServiceType('SimpleService');
 									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'SimpleService-123');
 
-									Expect(testFable.serviceManager.serviceMap['SimpleService']['SimpleService-123']).to.be.an('object');
+									Expect(testFable.serviceManager.servicesMap['SimpleService']['SimpleService-123']).to.be.an('object');
 								}
 							);
 						test
@@ -109,7 +109,7 @@ suite
 
 									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');
+									Expect(testFable.serviceManager.servicesMap.SimpleService.TheBestOne.MyFancyProperty).to.equal('Fancy');
 								}
 							);
 						test
@@ -121,7 +121,7 @@ suite
 									testFable.serviceManager.addServiceType('SimpleService', SimpleService);
 									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'SimpleService-123');
 
-									Expect(testFable.serviceManager.serviceMap['SimpleService']['SimpleService-123']).to.be.an('object');
+									Expect(testFable.serviceManager.servicesMap['SimpleService']['SimpleService-123']).to.be.an('object');
 
 									Expect(testFable.serviceManager.services['SimpleService']).to.be.an('object');
 
@@ -141,9 +141,9 @@ suite
 
 									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'SimpleService-13');
 
-									testFable.serviceManager.serviceMap['SimpleService']['SimpleService-13'].doSomething();
+									testFable.serviceManager.servicesMap['SimpleService']['SimpleService-13'].doSomething();
 
-									Expect(testFable.serviceManager.serviceMap['SimpleService']['SimpleService-13']).to.be.an('object');
+									Expect(testFable.serviceManager.servicesMap['SimpleService']['SimpleService-13']).to.be.an('object');
 								}
 							);
 
@@ -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.serviceMap.SimpleService['SimpleService-99']).to.be.an('undefined');
-									Expect(testFable.serviceMap.SimpleService['SimpleService-100']).to.be.an('object');
+									Expect(testFable.servicesMap.SimpleService['SimpleService-99']).to.be.an('undefined');
+									Expect(testFable.servicesMap.SimpleService['SimpleService-100']).to.be.an('object');
 									Expect(tmpServiceFromPrototype).to.be.an('object');
 
 									Expect(tmpService).to.be.an('object');
@@ -241,7 +241,7 @@ suite
 
 									testFable.serviceManager.connectPreinitServiceProviderInstance(tmpCoreService);
 
-									Expect(testFable.serviceMap.MockCoreService['MockCoreService-2']).to.be.an('object');
+									Expect(testFable.servicesMap.MockCoreService['MockCoreService-2']).to.be.an('object');
 									Expect(testFable.services.MockCoreService).to.be.an('object');
 
 									Expect(testFable.services.MockCoreService.fable.log).to.be.an('object');

package/test/Utility_tests.js

@@ -87,8 +87,8 @@ suite
 						testFable.services.Utility.buildHashedTemplate('Slogan', '<p>Some people, like <%= Name %>, have all the fun.</p>');
 						
 						// Access the low level service render function
-						Expect(testFable.serviceMap.Template.HeadLine.renderFunction({TitleText:'Test'})).to.equal('<h1>Test Page</h1>');
-						Expect(testFable.serviceMap.Template.Slogan.renderFunction({Name:'Jim'})).to.equal('<p>Some people, like Jim, have all the fun.</p>');
+						Expect(testFable.servicesMap.Template.HeadLine.renderFunction({TitleText:'Test'})).to.equal('<h1>Test Page</h1>');
+						Expect(testFable.servicesMap.Template.Slogan.renderFunction({Name:'Jim'})).to.equal('<p>Some people, like Jim, have all the fun.</p>');
 
 						// Use the high level simpler one
 						Expect(testFable.services.Utility.templates.HeadLine({TitleText:'A New'})).to.equal('<h1>A New Page</h1>');