Merge branch 'release/1.0.2'

.gitignore

@@ -5,3 +5,4 @@ npm-debug.log
 .idea
 dump.rdb
 test/unit/storage/sessions
+.nyc_output

.npmignore

@@ -9,3 +9,4 @@ dump.rdb
 benchmarks
 .idea
 bin
+nyc_output

CHANGELOG.md

@@ -1,3 +1,18 @@
+<a name="1.0.2"></a>
+## [1.0.2](https://github.com/poppinss/edge/compare/v1.0.1...v1.0.2) (2017-08-08)
+
+
+### Bug Fixes
+
+* **context:** bind context to global functions ([e0a2685](https://github.com/poppinss/edge/commit/e0a2685))
+
+
+### Features
+
+* **globals:** add elIf ([fb522ce](https://github.com/poppinss/edge/commit/fb522ce))
+
+
+
 <a name="1.0.1"></a>
 ## [1.0.1](https://github.com/poppinss/edge/compare/v1.0.0...v1.0.1) (2017-06-21)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge.js",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Node.js logical templating engine with fresh air",
   "main": "index.js",
   "scripts": {

src/Context/index.js

@@ -152,6 +152,7 @@ class Context {
     if (value === undefined) {
       debug('resolving %s key on globals', key)
       value = _.get(this.$globals, key)
+      value = typeof (value) === 'function' ? value.bind(this) : value
     }
 
     return value

src/Globals/index.js

@@ -140,7 +140,29 @@ const size = function (input) {
  */
 const el = function (htmlStr, hash) {
   return this.safe(htmlStr.replace(/\$([\w.-]+)/g, (match, group) => {
-    return _.get(hash, _.toPath(group))
+    return group === 'self' ? hash : _.get(hash, _.toPath(group))
+  }))
+}
+
+/**
+ * Return element only when the 3rd param
+ * is true.
+ *
+ * @method elIf
+ *
+ * @param  {String} htmlStr
+ * @param  {Object} hash
+ * @param  {Boolean} ifResult
+ *
+ * @return {String}
+ */
+const elIf = function (htmlStr, hash, ifResult) {
+  if (!ifResult) {
+    return ''
+  }
+
+  return this.safe(htmlStr.replace(/\$([\w.-]+)/g, (match, group) => {
+    return group === 'self' ? hash : _.get(hash, _.toPath(group))
   }))
 }
 
@@ -276,6 +298,7 @@ module.exports = {
   groupBy,
   size,
   el,
+  elIf,
   camelCase,
   upperCase,
   upperFirst,

test/unit/globals.spec.js

@@ -58,4 +58,34 @@ test.group('Globals', () => {
     const output = Globals.urlEncode('http://foo.com?username=aman virk')
     assert.equal(output, 'http://foo.com?username=aman%20virk')
   })
+
+  test('self should return the entire hash back', (assert) => {
+    const context = {
+      safe (input) {
+        return input
+      }
+    }
+    const output = Globals.el.bind(context)('$self', 'Hello')
+    assert.equal(output, 'Hello')
+  })
+
+  test('render when if value is true', (assert) => {
+    const context = {
+      safe (input) {
+        return input
+      }
+    }
+    const output = Globals.elIf.bind(context)('Hello $name', { name: 'virk' }, true)
+    assert.equal(output, 'Hello virk')
+  })
+
+  test('return empty string when elIf boolean is false', (assert) => {
+    const context = {
+      safe (input) {
+        return input
+      }
+    }
+    const output = Globals.elIf.bind(context)('Hello $name', { name: 'virk' }, false)
+    assert.equal(output, '')
+  })
 })