fable 3.0.28 → 3.0.30

package/gulpfile-config.json

@@ -5,7 +5,7 @@
 
 	"LibraryOutputFolder": "./dist/",
 
-	"LibraryUniminifiedFileName": "fable.js",
+	"LibraryUniminifiedFileName": "fable.compatible.js",
 
-	"LibraryMinifiedFileName": "fable.min.js"
+	"LibraryMinifiedFileName": "fable.compatible.min.js"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fable",
-  "version": "3.0.28",
+  "version": "3.0.30",
   "description": "An entity behavior management and API bundling library.",
   "main": "source/Fable.js",
   "scripts": {
@@ -63,11 +63,11 @@
   "dependencies": {
     "async.eachlimit": "^0.5.2",
     "async.waterfall": "^0.5.2",
-    "data-arithmatic": "^1.0.4",
-    "fable-log": "^3.0.7",
-    "fable-serviceproviderbase": "^3.0.0",
-    "fable-settings": "^3.0.3",
-    "fable-uuid": "^3.0.2",
+    "data-arithmatic": "^1.0.7",
+    "fable-log": "^3.0.8",
+    "fable-serviceproviderbase": "^3.0.2",
+    "fable-settings": "^3.0.4",
+    "fable-uuid": "^3.0.4",
     "precedent": "^1.0.10",
     "simple-get": "^4.0.1"
   }

package/source/Fable-ServiceManager.js

@@ -6,11 +6,13 @@
 
 const libFableServiceBase = require('fable-serviceproviderbase');
 
-class FableService
+class FableService extends libFableServiceBase.CoreServiceProviderBase
 {
-	constructor(pFable)
+	constructor(pSettings, pServiceHash)
 	{
-		this.fable = pFable;
+		super(pSettings, pServiceHash);
+
+		this.serviceType = 'ServiceManager';
 
 		this.serviceTypes = [];
 
@@ -32,7 +34,8 @@ class FableService
 		// Add the container for instantiated services to go in
 		this.services[pServiceType] = {};
 
-		if ((typeof(pServiceClass) == 'function') && (pServiceClass.prototype instanceof libFableServiceBase))
+		// 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))
 		{
 			// Add the class to the list of classes
 			this.serviceClasses[pServiceType] = pServiceClass;

package/source/Fable.js

@@ -10,106 +10,86 @@ const libFableLog = require('fable-log');
 
 const libFableServiceManager = require('./Fable-ServiceManager.js');
 
-// Services
-const libFableServiceDataArithmatic = require('./services/Fable-Service-DataArithmatic.js');
+// Default Services
+const libFableServiceDataArithmatic = require('data-arithmatic');
 const libFableServiceMetaTemplate = require('./services/Fable-Service-MetaTemplate.js');
+const libFableServiceOperation = require('./services/Fable-Service-Operation.js');
 const libFableServiceRestClient = require('./services/Fable-Service-RestClient.js');
 const libFableServiceTemplate = require('./services/Fable-Service-Template.js');
 const libFableServiceUtility = require('./services/Fable-Service-Utility.js');
 
-const libFableOperation = require('./Fable-Operation.js');
-
 class Fable
 {
 	constructor(pSettings)
 	{
-		let tmpSettings = new libFableSettings(pSettings);
-
-		this.settingsManager = tmpSettings;
-
+		// Initialization Phase 0: Set up the lowest level state (core services)
+		// Container for the core services prototypes.
+		// This is here so if an API consumer changes the default for a core service,
+		// fable still runs with what was initialized.
+		this._coreServices = {};
+
+		// Instantiate the default Settings Manager
+		this._coreServices.SettingsManager = new libFableSettings(pSettings);
 		// Instantiate the UUID generator
-		this.libUUID = new libFableUUID(this.settingsManager.settings);
-
-		this.log = new libFableLog(this.settingsManager.settings);
-		this.log.initialize();
-
-		// Built-in dependencies
-		this.Dependencies = (
-			{
-				precedent: libFableSettings.precedent
-			});
-
-		// Location for Operation state
-		this.Operations = {};
-
-		this.serviceManager = new libFableServiceManager(this);
+		this._coreServices.UUID = new libFableUUID(this._coreServices.SettingsManager.settings);
+		// Instantiate the logging system
+		this._coreServices.Logging = new libFableLog(this._coreServices.SettingsManager.settings);
+		this._coreServices.Logging.initialize();
+
+		// Initialization Phase 1: Instantiate the service manager
+		// This is the start actual bootstrapping point for fable
+		this._coreServices.ServiceManager = new libFableServiceManager(this);
+		this.serviceManager = this._coreServices.ServiceManager;
+		this.serviceManager.connectFable(this);
+		// Bootstrapping of fable into the Service Manager is complete
+
+		// Initialization Phase 2: Map in the default services.
+		// They will then be available in the Default service provider set as well.
+		this.serviceManager.connectPreinitServiceProviderInstance(this._coreServices.ServiceManager);
+		this.serviceManager.connectPreinitServiceProviderInstance(this._coreServices.UUID);
+		this.serviceManager.connectPreinitServiceProviderInstance(this._coreServices.Logging);
+		this.serviceManager.connectPreinitServiceProviderInstance(this._coreServices.SettingsManager);
 
 		// Initialize and instantiate the default baked-in Data Arithmatic service
-		this.serviceManager.addServiceType('DataArithmatic', libFableServiceDataArithmatic);
-		this.fable.serviceManager.instantiateServiceProvider('DataArithmatic', {}, 'Default-Service-DataArithmatic');
-		// This service is passing through the data arithmatic library
-		this.DataArithmatic = this.serviceManager.defaultServices.DataArithmatic._DataArithmaticLibrary;
-
-		// Initialize the template service
 		this.serviceManager.addServiceType('Template', libFableServiceTemplate);
-
-		// Initialize the metatemplate service
 		this.serviceManager.addServiceType('MetaTemplate', libFableServiceMetaTemplate);
-
-		// Initialize and instantiate the default baked-in Utility service
-		this.serviceManager.addServiceType('Utility', libFableServiceUtility)
-		this.fable.serviceManager.instantiateServiceProvider('Utility', {}, 'Default-Service-Utility');
-		this.Utility = this.serviceManager.defaultServices.Utility;
-
-		// Add the REST Client service type
+		this.serviceManager.addServiceType('DataArithmatic', libFableServiceDataArithmatic);
+		this.fable.serviceManager.instantiateServiceProvider('DataArithmatic');
+		this.serviceManager.addServiceType('Utility', libFableServiceUtility);
+		this.fable.serviceManager.instantiateServiceProvider('Utility');
+		this.serviceManager.addServiceType('Operation', libFableServiceOperation);
 		this.serviceManager.addServiceType('RestClient', libFableServiceRestClient);
 
-		this.services = this.serviceManager.services;
-		this.defaultServices = this.serviceManager.defaultServices;
 	}
 
 	get settings()
 	{
-		return this.settingsManager.settings;
+		return this._coreServices.SettingsManager.settings;
 	}
 
-	get fable()
+	get log()
 	{
-		return this;
+		return this._coreServices.Logging;
 	}
 
-	getUUID()
+	get services()
 	{
-		return this.libUUID.getUUID();
+		return this._coreServices.ServiceManager.services;
 	}
 
-	createOperation(pOperationName, pOperationHash)
+	get defaultServices()
 	{
-		let tmpOperation = new libFableOperation(this, pOperationName, pOperationHash);
-
-		if (this.Operations.hasOwnProperty(tmpOperation.Hash))
-		{
-			// Uh Oh ...... Operation Hash Collision!
-			// TODO: What to do?!
-		}
-		else
-		{
-			this.Operations[tmpOperation.Hash] = tmpOperation;
-		}
-
-		return tmpOperation;
+		return this._coreServices.ServiceManager.defaultServices;
 	}
 
-	getOperation(pOperationHash)
+	getUUID()
 	{
-		if (!this.Operations.hasOwnProperty(pOperationHash))
-		{
-			return false;
-		}
-		else
-		{
-			return this.Operations[pOperationHash];
-		}
+		return this._coreServices.UUID.getUUID();
+	}
+
+	get fable()
+	{
+		return this;
 	}
 }
 

package/source/services/Fable-Service-Operation-DefaultSettings.js

@@ -0,0 +1,27 @@
+module.exports = (
+    {
+        "Metadata": {
+            "GUID": false,
+            "Hash": false,
+
+            "Title": "",
+            "Summary": "",
+
+            "Version": 0
+        },
+        "Status": {
+            "Completed": false,
+
+            "CompletionProgress": 0,
+            "CompletionTimeElapsed": 0,
+
+            "Steps": 1,
+            "StepsCompleted": 0,
+
+            "StartTime": 0,
+            "EndTime": 0
+        },
+        "Errors": [],
+        "Log": []
+    }
+);

package/source/{Fable-Operation.js → services/Fable-Service-Operation.js}

@@ -1,47 +1,22 @@
-const _OperationStatePrototype = JSON.stringify(
-{
-	"Metadata": {
-		"GUID": false,
-		"Hash": false,
-
-		"Title": "",
-		"Summary": "",
-
-		"Version": 0
-	},
-	"Status": {
-        "Completed": false,
+const libFableServiceBase = require('../Fable-ServiceManager.js').ServiceProviderBase;
 
-        "CompletionProgress": 0,
-        "CompletionTimeElapsed": 0,
+const _OperationStatePrototypeString = JSON.stringify(require('./Fable-Service-Operation-DefaultSettings.js'));
 
-        "Steps": 1,
-        "StepsCompleted": 0,
-
-        "StartTime": 0,
-        "EndTime": 0
-	},
-	"Errors": [],
-	"Log": []
-});
-
-class FableOperation
+class FableOperation extends libFableServiceBase
 {
-	constructor(pFable, pOperationName, pOperationHash)
+
+	constructor(pFable, pOptions, pServiceHash)
 	{
-		this.fable = pFable;
+        super(pFable, pOptions, pServiceHash);
 
-		this.name = pOperationName;
+        this.serviceType = 'PhasedOperation';
 
-		this.state = JSON.parse(_OperationStatePrototype);
+		this.state = JSON.parse(_OperationStatePrototypeString);
 
 		this.state.Metadata.GUID = this.fable.getUUID();
-		this.state.Metadata.Hash = this.state.GUID;
+		this.state.Metadata.Hash = this.Hash;
 
-		if (typeof(pOperationHash) == 'string')
-		{
-			this.state.Metadata.Hash = pOperationHash;
-		}
+		this.name = (typeof(this.options.Name) == 'string') ? this.options.Name : `Unnamed Operation ${this.state.Metadata.GUID}`;
 	}
 
 	get GUID()
@@ -49,11 +24,6 @@ class FableOperation
 		return this.state.Metadata.GUID;
 	}
 
-	get Hash()
-	{
-		return this.state.Metadata.Hash;
-	}
-
 	get log()
 	{
 		return this;

package/test/FableDataArithmatic_tests.js

@@ -29,7 +29,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataArithmatic = testFable.DataArithmatic;
+						let _DataArithmatic = testFable.defaultServices.DataArithmatic;
 						Expect(_DataArithmatic
 							.stringReverse('Dogs'))
 							.to.equal('sgoD');
@@ -45,7 +45,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataArithmatic = testFable.DataArithmatic;
+						let _DataArithmatic = testFable.defaultServices.DataArithmatic;
 						Expect(_DataArithmatic
 							.insecureStringHash('Dogs'))
 							.to.equal('HSH2135767');
@@ -68,7 +68,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataArithmatic = testFable.DataArithmatic;
+						let _DataArithmatic = testFable.defaultServices.DataArithmatic;
 						// Test the enclosure cleaning function
 						Expect(_DataArithmatic
 							.cleanEnclosureWrapCharacters('`', '`Dogs`'))
@@ -102,7 +102,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataArithmatic = testFable.DataArithmatic;
+						let _DataArithmatic = testFable.defaultServices.DataArithmatic;
 						Expect(_DataArithmatic
 							.stringStartsWith('Dogs', 'Do'))
 							.to.equal(true);
@@ -124,7 +124,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataArithmatic = testFable.DataArithmatic;
+						let _DataArithmatic = testFable.defaultServices.DataArithmatic;
 						_DataArithmatic._UseEngineStringStartsWith = false;
 						Expect(_DataArithmatic
 							.stringStartsWith('Dogs', 'Do'))
@@ -147,7 +147,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataArithmatic = testFable.DataArithmatic;
+						let _DataArithmatic = testFable.defaultServices.DataArithmatic;
 						Expect(_DataArithmatic
 							.stringEndsWith('Dogs', 'gs'))
 							.to.equal(true);
@@ -169,7 +169,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataArithmatic = testFable.DataArithmatic;
+						let _DataArithmatic = testFable.defaultServices.DataArithmatic;
 						_DataArithmatic._UseEngineStringEndsWith = false;
 						Expect(_DataArithmatic
 							.stringEndsWith('Dogs', 'gs'))
@@ -199,7 +199,7 @@ suite
 					(fTestComplete)=>
 					{
 						let testFable = new libFable({LogStreams: false});
-						let _DataArithmatic = testFable.DataArithmatic;
+						let _DataArithmatic = testFable.defaultServices.DataArithmatic;
 						Expect(_DataArithmatic
 							.cleanNonAlphaCharacters('Dogs'))
 							.to.equal('Dogs');

package/test/FableOperations_tests.js

@@ -27,11 +27,11 @@ suite
 					function()
 					{
 						let testFable = new libFable();
-						let tmpOperation = testFable.createOperation('Big Complex Integration Operation', 'INTEGRATION-123');
+						let tmpOperation = testFable.serviceManager.instantiateServiceProvider('Operation', {Name: 'Big Complex Integration Operation'}, 'INTEGRATION-123');
 						Expect(tmpOperation).to.be.an('object');
-						Expect(testFable.getOperation('INTEGRATION-123')).to.equal(tmpOperation);
-						Expect(testFable.getOperation('BADHASH')).to.be.false;
-						Expect(testFable.Operations.hasOwnProperty('INTEGRATION-123')).to.equal(true);
+						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);
 						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');
@@ -43,15 +43,15 @@ suite
 					function()
 					{
 						let testFable = new libFable();
-						let tmpOperation = testFable.createOperation('Big Complex Integration Operation', 'INTEGRATION-123');
+						let tmpOperation = testFable.serviceManager.instantiateServiceProvider('Operation', {Name: 'Big Complex Integration Operation'}, 'INTEGRATION-123');;
 						Expect(tmpOperation).to.be.an('object');
 						Expect(tmpOperation.name).to.equal('Big Complex Integration Operation');
 
-						let tmpCollisionOperation = testFable.createOperation('Another Big Complex Integration Operation with Colliding Name', 'INTEGRATION-123');
+						let tmpCollisionOperation = testFable.serviceManager.instantiateServiceProvider('Operation', {Name: 'Another Big Complex Integration Operation with Colliding Name'}, 'INTEGRATION-123');;
 						Expect(tmpCollisionOperation).to.be.an('object');
 						Expect(tmpCollisionOperation.name).to.equal('Another Big Complex Integration Operation with Colliding Name');
 
-						Expect(testFable.getOperation('INTEGRATION-123')).to.equal(tmpOperation);
+						Expect(testFable.services.Operation['INTEGRATION-123']).to.equal(tmpCollisionOperation);
 
 					}
 				);
@@ -61,9 +61,9 @@ suite
 					function()
 					{
 						let testFable = new libFable();
-						let tmpOperation = testFable.createOperation('Another Big Complex Integration Operation');
+						let tmpOperation = testFable.serviceManager.instantiateServiceProvider('Operation', {Name:'Another Big Complex Integration Operation'});
 						Expect(tmpOperation).to.be.an('object');
-						Expect(testFable.Operations.hasOwnProperty(tmpOperation.Hash)).to.equal(true);
+						Expect(testFable.services.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/FableUtility_tests.js

@@ -36,7 +36,7 @@ suite
 					function()
 					{
 						testFable = new libFable();
-						let tmpTemplate = testFable.Utility.template('Something');
+						let tmpTemplate = testFable.defaultServices.Utility.template('Something');
 						Expect(tmpTemplate).to.be.a('function');
 					}
 				);
@@ -46,7 +46,7 @@ suite
 					function()
 					{
 						testFable = new libFable();
-						let tmpTemplate = testFable.Utility.template('Something');
+						let tmpTemplate = testFable.defaultServices.Utility.template('Something');
 						Expect(tmpTemplate).to.be.a('function');
 						Expect(tmpTemplate()).to.equal('Something');
 					}
@@ -57,7 +57,7 @@ suite
 					function()
 					{
 						testFable = new libFable();
-						let tmpTemplate = testFable.Utility.template('There // %> are \\ */ /* <%= Count %> things....');
+						let tmpTemplate = testFable.defaultServices.Utility.template('There // %> are \\ */ /* <%= Count %> things....');
 						Expect(tmpTemplate).to.be.a('function');
 						Expect(tmpTemplate({Count:1000})).to.equal('There // %> are \\ */ /* 1000 things....');
 					}
@@ -68,10 +68,10 @@ suite
 					function()
 					{
 						testFable = new libFable();
-						let tmpTemplate = testFable.Utility.template('There are so many of these things (<%= Count %> to be exact)....');
+						let tmpTemplate = testFable.defaultServices.Utility.template('There are so many of these things (<%= Count %> to be exact)....');
 						Expect(tmpTemplate).to.be.a('function');
 						Expect(tmpTemplate({Count:1000})).to.equal('There are so many of these things (1000 to be exact)....');
-						let tmpOtherTemplate = testFable.Utility.template('Things count: <%= Count %>');
+						let tmpOtherTemplate = testFable.defaultServices.Utility.template('Things count: <%= Count %>');
 						Expect(tmpOtherTemplate).to.be.a('function');
 						Expect(tmpOtherTemplate({Count:600})).to.equal('Things count: 600');
 						Expect(tmpTemplate({Count:256})).to.equal('There are so many of these things (256 to be exact)....');
@@ -83,16 +83,16 @@ suite
 					function()
 					{
 						testFable = new libFable();
-						testFable.Utility.buildHashedTemplate('HeadLine', '<h1><%= TitleText %> Page</h1>');
-						testFable.Utility.buildHashedTemplate('Slogan', '<p>Some people, like <%= Name %>, have all the fun.</p>');
+						testFable.defaultServices.Utility.buildHashedTemplate('HeadLine', '<h1><%= TitleText %> Page</h1>');
+						testFable.defaultServices.Utility.buildHashedTemplate('Slogan', '<p>Some people, like <%= Name %>, have all the fun.</p>');
 						
 						// Access the low level service render function
 						Expect(testFable.services.Template.HeadLine.renderFunction({TitleText:'Test'})).to.equal('<h1>Test Page</h1>');
 						Expect(testFable.services.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.Utility.templates.HeadLine({TitleText:'A New'})).to.equal('<h1>A New Page</h1>');
-						Expect(testFable.Utility.templates.Slogan({Name:'Bob'})).to.equal('<p>Some people, like Bob, have all the fun.</p>');
+						Expect(testFable.defaultServices.Utility.templates.HeadLine({TitleText:'A New'})).to.equal('<h1>A New Page</h1>');
+						Expect(testFable.defaultServices.Utility.templates.Slogan({Name:'Bob'})).to.equal('<p>Some people, like Bob, have all the fun.</p>');
 					}
 				);
 				test
@@ -101,7 +101,7 @@ suite
 					function()
 					{
 						testFable = new libFable();
-						let tmpTemplate = testFable.Utility.template('There are <%= Count %> things....', {Count:1000});
+						let tmpTemplate = testFable.defaultServices.Utility.template('There are <%= Count %> things....', {Count:1000});
 						Expect(tmpTemplate).to.equal('There are 1000 things....');
 					}
 				);
@@ -111,7 +111,7 @@ suite
 					function()
 					{
 						testFable = new libFable();
-						let tmpResult = testFable.Utility.extend({SomeValue:'here'});
+						let tmpResult = testFable.defaultServices.Utility.extend({SomeValue:'here'});
 						Expect(tmpResult).to.have.a.property('SomeValue')
 							.that.is.a('string');
 						Expect(tmpResult.SomeValue).to.equal('here')
@@ -123,7 +123,7 @@ suite
 					function()
 					{
 						testFable = new libFable();
-						let tmpResult = testFable.Utility.extend({SomeValue:'here',Size:10},{Color:'Red',Size:20});
+						let tmpResult = testFable.defaultServices.Utility.extend({SomeValue:'here',Size:10},{Color:'Red',Size:20});
 						Expect(tmpResult).to.have.a.property('SomeValue')
 							.that.is.a('string');
 						Expect(tmpResult.SomeValue).to.equal('here');
@@ -137,7 +137,7 @@ suite
 					function()
 					{
 						testFable = new libFable();
-						let tmpResult = testFable.Utility.extend(
+						let tmpResult = testFable.defaultServices.Utility.extend(
 							{SomeValue:'here',Size:10, Race:'Human'},
 							{Color:'Red',Size:20, Band:'Metalocalypse'},
 							{Name:'Bilbo', Size:15, Race:'Hobbit', Band:'The dead hobbitz'});
@@ -165,20 +165,20 @@ suite
 						 */
 						// Regular Expressions for easy conversion of underscore tests:
 						// S: assert.deepEqual\(_.chunk\((.*)\), (.*), '
-						// R: Expect(testFable.Utility.chunk($1)).to.deep.equal($2);   // $3
-					    Expect(testFable.Utility.chunk([], 2)).to.deep.equal([]);   // chunk for empty array returns an empty array');
+						// R: Expect(testFable.defaultServices.Utility.chunk($1)).to.deep.equal($2);   // $3
+					    Expect(testFable.defaultServices.Utility.chunk([], 2)).to.deep.equal([]);   // chunk for empty array returns an empty array');
 
-					    Expect(testFable.Utility.chunk([1, 2, 3], 0)).to.deep.equal([]);   // chunk into parts of 0 elements returns empty array');
-					    Expect(testFable.Utility.chunk([1, 2, 3], -1)).to.deep.equal([]);   // chunk into parts of negative amount of elements returns an empty array');
-					    Expect(testFable.Utility.chunk([1, 2, 3])).to.deep.equal([]);   // defaults to empty array (chunk size 0)');
+					    Expect(testFable.defaultServices.Utility.chunk([1, 2, 3], 0)).to.deep.equal([]);   // chunk into parts of 0 elements returns empty array');
+					    Expect(testFable.defaultServices.Utility.chunk([1, 2, 3], -1)).to.deep.equal([]);   // chunk into parts of negative amount of elements returns an empty array');
+					    Expect(testFable.defaultServices.Utility.chunk([1, 2, 3])).to.deep.equal([]);   // defaults to empty array (chunk size 0)');
 
-					    Expect(testFable.Utility.chunk([1, 2, 3], 1)).to.deep.equal([[1], [2], [3]]);   // chunk into parts of 1 elements returns original array');
+					    Expect(testFable.defaultServices.Utility.chunk([1, 2, 3], 1)).to.deep.equal([[1], [2], [3]]);   // chunk into parts of 1 elements returns original array');
 
-					    Expect(testFable.Utility.chunk([1, 2, 3], 3)).to.deep.equal([[1, 2, 3]]);   // chunk into parts of current array length elements returns the original array');
-					    Expect(testFable.Utility.chunk([1, 2, 3], 5)).to.deep.equal([[1, 2, 3]]);   // chunk into parts of more then current array length elements returns the original array');
+					    Expect(testFable.defaultServices.Utility.chunk([1, 2, 3], 3)).to.deep.equal([[1, 2, 3]]);   // chunk into parts of current array length elements returns the original array');
+					    Expect(testFable.defaultServices.Utility.chunk([1, 2, 3], 5)).to.deep.equal([[1, 2, 3]]);   // chunk into parts of more then current array length elements returns the original array');
 
-					    Expect(testFable.Utility.chunk([10, 20, 30, 40, 50, 60, 70], 2)).to.deep.equal([[10, 20], [30, 40], [50, 60], [70]]);   // chunk into parts of less then current array length elements');
-					    Expect(testFable.Utility.chunk([10, 20, 30, 40, 50, 60, 70], 3)).to.deep.equal([[10, 20, 30], [40, 50, 60], [70]]);   // chunk into parts of less then current array length elements');
+					    Expect(testFable.defaultServices.Utility.chunk([10, 20, 30, 40, 50, 60, 70], 2)).to.deep.equal([[10, 20], [30, 40], [50, 60], [70]]);   // chunk into parts of less then current array length elements');
+					    Expect(testFable.defaultServices.Utility.chunk([10, 20, 30, 40, 50, 60, 70], 3)).to.deep.equal([[10, 20, 30], [40, 50, 60], [70]]);   // chunk into parts of less then current array length elements');
 					}
 				);
 				test
@@ -190,7 +190,7 @@ suite
 
 						let tmpState = {};
 
-						testFable.Utility.waterfall([
+						testFable.defaultServices.Utility.waterfall([
 							(fStageComplete)=>
 							{
 								tmpState.Name = 'The Pixies';
@@ -220,7 +220,7 @@ suite
 
 						let tmpData = ['a','b','c','d','e'];
 
-						testFable.Utility.eachLimit(tmpData, 2,
+						testFable.defaultServices.Utility.eachLimit(tmpData, 2,
 							(pItem, fCallback)=>
 							{
 								tmpState[pItem] = pItem;

package/test/Fable_tests.js

@@ -16,8 +16,6 @@ suite
 	'Fable',
 	function()
 	{
-		var testFable = false;
-
 		setup
 		(
 			function()
@@ -35,7 +33,7 @@ suite
 					'The class should initialize itself into a happy little object.',
 					function()
 					{
-						testFable = new libFable({LogStreams: false});
+						let testFable = new libFable({LogStreams: false});
 						// Instantiate the logger
 						Expect(testFable).to.be.an('object', 'Fable should initialize as an object directly from the require statement.');
 						Expect(testFable).to.have.a.property('log')
@@ -50,10 +48,10 @@ suite
 				);
 				test
 				(
-					'The class should initialize itself into a happy little object.',
+					'The class should initialize itself into a happy little object with more config.',
 					function()
 					{
-						testFable = libFable.new({Product:'LegacyApplicationNameHere', LogStreams: false});
+						let testFable = libFable.new({Product:'LegacyApplicationNameHere', LogStreams: false});
 						// Instantiate the logger
 						Expect(testFable).to.be.an('object', 'Fable should initialize as an object directly from the require statement.');
 						Expect(testFable).to.have.a.property('log')
@@ -71,7 +69,7 @@ suite
 					'Logging should happen...',
 					function(fDone)
 					{
-						testFable = new libFable({Product:'LogTest', LogStreams:[{streamtype:'process.stdout'}]});
+						let testFable = new libFable({Product:'LogTest', LogStreams:[{streamtype:'process.stdout'}]});
 						Expect(testFable).to.have.a.property('log')
 						.that.is.a('object');
 						testFable.log.info('There should be a visible log entry here...');
@@ -83,7 +81,7 @@ suite
 					'Generate a uuid...',
 					function(fDone)
 					{
-						testFable = new libFable({Product:'LogTest', LogStreams:[{streamtype:'process.stdout'}]});
+						let testFable = new libFable({Product:'LogTest', LogStreams:[{streamtype:'process.stdout'}]});
 						Expect(testFable).to.have.a.property('log')
 							.that.is.a('object');
 						var tmpUUID = testFable.getUUID();
@@ -99,14 +97,14 @@ suite
 					'Change some settings later...',
 					function(fDone)
 					{
-						testFable = new libFable();
+						let testFable = new libFable();
 						Expect(testFable).to.have.a.property('settings')
 						.that.is.a('object');
 						Expect(testFable.settings.Product)
 							.to.equal('ApplicationNameHere');
 						Expect(testFable.settings.ProductVersion)
 							.to.equal('0.0.0');
-						testFable.settingsManager.merge({Product:'TestProduct'});
+						testFable.defaultServices.SettingsManager.merge({Product:'TestProduct'});
 						Expect(testFable.settings.Product)
 							.to.equal('TestProduct');
 						Expect(testFable.settings.ProductVersion)

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

@@ -1,17 +0,0 @@
-const libFableServiceBase = require('../Fable-ServiceManager.js').ServiceProviderBase;
-
-const libDataArithmatic = require('data-arithmatic');
-
-class FableServiceDataArithmatic extends libFableServiceBase
-{
-	constructor(pFable, pOptions, pServiceHash)
-	{
-        super(pFable, pOptions, pServiceHash);
-
-        this.serviceType = 'DataArithmatic';
-
-        this._DataArithmaticLibrary = new libDataArithmatic();
-	}
-}
-
-module.exports = FableServiceDataArithmatic;