mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -05:00
722086b4ed
This commit `smart` as a new and default anchor in `Fill`.
So:
```html
{{ $image.Fill "200x200" }}
```
Is, with default configuration, the same as:
```html
{{ $image.Fill "200x200" "smart" }}
```
You can change this default in your `config.toml`:
```toml
[imaging]
[imaging]
resampleFilter = "box"
quality = 68
anchor = "Smart"
```
Fixes #4375
96 lines
2.2 KiB
Go
96 lines
2.2 KiB
Go
package resource
|
|
|
|
import (
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"image"
|
|
"io"
|
|
"os"
|
|
"path"
|
|
|
|
"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", "/res")
|
|
|
|
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, 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 {
|
|
src, err := os.Open("testdata/" + name)
|
|
assert.NoError(err)
|
|
|
|
spec := newTestResourceSpec(assert)
|
|
|
|
out, err := spec.Fs.Source.Create("/b/" + 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.NewResourceFromFilename(factory, "/public", "/b/"+name, name)
|
|
assert.NoError(err)
|
|
assert.IsType(&Image{}, r)
|
|
return r.(*Image)
|
|
|
|
}
|
|
|
|
func assertFileCache(assert *require.Assertions, fs *hugofs.Fs, filename string, width, height int) {
|
|
f, err := fs.Source.Open(filepath.Join("/res/_gen/images", filename))
|
|
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 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)
|
|
}
|
|
}
|