fixed trailing dir slash when using slug

See testcase, dir + slug contained double slash when dir had a trailing
slash.

Signed-off-by: Noah Campbell <noahcampbell@gmail.com>

diff --git a/hugolib/page.go b/hugolib/page.go
index f9af8244877f6004b729d354c1e0856519751a2c..101f6c88488a03688792113edda87525c5bf9ee2 100644 (file)
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -265,7 +265,7 @@ func (p *Page) permalink() (*url.URL, error) {
                        if p.Site.Config != nil && p.Site.Config.UglyUrls {
                                permalink = path.Join(dir, p.Slug, p.Extension)
                        } else {
-                               permalink = dir + "/" + p.Slug + "/"
+                               permalink = path.Join(dir, p.Slug) + "/"
                        }
                } else if len(pUrl) > 2 {
                        permalink = pUrl

diff --git a/hugolib/page_permalink_test.go b/hugolib/page_permalink_test.go
index b4ef66ba768c9e1267e39c630e46418499245b35..fd1f2b2f8ba62658ef54f315722f84866e7bc7a3 100644 (file)
--- a/hugolib/page_permalink_test.go
+++ b/hugolib/page_permalink_test.go
@@ -7,12 +7,18 @@ import (
 
 func TestPermalink(t *testing.T) {
        tests := []struct {
+               file        string
+               dir         string
                base        template.URL
+               slug        string
                expectedAbs string
                expectedRel string
        }{
-               {"", "/x/y/z/boofar", "/x/y/z/boofar"},
-               {"http://barnew/", "http://barnew/x/y/z/boofar", "/x/y/z/boofar"},
+               {"x/y/z/boofar.md", "x/y/z", "", "", "/x/y/z/boofar", "/x/y/z/boofar"},
+               {"x/y/z/boofar.md", "x/y/z/", "", "", "/x/y/z/boofar", "/x/y/z/boofar"},
+               {"x/y/z/boofar.md", "x/y/z/", "", "boofar", "/x/y/z/boofar/", "/x/y/z/boofar/"},
+               {"x/y/z/boofar.md", "x/y/z", "http://barnew/", "", "http://barnew/x/y/z/boofar", "/x/y/z/boofar"},
+               {"x/y/z/boofar.md", "x/y/z/", "http://barnew/", "boofar", "http://barnew/x/y/z/boofar/", "/x/y/z/boofar/"},
        }
 
        for _, test := range tests {
@@ -21,7 +27,13 @@ func TestPermalink(t *testing.T) {
                                UrlPath: UrlPath{Section: "z"},
                                Site:    SiteInfo{BaseUrl: test.base},
                        },
-                       File: File{FileName: "x/y/z/boofar.md", Dir: "x/y/z"},
+                       File: File{FileName: test.file, Dir: test.dir},
+               }
+
+               if test.slug != "" {
+                       p.update(map[string]interface{}{
+                               "slug": test.slug,
+                       })
                }
 
                u, err := p.Permalink()