github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #36 from noahcampbell/master

Browse source 
Use / for template names regardless of platform.
This commit is contained in:
Steve Francia 2013-08-12 15:36:06 -07:00
commit cb39f052d1
4 changed files with 40 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hugolib/config.go
View file

@ -148,7 +148,7 @@ func FindPath() (string, error) {
} }
func (c *Config) GetAbsPath(name string) string { func (c *Config) GetAbsPath(name string) string {
if path.IsAbs(name) { if filepath.IsAbs(name) {
return name return name
} }

28
hugolib/path_seperators_test.go
View file

@ -23,25 +23,29 @@ func TestDegenerateMissingFolderInPageFilename(t *testing.T) {
} }
func TestNewPageWithFilePath(t *testing.T) { func TestNewPageWithFilePath(t *testing.T) {
toCheck := []map[string]string{ toCheck := []struct{
{"input": filepath.Join("sub", "foobar.html"), "expect": "sub"}, input string
{"input": filepath.Join("content", "sub", "foobar.html"), "expect": "sub"}, section string
{"input": filepath.Join("content", "dub", "sub", "foobar.html"), "expect": "sub"}, layout string
}{
{filepath.Join("sub", "foobar.html"), "sub", "sub/single.html"},
{filepath.Join("content", "sub", "foobar.html"), "sub", "sub/single.html"},
{filepath.Join("content", "dub", "sub", "foobar.html"), "sub", "sub/single.html"},
} }
for _, el := range toCheck { for _, el := range toCheck {
p, err := ReadFrom(strings.NewReader(SIMPLE_PAGE_YAML), el["input"]) p, err := ReadFrom(strings.NewReader(SIMPLE_PAGE_YAML), el.input)
if err != nil { if err != nil {
t.Fatalf("Reading from SIMPLE_PAGE_YAML resulted in an error: %s", err) t.Fatalf("Reading from SIMPLE_PAGE_YAML resulted in an error: %s", err)
} }
if p.Section != el["expect"] { if p.Section != el.section {
t.Fatalf("Section not set to %s for page %s. Got: %s", el["expect"], el["input"], p.Section) t.Fatalf("Section not set to %s for page %s. Got: %s", el.section, el.input, p.Section)
}
if p.Layout() != el.layout {
t.Fatalf("Layout incorrect. Expected: '%s', Got: '%s'", el.layout, p.Layout())
} }
} }
} }
func TestSettingOutFileOnPageContainsCorrectSlashes(t *testing.T) {
s := &Site{Config: Config{}}
p := NewPage(filepath.Join("sub", "foobar"))
s.setOutFile(p)
}

16
hugolib/path_seperators_windows_test.go Normal file
View file

@ -0,0 +1,16 @@
package hugolib
import (
"testing"
)
func TestTemplatePathSeperator(t *testing.T) {
config := Config{
LayoutDir: "c:\\a\\windows\\path\\layout",
Path: "c:\\a\\windows\\path",
}
s := &Site{Config: config}
if name := s.generateTemplateNameFrom("c:\\a\\windows\\path\\layout\\sub1\\index.html"); name != "sub1/index.html" {
t.Fatalf("Template name incorrect. Expected: %s, Got: %s", "sub1/index.html", name)
}
}

10
hugolib/site.go
View file

@ -163,14 +163,18 @@ func (s *Site) loadTemplates() {
return err return err
} }
text := string(filetext) text := string(filetext)
name := path[len(s.Config.GetAbsPath(s.Config.LayoutDir))+1:] t := s.Tmpl.New(s.generateTemplateNameFrom(path))
t := s.Tmpl.New(name)
template.Must(t.Parse(text)) template.Must(t.Parse(text))
} }
return nil return nil
} }
filepath.Walk(s.Config.GetAbsPath(s.Config.LayoutDir), walker) filepath.Walk(s.absLayoutDir(), walker)
}
func (s *Site) generateTemplateNameFrom(path string) (name string) {
name = filepath.ToSlash(path[len(s.absLayoutDir())+1:])
return
} }
func (s *Site) primeTemplates() { func (s *Site) primeTemplates() {