Add Translate to target

Translate handles Ugly Urls.
This commit is contained in:
Noah Campbell 2013-09-01 09:24:03 -07:00
parent c6ad532b94
commit 7919603fb5
4 changed files with 98 additions and 3 deletions

View file

@ -1,8 +1,8 @@
package hugolib
import (
"io"
"fmt"
"io"
)
func (s *Site) ShowPlan(out io.Writer) (err error) {

View file

@ -1,8 +1,8 @@
package hugolib
import (
"testing"
"bytes"
"testing"
)
func checkShowPlanExpected(t *testing.T, expected, got string) {

View file

@ -1,9 +1,53 @@
package target
import (
"fmt"
"io"
"path"
)
type Publisher interface {
Publish(string, io.Reader) error
}
type Translator interface {
Translate(string) (string, error)
}
type Filesystem struct {
UglyUrls bool
DefaultExtension string
}
func (fs *Filesystem) Translate(src string) (dest string, err error) {
if fs.UglyUrls {
return src, nil
}
dir, file := path.Split(src)
ext := fs.extension(path.Ext(file))
name := filename(file)
return path.Join(dir, name, fmt.Sprintf("index%s", ext)), nil
}
func (fs *Filesystem) extension(ext string) string {
if ext != "" {
return ext
}
if fs.DefaultExtension != "" {
return fs.DefaultExtension
}
return ".html"
}
func filename(f string) string {
ext := path.Ext(f)
if ext == "" {
return f
}
return f[:len(f)-len(ext)]
}

51
target/file_test.go Normal file
View file

@ -0,0 +1,51 @@
package target
import (
"testing"
)
func TestFileTranslator(t *testing.T) {
tests := []struct {
content string
expected string
}{
{"foo", "foo/index.html"},
{"foo.html", "foo/index.html"},
{"foo.xhtml", "foo/index.xhtml"},
{"section/foo", "section/foo/index.html"},
{"section/foo.html", "section/foo/index.html"},
{"section/foo.rss", "section/foo/index.rss"},
}
for _, test := range tests {
f := new(Filesystem)
dest, err := f.Translate(test.content)
if err != nil {
t.Fatalf("Translate returned and unexpected err: %s", err)
}
if dest != test.expected {
t.Errorf("Tranlate expected return: %s, got: %s", test.expected, dest)
}
}
}
func TestTranslateUglyUrls(t *testing.T) {
f := &Filesystem{UglyUrls: true}
dest, err := f.Translate("foo.html")
if err != nil {
t.Fatalf("Translate returned an unexpected err: %s", err)
}
if dest != "foo.html" {
t.Errorf("Translate expected return: %s, got: %s", "foo.html", dest)
}
}
func TestTranslateDefaultExtension(t *testing.T) {
f := &Filesystem{DefaultExtension: ".foobar"}
dest, _ := f.Translate("baz")
if dest != "baz/index.foobar" {
t.Errorf("Translate expected return: %s, got %s", "baz/index.foobar", dest)
}
}