mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -05:00
dea71670c0
Before this commit, you would have to use page bundles to do image processing etc. in Hugo. This commit adds * A new `/assets` top-level project or theme dir (configurable via `assetDir`) * A new template func, `resources.Get` which can be used to "get a resource" that can be further processed. This means that you can now do this in your templates (or shortcodes): ```bash {{ $sunset := (resources.Get "images/sunset.jpg").Fill "300x200" }} ``` This also adds a new `extended` build tag that enables powerful SCSS/SASS support with source maps. To compile this from source, you will also need a C compiler installed: ``` HUGO_BUILD_TAGS=extended mage install ``` Note that you can use output of the SCSS processing later in a non-SCSSS-enabled Hugo. The `SCSS` processor is a _Resource transformation step_ and it can be chained with the many others in a pipeline: ```bash {{ $css := resources.Get "styles.scss" | resources.ToCSS | resources.PostCSS | resources.Minify | resources.Fingerprint }} <link rel="stylesheet" href="{{ $styles.RelPermalink }}" integrity="{{ $styles.Data.Digest }}" media="screen"> ``` The transformation funcs above have aliases, so it can be shortened to: ```bash {{ $css := resources.Get "styles.scss" | toCSS | postCSS | minify | fingerprint }} <link rel="stylesheet" href="{{ $styles.RelPermalink }}" integrity="{{ $styles.Data.Digest }}" media="screen"> ``` A quick tip would be to avoid the fingerprinting part, and possibly also the not-superfast `postCSS` when you're doing development, as it allows Hugo to be smarter about the rebuilding. Documentation will follow, but have a look at the demo repo in https://github.com/bep/hugo-sass-test New functions to create `Resource` objects: * `resources.Get` (see above) * `resources.FromString`: Create a Resource from a string. New `Resource` transformation funcs: * `resources.ToCSS`: Compile `SCSS` or `SASS` into `CSS`. * `resources.PostCSS`: Process your CSS with PostCSS. Config file support (project or theme or passed as an option). * `resources.Minify`: Currently supports `css`, `js`, `json`, `html`, `svg`, `xml`. * `resources.Fingerprint`: Creates a fingerprinted version of the given Resource with Subresource Integrity.. * `resources.Concat`: Concatenates a list of Resource objects. Think of this as a poor man's bundler. * `resources.ExecuteAsTemplate`: Parses and executes the given Resource and data context (e.g. .Site) as a Go template. Fixes #4381 Fixes #4903 Fixes #4858
176 lines
4.4 KiB
Go
176 lines
4.4 KiB
Go
package resource
|
|
|
|
import (
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"fmt"
|
|
"image"
|
|
"io"
|
|
"io/ioutil"
|
|
"os"
|
|
"path"
|
|
"runtime"
|
|
"strings"
|
|
|
|
"github.com/gohugoio/hugo/helpers"
|
|
"github.com/gohugoio/hugo/hugofs"
|
|
"github.com/gohugoio/hugo/media"
|
|
"github.com/spf13/afero"
|
|
"github.com/spf13/viper"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func newTestResourceSpec(assert *require.Assertions) *Spec {
|
|
return newTestResourceSpecForBaseURL(assert, "https://example.com/")
|
|
}
|
|
|
|
func newTestResourceSpecForBaseURL(assert *require.Assertions, baseURL string) *Spec {
|
|
cfg := viper.New()
|
|
cfg.Set("baseURL", baseURL)
|
|
cfg.Set("resourceDir", "resources")
|
|
cfg.Set("contentDir", "content")
|
|
cfg.Set("dataDir", "data")
|
|
cfg.Set("i18nDir", "i18n")
|
|
cfg.Set("layoutDir", "layouts")
|
|
cfg.Set("assetDir", "assets")
|
|
cfg.Set("archetypeDir", "archetypes")
|
|
cfg.Set("publishDir", "public")
|
|
|
|
imagingCfg := map[string]interface{}{
|
|
"resampleFilter": "linear",
|
|
"quality": 68,
|
|
"anchor": "left",
|
|
}
|
|
|
|
cfg.Set("imaging", imagingCfg)
|
|
|
|
fs := hugofs.NewMem(cfg)
|
|
|
|
s, err := helpers.NewPathSpec(fs, cfg)
|
|
|
|
assert.NoError(err)
|
|
|
|
spec, err := NewSpec(s, nil, media.DefaultTypes)
|
|
assert.NoError(err)
|
|
return spec
|
|
}
|
|
|
|
func newTestResourceOsFs(assert *require.Assertions) *Spec {
|
|
cfg := viper.New()
|
|
cfg.Set("baseURL", "https://example.com")
|
|
|
|
workDir, err := ioutil.TempDir("", "hugores")
|
|
|
|
if runtime.GOOS == "darwin" && !strings.HasPrefix(workDir, "/private") {
|
|
// To get the entry folder in line with the rest. This its a little bit
|
|
// mysterious, but so be it.
|
|
workDir = "/private" + workDir
|
|
}
|
|
|
|
cfg.Set("workingDir", workDir)
|
|
cfg.Set("resourceDir", filepath.Join(workDir, "res"))
|
|
cfg.Set("contentDir", "content")
|
|
cfg.Set("dataDir", "data")
|
|
cfg.Set("i18nDir", "i18n")
|
|
cfg.Set("layoutDir", "layouts")
|
|
cfg.Set("assetDir", "assets")
|
|
cfg.Set("archetypeDir", "archetypes")
|
|
cfg.Set("publishDir", "public")
|
|
|
|
fs := hugofs.NewFrom(hugofs.Os, cfg)
|
|
fs.Destination = &afero.MemMapFs{}
|
|
|
|
s, err := helpers.NewPathSpec(fs, cfg)
|
|
|
|
assert.NoError(err)
|
|
|
|
spec, err := NewSpec(s, nil, media.DefaultTypes)
|
|
assert.NoError(err)
|
|
return spec
|
|
|
|
}
|
|
|
|
func fetchSunset(assert *require.Assertions) *Image {
|
|
return fetchImage(assert, "sunset.jpg")
|
|
}
|
|
|
|
func fetchImage(assert *require.Assertions, name string) *Image {
|
|
spec := newTestResourceSpec(assert)
|
|
return fetchImageForSpec(spec, assert, name)
|
|
}
|
|
|
|
func fetchImageForSpec(spec *Spec, assert *require.Assertions, name string) *Image {
|
|
r := fetchResourceForSpec(spec, assert, name)
|
|
assert.IsType(&Image{}, r)
|
|
return r.(*Image)
|
|
}
|
|
|
|
func fetchResourceForSpec(spec *Spec, assert *require.Assertions, name string) ContentResource {
|
|
src, err := os.Open(filepath.FromSlash("testdata/" + name))
|
|
assert.NoError(err)
|
|
|
|
out, err := openFileForWriting(spec.BaseFs.Content.Fs, name)
|
|
assert.NoError(err)
|
|
_, err = io.Copy(out, src)
|
|
out.Close()
|
|
src.Close()
|
|
assert.NoError(err)
|
|
|
|
factory := func(s string) string {
|
|
return path.Join("/a", s)
|
|
}
|
|
|
|
r, err := spec.New(ResourceSourceDescriptor{TargetPathBuilder: factory, SourceFilename: name})
|
|
assert.NoError(err)
|
|
|
|
return r.(ContentResource)
|
|
}
|
|
|
|
func assertImageFile(assert *require.Assertions, fs afero.Fs, filename string, width, height int) {
|
|
f, err := fs.Open(filename)
|
|
if err != nil {
|
|
printFs(fs, "", os.Stdout)
|
|
}
|
|
assert.NoError(err)
|
|
defer f.Close()
|
|
|
|
config, _, err := image.DecodeConfig(f)
|
|
assert.NoError(err)
|
|
|
|
assert.Equal(width, config.Width)
|
|
assert.Equal(height, config.Height)
|
|
}
|
|
|
|
func assertFileCache(assert *require.Assertions, fs afero.Fs, filename string, width, height int) {
|
|
assertImageFile(assert, fs, filepath.Join("_gen/images", filename), width, height)
|
|
}
|
|
|
|
func writeSource(t testing.TB, fs *hugofs.Fs, filename, content string) {
|
|
writeToFs(t, fs.Source, filename, content)
|
|
}
|
|
|
|
func writeToFs(t testing.TB, fs afero.Fs, filename, content string) {
|
|
if err := afero.WriteFile(fs, filepath.FromSlash(filename), []byte(content), 0755); err != nil {
|
|
t.Fatalf("Failed to write file: %s", err)
|
|
}
|
|
}
|
|
|
|
func printFs(fs afero.Fs, path string, w io.Writer) {
|
|
if fs == nil {
|
|
return
|
|
}
|
|
afero.Walk(fs, path, func(path string, info os.FileInfo, err error) error {
|
|
if info != nil && !info.IsDir() {
|
|
s := path
|
|
if lang, ok := info.(hugofs.LanguageAnnouncer); ok {
|
|
s = s + "\t" + lang.Lang()
|
|
}
|
|
if fp, ok := info.(hugofs.FilePather); ok {
|
|
s += "\tFilename: " + fp.Filename() + "\tBase: " + fp.BaseDir()
|
|
}
|
|
fmt.Fprintln(w, " ", s)
|
|
}
|
|
return nil
|
|
})
|
|
}
|