Skip to content

Commit 20c9b6e

Browse files
committed
resource: Add front matter metadata to Resource
This commit expands the Resource interface with 3 new methods: * Name * Title * Params All of these can be set in the Page front matter. `Name` will get its default value from the base filename, and is the value used in the ByPrefix and GetByPrefix lookup methods. Fixes #4244
1 parent f8a119b commit 20c9b6e

27 files changed

+627
-187
lines changed

‎hugolib/hugo_sites_build_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ func doTestMultiSitesBuild(t *testing.T, configTemplate, configSuffix string) {
225225

226226
gp1 := sites.GetContentPage(filepath.FromSlash("content/sect/doc1.en.md"))
227227
require.NotNil(t, gp1)
228-
require.Equal(t, "doc1", gp1.Title)
228+
require.Equal(t, "doc1", gp1.title)
229229
gp2 := sites.GetContentPage(filepath.FromSlash("content/dummysect/notfound.md"))
230230
require.Nil(t, gp2)
231231

@@ -317,9 +317,9 @@ func doTestMultiSitesBuild(t *testing.T, configTemplate, configSuffix string) {
317317
require.Len(t, homeEn.Translations(), 3)
318318
require.Equal(t, "fr", homeEn.Translations()[0].Lang())
319319
require.Equal(t, "nn", homeEn.Translations()[1].Lang())
320-
require.Equal(t, "På nynorsk", homeEn.Translations()[1].Title)
320+
require.Equal(t, "På nynorsk", homeEn.Translations()[1].title)
321321
require.Equal(t, "nb", homeEn.Translations()[2].Lang())
322-
require.Equal(t, "På bokmål", homeEn.Translations()[2].Title, configSuffix)
322+
require.Equal(t, "På bokmål", homeEn.Translations()[2].title, configSuffix)
323323
require.Equal(t, "Bokmål", homeEn.Translations()[2].Language().LanguageName, configSuffix)
324324

325325
sectFr := frSite.getPage(KindSection, "sect")
@@ -328,7 +328,7 @@ func doTestMultiSitesBuild(t *testing.T, configTemplate, configSuffix string) {
328328
require.Equal(t, "fr", sectFr.Lang())
329329
require.Len(t, sectFr.Translations(), 1)
330330
require.Equal(t, "en", sectFr.Translations()[0].Lang())
331-
require.Equal(t, "Sects", sectFr.Translations()[0].Title)
331+
require.Equal(t, "Sects", sectFr.Translations()[0].title)
332332

333333
nnSite := sites.Sites[2]
334334
require.Equal(t, "nn", nnSite.Language.Lang)
@@ -495,9 +495,9 @@ func TestMultiSitesRebuild(t *testing.T) {
495495
require.Len(t, enSite.RegularPages, 6)
496496
require.Len(t, enSite.AllPages, 34)
497497
require.Len(t, frSite.RegularPages, 5)
498-
require.Equal(t, "new_fr_1", frSite.RegularPages[3].Title)
499-
require.Equal(t, "new_en_2", enSite.RegularPages[0].Title)
500-
require.Equal(t, "new_en_1", enSite.RegularPages[1].Title)
498+
require.Equal(t, "new_fr_1", frSite.RegularPages[3].title)
499+
require.Equal(t, "new_en_2", enSite.RegularPages[0].title)
500+
require.Equal(t, "new_en_1", enSite.RegularPages[1].title)
501501

502502
rendered := readDestination(t, fs, "public/en/new1/index.html")
503503
require.True(t, strings.Contains(rendered, "new_en_1"), rendered)
@@ -531,7 +531,7 @@ func TestMultiSitesRebuild(t *testing.T) {
531531
},
532532
func(t *testing.T) {
533533
require.Len(t, enSite.RegularPages, 6, "Rename")
534-
require.Equal(t, "new_en_1", enSite.RegularPages[1].Title)
534+
require.Equal(t, "new_en_1", enSite.RegularPages[1].title)
535535
rendered := readDestination(t, fs, "public/en/new1renamed/index.html")
536536
require.True(t, strings.Contains(rendered, "new_en_1"), rendered)
537537
}},
@@ -683,7 +683,7 @@ title = "Svenska"
683683
// Veriy Swedish site
684684
require.Len(t, svSite.RegularPages, 1)
685685
svPage := svSite.RegularPages[0]
686-
require.Equal(t, "Swedish Contentfile", svPage.Title)
686+
require.Equal(t, "Swedish Contentfile", svPage.title)
687687
require.Equal(t, "sv", svPage.Lang())
688688
require.Len(t, svPage.Translations(), 2)
689689
require.Len(t, svPage.AllTranslations(), 3)

‎hugolib/node_as_page_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func doTestNodeAsPage(t *testing.T, ugly, preserveTaxonomyNames bool) {
104104
require.True(t, home.Path() != "")
105105

106106
section2 := nodes[5]
107-
require.Equal(t, "Section2", section2.Title)
107+
require.Equal(t, "Section2", section2.title)
108108

109109
pages := sites.findAllPagesByKind(KindPage)
110110
require.Len(t, pages, 4)
@@ -252,9 +252,9 @@ func doTestNodesWithNoContentFile(t *testing.T, ugly bool) {
252252
for _, p := range pages {
253253
var want string
254254
if ugly {
255-
want = "/" + p.s.PathSpec.URLize(p.Title) + ".html"
255+
want = "/" + p.s.PathSpec.URLize(p.title) + ".html"
256256
} else {
257-
want = "/" + p.s.PathSpec.URLize(p.Title) + "/"
257+
want = "/" + p.s.PathSpec.URLize(p.title) + "/"
258258
}
259259
if p.URL() != want {
260260
t.Errorf("Taxonomy term URL mismatch: want %q, got %q", want, p.URL())

0 commit comments

Comments
 (0)