Fixed empty strings support. Closes pugjs#223

also using ../ instead of jade now since npm is messing shit up
samirtohope · Jun 21, 2011 · b7dd7d9 · b7dd7d9
1 parent 05d45a6
commit b7dd7d9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,6 @@ UGLIFY_FLAGS = --no-mangle
 
 test:
 	@./node_modules/.bin/expresso \
-		-I lib \
 		-I node_modules \
 		$(TESTS)
 

diff --git a/lib/jade.js b/lib/jade.js
@@ -88,7 +88,7 @@ function attrs(obj){
     for (var i = 0; i < len; ++i) {
       var key = keys[i]
         , val = obj[key];
-      if (typeof val === 'boolean' || val === '' || val == null) {
+      if ('boolean' == typeof val || null == val) {
         if (val) {
           terse
             ? buf.push(key)

diff --git a/test/filters.test.js b/test/filters.test.js
@@ -3,7 +3,7 @@
  * Module dependencies.
  */
 
-var jade = require('jade'),
+var jade = require('../'),
     Compiler = jade.Compiler,
     render = jade.render,
     nodes = jade.nodes;

diff --git a/test/jade.test.js b/test/jade.test.js
@@ -3,8 +3,7 @@
  * Module dependencies.
  */
 
-var jade = require('jade')
-  , Buffer = require('buffer').Buffer
+var jade = require('../')
   , ENOENT;
 
 // COMPAT:
@@ -339,7 +338,7 @@ module.exports = {
         assert.equal('<p>click\n<a>Google</a>.\n</p>', render('p\n  | click\n  a Google\n  | .'));
         assert.equal('<p>(parens)</p>', render('p (parens)'));
         assert.equal('<p foo="bar">(parens)</p>', render('p(foo="bar") (parens)'));
-        assert.equal('<option>-- (optional) foo --</option>', render('option(value="") -- (optional) foo --'));
+        assert.equal('<option value="">-- (optional) foo --</option>', render('option(value="") -- (optional) foo --'));
     },
 
     'test tag text block': function(assert){
@@ -398,7 +397,6 @@ module.exports = {
         assert.equal('<input type="checkbox"/>', render('input(type="checkbox", checked= false)'));
         assert.equal('<input type="checkbox"/>', render('input(type="checkbox", checked= null)'));
         assert.equal('<input type="checkbox"/>', render('input(type="checkbox", checked= undefined)'));
-        assert.equal('<input type="checkbox"/>', render('input(type="checkbox", checked= "")'));
 
         assert.equal('<img src="/foo.png"/>', render('img(src="/foo.png")'), 'Test attr =');
         assert.equal('<img src="/foo.png"/>', render('img(src  =  "/foo.png")'), 'Test attr = whitespace');
@@ -477,12 +475,13 @@ module.exports = {
         assert.equal('<p></p>', render('p(id= name)', { locals: { name: undefined }}));
         assert.equal('<p></p>', render('p(id= name)', { locals: { name: null }}));
         assert.equal('<p></p>', render('p(id= name)', { locals: { name: false }}));
-        assert.equal('<p></p>', render('p(id= name)', { locals: { name: '' }}));
+        assert.equal('<p id=""></p>', render('p(id= name)', { locals: { name: '' }}));
         assert.equal('<p id="tj"></p>', render('p(id= name)', { locals: { name: 'tj' }}));
         assert.equal('<p id="default"></p>', render('p(id= name || "default")', { locals: { name: null }}));
         assert.equal('<p id="something"></p>', render("p(id= 'something')", { locals: { name: null }}));
         assert.equal('<p id="something"></p>', render("p(id = 'something')", { locals: { name: null }}));
         assert.equal('<p id="foo"></p>', render("p(id= (true ? 'foo' : 'bar'))"));
+        assert.equal('<option value="">Foo</option>', render("option(value='') Foo"));
     },
 
     'test code attrs class': function(assert){