mirror of
https://github.com/gohugoio/hugo.git
synced 2024-05-13 04:52:48 +00:00
Compare commits
8 commits
3e31be877a
...
279c8eb184
Author | SHA1 | Date | |
---|---|---|---|
279c8eb184 | |||
74ce5dc841 | |||
54a8f0ce21 | |||
38e05bd3c7 | |||
ebfca61ac4 | |||
e1917740af | |||
28434238db | |||
5a72de2600 |
|
@ -44,15 +44,9 @@ type Disqus struct {
|
||||||
type GoogleAnalytics struct {
|
type GoogleAnalytics struct {
|
||||||
Service `mapstructure:",squash"`
|
Service `mapstructure:",squash"`
|
||||||
|
|
||||||
// Enabling this will disable the use of Cookies and use Session Storage to Store the GA Client ID.
|
|
||||||
UseSessionStorage bool
|
|
||||||
|
|
||||||
// Enabling this will make the GA templates respect the
|
// Enabling this will make the GA templates respect the
|
||||||
// "Do Not Track" HTTP header. See https://www.paulfurley.com/google-analytics-dnt/.
|
// "Do Not Track" HTTP header. See https://www.paulfurley.com/google-analytics-dnt/.
|
||||||
RespectDoNotTrack bool
|
RespectDoNotTrack bool
|
||||||
|
|
||||||
// Enabling this will make it so the users' IP addresses are anonymized within Google Analytics.
|
|
||||||
AnonymizeIP bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Instagram holds the privacy configuration settings related to the Instagram shortcode.
|
// Instagram holds the privacy configuration settings related to the Instagram shortcode.
|
||||||
|
|
|
@ -33,8 +33,6 @@ disable = true
|
||||||
[privacy.googleAnalytics]
|
[privacy.googleAnalytics]
|
||||||
disable = true
|
disable = true
|
||||||
respectDoNotTrack = true
|
respectDoNotTrack = true
|
||||||
anonymizeIP = true
|
|
||||||
useSessionStorage = true
|
|
||||||
[privacy.instagram]
|
[privacy.instagram]
|
||||||
disable = true
|
disable = true
|
||||||
simple = true
|
simple = true
|
||||||
|
@ -60,8 +58,7 @@ simple = true
|
||||||
|
|
||||||
got := []bool{
|
got := []bool{
|
||||||
pc.Disqus.Disable, pc.GoogleAnalytics.Disable,
|
pc.Disqus.Disable, pc.GoogleAnalytics.Disable,
|
||||||
pc.GoogleAnalytics.RespectDoNotTrack, pc.GoogleAnalytics.AnonymizeIP,
|
pc.GoogleAnalytics.RespectDoNotTrack, pc.Instagram.Disable,
|
||||||
pc.GoogleAnalytics.UseSessionStorage, pc.Instagram.Disable,
|
|
||||||
pc.Instagram.Simple, pc.Twitter.Disable, pc.Twitter.EnableDNT,
|
pc.Instagram.Simple, pc.Twitter.Disable, pc.Twitter.EnableDNT,
|
||||||
pc.Twitter.Simple, pc.Vimeo.Disable, pc.Vimeo.EnableDNT, pc.Vimeo.Simple,
|
pc.Twitter.Simple, pc.Vimeo.Disable, pc.Vimeo.EnableDNT, pc.Vimeo.Simple,
|
||||||
pc.YouTube.PrivacyEnhanced, pc.YouTube.Disable,
|
pc.YouTube.PrivacyEnhanced, pc.YouTube.Disable,
|
||||||
|
|
48
docs/content/en/functions/bool.md
Normal file
48
docs/content/en/functions/bool.md
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
---
|
||||||
|
title: bool
|
||||||
|
linktitle: bool
|
||||||
|
description: Creates a `bool` from the argument passed into the function.
|
||||||
|
date: 2023-01-28
|
||||||
|
publishdate: 2023-01-28
|
||||||
|
lastmod: 2023-01-28
|
||||||
|
categories: [functions]
|
||||||
|
menu:
|
||||||
|
docs:
|
||||||
|
parent: "functions"
|
||||||
|
keywords: [strings,boolean,bool]
|
||||||
|
signature: ["bool INPUT"]
|
||||||
|
workson: []
|
||||||
|
hugoversion:
|
||||||
|
relatedfuncs: [truth]
|
||||||
|
deprecated: false
|
||||||
|
aliases: []
|
||||||
|
---
|
||||||
|
|
||||||
|
Useful for turning ints, strings, and nil into booleans.
|
||||||
|
|
||||||
|
```
|
||||||
|
{{ bool "true" }} → true
|
||||||
|
{{ bool "false" }} → false
|
||||||
|
|
||||||
|
{{ bool "TRUE" }} → true
|
||||||
|
{{ bool "FALSE" }} → false
|
||||||
|
|
||||||
|
{{ truth "t" }} → true
|
||||||
|
{{ truth "f" }} → false
|
||||||
|
|
||||||
|
{{ truth "T" }} → true
|
||||||
|
{{ truth "F" }} → false
|
||||||
|
|
||||||
|
{{ bool "1" }} → true
|
||||||
|
{{ bool "0" }} → false
|
||||||
|
|
||||||
|
{{ bool 1 }} → true
|
||||||
|
{{ bool 0 }} → false
|
||||||
|
|
||||||
|
{{ bool true }} → true
|
||||||
|
{{ bool false }} → false
|
||||||
|
|
||||||
|
{{ bool nil }} → false
|
||||||
|
```
|
||||||
|
|
||||||
|
This function will throw a type-casting error for most other types or strings. For less strict behavior, see [`truth`](/functions/truth).
|
51
docs/content/en/functions/truth.md
Normal file
51
docs/content/en/functions/truth.md
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
---
|
||||||
|
title: truth
|
||||||
|
linktitle: truth
|
||||||
|
description: Creates a `bool` from the truthyness of the argument passed into the function
|
||||||
|
date: 2023-01-28
|
||||||
|
publishdate: 2023-01-28
|
||||||
|
lastmod: 2023-01-28
|
||||||
|
categories: [functions]
|
||||||
|
menu:
|
||||||
|
docs:
|
||||||
|
parent: "functions"
|
||||||
|
keywords: [strings,boolean,bool,truthy,falsey]
|
||||||
|
signature: ["truth INPUT"]
|
||||||
|
workson: []
|
||||||
|
hugoversion:
|
||||||
|
relatedfuncs: [bool]
|
||||||
|
deprecated: false
|
||||||
|
aliases: []
|
||||||
|
---
|
||||||
|
|
||||||
|
Useful for turning different types into booleans based on their [truthy-ness](https://developer.mozilla.org/en-US/docs/Glossary/Truthy).
|
||||||
|
|
||||||
|
```
|
||||||
|
{{ truth "true" }} → true
|
||||||
|
{{ truth "false" }} → true
|
||||||
|
|
||||||
|
{{ truth "TRUE" }} → true
|
||||||
|
{{ truth "FALSE" }} → true
|
||||||
|
|
||||||
|
{{ truth "t" }} → true
|
||||||
|
{{ truth "f" }} → true
|
||||||
|
|
||||||
|
{{ truth "T" }} → true
|
||||||
|
{{ truth "F" }} → true
|
||||||
|
|
||||||
|
{{ truth "1" }} → true
|
||||||
|
{{ truth "0" }} → true
|
||||||
|
|
||||||
|
{{ truth 1 }} → true
|
||||||
|
{{ truth 0 }} → false
|
||||||
|
|
||||||
|
{{ truth true }} → true
|
||||||
|
{{ truth false }} → false
|
||||||
|
|
||||||
|
{{ truth nil }} → false
|
||||||
|
|
||||||
|
{{ truth "cheese" }} → true
|
||||||
|
{{ truth 1.67 }} → true
|
||||||
|
```
|
||||||
|
|
||||||
|
This function will not throw an error. For more strict behavior, see [`bool`](/functions/bool).
|
|
@ -1557,10 +1557,8 @@ config:
|
||||||
disqus:
|
disqus:
|
||||||
disable: false
|
disable: false
|
||||||
googleAnalytics:
|
googleAnalytics:
|
||||||
anonymizeIP: false
|
|
||||||
disable: false
|
disable: false
|
||||||
respectDoNotTrack: false
|
respectDoNotTrack: false
|
||||||
useSessionStorage: false
|
|
||||||
instagram:
|
instagram:
|
||||||
disable: false
|
disable: false
|
||||||
simple: false
|
simple: false
|
||||||
|
|
|
@ -15,8 +15,6 @@ package hugolib
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
qt "github.com/frankban/quicktest"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestInternalTemplatesImage(t *testing.T) {
|
func TestInternalTemplatesImage(t *testing.T) {
|
||||||
|
@ -70,9 +68,9 @@ title: My Site
|
||||||
<meta property="article:published_time" content="2021-02-26T18:02:00-01:00" />
|
<meta property="article:published_time" content="2021-02-26T18:02:00-01:00" />
|
||||||
<meta property="article:modified_time" content="2021-05-22T19:25:00-01:00" />
|
<meta property="article:modified_time" content="2021-05-22T19:25:00-01:00" />
|
||||||
<meta itemprop="name" content="My Bundle">
|
<meta itemprop="name" content="My Bundle">
|
||||||
<meta itemprop="image" content="https://example.org/mybundle/featured-sunset.jpg" />
|
<meta itemprop="image" content="https://example.org/mybundle/featured-sunset.jpg">
|
||||||
<meta itemprop="datePublished" content="2021-02-26T18:02:00-01:00" />
|
<meta itemprop="datePublished" content="2021-02-26T18:02:00-01:00">
|
||||||
<meta itemprop="dateModified" content="2021-05-22T19:25:00-01:00" />
|
<meta itemprop="dateModified" content="2021-05-22T19:25:00-01:00">
|
||||||
|
|
||||||
`)
|
`)
|
||||||
b.AssertFileContent("public/mypage/index.html", `
|
b.AssertFileContent("public/mypage/index.html", `
|
||||||
|
@ -83,57 +81,20 @@ title: My Site
|
||||||
<meta property="og:image" content="https://example.org/mypage/sample.jpg" />
|
<meta property="og:image" content="https://example.org/mypage/sample.jpg" />
|
||||||
<meta property="article:published_time" content="2021-02-26T18:02:00+01:00" />
|
<meta property="article:published_time" content="2021-02-26T18:02:00+01:00" />
|
||||||
<meta property="article:modified_time" content="2021-05-22T19:25:00+01:00" />
|
<meta property="article:modified_time" content="2021-05-22T19:25:00+01:00" />
|
||||||
<meta itemprop="image" content="https://example.org/pageimg1.jpg" />
|
<meta itemprop="image" content="https://example.org/pageimg1.jpg">
|
||||||
<meta itemprop="image" content="https://example.org/pageimg2.jpg" />
|
<meta itemprop="image" content="https://example.org/pageimg2.jpg">
|
||||||
<meta itemprop="image" content="https://example.local/logo.png" />
|
<meta itemprop="image" content="https://example.local/logo.png">
|
||||||
<meta itemprop="image" content="https://example.org/mypage/sample.jpg" />
|
<meta itemprop="image" content="https://example.org/mypage/sample.jpg">
|
||||||
<meta itemprop="datePublished" content="2021-02-26T18:02:00+01:00" />
|
<meta itemprop="datePublished" content="2021-02-26T18:02:00+01:00">
|
||||||
<meta itemprop="dateModified" content="2021-05-22T19:25:00+01:00" />
|
<meta itemprop="dateModified" content="2021-05-22T19:25:00+01:00">
|
||||||
`)
|
`)
|
||||||
b.AssertFileContent("public/mysite/index.html", `
|
b.AssertFileContent("public/mysite/index.html", `
|
||||||
<meta name="twitter:image" content="https://example.org/siteimg1.jpg" />
|
<meta name="twitter:image" content="https://example.org/siteimg1.jpg" />
|
||||||
<meta property="og:image" content="https://example.org/siteimg1.jpg" />
|
<meta property="og:image" content="https://example.org/siteimg1.jpg" />
|
||||||
<meta itemprop="image" content="https://example.org/siteimg1.jpg" />
|
<meta itemprop="image" content="https://example.org/siteimg1.jpg">
|
||||||
`)
|
`)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Just some simple test of the embedded templates to avoid
|
|
||||||
// https://github.com/gohugoio/hugo/issues/4757 and similar.
|
|
||||||
func TestEmbeddedTemplates(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
|
|
||||||
c := qt.New(t)
|
|
||||||
c.Assert(true, qt.Equals, true)
|
|
||||||
|
|
||||||
home := []string{"index.html", `
|
|
||||||
GA:
|
|
||||||
{{ template "_internal/google_analytics.html" . }}
|
|
||||||
|
|
||||||
GA async:
|
|
||||||
|
|
||||||
{{ template "_internal/google_analytics_async.html" . }}
|
|
||||||
|
|
||||||
Disqus:
|
|
||||||
|
|
||||||
{{ template "_internal/disqus.html" . }}
|
|
||||||
|
|
||||||
`}
|
|
||||||
|
|
||||||
b := newTestSitesBuilder(t)
|
|
||||||
b.WithSimpleConfigFile().WithTemplatesAdded(home...)
|
|
||||||
|
|
||||||
b.Build(BuildCfg{})
|
|
||||||
|
|
||||||
// Gheck GA regular and async
|
|
||||||
b.AssertFileContent("public/index.html",
|
|
||||||
"'anonymizeIp', true",
|
|
||||||
"'script','https://www.google-analytics.com/analytics.js','ga');\n\tga('create', 'UA-ga_id', 'auto')",
|
|
||||||
"<script async src='https://www.google-analytics.com/analytics.js'>")
|
|
||||||
|
|
||||||
// Disqus
|
|
||||||
b.AssertFileContent("public/index.html", "\"disqus_shortname\" + '.disqus.com/embed.js';")
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestEmbeddedPaginationTemplate(t *testing.T) {
|
func TestEmbeddedPaginationTemplate(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
|
|
|
@ -449,7 +449,9 @@ func (s *Site) Params() maps.Params {
|
||||||
|
|
||||||
// Deprecated: Use taxonomies instead.
|
// Deprecated: Use taxonomies instead.
|
||||||
func (s *Site) Author() map[string]any {
|
func (s *Site) Author() map[string]any {
|
||||||
hugo.Deprecate(".Site.Author", "Use taxonomies instead.", "v0.124.0")
|
if len(s.conf.Author) != 0 {
|
||||||
|
hugo.Deprecate(".Site.Author", "Use taxonomies instead.", "v0.124.0")
|
||||||
|
}
|
||||||
return s.conf.Author
|
return s.conf.Author
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -258,7 +258,6 @@ id = "UA-ga_id"
|
||||||
disable = false
|
disable = false
|
||||||
[privacy.googleAnalytics]
|
[privacy.googleAnalytics]
|
||||||
respectDoNotTrack = true
|
respectDoNotTrack = true
|
||||||
anonymizeIP = true
|
|
||||||
[privacy.instagram]
|
[privacy.instagram]
|
||||||
simple = true
|
simple = true
|
||||||
[privacy.twitter]
|
[privacy.twitter]
|
||||||
|
|
|
@ -57,7 +57,7 @@ func New(rs *resources.Spec) *Client {
|
||||||
|
|
||||||
// Copy copies r to the new targetPath.
|
// Copy copies r to the new targetPath.
|
||||||
func (c *Client) Copy(r resource.Resource, targetPath string) (resource.Resource, error) {
|
func (c *Client) Copy(r resource.Resource, targetPath string) (resource.Resource, error) {
|
||||||
key := dynacache.CleanKey(targetPath)
|
key := dynacache.CleanKey(targetPath) + "__copy"
|
||||||
return c.rs.ResourceCache.GetOrCreate(key, func() (resource.Resource, error) {
|
return c.rs.ResourceCache.GetOrCreate(key, func() (resource.Resource, error) {
|
||||||
return resources.Copy(r, targetPath), nil
|
return resources.Copy(r, targetPath), nil
|
||||||
})
|
})
|
||||||
|
@ -66,7 +66,7 @@ func (c *Client) Copy(r resource.Resource, targetPath string) (resource.Resource
|
||||||
// Get creates a new Resource by opening the given pathname in the assets filesystem.
|
// Get creates a new Resource by opening the given pathname in the assets filesystem.
|
||||||
func (c *Client) Get(pathname string) (resource.Resource, error) {
|
func (c *Client) Get(pathname string) (resource.Resource, error) {
|
||||||
pathname = path.Clean(pathname)
|
pathname = path.Clean(pathname)
|
||||||
key := dynacache.CleanKey(pathname)
|
key := dynacache.CleanKey(pathname) + "__get"
|
||||||
|
|
||||||
return c.rs.ResourceCache.GetOrCreate(key, func() (resource.Resource, error) {
|
return c.rs.ResourceCache.GetOrCreate(key, func() (resource.Resource, error) {
|
||||||
// The resource file will not be read before it gets used (e.g. in .Content),
|
// The resource file will not be read before it gets used (e.g. in .Content),
|
||||||
|
|
|
@ -227,3 +227,50 @@ eventDate: 2023-11-01T07:00:00-08:00
|
||||||
|
|
||||||
b.AssertFileContent("public/index.html", "2023-11|p9|p8|p7|2023-10|p6|p5|p4|2023-09|p3|p2|p1|")
|
b.AssertFileContent("public/index.html", "2023-11|p9|p8|p7|2023-10|p6|p5|p4|2023-09|p3|p2|p1|")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Issue 10412
|
||||||
|
func TestImageTransformThenCopy(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
files := `
|
||||||
|
-- hugo.toml --
|
||||||
|
disableKinds = ['page','rss','section','sitemap','taxonomy','term']
|
||||||
|
-- assets/pixel.png --
|
||||||
|
iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==
|
||||||
|
-- layouts/index.html --
|
||||||
|
{{- with resources.Get "pixel.png" }}
|
||||||
|
{{- with .Resize "200x" | resources.Copy "pixel.png" }}
|
||||||
|
<img src="{{ .RelPermalink }}" width="{{ .Width }}" height="{{ .Height }}">|{{ .Key }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
`
|
||||||
|
|
||||||
|
b := hugolib.Test(t, files)
|
||||||
|
|
||||||
|
b.AssertFileExists("public/pixel.png", true)
|
||||||
|
b.AssertFileContent("public/index.html",
|
||||||
|
`<img src="/pixel.png" width="200" height="200">|/pixel.png`,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Issue 12310
|
||||||
|
func TestUseDifferentCacheKeyForResourceCopy(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
files := `
|
||||||
|
-- hugo.toml --
|
||||||
|
disableKinds = ['page','section','rss','sitemap','taxonomy','term']
|
||||||
|
-- assets/a.txt --
|
||||||
|
This was assets/a.txt
|
||||||
|
-- layouts/index.html --
|
||||||
|
{{ $nilResource := resources.Get "/p1/b.txt" }}
|
||||||
|
{{ $r := resources.Get "a.txt" }}
|
||||||
|
{{ $r = resources.Copy "/p1/b.txt" $r }}
|
||||||
|
{{ $r.RelPermalink }}
|
||||||
|
`
|
||||||
|
|
||||||
|
b, err := hugolib.TestE(t, files)
|
||||||
|
|
||||||
|
b.Assert(err, qt.IsNil)
|
||||||
|
b.AssertFileContent("public/p1/b.txt", "This was assets/a.txt")
|
||||||
|
}
|
||||||
|
|
|
@ -17,6 +17,7 @@ package cast
|
||||||
import (
|
import (
|
||||||
"html/template"
|
"html/template"
|
||||||
|
|
||||||
|
"github.com/gohugoio/hugo/common/hreflect"
|
||||||
_cast "github.com/spf13/cast"
|
_cast "github.com/spf13/cast"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -45,6 +46,23 @@ func (ns *Namespace) ToFloat(v any) (float64, error) {
|
||||||
return _cast.ToFloat64E(v)
|
return _cast.ToFloat64E(v)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ToBool converts v to a boolean.
|
||||||
|
func (ns *Namespace) ToBool(v any) (bool, error) {
|
||||||
|
v = convertTemplateToString(v)
|
||||||
|
result, err := _cast.ToBoolE(v)
|
||||||
|
if err != nil {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ToTruth yields the same behavior as ToBool when possible.
|
||||||
|
// If the cast is unsuccessful, ToTruth converts v to a boolean using the JavaScript [definition of truthy](https://developer.mozilla.org/en-US/docs/Glossary/Truthy).
|
||||||
|
// Accordingly, it never yields an error, but maintains the signature of other cast methods for consistency.
|
||||||
|
func (ns *Namespace) ToTruth(v any) (bool, error) {
|
||||||
|
return hreflect.IsTruthful(v), nil
|
||||||
|
}
|
||||||
|
|
||||||
func convertTemplateToString(v any) any {
|
func convertTemplateToString(v any) any {
|
||||||
switch vv := v.(type) {
|
switch vv := v.(type) {
|
||||||
case template.HTML:
|
case template.HTML:
|
||||||
|
|
|
@ -117,3 +117,90 @@ func TestToFloat(t *testing.T) {
|
||||||
c.Assert(result, qt.Equals, test.expect, errMsg)
|
c.Assert(result, qt.Equals, test.expect, errMsg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestToBool(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
c := qt.New(t)
|
||||||
|
ns := New()
|
||||||
|
|
||||||
|
for i, test := range []struct {
|
||||||
|
v any
|
||||||
|
expect any
|
||||||
|
error any
|
||||||
|
}{
|
||||||
|
{"true", true, nil},
|
||||||
|
{"false", false, nil},
|
||||||
|
{"TRUE", true, nil},
|
||||||
|
{"FALSE", false, nil},
|
||||||
|
{"t", true, nil},
|
||||||
|
{"f", false, nil},
|
||||||
|
{"T", true, nil},
|
||||||
|
{"F", false, nil},
|
||||||
|
{"1", true, nil},
|
||||||
|
{"0", false, nil},
|
||||||
|
{1, true, nil},
|
||||||
|
{0, false, nil},
|
||||||
|
{true, true, nil},
|
||||||
|
{false, false, nil},
|
||||||
|
{nil, false, nil},
|
||||||
|
|
||||||
|
{"cheese", false, nil},
|
||||||
|
{"", false, nil},
|
||||||
|
} {
|
||||||
|
errMsg := qt.Commentf("[%d] %v", i, test.v)
|
||||||
|
|
||||||
|
result, err := ns.ToBool(test.v)
|
||||||
|
|
||||||
|
if b, ok := test.error.(bool); ok && !b {
|
||||||
|
c.Assert(err, qt.Not(qt.IsNil), errMsg)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
c.Assert(err, qt.IsNil, errMsg)
|
||||||
|
c.Assert(result, qt.Equals, test.expect, errMsg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestToTruth(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
c := qt.New(t)
|
||||||
|
ns := New()
|
||||||
|
|
||||||
|
for i, test := range []struct {
|
||||||
|
v any
|
||||||
|
expect any
|
||||||
|
}{
|
||||||
|
{"true", true},
|
||||||
|
{"false", true},
|
||||||
|
{"TRUE", true},
|
||||||
|
{"FALSE", true},
|
||||||
|
{"t", true},
|
||||||
|
{"f", true},
|
||||||
|
{"T", true},
|
||||||
|
{"F", true},
|
||||||
|
{"1", true},
|
||||||
|
{"0", true},
|
||||||
|
{1, true},
|
||||||
|
{0, false},
|
||||||
|
{"cheese", true},
|
||||||
|
{"", false},
|
||||||
|
{1.67, true},
|
||||||
|
{template.HTML("2"), true},
|
||||||
|
{template.CSS("3"), true},
|
||||||
|
{template.HTMLAttr("4"), true},
|
||||||
|
{template.JS("-5.67"), true},
|
||||||
|
{template.JSStr("6"), true},
|
||||||
|
{t, true},
|
||||||
|
{nil, false},
|
||||||
|
{"null", true},
|
||||||
|
{"undefined", true},
|
||||||
|
{"NaN", true},
|
||||||
|
} {
|
||||||
|
errMsg := qt.Commentf("[%d] %v", i, test.v)
|
||||||
|
|
||||||
|
result, err := ns.ToTruth(test.v)
|
||||||
|
|
||||||
|
c.Assert(err, qt.IsNil, errMsg)
|
||||||
|
c.Assert(result, qt.Equals, test.expect, errMsg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -52,6 +52,24 @@ func init() {
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
ns.AddMethodMapping(ctx.ToBool,
|
||||||
|
[]string{"bool"},
|
||||||
|
[][2]string{
|
||||||
|
{`{{ "0" | bool | printf "%T" }}`, `bool`},
|
||||||
|
{`{{ "true" | bool }}`, `true`},
|
||||||
|
{`{{ "false" | bool }}`, `false`},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
ns.AddMethodMapping(ctx.ToTruth,
|
||||||
|
[]string{"truth"},
|
||||||
|
[][2]string{
|
||||||
|
{`{{ "1234" | truth | printf "%T" }}`, `bool`},
|
||||||
|
{`{{ "1234" | truth }}`, `true`},
|
||||||
|
{`{{ "" | truth }}`, `false`},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
return ns
|
return ns
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,12 +15,12 @@
|
||||||
package debug
|
package debug
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"sort"
|
"sort"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/bep/logg"
|
"github.com/bep/logg"
|
||||||
"github.com/sanity-io/litter"
|
|
||||||
"github.com/spf13/cast"
|
"github.com/spf13/cast"
|
||||||
"github.com/yuin/goldmark/util"
|
"github.com/yuin/goldmark/util"
|
||||||
|
|
||||||
|
@ -108,7 +108,11 @@ type Namespace struct {
|
||||||
// Also note that the output from Dump may change from Hugo version to the next,
|
// Also note that the output from Dump may change from Hugo version to the next,
|
||||||
// so don't depend on a specific output.
|
// so don't depend on a specific output.
|
||||||
func (ns *Namespace) Dump(val any) string {
|
func (ns *Namespace) Dump(val any) string {
|
||||||
return litter.Sdump(val)
|
b, err := json.MarshalIndent(val, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return string(b)
|
||||||
}
|
}
|
||||||
|
|
||||||
// VisualizeSpaces returns a string with spaces replaced by a visible string.
|
// VisualizeSpaces returns a string with spaces replaced by a visible string.
|
||||||
|
|
|
@ -43,3 +43,33 @@ disableKinds = ["taxonomy", "term"]
|
||||||
|
|
||||||
b.AssertLogContains("timer: name foo count 5 duration")
|
b.AssertLogContains("timer: name foo count 5 duration")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDebugDumpPage(t *testing.T) {
|
||||||
|
files := `
|
||||||
|
-- hugo.toml --
|
||||||
|
baseURL = "https://example.org/"
|
||||||
|
disableLiveReload = true
|
||||||
|
[taxonomies]
|
||||||
|
tag = "tags"
|
||||||
|
-- content/_index.md --
|
||||||
|
---
|
||||||
|
title: "The Index"
|
||||||
|
date: 2012-03-15
|
||||||
|
---
|
||||||
|
-- content/p1.md --
|
||||||
|
---
|
||||||
|
title: "The First"
|
||||||
|
tags: ["a", "b"]
|
||||||
|
---
|
||||||
|
-- layouts/_default/list.html --
|
||||||
|
Dump: {{ debug.Dump . | safeHTML }}
|
||||||
|
Dump Site: {{ debug.Dump site }}
|
||||||
|
Dum site.Taxonomies: {{ debug.Dump site.Taxonomies | safeHTML }}
|
||||||
|
-- layouts/_default/single.html --
|
||||||
|
Dump: {{ debug.Dump . | safeHTML }}
|
||||||
|
|
||||||
|
|
||||||
|
`
|
||||||
|
b := hugolib.TestRunning(t, files)
|
||||||
|
b.AssertFileContent("public/index.html", "Dump: {\n \"Date\": \"2012-03-15T00:00:00Z\"")
|
||||||
|
}
|
||||||
|
|
|
@ -36,7 +36,7 @@ func init() {
|
||||||
[][2]string{
|
[][2]string{
|
||||||
{`{{ $m := newScratch }}
|
{`{{ $m := newScratch }}
|
||||||
{{ $m.Set "Hugo" "Rocks!" }}
|
{{ $m.Set "Hugo" "Rocks!" }}
|
||||||
{{ $m.Values | debug.Dump | safeHTML }}`, "map[string]interface {}{\n \"Hugo\": \"Rocks!\",\n}"},
|
{{ $m.Values | debug.Dump | safeHTML }}`, "{\n \"Hugo\": \"Rocks!\"\n}"},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -1,51 +1,22 @@
|
||||||
{{- $pc := .Site.Config.Privacy.GoogleAnalytics -}}
|
{{ if not site.Config.Privacy.GoogleAnalytics.Disable }}
|
||||||
{{- if not $pc.Disable }}{{ with .Site.Config.Services.GoogleAnalytics.ID -}}
|
{{ with site.Config.Services.GoogleAnalytics.ID }}
|
||||||
{{ if hasPrefix . "G-"}}
|
{{ if strings.HasPrefix (lower .) "ua-" }}
|
||||||
<script async src="https://www.googletagmanager.com/gtag/js?id={{ . }}"></script>
|
{{ warnf "Google Analytics 4 (GA4) replaced Google Universal Analytics (UA) effective 1 July 2023. See https://support.google.com/analytics/answer/11583528. Create a GA4 property and data stream, then replace the Google Analytics ID in your site configuration with the new value." }}
|
||||||
<script>
|
{{ else }}
|
||||||
{{ template "__ga_js_set_doNotTrack" $ }}
|
<script async src="https://www.googletagmanager.com/gtag/js?id={{ . }}"></script>
|
||||||
if (!doNotTrack) {
|
<script>
|
||||||
window.dataLayer = window.dataLayer || [];
|
var doNotTrack = false;
|
||||||
function gtag(){dataLayer.push(arguments);}
|
if ({{ site.Config.Privacy.GoogleAnalytics.RespectDoNotTrack }}) {
|
||||||
gtag('js', new Date());
|
var dnt = (navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack);
|
||||||
gtag('config', '{{ . }}', { 'anonymize_ip': {{- $pc.AnonymizeIP -}} });
|
var doNotTrack = (dnt == "1" || dnt == "yes");
|
||||||
}
|
}
|
||||||
</script>
|
if (!doNotTrack) {
|
||||||
{{ else if hasPrefix . "UA-" }}
|
window.dataLayer = window.dataLayer || [];
|
||||||
<script>
|
function gtag(){dataLayer.push(arguments);}
|
||||||
{{ template "__ga_js_set_doNotTrack" $ }}
|
gtag('js', new Date());
|
||||||
if (!doNotTrack) {
|
gtag('config', '{{ . }}');
|
||||||
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
}
|
||||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
</script>
|
||||||
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
{{ end }}
|
||||||
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
|
{{ end }}
|
||||||
{{- if $pc.UseSessionStorage }}
|
{{ end }}
|
||||||
if (window.sessionStorage) {
|
|
||||||
var GA_SESSION_STORAGE_KEY = 'ga:clientId';
|
|
||||||
ga('create', '{{ . }}', {
|
|
||||||
'storage': 'none',
|
|
||||||
'clientId': sessionStorage.getItem(GA_SESSION_STORAGE_KEY)
|
|
||||||
});
|
|
||||||
ga(function(tracker) {
|
|
||||||
sessionStorage.setItem(GA_SESSION_STORAGE_KEY, tracker.get('clientId'));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
{{ else }}
|
|
||||||
ga('create', '{{ . }}', 'auto');
|
|
||||||
{{ end -}}
|
|
||||||
{{ if $pc.AnonymizeIP }}ga('set', 'anonymizeIp', true);{{ end }}
|
|
||||||
ga('send', 'pageview');
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
{{- end -}}
|
|
||||||
{{- end }}{{ end -}}
|
|
||||||
|
|
||||||
{{- define "__ga_js_set_doNotTrack" -}}{{/* This is also used in the async version. */}}
|
|
||||||
{{- $pc := .Site.Config.Privacy.GoogleAnalytics -}}
|
|
||||||
{{- if not $pc.RespectDoNotTrack -}}
|
|
||||||
var doNotTrack = false;
|
|
||||||
{{- else -}}
|
|
||||||
var dnt = (navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack);
|
|
||||||
var doNotTrack = (dnt == "1" || dnt == "yes");
|
|
||||||
{{- end -}}
|
|
||||||
{{- end -}}
|
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
{{ warnf "_internal/google_analytics_async.html is no longer supported by Google and will be removed in a future version of Hugo" }}
|
|
||||||
{{- $pc := .Site.Config.Privacy.GoogleAnalytics -}}
|
|
||||||
{{- if not $pc.Disable -}}
|
|
||||||
{{ with .Site.Config.Services.GoogleAnalytics.ID }}
|
|
||||||
<script>
|
|
||||||
{{ template "__ga_js_set_doNotTrack" $ }}
|
|
||||||
if (!doNotTrack) {
|
|
||||||
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
|
|
||||||
{{- if $pc.UseSessionStorage }}
|
|
||||||
if (window.sessionStorage) {
|
|
||||||
var GA_SESSION_STORAGE_KEY = 'ga:clientId';
|
|
||||||
ga('create', '{{ . }}', {
|
|
||||||
'storage': 'none',
|
|
||||||
'clientId': sessionStorage.getItem(GA_SESSION_STORAGE_KEY)
|
|
||||||
});
|
|
||||||
ga(function(tracker) {
|
|
||||||
sessionStorage.setItem(GA_SESSION_STORAGE_KEY, tracker.get('clientId'));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
{{ else }}
|
|
||||||
ga('create', '{{ . }}', 'auto');
|
|
||||||
{{ end -}}
|
|
||||||
{{ if $pc.AnonymizeIP }}ga('set', 'anonymizeIp', true);{{ end }}
|
|
||||||
ga('send', 'pageview');
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
<script async src='https://www.google-analytics.com/analytics.js'></script>
|
|
||||||
{{ end }}
|
|
||||||
{{- end -}}
|
|
|
@ -1,17 +1,56 @@
|
||||||
<meta itemprop="name" content="{{ .Title }}">
|
{{- with or .Title site.Title }}
|
||||||
<meta itemprop="description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}">
|
<meta itemprop="name" content="{{ . }}">
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
{{- if .IsPage -}}
|
{{- with or .Description .Summary site.Params.Description }}
|
||||||
{{- $iso8601 := "2006-01-02T15:04:05-07:00" -}}
|
<meta itemprop="description" content="{{ . }}">
|
||||||
{{ with .PublishDate }}<meta itemprop="datePublished" {{ .Format $iso8601 | printf "content=%q" | safeHTMLAttr }} />{{ end}}
|
{{- end }}
|
||||||
{{ with .Lastmod }}<meta itemprop="dateModified" {{ .Format $iso8601 | printf "content=%q" | safeHTMLAttr }} />{{ end}}
|
|
||||||
<meta itemprop="wordCount" content="{{ .WordCount }}">
|
|
||||||
|
|
||||||
{{- $images := partial "_funcs/get-page-images" . -}}
|
{{- $ISO8601 := "2006-01-02T15:04:05-07:00" }}
|
||||||
{{- range first 6 $images -}}
|
{{- with .PublishDate }}
|
||||||
<meta itemprop="image" content="{{ .Permalink }}" />
|
<meta itemprop="datePublished" {{ .Format $ISO8601 | printf "content=%q" | safeHTMLAttr }}>
|
||||||
{{- end -}}
|
{{- end }}
|
||||||
|
|
||||||
<!-- Output all taxonomies as schema.org keywords -->
|
{{- with .Lastmod }}
|
||||||
<meta itemprop="keywords" content="{{ if .IsPage}}{{ range $index, $tag := .Params.tags }}{{ $tag }},{{ end }}{{ else }}{{ range $plural, $terms := .Site.Taxonomies }}{{ range $term, $val := $terms }}{{ printf "%s," $term }}{{ end }}{{ end }}{{ end }}" />
|
<meta itemprop="dateModified" {{ .Format $ISO8601 | printf "content=%q" | safeHTMLAttr }}>
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- with .WordCount }}
|
||||||
|
<meta itemprop="wordCount" content="{{ . }}">
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- $images := partial "_funcs/get-page-images" . }}
|
||||||
|
{{- range first 6 $images }}
|
||||||
|
<meta itemprop="image" content="{{ .Permalink }}">
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- /*
|
||||||
|
Keywords precedence:
|
||||||
|
|
||||||
|
1. Use "keywords" term page titles.
|
||||||
|
2. Use "keywords" from front matter if "keywords" is not a taxonomy.
|
||||||
|
3. Use "tags" term page titles.
|
||||||
|
4. Use term page titles from all taxonomies.
|
||||||
|
|
||||||
|
*/}}
|
||||||
|
{{- $keywords := slice }}
|
||||||
|
{{- range .GetTerms "keywords" }}
|
||||||
|
{{- $keywords = $keywords | append .Title }}
|
||||||
|
{{- else }}
|
||||||
|
{{- with .Keywords }}
|
||||||
|
{{- $keywords = . }}
|
||||||
|
{{- else }}
|
||||||
|
{{- range .GetTerms "tags" }}
|
||||||
|
{{- $keywords = $keywords | append .Title }}
|
||||||
|
{{- else }}
|
||||||
|
{{- range $taxonomy, $_ := site.Taxonomies }}
|
||||||
|
{{- range $.GetTerms $taxonomy }}
|
||||||
|
{{- $keywords = $keywords | append .Title }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- with $keywords }}
|
||||||
|
<meta itemprop="keywords" content="{{ delimit . `,` }}">
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
|
@ -210,3 +210,47 @@ var a = §§{{.Title }}§§;
|
||||||
// This used to fail, but not in >= Hugo 0.121.0.
|
// This used to fail, but not in >= Hugo 0.121.0.
|
||||||
b.Assert(err, qt.IsNil)
|
b.Assert(err, qt.IsNil)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGoogleAnalyticsTemplate(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
files := `
|
||||||
|
-- hugo.toml --
|
||||||
|
disableKinds = ['page','section','rss','sitemap','taxonomy','term']
|
||||||
|
[privacy.googleAnalytics]
|
||||||
|
disable = false
|
||||||
|
respectDoNotTrack = true
|
||||||
|
[services.googleAnalytics]
|
||||||
|
id = 'G-0123456789'
|
||||||
|
-- layouts/index.html --
|
||||||
|
{{ template "_internal/google_analytics.html" . }}
|
||||||
|
`
|
||||||
|
|
||||||
|
b := hugolib.Test(t, files)
|
||||||
|
|
||||||
|
b.AssertFileContent("public/index.html",
|
||||||
|
`<script async src="https://www.googletagmanager.com/gtag/js?id=G-0123456789"></script>`,
|
||||||
|
`var dnt = (navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack);`,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDisqusTemplate(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
files := `
|
||||||
|
-- hugo.toml --
|
||||||
|
disableKinds = ['page','section','rss','sitemap','taxonomy','term']
|
||||||
|
[services.disqus]
|
||||||
|
shortname = 'foo'
|
||||||
|
[privacy.disqus]
|
||||||
|
disable = false
|
||||||
|
-- layouts/index.html --
|
||||||
|
{{ template "_internal/disqus.html" . }}
|
||||||
|
`
|
||||||
|
|
||||||
|
b := hugolib.Test(t, files)
|
||||||
|
|
||||||
|
b.AssertFileContent("public/index.html",
|
||||||
|
`s.src = '//' + "foo" + '.disqus.com/embed.js';`,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue