Skip to content
Permalink
Browse files

Fix cache keys for bundled resoures in transform.Unmarshal

Fixes #6327
  • Loading branch information...
bep committed Sep 12, 2019
1 parent fcfa6f3 commit c0d7573677e9726c14749ccd432dccb75e0d194d
Showing with 32 additions and 2 deletions.
  1. +30 −0 hugolib/hugo_smoke_test.go
  2. +1 −1 resources/resource.go
  3. +1 −1 resources/resource_test.go
@@ -301,3 +301,33 @@ The content.

b.CreateSites().Build(BuildCfg{})
}

func TestBundleMany(t *testing.T) {

b := newTestSitesBuilder(t).WithSimpleConfigFile()
for i := 1; i <= 50; i++ {
b.WithContent(fmt.Sprintf("bundle%d/index.md", i), fmt.Sprintf(`
---
title: "Page %d"
---
`, i))
b.WithSourceFile(fmt.Sprintf("content/bundle%d/data.yaml", i), fmt.Sprintf(`
data: v%d
`, i))
}

b.WithTemplatesAdded("_default/single.html", `
{{ $yaml := .Resources.GetMatch "*.yaml" }}
{{ $data := $yaml | transform.Unmarshal }}
data content: {{ $yaml.Content | safeHTML }}
data unmarshaled: {{ $data.data }}
`)

b.CreateSites().Build(BuildCfg{})

for i := 1; i <= 50; i++ {
b.AssertFileContent(fmt.Sprintf("public/bundle%d/data.yaml", i), fmt.Sprintf("data: v%d", i))
b.AssertFileContent(fmt.Sprintf("public/bundle%d/index.html", i), fmt.Sprintf("data unmarshaled: v%d", i))
}
}
@@ -213,7 +213,7 @@ func (l *genericResource) Data() interface{} {
}

func (l *genericResource) Key() string {
return l.relTargetDirFile.path()
return l.RelPermalink()
}

func (l *genericResource) MediaType() media.Type {
@@ -52,7 +52,7 @@ func TestGenericResourceWithLinkFacory(t *testing.T) {

c.Assert(r.Permalink(), qt.Equals, "https://example.com/foo/foo.css")
c.Assert(r.RelPermalink(), qt.Equals, "/foo/foo.css")
c.Assert(r.Key(), qt.Equals, "foo.css")
c.Assert(r.Key(), qt.Equals, "/foo/foo.css")
c.Assert(r.ResourceType(), qt.Equals, "css")
}

0 comments on commit c0d7573

Please sign in to comment.
You can’t perform that action at this time.