relative path in error

lib/hbs.js

@@ -420,7 +420,7 @@ function _express3(filename, source, options, cb) {
       source = fs.readFileSync(filename, 'utf8');
       template = self.handlebars.compile(source);
       // for error message
-      template.__filename = filename.substring(filename.lastIndexOf(path.sep) + 1, filename.length);
+      template.__filename = path.relative(self.viewsDir, filename);
       if (options.cache) {
         self.cache[filename] = { source: source, template: template };
       }

test/issues.js

@@ -183,6 +183,28 @@ describe('issue-49', function() {
       done();
     });
   });
+
+  it('should report relative filename with error', function(done) {
+    var hb = hbs.create()
+    var render = hb.express3({});
+    var locals = H.createLocals('express3', dirname, {});
+    render(dirname + '/front/error.hbs', locals, function(err, html) {
+      assert(err.stack.indexOf('front/error.hbs') > 0);
+      done();
+    });
+  });
+
+  it('should report filename with partial error', function(done) {
+    var hb = hbs.create()
+    var render = hb.express3({
+      partialsDir: dirname + '/partials'
+    });
+    var locals = H.createLocals('express3', dirname, {});
+    render(dirname + '/partial.hbs', locals, function(err, html) {
+      assert(err.stack.indexOf('partial.hbs') > 0);
+      done();
+    });
+  });
 });
 
 

test/issues/49/front/error.hbs

@@ -0,0 +1 @@
+{{{http://google.co.uk}}

test/issues/49/partial.hbs

@@ -0,0 +1 @@
+{{> partial-error}}

test/issues/49/partials/partial-error.hbs

@@ -0,0 +1 @@
+{{http://google.co.uk}