manyfest 1.0.32 → 1.0.34

package/test/Manyfest_Object_ReadSets_tests.js

@@ -12,6 +12,7 @@ var Expect = Chai.expect;
 let libManyfest = require('../source/Manyfest.js');
 
 let _SampleDataArchiveOrgFrankenberry = require('./Data-Archive-org-Frankenberry.json');
+let _SampleDataFruits = require('./Data-Fruits.json');
 
 suite
 (
@@ -113,6 +114,24 @@ suite
 					}
 				);
 				test
+				(
+					'Arrays in sub-objects.',
+					(fTestComplete)=>
+					{
+						let _Manyfest = new libManyfest(
+							{
+								Scope:'Archive.org',
+								Descriptors: {}
+							});
+
+						Expect(_Manyfest.getValueAtAddress(_SampleDataFruits, 'FruityVice[3].name')).to.equal('Tomato');
+						Expect(_Manyfest.getValueAtAddress({Fruit:_SampleDataFruits}, 'Fruit.FruityVice[3].name')).to.equal('Tomato');
+
+
+						fTestComplete();
+					}
+				);
+				test
 				(
 					'Sub-objects in arrays can be parsed and the values will be pulled in magically.',
 					(fTestComplete)=>

package/test/Manyfest_Object_Read_tests.js

@@ -262,61 +262,24 @@ suite
 						Expect(_Manyfest.getValueAtAddress(_MockObject, 'TheFunction()')).to.equal('Value is: undefined');
 						Expect(_Manyfest.getValueAtAddress(_MockObject, 'TheFunction(Name)')).to.equal('Value is: Yadda');
 						Expect(_Manyfest.getValueAtAddress(_MockObject, 'ComplexFunction(Name,Name)')).to.equal('Value is: Yadda and would output as Yadda');
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'TheFunction("Barney")')).to.equal('Value is: Barney');
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'TheFunction("0")')).to.equal('Value is: 0');
 
 						// This is stupid but works
 						Expect(_Manyfest.getValueAtAddress(_MockObject, 'ComplexFunction(Name,TheFunction(Manyfest.Descriptors["metadata.creator"].Hash))'))
 							.to.equal('Value is: Yadda and would output as Value is: Creator');
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'ComplexFunction("Jim",TheFunction("Janet"))'))
+							.to.equal('Value is: Jim and would output as Value is: Janet');
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'ComplexFunction("Jet","Janet")'))
+							.to.equal('Value is: Jet and would output as Janet');
+						Expect(_Manyfest.getValueAtAddress(_MockObject, 'ComplexFunction("Jim",TheFunction(Manyfest.Descriptors["metadata.creator"].Hash))'))
+							.to.equal('Value is: Jim and would output as Value is: Creator');
 
 						Expect(_Manyfest.getValueAtAddress(_MockObject, 'Behaviors.Increment()'))
 							.to.equal(1);
 
 						Expect(_Manyfest.getValueAtAddress(_MockObject, 'Behaviors.SillyObject().Stores[0]')).to.equal('Aberdeen');
 
-						fTestComplete();
-					}
-				);
-				test
-				(
-					'Functions with fixed and static parameters',
-					(fTestComplete)=>
-					{
-						// Create a compmlex mock object to check metadata on.
-						let _MockObject = (
-							{
-								"Name": "Yadda",
-								"ComplexFunction": (pValue, pOutput) => { return `Value is: ${pValue} and would output as ${pOutput}`; },
-								"Behaviors": 
-									{
-										"Value": 0,
-										"TheFunction": (pValue) => { return `Value is: ${pValue}`; },
-										"Increment": function () 
-											{
-												this.Value++; return this.Value;
-											},
-										"SillyObject": function()
-										{
-											return { Cost: 1.00, Name: 'Beanie Baby', Stores: ['Aberdeen', 'Seattle', 'Tacoma'] }
-										},
-										"FormatOutput": function () { return `My magic value is: ${this.Value}`; }
-									},
-								"Manyfest":
-									{
-										Scope:'Function.Mock',
-										Descriptors:
-											{
-												"metadata.creator":
-													{
-														Name:'Creator',
-														Hash:'Creator'
-													}
-											}
-									},
-								"Data": _SampleDataArchiveOrgFrankenberry
-							});
-						let _Manyfest = new libManyfest(_MockObject.Manyfest);
-
-						Expect(_Manyfest.getValueAtAddress(_MockObject, 'Behaviors.TheFunction("100")')).to.equal('Value is: 100');
-
 						fTestComplete();
 					}
 				);