Skip to content

Commit

Permalink
resources/page: Make Taxonomy.Get and Taxonomy.Count case-insensitive
Browse files Browse the repository at this point in the history
Closes #12177
  • Loading branch information
jmooring authored and bep committed Mar 1, 2024
1 parent 92684f9 commit 3f217fd
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 2 deletions.
5 changes: 3 additions & 2 deletions resources/page/taxonomy.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package page
import (
"fmt"
"sort"
"strings"

"github.com/gohugoio/hugo/compare"
"github.com/gohugoio/hugo/langs"
Expand Down Expand Up @@ -58,11 +59,11 @@ type OrderedTaxonomyEntry struct {

// Get the weighted pages for the given key.
func (i Taxonomy) Get(key string) WeightedPages {
return i[key]
return i[strings.ToLower(key)]
}

// Count the weighted pages for the given key.
func (i Taxonomy) Count(key string) int { return len(i[key]) }
func (i Taxonomy) Count(key string) int { return len(i[strings.ToLower(key)]) }

// TaxonomyArray returns an ordered taxonomy with a non defined order.
func (i Taxonomy) TaxonomyArray() OrderedTaxonomy {
Expand Down
55 changes: 55 additions & 0 deletions resources/page/taxonomy_integration_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
// Copyright 2024 The Hugo Authors. All rights reserved.
//
// 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 page_test

import (
"testing"

"github.com/gohugoio/hugo/hugolib"
)

func TestTaxonomiesGetAndCount(t *testing.T) {
t.Parallel()

files := `
-- hugo.toml --
disableKinds = ['rss','sitemap']
[taxonomies]
author = 'authors'
-- layouts/_default/home.html --
John Smith count: {{ site.Taxonomies.authors.Count "John Smith" }}
Robert Jones count: {{ (site.Taxonomies.authors.Get "Robert Jones").Pages.Len }}
-- layouts/_default/single.html --
{{ .Title }}|
-- layouts/_default/list.html --
{{ .Title }}|
-- content/p1.md --
---
title: p1
authors: [John Smith,Robert Jones]
---
-- content/p2.md --
---
title: p2
authors: [John Smith]
---
`

b := hugolib.Test(t, files)

b.AssertFileContent("public/index.html",
"John Smith count: 2",
"Robert Jones count: 1",
)
}

0 comments on commit 3f217fd

Please sign in to comment.