Never remove trailing slash in RelPermalink

Fixed #1174

diff --git a/helpers/path.go b/helpers/path.go
index 71ffee9801b2688ff358f6fdbba1c8d6f39733a3..0dee8db4c74e5fa19d50add53a75eeb9be811129 100644 (file)
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -331,6 +331,10 @@ func GetRelativePath(path, base string) (final string, err error) {
        if err != nil {
                return "", err
        }
+
+       if strings.HasSuffix(path, "/") && !strings.HasSuffix(name, "/") {
+               name += "/"
+       }
        return name, nil
 }
 

diff --git a/helpers/path_test.go b/helpers/path_test.go
index c9b4beac13fbc6bcb4b4da9d0a5274a80a0c29d5..cb87142668b8e9f551dc6ef8e8c0ad242d1622a9 100644 (file)
--- a/helpers/path_test.go
+++ b/helpers/path_test.go
@@ -65,6 +65,7 @@ func TestGetRelativePath(t *testing.T) {
                expect interface{}
        }{
                {filepath.FromSlash("/a/b"), filepath.FromSlash("/a"), filepath.FromSlash("b")},
+               {filepath.FromSlash("/a/b/c/"), filepath.FromSlash("/a"), filepath.FromSlash("b/c/")},
                {filepath.FromSlash("/c"), filepath.FromSlash("/a/b"), filepath.FromSlash("../../c")},
                {filepath.FromSlash("/c"), "", false},
        }

diff --git a/hugolib/page_permalink_test.go b/hugolib/page_permalink_test.go
index e7f7400ba708d6d95a9d47e9a7afaa45b7a90c4a..2e860ef8d85de903a5b55f0a7e88167f5a5373b5 100644 (file)
--- a/hugolib/page_permalink_test.go
+++ b/hugolib/page_permalink_test.go
@@ -26,6 +26,9 @@ func TestPermalink(t *testing.T) {
        }{
                {"x/y/z/boofar.md", "x/y/z", "", "", "", false, false, "/x/y/z/boofar/", "/x/y/z/boofar/"},
                {"x/y/z/boofar.md", "x/y/z/", "", "", "", false, false, "/x/y/z/boofar/", "/x/y/z/boofar/"},
+               // Issue #1174
+               {"x/y/z/boofar.md", "x/y/z", "http://gopher.com/", "", "", false, true, "http://gopher.com/x/y/z/boofar/", "/x/y/z/boofar/"},
+               {"x/y/z/boofar.md", "x/y/z/", "http://gopher.com/", "", "", true, true, "http://gopher.com/x/y/z/boofar.html", "/x/y/z/boofar.html"},
                {"x/y/z/boofar.md", "x/y/z/", "", "boofar", "", false, false, "/x/y/z/boofar/", "/x/y/z/boofar/"},
                {"x/y/z/boofar.md", "x/y/z", "http://barnew/", "", "", false, false, "http://barnew/x/y/z/boofar/", "/x/y/z/boofar/"},
                {"x/y/z/boofar.md", "x/y/z/", "http://barnew/", "boofar", "", false, false, "http://barnew/x/y/z/boofar/", "/x/y/z/boofar/"},