Merge pull request #115 from lavaxun/master

fix cachePartials extension name
TryGhost · Dec 2, 2018 · e9b246f · e9b246f
2 parents c34d4cb + 7cebbb0
commit e9b246f
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 1 deletion.
diff --git a/lib/hbs.js b/lib/hbs.js
@@ -165,7 +165,7 @@ ExpressHbs.prototype.cachePartials = function(cb) {
       var dirname = path.dirname(entry.path);
       dirname = dirname === '.' ? '' : dirname + '/';
 
-      var name = dirname + path.basename(entry.name, path.extname(entry.name));
+      var name = dirname + path.basename(entry.name, self._options.extname);
       // fix the path in windows
       name = name.split('\\').join('/');
       self.registerPartial(name, source, entry.fullPath);

diff --git a/test/customExtension.js b/test/customExtension.js
@@ -0,0 +1,35 @@
+'use strict';
+var assert = require('assert');
+var hbs = require('..');
+var path = require('path');
+var H = require('./helpers');
+
+
+// MEANJS is using custom extension .server.view.html instead of .hbs 
+// https://github.com/meanjs/mean
+describe('custom extension for partials view', function() {
+  var dirname = path.join(__dirname, 'views/customExtension');
+  var render = hbs.create().express4({
+      extname: '.server.view.html',
+      partialsDir: dirname + '/partialsDir'
+  });
+
+  it('should allow rendering multiple partials with custom extension', function(done) {
+    function check(err, html) {
+      assert.ifError(err);
+      assert.equal(
+        '<html>' + 
+          '<subpartial>1</subpartial>' + 
+          '<partial>1</partial>' + 
+          '<subpartial>2</subpartial>' + 
+          '<partial>2</partial>' + 
+        '</html>', 
+      H.stripWs(html));
+      done();
+    }
+
+    var options = {cache: true, settings: {views: dirname }};
+    render(dirname + '/template.server.view.html', options, check);
+  });
+
+});
diff --git a/test/views/customExtension/layout.server.view.html b/test/views/customExtension/layout.server.view.html
@@ -0,0 +1 @@
+<html>{{{body}}}</html>
diff --git a/test/views/customExtension/partialsDir/partial1.server.view.html b/test/views/customExtension/partialsDir/partial1.server.view.html
@@ -0,0 +1 @@
+<partial>1</partial>
diff --git a/test/views/customExtension/partialsDir/partial2.server.view.html b/test/views/customExtension/partialsDir/partial2.server.view.html
@@ -0,0 +1 @@
+<partial>2</partial>
diff --git a/test/views/customExtension/partialsDir/subs/subPartial1.server.view.html b/test/views/customExtension/partialsDir/subs/subPartial1.server.view.html
@@ -0,0 +1 @@
+<subpartial>1</subpartial>
diff --git a/test/views/customExtension/partialsDir/subs/subPartial2.server.view.html b/test/views/customExtension/partialsDir/subs/subPartial2.server.view.html
@@ -0,0 +1 @@
+<subpartial>2</subpartial>
diff --git a/test/views/customExtension/template.server.view.html b/test/views/customExtension/template.server.view.html
@@ -0,0 +1,5 @@
+{{!< layout}}
+{{> subs/subPartial1}}
+{{> partial1}}
+{{> subs/subPartial2}}
+{{> partial2}}