Merge pull request #27 from shaoshuai0102/master

null 变量处理问题

Author: fengmk2

lib/engine/engine-ref.js

@@ -28,7 +28,7 @@ module.exports = {
     if (objr.stats !== STATS.SUCCESS) return objr
 
     var v = objr.value
-    if (v === undefined) {
+    if (v === undefined || v === null) {
       var result = {
         stats: STATS.SUCCESS,
         value: v,
@@ -232,5 +232,3 @@ function extractProp(v) {
   v = v.replace(/^(get|set|is)/, '')
   return v[0].toLowerCase() + v.substr(1)
 }
-
-

lib/engine/index.js

@@ -111,7 +111,7 @@ Engine.prototype.Statements = function(node) {
     var cr = this[cn.type](cn)
 
     if (cr.stats === STATS.SUCCESS) {
-      if (cn.type === 'Reference' && cr.value === undefined) {
+      if (cn.type === 'Reference' && (cr.value === undefined || cr.value === null)) {
         if (!cr.silent) {
           result.value += cr.literal
         }
@@ -177,9 +177,3 @@ Engine.prototype.mergeResult = function(target, src) {
 }
 
 module.exports = Engine
-
-
-
-
-
-

test/engine.test.js

@@ -31,7 +31,7 @@ describe('engine.test.js', function () {
 
       engine.render({name: 'fengmk2'}).should.equal('Hello, fengmk2!\n')
       engine.render({name: ''}).should.equal('Hello, !\n')
-      engine.render({name: null}).should.equal('Hello, null!\n')
+      engine.render({name: null}).should.equal('Hello, ${name}!\n')
       engine.render({name: undefined}).should.equal('Hello, ${name}!\n')
       engine.render({}).should.equal('Hello, ${name}!\n')
     })
@@ -41,7 +41,7 @@ describe('engine.test.js', function () {
         template: 'ok $!id.'
       })
       engine.render({}).should.equal('ok .')
-      engine.render({id: null}).should.equal('ok null.')
+      engine.render({id: null}).should.equal('ok .')
       engine.render({id: 123}).should.equal('ok 123.')
       engine.render({id: 'foo'}).should.equal('ok foo.')
     })