Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement amber templates #55

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Implement amber templates #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import (
"encoding/xml"
"fmt"
"html/template"
"io"
"io"
"io/ioutil"
"net/http"
"os"
Expand All @@ -51,6 +51,8 @@ import (
"github.com/oxtoacart/bpool"

"github.com/go-martini/martini"

"github.com/eknkc/amber"
)

const (
Expand Down Expand Up @@ -153,17 +155,33 @@ func Renderer(options ...Options) martini.Handler {
opt := prepareOptions(options)
cs := prepareCharset(opt.Charset)
t := compile(opt)
compiledAmberFiles, err := compileAmberFiles(opt)
if err != nil {
panic(err)
}

// Check no name conflicts between template and amber
for n := range compiledAmberFiles {
found := t.Lookup(n)
if found != nil {
panic(fmt.Errorf("Template name conflict: \"%s\"", n))
}
}

bufpool = bpool.NewBufferPool(64)
return func(res http.ResponseWriter, req *http.Request, c martini.Context) {
var tc *template.Template
var at map[string]*template.Template
if martini.Env == martini.Dev {
// recompile for easy development
tc = compile(opt)
at, _ = compileAmberFiles(opt)
} else {
// use a clone of the initial template
tc, _ = t.Clone()
at = compiledAmberFiles
}
c.MapTo(&renderer{res, req, tc, opt, cs}, (*Render)(nil))
c.MapTo(&renderer{res, req, tc, opt, cs, at}, (*Render)(nil))
}
}

Expand Down Expand Up @@ -251,6 +269,7 @@ type renderer struct {
t *template.Template
opt Options
compiledCharset string
amberFiles map[string]*template.Template
}

func (r *renderer) JSON(status int, v interface{}) {
Expand Down Expand Up @@ -358,6 +377,9 @@ func (r *renderer) Template() *template.Template {

func (r *renderer) execute(name string, binding interface{}) (*bytes.Buffer, error) {
buf := bufpool.Get()
if amb, ok := r.amberFiles[name]; ok && amb != nil {
return buf, amb.Execute(buf, binding)
}
return buf, r.t.ExecuteTemplate(buf, name, binding)
}

Expand All @@ -384,3 +406,12 @@ func (r *renderer) prepareHTMLOptions(htmlOpt []HTMLOptions) HTMLOptions {
Layout: r.opt.Layout,
}
}

func compileAmberFiles(opt Options) (map[string]*template.Template, error) {
ret, err := amber.CompileDir(opt.Directory, amber.DefaultDirOptions, amber.DefaultOptions)
if os.IsNotExist(err) {
return nil, nil
}

return ret, err
}
10 changes: 5 additions & 5 deletions render_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,21 +393,21 @@ func Test_Render_BinaryData_CustomMimeType(t *testing.T) {

func Test_Render_Status204(t *testing.T) {
res := httptest.NewRecorder()
r := renderer{res, nil, nil, Options{}, ""}
r := renderer{res, nil, nil, Options{}, "", nil}
r.Status(204)
expect(t, res.Code, 204)
}

func Test_Render_Error404(t *testing.T) {
res := httptest.NewRecorder()
r := renderer{res, nil, nil, Options{}, ""}
r := renderer{res, nil, nil, Options{}, "", nil}
r.Error(404)
expect(t, res.Code, 404)
}

func Test_Render_Error500(t *testing.T) {
res := httptest.NewRecorder()
r := renderer{res, nil, nil, Options{}, ""}
r := renderer{res, nil, nil, Options{}, "", nil}
r.Error(500)
expect(t, res.Code, 500)
}
Expand All @@ -420,7 +420,7 @@ func Test_Render_Redirect_Default(t *testing.T) {
}
res := httptest.NewRecorder()

r := renderer{res, &req, nil, Options{}, ""}
r := renderer{res, &req, nil, Options{}, "", nil}
r.Redirect("two")

expect(t, res.Code, 302)
Expand All @@ -435,7 +435,7 @@ func Test_Render_Redirect_Code(t *testing.T) {
}
res := httptest.NewRecorder()

r := renderer{res, &req, nil, Options{}, ""}
r := renderer{res, &req, nil, Options{}, "", nil}
r.Redirect("two", 307)

expect(t, res.Code, 307)
Expand Down