Select asset templates by the final extension only

render.go

@@ -360,7 +360,7 @@ func (r *Render) compileTemplatesFromAsset() {
 
 		ext := ""
 		if strings.Contains(rel, ".") {
-			ext = "." + strings.Join(strings.Split(rel, ".")[1:], ".")
+			ext = filepath.Ext(rel) // match the directory walker: only the final extension
 		}
 
 		for _, extension := range r.opt.Extensions {

render_html_test.go

@@ -524,3 +524,33 @@ func TestHTMLPerCallContentType(t *testing.T) {
 	expect(t, res.Header().Get(ContentType), "application/xhtml+xml")
 	expect(t, res.Body.String(), "<h1>Hello gophers</h1>\n")
 }
+
+var dotDirFiles = map[string]string{
+	"testdata/dotdir/users.tmpl/index.tmpl": "Hello asset",
+	"testdata/dotdir/a.b.tmpl":              "Hello ab",
+}
+
+// The asset loader must select templates by the same extension rule as the
+// directory walker, including under a dot-named directory and for multi-dot names.
+func TestHTMLAssetExtensionMatchesDirectory(t *testing.T) {
+	names := make([]string, 0, len(dotDirFiles))
+	for n := range dotDirFiles {
+		names = append(names, n)
+	}
+
+	dirRender := New(Options{Directory: "testdata/dotdir"})
+	assetRender := New(Options{
+		Directory:  "testdata/dotdir",
+		Asset:      func(n string) ([]byte, error) { return []byte(dotDirFiles[n]), nil },
+		AssetNames: func() []string { return names },
+	})
+
+	for _, name := range []string{"users.tmpl/index", "a.b"} {
+		if dirRender.TemplateLookup(name) == nil {
+			t.Errorf("directory mode did not load %q", name)
+		}
+		if assetRender.TemplateLookup(name) == nil {
+			t.Errorf("asset mode did not load %q", name)
+		}
+	}
+}

testdata/dotdir/a.b.tmpl

@@ -0,0 +1 @@
+Hello ab

testdata/dotdir/users.tmpl/index.tmpl

@@ -0,0 +1 @@
+Hello asset