-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #117 from rebuy-de/replace-mvp
replace MVP with ViewWrapper
- Loading branch information
Showing
4 changed files
with
168 additions
and
169 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| package webutil | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "encoding/json" | ||
| "fmt" | ||
| "html/template" | ||
| "io/fs" | ||
| "net/http" | ||
|
|
||
| "github.com/pkg/errors" | ||
| "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| type ViewHandler struct { | ||
| FS fs.FS | ||
| FuncMaps []TemplateFuncMap | ||
| } | ||
|
|
||
| func NewViewHandler(fs fs.FS, fms ...TemplateFuncMap) *ViewHandler { | ||
| v := &ViewHandler{ | ||
| FS: fs, | ||
| FuncMaps: fms, | ||
| } | ||
|
|
||
| return v | ||
| } | ||
|
|
||
| type ResponseHandlerFunc func(*View, *http.Request) Response | ||
|
|
||
| func (h *ViewHandler) Wrap(fn ResponseHandlerFunc) http.HandlerFunc { | ||
| return func(w http.ResponseWriter, r *http.Request) { | ||
| fn(&View{handler: h}, r)(w, r) | ||
| } | ||
| } | ||
|
|
||
| func (h *ViewHandler) Render(filename string, r *http.Request, d interface{}) (*bytes.Buffer, error) { | ||
| t := template.New(filename) | ||
|
|
||
| for _, fm := range h.FuncMaps { | ||
| t = t.Funcs(fm(r)) | ||
| } | ||
|
|
||
| t, err := t.ParseFS(h.FS, "*") | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "parsing template failed") | ||
| } | ||
|
|
||
| buf := new(bytes.Buffer) | ||
| err = t.Execute(buf, d) | ||
|
|
||
| return buf, errors.Wrap(err, "executing template failed") | ||
| } | ||
|
|
||
| type TemplateFuncMap func(*http.Request) template.FuncMap | ||
|
|
||
| func SimpleTemplateFuncMap(name string, fn interface{}) TemplateFuncMap { | ||
| return func(_ *http.Request) template.FuncMap { | ||
| return template.FuncMap{ | ||
| name: fn, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func SimpleTemplateFuncMaps(fm template.FuncMap) TemplateFuncMap { | ||
| return func(_ *http.Request) template.FuncMap { | ||
| return fm | ||
| } | ||
| } | ||
|
|
||
| type Response = http.HandlerFunc | ||
|
|
||
| type View struct { | ||
| handler *ViewHandler | ||
| } | ||
|
|
||
| func (v *View) Error(status int, err error) http.HandlerFunc { | ||
| return func(w http.ResponseWriter, r *http.Request) { | ||
| logrus. | ||
| WithField("stacktrace", fmt.Sprintf("%+v", err)). | ||
| WithError(errors.WithStack(err)). | ||
| Errorf("request failed: %s", err) | ||
|
|
||
| w.WriteHeader(status) | ||
| fmt.Fprint(w, err.Error()) | ||
| } | ||
| } | ||
|
|
||
| func (v *View) Errorf(status int, text string, a ...interface{}) http.HandlerFunc { | ||
| return v.Error(status, fmt.Errorf(text, a...)) | ||
| } | ||
|
|
||
| func (v *View) Redirect(status int, location string, args ...interface{}) http.HandlerFunc { | ||
| return func(w http.ResponseWriter, r *http.Request) { | ||
| url := fmt.Sprintf(location, args...) | ||
| http.Redirect(w, r, url, status) | ||
| } | ||
| } | ||
|
|
||
| func (v *View) JSON(status int, data any) http.HandlerFunc { | ||
| return func(w http.ResponseWriter, r *http.Request) { | ||
| buf := new(bytes.Buffer) | ||
| enc := json.NewEncoder(buf) | ||
| enc.SetIndent("", " ") | ||
|
|
||
| err := enc.Encode(data) | ||
| if err != nil { | ||
| v.Error(http.StatusInternalServerError, err)(w, r) | ||
| return | ||
| } | ||
|
|
||
| w.WriteHeader(status) | ||
| w.Header().Set("Content-Type", "application/json") | ||
| buf.WriteTo(w) | ||
| } | ||
| } | ||
|
|
||
| func (v *View) HTML(status int, filename string, data any) http.HandlerFunc { | ||
| return func(w http.ResponseWriter, r *http.Request) { | ||
| buf, err := v.handler.Render(filename, r, data) | ||
| if err != nil { | ||
| v.Error(http.StatusInternalServerError, err)(w, r) | ||
| return | ||
| } | ||
|
|
||
| w.WriteHeader(status) | ||
| w.Header().Set("Content-Type", "text/html") | ||
| buf.WriteTo(w) | ||
| } | ||
| } |