2019-01-02 06:33:26 -05:00
|
|
|
// Copyright 2019 The Hugo Authors. All rights reserved.
|
2018-03-21 12:21:46 -04:00
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
package hugolib
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"os"
|
|
|
|
"path/filepath"
|
|
|
|
"testing"
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
"github.com/gohugoio/hugo/resources/page"
|
|
|
|
|
2018-03-21 12:21:46 -04:00
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
)
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
/en/p1.md
|
|
|
|
/nn/p1.md
|
|
|
|
|
|
|
|
.Readdir
|
|
|
|
|
|
|
|
- Name() => p1.en.md, p1.nn.md
|
|
|
|
|
|
|
|
.Stat(name)
|
|
|
|
|
|
|
|
.Open() --- real file name
|
|
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
func TestLanguageContentRoot(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
assert := require.New(t)
|
|
|
|
|
|
|
|
config := `
|
|
|
|
baseURL = "https://example.org/"
|
|
|
|
|
|
|
|
defaultContentLanguage = "en"
|
|
|
|
defaultContentLanguageInSubdir = true
|
|
|
|
|
|
|
|
contentDir = "content/main"
|
|
|
|
workingDir = "/my/project"
|
|
|
|
|
|
|
|
[Languages]
|
|
|
|
[Languages.en]
|
|
|
|
weight = 10
|
|
|
|
title = "In English"
|
|
|
|
languageName = "English"
|
|
|
|
|
|
|
|
[Languages.nn]
|
|
|
|
weight = 20
|
|
|
|
title = "På Norsk"
|
|
|
|
languageName = "Norsk"
|
|
|
|
# This tells Hugo that all content in this directory is in the Norwegian language.
|
|
|
|
# It does not have to have the "my-page.nn.md" format. It can, but that is optional.
|
|
|
|
contentDir = "content/norsk"
|
|
|
|
|
|
|
|
[Languages.sv]
|
|
|
|
weight = 30
|
|
|
|
title = "På Svenska"
|
|
|
|
languageName = "Svensk"
|
|
|
|
contentDir = "content/svensk"
|
|
|
|
`
|
|
|
|
|
|
|
|
pageTemplate := `
|
|
|
|
---
|
|
|
|
title: %s
|
|
|
|
slug: %s
|
|
|
|
weight: %d
|
|
|
|
---
|
|
|
|
|
|
|
|
Content.
|
|
|
|
|
2018-07-17 15:44:08 -04:00
|
|
|
SVP3-REF: {{< ref path="/sect/page3.md" lang="sv" >}}
|
|
|
|
SVP3-RELREF: {{< relref path="/sect/page3.md" lang="sv" >}}
|
|
|
|
|
2018-03-21 12:21:46 -04:00
|
|
|
`
|
|
|
|
|
|
|
|
pageBundleTemplate := `
|
|
|
|
---
|
|
|
|
title: %s
|
|
|
|
weight: %d
|
|
|
|
---
|
|
|
|
|
|
|
|
Content.
|
|
|
|
|
|
|
|
`
|
|
|
|
var contentFiles []string
|
|
|
|
section := "sect"
|
|
|
|
|
|
|
|
var contentRoot = func(lang string) string {
|
|
|
|
switch lang {
|
|
|
|
case "nn":
|
2019-01-02 06:33:26 -05:00
|
|
|
return "content/norsk"
|
2018-03-21 12:21:46 -04:00
|
|
|
case "sv":
|
2019-01-02 06:33:26 -05:00
|
|
|
return "content/svensk"
|
|
|
|
default:
|
|
|
|
return "content/main"
|
2018-03-21 12:21:46 -04:00
|
|
|
}
|
2019-01-02 06:33:26 -05:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
var contentSectionRoot = func(lang string) string {
|
|
|
|
return contentRoot(lang) + "/" + section
|
2018-03-21 12:21:46 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
for _, lang := range []string{"en", "nn", "sv"} {
|
|
|
|
for j := 1; j <= 10; j++ {
|
|
|
|
if (lang == "nn" || lang == "en") && j%4 == 0 {
|
|
|
|
// Skip 4 and 8 for nn
|
|
|
|
// We also skip it for en, but that is added to the Swedish directory below.
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
if lang == "sv" && j%5 == 0 {
|
|
|
|
// Skip 5 and 10 for sv
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
base := fmt.Sprintf("p-%s-%d", lang, j)
|
2019-01-02 06:33:26 -05:00
|
|
|
slug := base
|
2018-03-21 12:21:46 -04:00
|
|
|
langID := ""
|
|
|
|
|
|
|
|
if lang == "sv" && j%4 == 0 {
|
|
|
|
// Put an English page in the Swedish content dir.
|
|
|
|
langID = ".en"
|
|
|
|
}
|
|
|
|
|
|
|
|
if lang == "en" && j == 8 {
|
|
|
|
// This should win over the sv variant above.
|
|
|
|
langID = ".en"
|
|
|
|
}
|
|
|
|
|
|
|
|
slug += langID
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
contentRoot := contentSectionRoot(lang)
|
2018-03-21 12:21:46 -04:00
|
|
|
|
|
|
|
filename := filepath.Join(contentRoot, fmt.Sprintf("page%d%s.md", j, langID))
|
|
|
|
contentFiles = append(contentFiles, filename, fmt.Sprintf(pageTemplate, slug, slug, j))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Put common translations in all of them
|
|
|
|
for i, lang := range []string{"en", "nn", "sv"} {
|
2019-01-02 06:33:26 -05:00
|
|
|
contentRoot := contentSectionRoot(lang)
|
2018-03-21 12:21:46 -04:00
|
|
|
|
|
|
|
slug := fmt.Sprintf("common_%s", lang)
|
|
|
|
|
|
|
|
filename := filepath.Join(contentRoot, "common.md")
|
|
|
|
contentFiles = append(contentFiles, filename, fmt.Sprintf(pageTemplate, slug, slug, 100+i))
|
|
|
|
|
|
|
|
for j, lang2 := range []string{"en", "nn", "sv"} {
|
|
|
|
filename := filepath.Join(contentRoot, fmt.Sprintf("translated_all.%s.md", lang2))
|
|
|
|
langSlug := slug + "_translated_all_" + lang2
|
|
|
|
contentFiles = append(contentFiles, filename, fmt.Sprintf(pageTemplate, langSlug, langSlug, 200+i+j))
|
|
|
|
}
|
|
|
|
|
|
|
|
for j, lang2 := range []string{"sv", "nn"} {
|
|
|
|
if lang == "en" {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
filename := filepath.Join(contentRoot, fmt.Sprintf("translated_some.%s.md", lang2))
|
|
|
|
langSlug := slug + "_translated_some_" + lang2
|
|
|
|
contentFiles = append(contentFiles, filename, fmt.Sprintf(pageTemplate, langSlug, langSlug, 300+i+j))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a bundle with some images
|
|
|
|
for i, lang := range []string{"en", "nn", "sv"} {
|
2019-01-02 06:33:26 -05:00
|
|
|
contentRoot := contentSectionRoot(lang)
|
2018-03-21 12:21:46 -04:00
|
|
|
slug := fmt.Sprintf("bundle_%s", lang)
|
|
|
|
filename := filepath.Join(contentRoot, "mybundle", "index.md")
|
|
|
|
contentFiles = append(contentFiles, filename, fmt.Sprintf(pageBundleTemplate, slug, 400+i))
|
|
|
|
if lang == "en" {
|
|
|
|
imageFilename := filepath.Join(contentRoot, "mybundle", "logo.png")
|
|
|
|
contentFiles = append(contentFiles, imageFilename, "PNG Data")
|
|
|
|
}
|
|
|
|
imageFilename := filepath.Join(contentRoot, "mybundle", "featured.png")
|
|
|
|
contentFiles = append(contentFiles, imageFilename, fmt.Sprintf("PNG Data for %s", lang))
|
|
|
|
|
|
|
|
// Add some bundled pages
|
|
|
|
contentFiles = append(contentFiles, filepath.Join(contentRoot, "mybundle", "p1.md"), fmt.Sprintf(pageBundleTemplate, slug, 401+i))
|
|
|
|
contentFiles = append(contentFiles, filepath.Join(contentRoot, "mybundle", "sub", "p1.md"), fmt.Sprintf(pageBundleTemplate, slug, 402+i))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
// Add some static files inside the content dir
|
|
|
|
// https://github.com/gohugoio/hugo/issues/5759
|
|
|
|
for _, lang := range []string{"en", "nn", "sv"} {
|
|
|
|
contentRoot := contentRoot(lang)
|
|
|
|
for i := 0; i < 2; i++ {
|
|
|
|
filename := filepath.Join(contentRoot, "mystatic", fmt.Sprintf("file%d.yaml", i))
|
|
|
|
contentFiles = append(contentFiles, filename, lang)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-21 12:21:46 -04:00
|
|
|
b := newTestSitesBuilder(t)
|
|
|
|
b.WithWorkingDir("/my/project").WithConfigFile("toml", config).WithContent(contentFiles...).CreateSites()
|
|
|
|
|
|
|
|
_ = os.Stdout
|
|
|
|
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
err := b.BuildE(BuildCfg{})
|
|
|
|
|
|
|
|
//dumpPages(b.H.Sites[1].RegularPages()...)
|
|
|
|
|
|
|
|
assert.NoError(err)
|
2018-03-21 12:21:46 -04:00
|
|
|
|
|
|
|
assert.Equal(3, len(b.H.Sites))
|
|
|
|
|
|
|
|
enSite := b.H.Sites[0]
|
|
|
|
nnSite := b.H.Sites[1]
|
|
|
|
svSite := b.H.Sites[2]
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
b.AssertFileContent("/my/project/public/en/mystatic/file1.yaml", "en")
|
|
|
|
b.AssertFileContent("/my/project/public/nn/mystatic/file1.yaml", "nn")
|
|
|
|
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
//dumpPages(nnSite.RegularPages()...)
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
assert.Equal(12, len(nnSite.RegularPages()))
|
|
|
|
assert.Equal(13, len(enSite.RegularPages()))
|
2018-03-21 12:21:46 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
assert.Equal(10, len(svSite.RegularPages()))
|
2018-03-21 12:21:46 -04:00
|
|
|
|
2018-07-17 05:18:29 -04:00
|
|
|
svP2, err := svSite.getPageNew(nil, "/sect/page2.md")
|
|
|
|
assert.NoError(err)
|
|
|
|
nnP2, err := nnSite.getPageNew(nil, "/sect/page2.md")
|
|
|
|
assert.NoError(err)
|
|
|
|
|
|
|
|
enP2, err := enSite.getPageNew(nil, "/sect/page2.md")
|
|
|
|
assert.NoError(err)
|
2019-01-02 06:33:26 -05:00
|
|
|
assert.Equal("en", enP2.Language().Lang)
|
|
|
|
assert.Equal("sv", svP2.Language().Lang)
|
|
|
|
assert.Equal("nn", nnP2.Language().Lang)
|
2018-07-17 15:44:08 -04:00
|
|
|
|
|
|
|
content, _ := nnP2.Content()
|
|
|
|
assert.Contains(content, "SVP3-REF: https://example.org/sv/sect/p-sv-3/")
|
|
|
|
assert.Contains(content, "SVP3-RELREF: /sv/sect/p-sv-3/")
|
|
|
|
|
|
|
|
// Test RelRef with and without language indicator.
|
|
|
|
nn3RefArgs := map[string]interface{}{
|
|
|
|
"path": "/sect/page3.md",
|
|
|
|
"lang": "nn",
|
|
|
|
}
|
|
|
|
nnP3RelRef, err := svP2.RelRef(
|
|
|
|
nn3RefArgs,
|
|
|
|
)
|
|
|
|
assert.NoError(err)
|
|
|
|
assert.Equal("/nn/sect/p-nn-3/", nnP3RelRef)
|
|
|
|
nnP3Ref, err := svP2.Ref(
|
|
|
|
nn3RefArgs,
|
|
|
|
)
|
|
|
|
assert.NoError(err)
|
|
|
|
assert.Equal("https://example.org/nn/sect/p-nn-3/", nnP3Ref)
|
2018-07-17 05:18:29 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
for i, p := range enSite.RegularPages() {
|
2018-03-21 12:21:46 -04:00
|
|
|
j := i + 1
|
|
|
|
msg := fmt.Sprintf("Test %d", j)
|
2019-01-02 06:33:26 -05:00
|
|
|
assert.Equal("en", p.Language().Lang, msg)
|
2018-03-21 12:21:46 -04:00
|
|
|
assert.Equal("sect", p.Section())
|
|
|
|
if j < 9 {
|
|
|
|
if j%4 == 0 {
|
|
|
|
assert.Contains(p.Title(), fmt.Sprintf("p-sv-%d.en", i+1), msg)
|
|
|
|
} else {
|
|
|
|
assert.Contains(p.Title(), "p-en", msg)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check bundles
|
2019-01-02 06:33:26 -05:00
|
|
|
bundleEn := enSite.RegularPages()[len(enSite.RegularPages())-1]
|
|
|
|
bundleNn := nnSite.RegularPages()[len(nnSite.RegularPages())-1]
|
|
|
|
bundleSv := svSite.RegularPages()[len(svSite.RegularPages())-1]
|
2018-03-21 12:21:46 -04:00
|
|
|
|
|
|
|
assert.Equal("/en/sect/mybundle/", bundleEn.RelPermalink())
|
|
|
|
assert.Equal("/sv/sect/mybundle/", bundleSv.RelPermalink())
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
assert.Equal(4, len(bundleNn.Resources()))
|
|
|
|
assert.Equal(4, len(bundleSv.Resources()))
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
assert.Equal(4, len(bundleEn.Resources()))
|
2018-03-21 12:21:46 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
b.AssertFileContent("/my/project/public/en/sect/mybundle/index.html", "image/png: /en/sect/mybundle/logo.png")
|
|
|
|
b.AssertFileContent("/my/project/public/nn/sect/mybundle/index.html", "image/png: /nn/sect/mybundle/logo.png")
|
|
|
|
b.AssertFileContent("/my/project/public/sv/sect/mybundle/index.html", "image/png: /sv/sect/mybundle/logo.png")
|
2018-03-21 12:21:46 -04:00
|
|
|
|
|
|
|
b.AssertFileContent("/my/project/public/sv/sect/mybundle/featured.png", "PNG Data for sv")
|
|
|
|
b.AssertFileContent("/my/project/public/nn/sect/mybundle/featured.png", "PNG Data for nn")
|
|
|
|
b.AssertFileContent("/my/project/public/en/sect/mybundle/featured.png", "PNG Data for en")
|
|
|
|
b.AssertFileContent("/my/project/public/en/sect/mybundle/logo.png", "PNG Data")
|
|
|
|
b.AssertFileContent("/my/project/public/sv/sect/mybundle/logo.png", "PNG Data")
|
|
|
|
b.AssertFileContent("/my/project/public/nn/sect/mybundle/logo.png", "PNG Data")
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
nnSect := nnSite.getPage(page.KindSection, "sect")
|
2018-03-21 12:21:46 -04:00
|
|
|
assert.NotNil(nnSect)
|
2019-01-02 06:33:26 -05:00
|
|
|
assert.Equal(12, len(nnSect.Pages()))
|
2018-03-21 12:21:46 -04:00
|
|
|
nnHome, _ := nnSite.Info.Home()
|
|
|
|
assert.Equal("/nn/", nnHome.RelPermalink())
|
|
|
|
|
|
|
|
}
|