Merge pull request #569 from wycats/lookup-helper

Unable to lookup array values using @index

3 files changed, 27 insertions, 1 deletions

diff --git a/lib/handlebars/base.js b/lib/handlebars/base.js
index 7ebfc55..02d274d 100644
--- a/lib/handlebars/base.js
+++ b/lib/handlebars/base.js
@@ -193,6 +193,10 @@ function registerDefaultHelpers(instance) {
     var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
     instance.log(level, context);
   });
+
+  instance.registerHelper('lookup', function(obj, field, options) {
+    return obj && obj[field];
+  });
 }
 
 export var logger = {
diff --git a/lib/handlebars/compiler/compiler.js b/lib/handlebars/compiler/compiler.js
index cfcc70a..21e1024 100644
--- a/lib/handlebars/compiler/compiler.js
+++ b/lib/handlebars/compiler/compiler.js
@@ -85,7 +85,8 @@ Compiler.prototype = {
       'if': true,
       'unless': true,
       'with': true,
-      'log': true
+      'log': true,
+      'lookup': true
     };
     if (knownHelpers) {
       for (var name in knownHelpers) {
diff --git a/spec/builtins.js b/spec/builtins.js
index 53f46cc..bbe494e 100644
--- a/spec/builtins.js
+++ b/spec/builtins.js
@@ -203,4 +203,25 @@ describe('builtin helpers', function() {
     equals("whee", logArg, "should call log with 'whee'");
   });
 
+
+  describe('#lookup', function() {
+    it('should lookup arbitrary content', function() {
+      var string = '{{#each goodbyes}}{{lookup ../data .}}{{/each}}',
+          hash   = {goodbyes: [0, 1], data: ['foo', 'bar']};
+
+      var template = CompilerContext.compile(string);
+      var result = template(hash);
+
+      equal(result, 'foobar');
+    });
+    it('should not fail on undefined value', function() {
+      var string = '{{#each goodbyes}}{{lookup ../bar .}}{{/each}}',
+          hash   = {goodbyes: [0, 1], data: ['foo', 'bar']};
+
+      var template = CompilerContext.compile(string);
+      var result = template(hash);
+
+      equal(result, '');
+    });
+  });
 });