fixed username checking in localstorage, updated jio.js and complex_queries.js

complex_queries.js

@@ -1363,6 +1363,9 @@ SimpleQuery.prototype.match = function (item, wildcard_character) {
     object_value = item[key];
     value = this.value;
   }
+  if (object_value === undefined || value === undefined) {
+    return RSVP.resolve(false);
+  }
   return matchMethod(object_value, value, wildcard_character);
 };
 
@@ -1406,15 +1409,6 @@ SimpleQuery.prototype["="] = function (object_value, comparison_value,
     if (typeof value === 'object' && value.hasOwnProperty('content')) {
       value = value.content;
     }
-    if (comparison_value === undefined) {
-      if (value === undefined) {
-        return RSVP.resolve(true);
-      }
-      return RSVP.resolve(false);
-    }
-    if (value === undefined) {
-      return RSVP.resolve(false);
-    }
     if (value.cmp !== undefined) {
       return RSVP.resolve(value.cmp(comparison_value,
                                     wildcard_character) === 0);
@@ -1451,15 +1445,6 @@ SimpleQuery.prototype["!="] = function (object_value, comparison_value,
     if (typeof value === 'object' && value.hasOwnProperty('content')) {
       value = value.content;
     }
-    if (comparison_value === undefined) {
-      if (value === undefined) {
-        return RSVP.resolve(false);
-      }
-      return RSVP.resolve(true);
-    }
-    if (value === undefined) {
-      return RSVP.resolve(true);
-    }
     if (value.cmp !== undefined) {
       return RSVP.resolve(value.cmp(comparison_value,
                                     wildcard_character) !== 0);
@@ -1493,9 +1478,6 @@ SimpleQuery.prototype["<"] = function (object_value, comparison_value) {
   if (typeof value === 'object' && value.hasOwnProperty('content')) {
     value = value.content;
   }
-  if (value === undefined || comparison_value === undefined) {
-    return RSVP.resolve(false);
-  }
   if (value.cmp !== undefined) {
     return RSVP.resolve(value.cmp(comparison_value) < 0);
   }
@@ -1520,9 +1502,6 @@ SimpleQuery.prototype["<="] = function (object_value, comparison_value) {
   if (typeof value === 'object' && value.hasOwnProperty('content')) {
     value = value.content;
   }
-  if (value === undefined || comparison_value === undefined) {
-    return RSVP.resolve(false);
-  }
   if (value.cmp !== undefined) {
     return RSVP.resolve(value.cmp(comparison_value) <= 0);
   }
@@ -1547,9 +1526,6 @@ SimpleQuery.prototype[">"] = function (object_value, comparison_value) {
   if (typeof value === 'object' && value.hasOwnProperty('content')) {
     value = value.content;
   }
-  if (value === undefined || comparison_value === undefined) {
-    return RSVP.resolve(false);
-  }
   if (value.cmp !== undefined) {
     return RSVP.resolve(value.cmp(comparison_value) > 0);
   }
@@ -1574,9 +1550,6 @@ SimpleQuery.prototype[">="] = function (object_value, comparison_value) {
   if (typeof value === 'object' && value.hasOwnProperty('content')) {
     value = value.content;
   }
-  if (value === undefined || comparison_value === undefined) {
-    return RSVP.resolve(false);
-  }
   if (value.cmp !== undefined) {
     return RSVP.resolve(value.cmp(comparison_value) >= 0);
   }

jio.js

@@ -2366,8 +2366,6 @@ function enableJobChecker(jio, shared, options) {
   // emits 'job:modified', 'job:start', 'job:resolved',
   // 'job:end', 'job:reject' events
 
-  var i;
-
   shared.job_rule_action_names = [undefined, "ok", "wait", "update", "deny"];
 
   shared.job_rule_actions = {
@@ -2549,6 +2547,8 @@ function enableJobChecker(jio, shared, options) {
     }
   }
 
+  var index;
+
   if (options.job_management !== false) {
 
     shared.job_rules = [{
@@ -2588,8 +2588,8 @@ function enableJobChecker(jio, shared, options) {
     }
 
     if (Array.isArray(options.job_rules)) {
-      for (i = 0; i < options.job_rules.length; i += 1) {
-        addJobRule(deepClone(options.job_rules[i]));
+      for (index = 0; index < options.job_rules.length; index += 1) {
+        addJobRule(deepClone(options.job_rules[index]));
       }
     }
 

src/jio.storage/localstorage.js

@@ -124,9 +124,8 @@
    * @constructor
    */
   function LocalStorage(spec) {
-    if (typeof spec.username !== 'string' && !spec.username) {
-      throw new TypeError("LocalStorage 'username' must be a string " +
-                          "which contains more than one character.");
+    if (typeof spec.username !== 'string' || spec.username === '') {
+      throw new TypeError("LocalStorage 'username' must be a non-empty string");
     }
     this._localpath = 'jio/localstorage/' + spec.username + '/' + (
       spec.application_name === null || spec.application_name ===