manyfest 1.0.28 → 1.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manyfest",
-    "version": "1.0.28",
+    "version": "1.0.29",
     "description": "JSON Object Manifest for Data Description and Parsing",
     "main": "source/Manyfest.js",
     "scripts": {
@@ -44,10 +44,10 @@
         ]
     },
     "dependencies": {
-        "fable-serviceproviderbase": "^3.0.12"
+        "fable-serviceproviderbase": "^3.0.13"
     },
     "devDependencies": {
-        "quackage": "^1.0.25"
+        "quackage": "^1.0.29"
     },
     "author": "steven velozo <steven@velozo.com>",
     "license": "MIT",

package/source/Manyfest-ObjectAddress-CheckAddressExists.js

@@ -23,11 +23,8 @@ let libSimpleLog = require('./Manyfest-LogToConsole.js');
 */
 class ManyfestObjectAddressResolverCheckAddressExists
 {
-	constructor(pInfoLog, pErrorLog)
+	constructor()
 	{
-		// Wire in logging
-		this.logInfo = (typeof(pInfoLog) == 'function') ? pInfoLog : libSimpleLog;
-		this.logError = (typeof(pErrorLog) == 'function') ? pErrorLog : libSimpleLog;
 	}
 
 	// Check if an address exists.

package/source/Manyfest-ObjectAddress-DeleteValue.js

@@ -37,7 +37,7 @@ class ManyfestObjectAddressResolverDeleteValue
 	}
 
 	// TODO: Dry me
-	checkFilters(pAddress, pRecord)
+	checkRecordFilters(pAddress, pRecord)
 	{
 		return fParseConditionals(this, pAddress, pRecord);
 	}
@@ -151,7 +151,7 @@ class ManyfestObjectAddressResolverDeleteValue
 				for (let i = tmpInputArray.length - 1; i >= 0; i--)
 				{
 					// The filtering is complex but allows config-based metaprogramming directly from schema
-					let tmpKeepRecord = this.checkFilters(pAddress, tmpInputArray[i]);
+					let tmpKeepRecord = this.checkRecordFilters(pAddress, tmpInputArray[i]);
 					if (tmpKeepRecord)
 					{
 						// Delete elements end to beginning
@@ -319,7 +319,7 @@ class ManyfestObjectAddressResolverDeleteValue
 					let tmpValue = this.deleteValueAtAddress(pObject[tmpObjectPropertyName][tmpObjectPropertyKeys[i]], tmpNewAddress, tmpPropertyParentAddress);
 
 					// The filtering is complex but allows config-based metaprogramming directly from schema
-					let tmpKeepRecord = this.checkFilters(pAddress, tmpValue);
+					let tmpKeepRecord = this.checkRecordFilters(pAddress, tmpValue);
 					if (tmpKeepRecord)
 					{
 						tmpContainerObject[`${tmpPropertyParentAddress}.${tmpNewAddress}`] = tmpValue;

package/source/Manyfest-ObjectAddress-GetValue.js

@@ -36,7 +36,7 @@ class ManyfestObjectAddressResolverGetValue
 		this.cleanWrapCharacters = fCleanWrapCharacters;
 	}
 
-	checkFilters(pAddress, pRecord)
+	checkRecordFilters(pAddress, pRecord)
 	{
 		return fParseConditionals(this, pAddress, pRecord);
 	}
@@ -193,7 +193,7 @@ class ManyfestObjectAddressResolverGetValue
 				for (let i = 0; i < tmpInputArray.length; i++)
 				{
 					// The filtering is complex but allows config-based metaprogramming directly from schema
-					let tmpKeepRecord = this.checkFilters(pAddress, tmpInputArray[i]);
+					let tmpKeepRecord = this.checkRecordFilters(pAddress, tmpInputArray[i]);
 					if (tmpKeepRecord)
 					{
 						tmpOutputArray.push(tmpInputArray[i]);
@@ -366,7 +366,7 @@ class ManyfestObjectAddressResolverGetValue
 					let tmpValue = this.getValueAtAddress(pObject[tmpObjectPropertyName][tmpObjectPropertyKeys[i]], tmpNewAddress, tmpPropertyParentAddress, tmpRootObject);
 
 					// The filtering is complex but allows config-based metaprogramming directly from schema
-					let tmpKeepRecord = this.checkFilters(pAddress, tmpValue);
+					let tmpKeepRecord = this.checkRecordFilters(pAddress, tmpValue);
 					if (tmpKeepRecord)
 					{
 						tmpContainerObject[`${tmpPropertyParentAddress}.${tmpNewAddress}`] = tmpValue;

package/source/Manyfest-ParseConditionals.js

@@ -17,11 +17,61 @@ const _ConditionalStanzaStartLength = _ConditionalStanzaStart.length;
 const _ConditionalStanzaEnd = '?~>>';
 const _ConditionalStanzaEndLength = _ConditionalStanzaEnd.length;
 
+// Ugh dependency injection.  Can't wait to make these all fable services.
+let libObjectAddressCheckAddressExists = new (require('./Manyfest-ObjectAddress-CheckAddressExists.js'))();
+
 // Test the condition of a value in a record
 const testCondition = (pManyfest, pRecord, pSearchAddress, pSearchComparator, pValue) =>
 {
 	switch(pSearchComparator)
 	{
+		case 'TRUE':
+			return (pManyfest.getValueAtAddress(pRecord, pSearchAddress) === true);
+			break;
+		case 'FALSE':
+			return (pManyfest.getValueAtAddress(pRecord, pSearchAddress) === false);
+			break;
+		case 'LNGT':
+		case 'LENGTH_GREATER_THAN':
+			switch(typeof(typeof(pManyfest.getValueAtAddress(pRecord, pSearchAddress))))
+			{
+				case 'string':
+					return (pManyfest.getValueAtAddress(pRecord, pSearchAddress).length > pValue);
+					break;
+				case 'object':
+					return (pManyfest.getValueAtAddress(pRecord, pSearchAddress).length > pValue);
+					break;
+				default:
+					return false;
+					break;
+			}
+			break;
+		case 'LNLT':
+		case 'LENGTH_LESS_THAN':
+			switch(typeof(typeof(pManyfest.getValueAtAddress(pRecord, pSearchAddress))))
+			{
+				case 'string':
+					return (pManyfest.getValueAtAddress(pRecord, pSearchAddress).length < pValue);
+					break;
+				case 'object':
+					return (pManyfest.getValueAtAddress(pRecord, pSearchAddress).length < pValue);
+					break;
+				default:
+					return false;
+					break;
+			}
+			break;
+		case 'FALSE':
+			return (pManyfest.getValueAtAddress(pRecord, pSearchAddress) === false);
+			break;
+		case 'EX':
+		case 'EXISTS':
+			return libObjectAddressCheckAddressExists.checkAddressExists(pRecord, pSearchAddress);
+			break;
+		case 'DNEX':
+		case 'DOES_NOT_EXIST':
+			return !libObjectAddressCheckAddressExists.checkAddressExists(pRecord, pSearchAddress);
+			break;
 		case '!=':
 			return (pManyfest.getValueAtAddress(pRecord, pSearchAddress) != pValue);
 			break;
@@ -55,7 +105,6 @@ const parseConditionals = (pManyfest, pAddress, pRecord) =>
 		Algorithm is simple:
 
 		1.  Enuerate start points
-
 		2.  Find stop points within each start point
 		3. Check the conditional
 	*/
@@ -70,9 +119,22 @@ const parseConditionals = (pManyfest, pAddress, pRecord) =>
 		{
 			let tmpMagicComparisonPatternSet = pAddress.substring(tmpStartIndex+_ConditionalStanzaStartLength, tmpStopIndex).split(',');
 
+			// The address to search for
 			let tmpSearchAddress = tmpMagicComparisonPatternSet[0];
-			let tmpSearchComparator = tmpMagicComparisonPatternSet[1];
-			let tmpSearchValue = tmpMagicComparisonPatternSet[2];
+
+			// The copmparison expression (EXISTS as default)
+			let tmpSearchComparator = 'EXISTS';
+			if (tmpMagicComparisonPatternSet.length > 1)
+			{
+				tmpSearchComparator = tmpMagicComparisonPatternSet[1];				
+			}
+
+			// The value to search for
+			let tmpSearchValue = false;
+			if (tmpMagicComparisonPatternSet.length > 2)
+			{
+				tmpSearchValue = tmpMagicComparisonPatternSet[2];
+			}
 
 			// Process the piece
 			tmpKeepRecord = tmpKeepRecord && testCondition(pManyfest, pRecord, tmpSearchAddress, tmpSearchComparator, tmpSearchValue);

package/test/Data-Archive-org-Frankenberry.json

@@ -127,7 +127,8 @@
             "crc32": "d9e1b316",
             "sha1": "4dab42952fe0405a3b7f80146636b33d7b1bd01e",
             "format": "Item Tile",
-            "rotation": "0"
+            "rotation": "0",
+            "thumbnail": true
         },
         {
             "name": "frankerberry_countchockula_1971.0001.gif",
@@ -151,7 +152,8 @@
             "sha1": "41162dc2d1a91b618124c84628d0c231544a02be",
             "length": "31.14",
             "height": "480",
-            "width": "640"
+            "width": "640",
+            "thumbnail": false
         },
         {
             "name": "frankerberry_countchockula_1971.0001.mpg.idx",

package/test/Manyfest_Embedded_Solvers_tests.js

@@ -51,7 +51,55 @@ suite
 				)
 				test
 				(
-					'Magic filters should be magic.',
+					'Magic filters should be able to process non equality filters.',
+					(fTestComplete)=>
+					{
+						let _Manyfest = new libManyfest(
+							{
+								Scope:'Archive.org',
+								Descriptors:
+									{
+                                        'files[]<<~?length,EXISTS?~>>': {Name:'Files With a length Property', Hash:'FilesWithLength'},
+                                        'files[]<<~?length,DNEX?~>>': {Name:'Files Without a length Property', Hash:'FilesWithoutLength'},
+                                        'files[]<<~?length,DNEX?~>><<~?source,==,original?~>>': {Name:'Original Files With a length Property', Hash:'OriginalFilesWithLength'},
+										'files[]<<~?thumbnail,EXISTS?~>>': {Name:'Thumbnail Bit is Explicitly Set', Hash:'ThumbnailExplicitlySet'},
+										'files[]<<~?thumbnail,TRUE?~>>': {Name:'Thumbnail Files', Hash:'ThumbnailFiles'},
+										'files[]<<~?thumbnail,FALSE?~>>': {Name:'Not Thumbnail Files', Hash:'NotThumbnailFiles'}
+									}
+							});
+
+						// Grab magic filtered thumbnails
+						// Also, the "thumbnail" property was added to the data later ... it's not actually from archive.org but I wanted to test this feature.
+						let tmpThumbnailFiles = _Manyfest.getValueByHash(_SampleDataArchiveOrgFrankenberry, 'ThumbnailFiles');
+						Expect(tmpThumbnailFiles).to.be.an('array');
+						Expect(tmpThumbnailFiles.length).to.equal(1);
+
+						let tmpNotThumbnailFiles = _Manyfest.getValueByHash(_SampleDataArchiveOrgFrankenberry, 'NotThumbnailFiles');
+						Expect(tmpNotThumbnailFiles).to.be.an('array');
+						Expect(tmpNotThumbnailFiles.length).to.equal(1);
+
+						let tmpFilesWithLength = _Manyfest.getValueByHash(_SampleDataArchiveOrgFrankenberry, 'FilesWithLength');
+						Expect(tmpFilesWithLength).to.be.an('array');
+						Expect(tmpFilesWithLength.length).to.equal(3);
+
+						let tmpOGFilesWithLength = _Manyfest.getValueByHash(_SampleDataArchiveOrgFrankenberry, 'OriginalFilesWithLength');
+						Expect(tmpOGFilesWithLength).to.be.an('array');
+						Expect(tmpOGFilesWithLength.length).to.equal(2);
+
+						let tmpFilesWithoutLength = _Manyfest.getValueByHash(_SampleDataArchiveOrgFrankenberry, 'FilesWithoutLength');
+						Expect(tmpFilesWithoutLength).to.be.an('array');
+						Expect(tmpFilesWithoutLength.length).to.equal(14);
+
+						let tmpExplicitlyExists = _Manyfest.getValueByHash(_SampleDataArchiveOrgFrankenberry, 'ThumbnailExplicitlySet');
+						Expect(tmpExplicitlyExists).to.be.an('array');
+						Expect(tmpExplicitlyExists.length).to.equal(2);
+
+						fTestComplete();
+					}
+				);
+				test
+				(
+					'Magic filters should be magic and process equality filters.',
 					(fTestComplete)=>
 					{
 						let _Manyfest = new libManyfest(