express-freemarker - npm Package Compare versions

Comparing version 0.1.0 to 0.1.1

index.js

@@ -30,20 +30,29 @@ // libs/fmpp/bin/fmpp  test/template/index.ftl -D "tdd(../data.json)" -o test/index.html
       // args = [filename, "-D", "tdd(" + path.join( basedir, dataname) + ")", "-o", path.join(basedir, tname)];
-    var args = [filename, "-D", data, "-o", tname ];
+    var args = [filename, "-D", data, "-o", tname  ];
     var fmpp = spawn(path2fmpp, args, function(err, content){
-      console.log( content )
       if(err) throw err;
     })
-    // fmpp.stdout.on('data', function (data) {
-    //   console.log('stdout: ' + data);
-    // });
 
+    var errorMsg = "";
     fmpp.stderr.on('data', function (data) {
-      callback(data)
+      // console.log(data.toString(), 'error')
+      // callback(data.toString())
     });
+    // @TODO FIX.
+    fmpp.stdout.on('data', function (data) {
+      errorMsg += data.toString();
+      // callback(data.toString())
+    });
 
     fmpp.on('close', function (code) {
-      if(code !== 0) return;
-      fs.readFile(tname, 'utf8', function(err, content){
-        callback(err, content);
-        fs.unlink(tname);
+      if(~errorMsg.indexOf(">>> ABORTED! <<<") || code !== 0){
+        var isError = true;
+        callback(errorMsg || "uncatched freemarker parse Error occurs in " + filename)
+      }
+      fs.exists(tname, function(flag){
+        if(isError) return fs.unlink(tname, function(){});
+        fs.readFile(tname, 'utf8', function(err, content){
+          callback(err, content);
+          fs.unlink(tname, function(){});
+        })
       })
@@ -50,0 +59,0 @@ });

package.json

 {
   "name": "express-freemarker",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "",
@@ -5,0 +5,0 @@ "main": "index.js",

test/index.js

@@ -8,3 +8,2 @@ var fmpp = require("../");
 render( path.join(__dirname, 'template/index.ftl'), {
-  name: 'zhenghaibo',
   flowers: [
@@ -15,3 +14,4 @@ ["zhenghaibo", 'hello' ,100],
 }, function(err, content){
-  console.log(content)
+  if(err) return console.log(err)
+  else console.log(content)
 })

No alert changes

Improved metrics

Lines of code

76

increased by13.43%

Worsened metrics

Total package byte prevSize

1927239

decreased by-1.68%

Number of package files

20

decreased by-4.76%

No dependency changes