camzalewski/personal-site
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Added controller testing.

Browse source
This commit is contained in:
mikestefanello 2021-12-05 20:22:45 -05:00
parent 7f93fa7f6c
commit 5e384c8a4e
7 changed files with 105 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
controllers/controller.go
View file

@ -5,6 +5,9 @@ import (
"fmt"
"html/template"
"net/http"
"path"
"path/filepath"
"runtime"
"sync"
"goweb/config"
@ -25,6 +28,8 @@ var (
// Template function map
funcMap = funcmap.GetFuncMap()
templatePath = getTemplatesDirectoryPath()
)
type Controller struct {
@ -74,15 +79,15 @@ func (t *Controller) parsePageTemplates(p Page) error {
template.New(p.Layout+TemplateExt).
Funcs(funcMap).
ParseFiles(
fmt.Sprintf("%s/layouts/%s%s", TemplateDir, p.Layout, TemplateExt),
fmt.Sprintf("%s/pages/%s%s", TemplateDir, p.Name, TemplateExt),
fmt.Sprintf("%s/layouts/%s%s", templatePath, p.Layout, TemplateExt),
fmt.Sprintf("%s/pages/%s%s", templatePath, p.Name, TemplateExt),
)
if err != nil {
return err
}
parsed, err = parsed.ParseGlob(fmt.Sprintf("%s/components/*%s", TemplateDir, TemplateExt))
parsed, err = parsed.ParseGlob(fmt.Sprintf("%s/components/*%s", templatePath, TemplateExt))
if err != nil {
return err
@ -98,3 +103,12 @@ func (t *Controller) parsePageTemplates(p Page) error {
func (t *Controller) Redirect(c echo.Context, route string, routeParams ...interface{}) error {
return c.Redirect(http.StatusFound, c.Echo().Reverse(route, routeParams))
}
// getTemplatesDirectoryPath gets the templates directory path
// This is needed incase this is called from a package outside of main,
// such as testing
func getTemplatesDirectoryPath() string {
_, b, _, _ := runtime.Caller(0)
d := path.Join(path.Dir(b))
return filepath.Join(filepath.Dir(d), TemplateDir)
}