Merge pull request rooseveltframework#422 from kethinov/0.5.5

0.5.5
kethinov · Sep 29, 2020 · 2631a33 · 2631a33
2 parents a97180c + 96fb494
commit 2631a33
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 - Put your changes here...
 
+## 0.5.5
+
+- Closed https://github.com/rooseveltframework/teddy/issues/421
+
 ## 0.5.4
 
 - Closed https://github.com/rooseveltframework/teddy/issues/412

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
       "url": "https://github.com/rooseveltframework/teddy/graphs/contributors"
     }
   ],
-  "version": "0.5.4",
+  "version": "0.5.5",
   "files": [
     "dist/teddy.js"
   ],

diff --git a/test/misc.js b/test/misc.js
@@ -253,6 +253,11 @@ describe('Misc', function () {
     done()
   })
 
+  it('should render {zero} as 0 (misc/zero.html)', function (done) {
+    assert.equalIgnoreSpaces(teddy.render('misc/zero.html', model), '<p>0</p>')
+    done()
+  })
+
   // wontfix: https://github.com/rooseveltframework/teddy/issues/357
   it.skip('should not render excessive whitespace in a <textarea> as a result of teddy tag indententation / formatting (misc/excessiveWhitespace.html)', function (done) {
     assert.equal(teddy.render('misc/excessiveWhitespace.html', model), '<textarea>Some text here</textarea>')

diff --git a/test/models/model.js b/test/models/model.js
@@ -10,6 +10,7 @@ function makeModel () {
     pageContent: '<body>hello</body>',
     undefinedVar: undefined,
     emptyString: '',
+    zero: 0,
     definedParent: { undefinedMember: undefined, emptyMember: '' },
     camelLetters: ['a', 'b', 'c'],
     missingLetter: ['a', undefined, 'c'],

diff --git a/test/templates/misc/zero.html b/test/templates/misc/zero.html
@@ -0,0 +1,5 @@
+{!
+  should render {zero} as 0
+!}
+
+<p>{zero}</p>
diff --git a/utils.js b/utils.js
@@ -60,7 +60,7 @@ function getTeddyVal (name, model, escapeOverride) {
     }
   }
 
-  if (tempValue || tempValue === '' || tempValue === false) {
+  if (tempValue || tempValue === 0 || tempValue === '' || tempValue === false) {
     if (noParse && noSuppress) { // something|p|s
       return noParseFlag(tempValue)
     } else if (noSuppress) { // something|s