Homepage "/" respects PublishDir

It wasn't taking the value of PublishDir into consideration for the
special case of the homepage "/".

Fixes #75

diff --git a/hugolib/site_url_test.go b/hugolib/site_url_test.go
index 3353e4a84abee22a421c7e73be034c00be4d39ab..e506ee66b86e0d048756ccaa8fa167592608a48b 100644 (file)
--- a/hugolib/site_url_test.go
+++ b/hugolib/site_url_test.go
@@ -49,8 +49,6 @@ func TestPageCount(t *testing.T) {
        s := &Site{Target: target}
        s.prepTemplates()
        must(s.addTemplate("indexes/blue.html", INDEX_TEMPLATE))
-       //s.Files = append(s.Files, "blue/doc1.md")
-       //s.Files = append(s.Files, "blue/doc2.md")
        s.Pages = append(s.Pages, mustReturn(ReadFrom(strings.NewReader(SLUG_DOC_1), filepath.FromSlash("content/blue/doc1.md"))))
        s.Pages = append(s.Pages, mustReturn(ReadFrom(strings.NewReader(SLUG_DOC_2), filepath.FromSlash("content/blue/doc2.md"))))
 

diff --git a/target/file.go b/target/file.go
index 29c019f4ebe334e9648f37638ee2b370cd2592da..f5ae62db3d2a4bb8c484ce2b190fef7ecdcbece2 100644 (file)
--- a/target/file.go
+++ b/target/file.go
@@ -56,6 +56,9 @@ func (fs *Filesystem) Publish(path string, r io.Reader) (err error) {
 
 func (fs *Filesystem) Translate(src string) (dest string, err error) {
        if src == "/" {
+               if fs.PublishDir != "" {
+                       return path.Join(fs.PublishDir, "index.html"), nil
+               }
                return "index.html", nil
        }
 

diff --git a/target/file_test.go b/target/file_test.go
index 14e47ee6fcb55b7c5f719eb40edcc747fc3dfb8d..ee474c1c40ca8e3a97ce1bf88b64c6e51b943452 100644 (file)
--- a/target/file_test.go
+++ b/target/file_test.go
@@ -32,6 +32,31 @@ func TestFileTranslator(t *testing.T) {
        }
 }
 
+func TestFileTranslatorBase(t *testing.T) {
+       tests := []struct {
+               content string
+               expected string
+       }{
+               {"/", "a/base/index.html"},
+       }
+
+       for _, test := range tests {
+               f := &Filesystem{PublishDir: "a/base"}
+               fts := &Filesystem{PublishDir: "a/base/"}
+
+               for _, fs := range []*Filesystem{f, fts} {
+                       dest, err := fs.Translate(test.content)
+                       if err != nil {
+                               t.Fatalf("Translated returned and err: %s", err)
+                       }
+
+                       if dest != test.expected {
+                               t.Errorf("Translate expected: %s, got: %s", test.expected, dest)
+                       }
+               }
+       }
+}
+
 func TestTranslateUglyUrls(t *testing.T) {
        tests := []struct {
                content  string