Merge pull request #14 from manifoldjs/v0.1.2

Release v0.1.2

Author: Esteban Lopez

lib/constants.js

@@ -40,6 +40,7 @@ module.exports = {
   BASE_MANIFEST_FORMAT: 'w3c',
   CHROME_MANIFEST_FORMAT: 'chromeos',
   FIREFOX_MANIFEST_FORMAT: 'firefox',
-  WINDOWS10_MANIFEST_FORMAT: 'windows10',    
+  WINDOWS10_MANIFEST_FORMAT: 'windows10',
+  EDGE_EXTENSION_FORMAT: 'edgeextension',
   validation: validationConstants
 };

lib/manifestTools/manifestValidator.js

@@ -112,15 +112,18 @@ function runValidationRules(w3cManifestInfo, rules, callback) {
 function applyValidationRules(w3cManifestInfo, platformModules, platforms) {
 
   var allResults = [];
-  
-  // load and run validation rules for "all platforms"
-  var validationRulesDir = path.join(__dirname, 'validationRules');
-  return loadValidationRules(validationRulesDir).then(function (rules) {
-    return runValidationRules(w3cManifestInfo, rules).then(function (results) {
-      allResults.push.apply(allResults, results);
+
+  function validateAllPlatforms() {
+    // load and run validation rules for "all platforms"
+    var validationRulesDir = path.join(__dirname, 'validationRules');
+    return loadValidationRules(validationRulesDir).then(function (rules) {
+      return runValidationRules(w3cManifestInfo, rules).then(function (results) {
+        allResults.push.apply(allResults, results);
+      });
     });
-  })
-  .then(function () {
+  }
+
+  function validatePlatform() {
     // run platform-specific validation rules 
     var platformTasks = platformModules.map(function (platform) {
       return platform.getValidationRules(platforms).then(function (rules) {
@@ -131,8 +134,17 @@ function applyValidationRules(w3cManifestInfo, platformModules, platforms) {
     });
 
     return Q.allSettled(platformTasks);
-  })
-  .thenResolve(allResults);  
+  }
+  
+  // Don't run the "All Platform" validattion for Edge Extensions since they are not w3c compliant
+  if (platforms.length === 1 && platforms[0] === constants.EDGE_EXTENSION_FORMAT) {
+    return validatePlatform()
+      .thenResolve(allResults);
+  } else {
+    return validateAllPlatforms()
+      .then(validatePlatform)
+      .thenResolve(allResults);
+  } 
 }
 
 function validateManifest(w3cManifestInfo, platforms, callback) {

lib/manifestTools/transformations/edgeextension.js

@@ -0,0 +1,43 @@
+'use strict';
+
+function convertToBase (manifestInfo, callback) {
+  if (!manifestInfo || !manifestInfo.content) {
+    return callback(new Error('Manifest content is empty or not initialized.'));
+  }
+
+  return callback(undefined, manifestInfo);
+}
+
+function convertFromBase (manifestInfo, callback) {
+  if (!manifestInfo || !manifestInfo.content) {
+    return callback(new Error('Manifest content is empty or not initialized.'));
+  }
+
+  return callback(undefined, manifestInfo);
+}
+
+var validRootProperties = ['name', 'author', 'version', 'default_locale', 'description', 'manifest_version', 'icons', 'content_security_policy',
+                           'browser_action', 'page_action', 'background', 'commands', 'content_scripts', 'externally_connectable', 'homepage_url',
+                           'addressbar', 'options_page', 'permissions', 'optional_permissions', 'web_accessible_resources', 'minimum_edge_version',
+                           'key', '-ms-preload'];
+
+function matchFormat (manifestObj) {
+  var lowercasePropName;
+
+  for (var prop in manifestObj) {
+    if (manifestObj.hasOwnProperty(prop)) {
+      lowercasePropName = prop.toLowerCase();
+      if (validRootProperties.indexOf(lowercasePropName) === -1 && lowercasePropName.indexOf('_') <= 0) {
+        return false;
+      }
+    }
+  }
+
+  return true;
+}
+
+module.exports = {
+  convertToBase: convertToBase,
+  convertFromBase: convertFromBase,
+  matchFormat: matchFormat
+};

lib/packageTools.js

@@ -63,14 +63,22 @@ function downloadFile (inputUri, callback) {
 
 // returns package information (package.json) given a package name 
 function getPackageInformation (packageName) {
-  
+
   try {
     var packagePath = path.dirname(require.main.filename);
+    var modulesPath = path.join(packagePath, node_modules);
+
+    try { fs.statSync(modulesPath).isDirectory(); }
+    catch (er) { 
+      modulesPath = path.resolve(packagePath, '..');  
+    }
+
     if (packageName) {
-      packagePath = path.join(packagePath, node_modules, packageName);      
+      packagePath = path.join(modulesPath, packageName);      
     }
-    
+
     packagePath = path.join(packagePath, packageJson);
+
     return require(packagePath);  
   }
   catch (err) {

lib/utils.js

@@ -67,7 +67,7 @@ function sanitizeName (name) {
   while (currentLength > sanitizedName.length);
 
   if (sanitizedName.length === 0) {
-    sanitizedName = 'MyManifoldJSApp';
+    sanitizedName = 'myManifoldJSApp';
   }
 
   return sanitizedName;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "manifoldjs-lib",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "ManifoldJS Core Library",
   "repository": {
     "type": "git",

test/common/utils.js

@@ -214,7 +214,7 @@ describe('utils', function () {
       var inputValue = '111.222.333';
       var result = utils.sanitizeName(inputValue);
       /*jshint -W030 */
-      result.should.be.exactly('MyManifoldJSApp');
+      result.should.be.exactly('myManifoldJSApp');
     });    
   });
 });