react 0.6.1 → 0.7.1

package/lib/track-tasks.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -6,7 +5,8 @@ if (typeof define !== 'function') {
 }
 
 define([], function () {
-  
+  'use strict';
+
   /**
      Track the tasks, start, complete, args, results, elapsed time
      Emits events that can be monitored
@@ -69,6 +69,6 @@ define([], function () {
 
   }
 
-  return trackTasks; 
+  return trackTasks;
 
-});  
+});

package/lib/validate.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -6,8 +5,9 @@ if (typeof define !== 'function') {
 }
 
 define(['util', './sprintf', 'ensure-array', './task'], function (util, sprintf, array, taskUtil) {
+  'use strict';
   /*jshint latedef:false */
-  
+
   var AST_IS_OBJECT = 'ast must be an object with inParams, tasks, and outTask';
   var INPARAMS_ARR_STR = 'ast.inParams must be an array of strings';
   var TASKS_ARR = 'ast.tasks must be an array of tasks';
@@ -17,7 +17,7 @@ define(['util', './sprintf', 'ensure-array', './task'], function (util, sprintf,
   var MISSING_INPUTS = 'missing or mispelled variable referenced in flow definition: %s';
 
   // match any of our literals true, false, int, float, quoted strings, or is property (has dot), match vcon.js
-  var LITERAL_OR_PROP_RE = /^(true|false|this|null|\-?[0-9\.]+)$|'|"|\./i;  
+  var LITERAL_OR_PROP_RE = /^(true|false|this|null|\-?[0-9\.]+)$|'|"|\./i;
 
   function format_error(errmsg, obj) {
     return sprintf('%s - %s', errmsg, util.inspect(obj));
@@ -73,11 +73,11 @@ define(['util', './sprintf', 'ensure-array', './task'], function (util, sprintf,
     tasks.forEach(function (t) {
       errors = errors.concat(taskUtil.validate(t));
     });
-      return errors;
+    return errors;
   }
 
   function validateTaskNamesUnique(tasks) {
-      if (!Array.isArray(tasks)) return [];
+    if (!Array.isArray(tasks)) return [];
     var errors = [];
     var namedTasks = tasks.filter(function (t) { return (t.name); });
     var names = namedTasks.map(function (t) { return t.name; });
@@ -85,7 +85,7 @@ define(['util', './sprintf', 'ensure-array', './task'], function (util, sprintf,
       if (accum[name]) errors.push(sprintf('%s %s', NAMES_UNIQUE, name));
       else accum[name] = true;
       return accum;
-    }, {});                             
+    }, {});
     return errors;
   }
 
@@ -151,9 +151,9 @@ define(['util', './sprintf', 'ensure-array', './task'], function (util, sprintf,
       if (!isLiteralOrProp(p) && !names[p]) accum.push(sprintf(MISSING_INPUTS, p)); // add error if missing
       return accum;
     }, errors);
-    return errors;  
+    return errors;
   }
 
   return validate;
 
-});  
+});

package/lib/vcon.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -6,7 +5,8 @@ if (typeof define !== 'function') {
 }
 
 define([], function () {
-  
+  'use strict';
+
   var LAST_RESULTS_KEY = ':LAST_RESULTS';
 
   function VContext() {
@@ -29,10 +29,23 @@ define([], function () {
     var m = /^("|')([^\1]*)\1$/.exec(name);  //check for quoted string " or '
     if (m) return m[2]; // if is quoted str, return inside of the quotes
     var nameAndProps = name.split('.');
-    return nameAndProps.reduce(function (accObj, prop) {
+    var result = this.resolveNameArr(nameAndProps);
+    return result;
+  };
+
+  VContext.prototype.resolveNameArr = function (nameAndProps) {
+    var vConValues = this.values;
+    var result = nameAndProps.reduce(function (accObj, prop) {
       if (accObj === undefined || accObj === null) return undefined; // prevent exception
       return accObj[prop];
     }, vConValues);   // vCon['foo']['bar']
+    if (result === undefined && this.global !== undefined) { // see if matches any global
+      result = nameAndProps.reduce(function (accObj, prop) {
+        if (accObj === undefined || accObj === null) return undefined; // prevent exception
+        return accObj[prop];
+      }, this.global);   // global['foo']['bar']
+    }
+    return result;
   };
 
   /**
@@ -62,7 +75,7 @@ define([], function () {
     }, vConValues);   // vCon['foo']['bar']
     obj[lastProp] = value;
   };
-  
+
 
   /**
      Create Variable Context using arguments passed in.
@@ -72,6 +85,7 @@ define([], function () {
        @param self used to pass 'this' context in
   */
   VContext.create = function (args, inParams, locals, self) {
+    /*jshint validthis:true, evil:true */
     var initValues = {};
     if (self) initValues['this'] = self;
     if (locals) Object.keys(locals).forEach(function (k) { initValues[k] = locals[k]; }); // copy over keys
@@ -81,10 +95,19 @@ define([], function () {
       if (param) vcon[param] = (x !== undefined) ? x : null; // upgrade undefined to null
       return vcon;
     }, initValues);
+
+    // add in global
+    if (typeof global === 'object') { // node.js and modern browsers expose global
+      vContext.global = global;
+    } else { // try to access this using Function eval of this
+      // http://stackoverflow.com/questions/3277182/how-to-get-the-global-object-in-javascript
+      vContext.global = new Function('return this')();
+    }
+
     return vContext;
   };
 
 
   return VContext;
 
-});  
+});

package/lib/when-task.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -6,7 +5,8 @@ if (typeof define !== 'function') {
 }
 
 define(['util', './sprintf', './base-task'], function (util, sprintf, BaseTask) {
-  
+  'use strict';
+
   /**
      When task which checks if is a promise (has a then method)
      and waits for it to resolve.
@@ -30,19 +30,18 @@ define(['util', './sprintf', './base-task'], function (util, sprintf, BaseTask)
   WhenTask.prototype = new BaseTask();
   WhenTask.prototype.constructor = WhenTask;
 
-  WhenTask.prototype.f = function when() { // just here to keep validations happy 
-  }
+  WhenTask.prototype.f = function when() { }; // just here to keep validations happy
 
   WhenTask.validate = function (taskDef) {
     var errors = [];
     if (!taskDef.a || !taskDef.out) {
       errors.push(format_error(REQ, taskDef));
     } else {
-      if (! (Array.isArray(taskDef.a) && taskDef.a.length === 1 && 
+      if (! (Array.isArray(taskDef.a) && taskDef.a.length === 1 &&
              taskDef.a.every(function (x) { return (typeof(x) === 'string'); }))) {
         errors.push(format_error(A_REQ, taskDef));
       }
-      if (! (Array.isArray(taskDef.out) && taskDef.out.length <= 1 && 
+      if (! (Array.isArray(taskDef.out) && taskDef.out.length <= 1 &&
              taskDef.out.every(function (x) { return (typeof(x) === 'string'); }))) {
         errors.push(format_error(OUT_REQ, taskDef));
       }
@@ -77,9 +76,9 @@ define(['util', './sprintf', './base-task'], function (util, sprintf, BaseTask)
       }
     } catch (err) { //catch and handle the task error, calling final cb
       handleError(this, err);
-    } 
+    }
   };
 
   return WhenTask;
 
-});  
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react",
   "description": "React is a javascript module implementing a lightweight rules engine to make it easier to work with asynchronous code, by reducing boilerplate code and improving error and exception handling while allowing variable and task dependencies when defining flow.",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "author": "Jeff Barczewski <jeff.barczewski@gmail.com>",
   "repository": { "type": "git", "url": "http://github.com/jeffbski/react.git" },
   "bugs" : { "url": "http://github.com/jeffbski/react/issues" },
@@ -9,17 +9,27 @@
   "main": "lib/react",
   "engines": { "node": ">=0.6" },
   "dependencies": {
-    "amdefine": "~0.0.2",
-    "eventemitter2": "~0.4.1",
+    "amdefine": "~0.0.5",
+    "eventemitter2": "~0.4.11",
     "ensure-array": "~0.0.5"
   },
   "devDependencies": {
-    "requirejs": "~1.0.7",
-    "mocha": "~0.14.1",
-    "chai": "~0.5.2",
-    "jake": "~0.2.31",
+    "requirejs": "~2.1.6",
+    "mocha": "~1.10.0",
+    "chai": "~1.6.0",
+    "jake": "~0.5.15",
     "Deferred" : "~0.1.1"
   },
+  "keywords": [
+    "flow",
+    "flow control",
+    "control flow",
+    "dataflow",
+    "reactive",
+    "deferred",
+    "promise",
+    "async"
+  ],
   "scripts": {
     "test": "./node_modules/mocha/bin/mocha ./test/*.mocha.js"
   }

package/test/ast.mocha.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global react:true */
 
 if (typeof(chai) === 'undefined') {
@@ -10,6 +9,7 @@ if (typeof(react) === 'undefined') {
 }
 
 (function () {
+  'use strict';
 
   var t = chai.assert;
 
@@ -57,7 +57,7 @@ if (typeof(react) === 'undefined') {
     var fn = react();
     var collector = react.createEventCollector();
     collector.capture(fn, 'ast.*');
-    
+
     var errors = fn.setAndValidateAST({
       inParams: ['res', 'prefstr', 'poststr'],
       tasks: [
@@ -80,7 +80,7 @@ if (typeof(react) === 'undefined') {
 
   test('ast.defined event is passed to process', function (done) {
     // browser might not have this, so only if process is an eventemitter
-    if (process && process.once) {
+    if (typeof process !== 'undefined' && process && process.once) {
       var fn = react();
       process.once('ast.defined', function (ast) {
         t.isObject(ast);
@@ -99,7 +99,7 @@ if (typeof(react) === 'undefined') {
           { f: postfix, a: ['plres', 'poststr'], out: ['plresp'] }
         ],
         outTask: { a: ['plresp'] }
-      });      
+      });
     } else {
       done(); //skipping in browser
     }

package/test/cb-task.mocha.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global react:true CbTask:true VContext:true */
 
 if (typeof(chai) === 'undefined') {
@@ -18,6 +17,7 @@ if (typeof(VContext) === 'undefined') {
 }
 
 (function () {
+  'use strict';
 
   var t = chai.assert;
 
@@ -66,7 +66,7 @@ if (typeof(VContext) === 'undefined') {
     t.equal(task.isReady(vCon, tasksByName), false);
     task.status = null;
     t.equal(task.isReady(vCon, tasksByName), true);
-    done();  
+    done();
   });
 
   test('no args defined, no after -> not ready', function (done) {
@@ -82,39 +82,39 @@ if (typeof(VContext) === 'undefined') {
     var vCon = VContext.create([1, {}], ['b', 'c']);
     var tasksByName = { foo: task };
     t.equal(task.isReady(vCon, tasksByName), false);
-    done();  
+    done();
   });
 
   test('all args defined, no after, out no obj parent -> NOT ready', function (done) {
     var task = new CbTask({ type: 'cb', f: foo, a: ['b', 'c'], out: ['d.e'] });
     var vCon = VContext.create([1, null], ['b', 'c']);
     var tasksByName = { foo: task };
-    t.equal(task.isReady(vCon, tasksByName), false, 'false if out objparent undef');  
-    done();  
+    t.equal(task.isReady(vCon, tasksByName), false, 'false if out objparent undef');
+    done();
   });
 
   test('all args defined, no after, out no obj.par.par -> NOT ready', function (done) {
     var task = new CbTask({ type: 'cb', f: foo, a: ['b', 'c'], out: ['c.e.f'] });
     var vCon = VContext.create([1, { }], ['b', 'c']);
     var tasksByName = { foo: task };
-    t.equal(task.isReady(vCon, tasksByName), false, 'false if out objparent undef');  
-    done();  
+    t.equal(task.isReady(vCon, tasksByName), false, 'false if out objparent undef');
+    done();
   });
 
   test('all args defined, no after, out null obj parent -> NOT ready', function (done) {
     var task = new CbTask({ type: 'cb', f: foo, a: ['b', 'c'], out: ['c.e'] });
     var vCon = VContext.create([1, null], ['b', 'c']);
     var tasksByName = { foo: task };
-    t.equal(task.isReady(vCon, tasksByName), false, 'false if out objparent null');  
-    done();  
+    t.equal(task.isReady(vCon, tasksByName), false, 'false if out objparent null');
+    done();
   });
 
   test('all args defined, no after, out null obj.par.par -> NOT ready', function (done) {
     var task = new CbTask({ type: 'cb', f: foo, a: ['b', 'c'], out: ['c.e.f'] });
     var vCon = VContext.create([1, { e: null }], ['b', 'c']);
     var tasksByName = { foo: task };
-    t.equal(task.isReady(vCon, tasksByName), false, 'false if out objparent null');  
-    done();  
+    t.equal(task.isReady(vCon, tasksByName), false, 'false if out objparent null');
+    done();
   });
 
   test('all args defined, no after -> ready', function (done) {
@@ -122,7 +122,7 @@ if (typeof(VContext) === 'undefined') {
     var vCon = VContext.create([1, null], ['b', 'c']);
     var tasksByName = { foo: task };
     t.equal(task.isReady(vCon, tasksByName), true);
-    done();  
+    done();
   });
 
   test('all args defined, objprop null, no after -> ready', function (done) {
@@ -130,7 +130,7 @@ if (typeof(VContext) === 'undefined') {
     var vCon = VContext.create([1, { prop: null }], ['b', 'c']);
     var tasksByName = { foo: task };
     t.equal(task.isReady(vCon, tasksByName), true);
-    done();  
+    done();
   });
 
   test('all args defined, after not complete -> NOT ready', function (done) {
@@ -140,8 +140,8 @@ if (typeof(VContext) === 'undefined') {
       { type: 'cb', f: foo, a: ['b', 'c'], out: [], after: ['cat', 'bar']});
     var vCon = VContext.create([1, 2], ['b', 'c']);
     var tasksByName = { foo: task, bar: tbar, cat: tcat };
-    t.equal(task.isReady(vCon, tasksByName), false);  
-    done();  
+    t.equal(task.isReady(vCon, tasksByName), false);
+    done();
   });
 
   test('all args defined, after all complete -> ready', function (done) {
@@ -151,8 +151,8 @@ if (typeof(VContext) === 'undefined') {
       { type: 'cb', f: foo, a: ['b', 'c'], out: [], after: ['cat', 'bar']});
     var vCon = VContext.create([1, 2], ['b', 'c']);
     var tasksByName = { foo: task, bar: tbar, cat: tcat };
-    t.equal(task.isReady(vCon, tasksByName), true);  
-    done();  
+    t.equal(task.isReady(vCon, tasksByName), true);
+    done();
   });
 
   test('string without . is not method call', function (done) {

package/test/core-deferred.mocha.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global react:true Deferred:true */
 
 if (typeof(chai) === 'undefined') {
@@ -14,6 +13,7 @@ if (typeof(Deferred) === 'undefined') {
 }
 
 (function () {
+  'use strict';
 
   var t = chai.assert;
 
@@ -55,7 +55,7 @@ if (typeof(Deferred) === 'undefined') {
     var fn = react();
     var errors = fn.setAndValidateAST({
       inParams: ['a', 'b'],
-      tasks: [    
+      tasks: [
         { f: multiply, a: ['a', 'b'], out: ['c'], type: 'promise' },
         { f: add, a: ['c', 'b'], out: ['d'], type: 'promise' }
       ],
@@ -69,7 +69,7 @@ if (typeof(Deferred) === 'undefined') {
       t.equal(d, 9);
       done();
     });
-  });  
+  });
 
   test('using "this" in a cb function', function (done) {
     function getA(cb) {
@@ -81,11 +81,11 @@ if (typeof(Deferred) === 'undefined') {
       }, 10);
       return deferred.promise();
     }
-    
+
     var fn = react();
     var errors = fn.setAndValidateAST({
       inParams: [],
-      tasks: [    
+      tasks: [
         { f: getA, a: [], out: ['a'], type: 'promise' }
       ],
       outTask: { a: ['a'] }
@@ -108,7 +108,7 @@ if (typeof(Deferred) === 'undefined') {
     var fn = react();
     var errors = fn.setAndValidateAST({
       inParams: ['a', 'b'],
-      tasks: [    
+      tasks: [
         { f: badFunc, a: ['a', 'b'], out: ['c'], type: 'promise' },
         { f: add, a: ['c', 'b'], out: ['d'], type: 'promise' }
       ],
@@ -126,7 +126,7 @@ if (typeof(Deferred) === 'undefined') {
     var fn = react();
     var errors = fn.setAndValidateAST({
       inParams: ['a', 'b'],
-      tasks: [    
+      tasks: [
         { f: badF2, a: ['a', 'b'], out: ['c'], type: 'promise' },
         { f: add, a: ['c', 'b'], out: ['d'], type: 'promise' }
       ],
@@ -140,4 +140,4 @@ if (typeof(Deferred) === 'undefined') {
     });
   });
 
-}());  
+}());