react 0.2.1 → 0.2.2

package/examples/default-events1.js

@@ -24,7 +24,7 @@ function markdown(filedata) { return 'html'+filedata; }
 function prepareDirectory(outDirname, cb){ setTimeout(cb, 200, null, 'dircreated-'+outDirname); }
 function writeOutput(html, user, cb){  setTimeout(cb, 300, null, html+'_bytesWritten'); }
 function loadEmailTemplate(cb) { setTimeout(cb, 50, null, 'emailmd'); }
-function customizeEmail(user, emailHtml, cb) { return 'cust-'+user+emailHtml; }
+function customizeEmail(user, emailHtml) { return 'cust-'+user+emailHtml; }
 function deliverEmail(custEmailHtml, cb) { setTimeout(cb, 100, null, 'delivered-'+custEmailHtml); }
 
 function useHtml(err, html, user, bytesWritten) {
@@ -43,9 +43,9 @@ var loadAndSave = react('loadAndSave', 'filename, uid, outDirname, cb -> err, ht
   writeOutput,      'html, user, cb   -> err, bytesWritten', { after: prepareDirectory },  // only after prepareDirectory done
   loadEmailTemplate, 'cb              -> err, emailmd',
   markdown,         'emailmd          -> emailHtml',   // using a sync function
-  customizeEmail,   'user, emailHtml, cb -> err, custEmailHtml',
+  customizeEmail,   'user, emailHtml  -> err, custEmailHtml', // sync fn
   deliverEmail,     'custEmailHtml, cb -> err, deliveredEmail', { after: writeOutput }  // only after writeOutput is done
-); 
+);
 
 loadAndSave('file.md', 100, '/tmp/foo', useHtml);  // executing the flow
 

package/examples/default1.js

@@ -9,12 +9,13 @@ function markdown(filedata) { return 'html'+filedata; }
 function prepareDirectory(outDirname, cb){ setTimeout(cb, 200, null, 'dircreated-'+outDirname); }
 function writeOutput(html, user, cb){  setTimeout(cb, 300, null, html+'_bytesWritten'); }
 function loadEmailTemplate(cb) { setTimeout(cb, 50, null, 'emailmd'); }
-function customizeEmail(user, emailHtml, cb) { return 'cust-'+user+emailHtml; }
+function customizeEmail(user, emailHtml) { return 'cust-'+user+emailHtml; }
 function deliverEmail(custEmailHtml, cb) { setTimeout(cb, 100, null, 'delivered-'+custEmailHtml); }
 
 function useHtml(err, html, user, bytesWritten) {
   if (err) {
     console.log('***Error: %s', err);
+    console.error(err.stack);
     return;
   }
   console.log('final result: %s, user: %s, written:%s', html, user, bytesWritten);
@@ -22,15 +23,15 @@ function useHtml(err, html, user, bytesWritten) {
 
 // define fn, glue together with react, it will parallelize
 // starts with name and in/out params, then the tasks
-var loadAndSave = react('loadAndSave', 'fName, uid, outDir, cb -> err, html, user, bytes',  
+var loadAndSave = react('loadAndSave', 'filename, uid, outDir, cb -> err, html, user, bytes',  
   loadUser,         'uid, cb          -> err, user',     // calling async loadUser with uid, cb called with err and user
   loadFile,         'filename, cb     -> err, filedata',
   markdown,         'filedata         -> html',    // using a sync function
-  prepareDirectory, 'outDirname, cb   -> err, dircreated',
-  writeOutput,      'html, user, cb   -> err, bytesWritten', { after: prepareDirectory },  // only after prepareDirectory done
+  prepareDirectory, 'outDir, cb   -> err, dircreated',
+  writeOutput,      'html, user, cb   -> err, bytes', { after: prepareDirectory },  // only after prepareDirectory done
   loadEmailTemplate, 'cb              -> err, emailmd',
   markdown,         'emailmd          -> emailHtml',   // using a sync function
-  customizeEmail,   'user, emailHtml, cb  -> custEmailHtml',
+  customizeEmail,   'user, emailHtml  -> custEmailHtml',  // sync function
   deliverEmail,     'custEmailHtml, cb    -> err, deliveredEmail', { after: writeOutput }  // only after writeOutput is done
 );
 

package/lib/error.js

@@ -9,19 +9,29 @@ function ensureStackTraceLimitSet(stackTraceLimit) {
 }
 
 function fName(fn) {
-  return (typeof(fn) === 'string') ? fn : fn.name;
+  if (!fn) return 'undefined';
+  return (fn && fn.name) ? fn.name : fn;
 }
 
 function formatErrorMeta(err) {
   if (!err.meta) return;
   var vcon = err.meta.vcon;
   var task = err.meta.task;
-  return '\n\n' +
-      'Error occurs in Task function: ' + fName(task.f) + '(' + task.a.join(',') + ')\n\n' + 
-      'Variable Context: \n' +
-      util.inspect(vcon) + '\n\n' +
-      'Task Source:\n\n' +
-      task.f.toString() + '\n\n'; //TODO need to pretty print function, gets collapsed
+  var errString = '\n\n';
+  if (task && task.f && task.a) {
+    errString += ('Error occurs in Task function: ' + fName(task.f) + '(' + task.a.join(',') + ')\n\n');
+  }
+  if (vcon) {
+    errString += 'Variable Context: \n';
+    errString += util.inspect(vcon);
+    errString +=  '\n\n';
+  }
+  if (task && task.f) {
+    errString += 'Task Source:\n\n';
+    errString += task.f.toString(); //TODO need to pretty print function, gets collapsed
+    errString += '\n\n';
+  }
+  return errString;    
 }
 
 function augmentError(err, meta) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react",
   "description": "React is a javascript module 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.2.1",
+  "version": "0.2.2",
   "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" },

package/test/dsl.test.js

@@ -214,7 +214,35 @@ test('not enough args throws error', function (t) {
   t.end();  
 });
 
-
+test('long example', function (t) {
+  t.plan(4);
+  function loadUser(uid, cb){ setTimeout(cb, 100, null, "User"+uid); }
+  function loadFile(filename, cb){ setTimeout(cb, 100, null, 'Filedata'+filename); }
+  function markdown(filedata) { return 'html'+filedata; }
+  function prepareDirectory(outDirname, cb){ setTimeout(cb, 200, null, 'dircreated-'+outDirname); }
+  function writeOutput(html, user, cb){  setTimeout(cb, 300, null, html+'_bytesWritten'); }
+  function loadEmailTemplate(cb) { setTimeout(cb, 50, null, 'emailmd'); }
+  function customizeEmail(user, emailHtml) { return 'cust-'+user+emailHtml; }
+  function deliverEmail(custEmailHtml, cb) { setTimeout(cb, 100, null, 'delivered-'+custEmailHtml); }
+  var loadAndSave = react('loadAndSave', 'filename, uid, outDirname, cb -> err, html, user, bytesWritten',  // name, in/out params
+    loadUser,         'uid, cb          -> err, user',     // calling async fn loadUser with uid, callback is called with err and user
+    loadFile,         'filename, cb     -> err, filedata',
+    markdown,         'filedata         -> html',    // using a sync function
+    prepareDirectory, 'outDirname, cb   -> err, dircreated',
+    writeOutput,      'html, user, cb   -> err, bytesWritten', { after: prepareDirectory },  // only after prepareDirectory done
+    loadEmailTemplate, 'cb              -> err, emailmd',
+    markdown,         'emailmd          -> emailHtml',   // using a sync function
+    customizeEmail,   'user, emailHtml  -> custEmailHtml',
+    deliverEmail,     'custEmailHtml, cb -> err, deliveredEmail', { after: writeOutput }  // only after writeOutput is done
+  );
+  loadAndSave('file.md', 100, '/tmp/foo', function (err, html, user, bytesWritten) {  // executing the flow
+    t.equal(err, null);
+    t.equal(html, 'htmlFiledatafile.md');
+    t.equal(user, 'User100');
+    t.equal(bytesWritten, 'htmlFiledatafile.md_bytesWritten');
+    t.end();
+  });
+});
 
 // selectFirst