Skip to content

C
caddy
Commit 9d456bba authored by Guilherme Rezende's avatar Guilherme Rezende
Browse files
Options

Add argument in new optional block in templates midd to set delimiters

parent d227bec0
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 9 deletions
config/setup/templates.go
View file @ 9d456bba
...@@ -32,18 +32,48 @@ func templatesParse(c *Controller) ([]templates.Rule, error) { ...@@ -32,18 +32,48 @@ func templatesParse(c *Controller) ([]templates.Rule, error) {
for c.Next() { for c.Next() {
var rule templates.Rule var rule templates.Rule
if c.NextArg() { rule.Path = defaultTemplatePath
rule.Extensions = defaultTemplateExtensions
args := c.RemainingArgs()
switch len(args) {
case 0:
// Optional block
for c.NextBlock() {
switch c.Val() {
case "path":
args := c.RemainingArgs()
if len(args) != 1 {
return nil, c.ArgErr()
}
rule.Path = args[0]
case "ext":
args := c.RemainingArgs()
if len(args) == 0 {
return nil, c.ArgErr()
}
rule.Extensions = args
case "between":
args := c.RemainingArgs()
if len(args) != 2 {
return nil, c.ArgErr()
}
rule.Delims[0] = args[0]
rule.Delims[1] = args[1]
}
}
default:
// First argument would be the path // First argument would be the path
rule.Path = c.Val() rule.Path = args[0]
// Any remaining arguments are extensions // Any remaining arguments are extensions
rule.Extensions = c.RemainingArgs() rule.Extensions = args[1:]
if len(rule.Extensions) == 0 { if len(rule.Extensions) == 0 {
rule.Extensions = defaultTemplateExtensions rule.Extensions = defaultTemplateExtensions
} }
} else {
rule.Path = defaultTemplatePath
rule.Extensions = defaultTemplateExtensions
} }
for _, ext := range rule.Extensions { for _, ext := range rule.Extensions {
...@@ -52,7 +82,6 @@ func templatesParse(c *Controller) ([]templates.Rule, error) { ...@@ -52,7 +82,6 @@ func templatesParse(c *Controller) ([]templates.Rule, error) {
rules = append(rules, rule) rules = append(rules, rule)
} }
return rules, nil return rules, nil
} }
......
middleware/templates/templates.go
View file @ 9d456bba
...@@ -33,9 +33,18 @@ func (t Templates) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error ...@@ -33,9 +33,18 @@ func (t Templates) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error
// Create execution context // Create execution context
ctx := middleware.Context{Root: t.FileSys, Req: r, URL: r.URL} ctx := middleware.Context{Root: t.FileSys, Req: r, URL: r.URL}
// New template
templateName := filepath.Base(fpath)
tpl := template.New(templateName)
// Set delims
if rule.Delims != [2]string{} {
tpl.Delims(rule.Delims[0], rule.Delims[1])
}
// Build the template // Build the template
templatePath := filepath.Join(t.Root, fpath) templatePath := filepath.Join(t.Root, fpath)
tpl, err := template.ParseFiles(templatePath) tpl, err := tpl.ParseFiles(templatePath)
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return http.StatusNotFound, nil return http.StatusNotFound, nil
...@@ -82,4 +91,5 @@ type Rule struct { ...@@ -82,4 +91,5 @@ type Rule struct {
Path string Path string
Extensions []string Extensions []string
IndexFiles []string IndexFiles []string
Delims [2]string
} }
middleware/templates/templates_test.go
View file @ 9d456bba
...@@ -23,6 +23,7 @@ func Test(t *testing.T) { ...@@ -23,6 +23,7 @@ func Test(t *testing.T) {
Extensions: []string{".html", ".htm"}, Extensions: []string{".html", ".htm"},
IndexFiles: []string{"index.html", "index.htm"}, IndexFiles: []string{"index.html", "index.htm"},
Path: "/images", Path: "/images",
Delims: [2]string{"{%", "%}"},
}, },
}, },
Root: "./testdata", Root: "./testdata",
...@@ -94,6 +95,30 @@ func Test(t *testing.T) { ...@@ -94,6 +95,30 @@ func Test(t *testing.T) {
t.Fatalf("Test: the expected body %v is different from the response one: %v", expectedBody, respBody) t.Fatalf("Test: the expected body %v is different from the response one: %v", expectedBody, respBody)
} }
/*
* Test tmpl on /images/img2.htm
*/
req, err = http.NewRequest("GET", "/images/img2.htm", nil)
if err != nil {
t.Fatalf("Could not create HTTP request: %v", err)
}
rec = httptest.NewRecorder()
tmpl.ServeHTTP(rec, req)
if rec.Code != http.StatusOK {
t.Fatalf("Test: Wrong response code: %d, should be %d", rec.Code, http.StatusOK)
}
respBody = rec.Body.String()
expectedBody = `<!DOCTYPE html><html><head><title>img</title></head><body>{{.Include "header.html"}}</body></html>
`
if respBody != expectedBody {
t.Fatalf("Test: the expected body %v is different from the response one: %v", expectedBody, respBody)
}
/* /*
* Test tmplroot on /root.html * Test tmplroot on /root.html
*/ */
......
middleware/templates/testdata/images/img.htm
View file @ 9d456bba
<!DOCTYPE html><html><head><title>img</title></head><body>{{.Include "header.html"}}</body></html> <!DOCTYPE html><html><head><title>img</title></head><body>{%.Include "header.html"%}</body></html>
middleware/templates/testdata/images/img2.htm 0 → 100644
View file @ 9d456bba
<!DOCTYPE html><html><head><title>img</title></head><body>{{.Include "header.html"}}</body></html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7