fable-serviceproviderbase 3.0.3 → 3.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fable-serviceproviderbase",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "description": "Simple base classes for fable services.",
   "main": "source/Fable-ServiceProviderBase.js",
   "scripts": {
@@ -42,7 +42,7 @@
   "homepage": "https://github.com/stevenvelozo/fable-serviceproviderbase",
   "devDependencies": {
     "chai": "4.3.7",
-    "fable": "^3.0.29",
+    "fable": "^3.0.46",
     "mocha": "10.2.0",
     "nyc": "^15.1.0"
   }

package/source/Fable-ServiceProviderBase.js

@@ -9,16 +9,30 @@ class FableServiceProviderBase
 	{
 		this.fable = pFable;
 
-		this.options = (typeof(pOptions) === 'object') ? pOptions : {};
-
-        this.serviceType = 'Unknown';
-
-        this.UUID = pFable.getUUID();
-
-        this.Hash = (typeof(pServiceHash) === 'string') ? pServiceHash : `${this.UUID}`;
+		this.options = (typeof(pOptions) === 'object') ? pOptions
+						: ((typeof(pFable) === 'object') && !pFable.isFable) ? pFable
+						: {};
+
+		this.serviceType = 'Unknown';
+
+		if (typeof(pFable.getUUID) == 'function')
+		{
+			this.UUID = pFable.getUUID();
+		}
+		else
+		{
+			this.UUID = `NoFABLESVC-${Math.floor((Math.random() * (99999 - 10000)) + 10000)}`
+		}
+
+		this.Hash = (typeof(pServiceHash) === 'string') ? pServiceHash : `${this.UUID}`;
+
+		// Pull back a few things
+		this.log = this.fable.log;
+		this.services = this.fable.services;
+		this.defaultServices = this.fable.defaultServices;
 	}
 
-    static isFableService = true;
+	static isFableService = true;
 }
 
 module.exports = FableServiceProviderBase;

package/test/FableServiceProvider_tests.js

@@ -88,7 +88,7 @@ suite
 					function()
 					{
 						testFable = new libFable();
-                        
+
                         let tmpSimpleService = new SimpleService(testFable, {SomeOption: true});
 
                         tmpSimpleService.doSomething();
@@ -115,10 +115,13 @@ suite
 					{
 						testFable = new libFable();
                         testFable.serviceManager.addServiceType('SimpleService', SimpleService);
-                        testFable.serviceManager.instantiateServiceProvider('SimpleService', {SomeOption: true}, 'SimpleService-123');
+                        let tmpSimpleService = testFable.serviceManager.instantiateServiceProvider('SimpleService', {SomeOption: true}, 'SimpleService-123');
 
                         Expect(testFable.serviceManager.services['SimpleService']['SimpleService-123']).to.be.an('object');
 
+                        // The passed-in magic stuff should work too.
+                        tmpSimpleService.log.info(`There were almost ${tmpSimpleService.defaultServices.DataFormat.formatterDollars(9821229.37)} dollars just lying here!`);
+
                         Expect(testFable.serviceManager.defaultServices['SimpleService']).to.be.an('object');
 
                         testFable.serviceManager.defaultServices.SimpleService.doSomething();
@@ -241,6 +244,18 @@ suite
                     }
                 )
 
+                test
+                (
+                    'Construct a service without a fable at all',
+                    function()
+                    {
+                        let tmpService = new SimpleService({Setting:'Something'});
+
+                        Expect(tmpService.options.Setting).to.equal('Something');
+                        Expect(tmpService.UUID).to.be.a('string');
+                    }
+                )
+
                 test
                 (
                     'Attempt to change the default service provider to a nonexistant provider',