mirror of
https://github.com/gohugoio/hugo.git
synced 2025-08-28 22:19:59 +02:00
Image resource refactor
This commit pulls most of the image related logic into its own package, to make it easier to reason about and extend. This is also a rewrite of the transformation logic used in Hugo Pipes, mostly to allow constructs like the one below: {{ ($myimg | fingerprint ).Width }} Fixes #5903 Fixes #6234 Fixes #6266
This commit is contained in:
@@ -16,6 +16,7 @@ package minifier
|
||||
import (
|
||||
"github.com/gohugoio/hugo/minifiers"
|
||||
"github.com/gohugoio/hugo/resources"
|
||||
"github.com/gohugoio/hugo/resources/internal"
|
||||
"github.com/gohugoio/hugo/resources/resource"
|
||||
)
|
||||
|
||||
@@ -37,8 +38,8 @@ type minifyTransformation struct {
|
||||
m minifiers.Client
|
||||
}
|
||||
|
||||
func (t *minifyTransformation) Key() resources.ResourceTransformationKey {
|
||||
return resources.NewResourceTransformationKey("minify")
|
||||
func (t *minifyTransformation) Key() internal.ResourceTransformationKey {
|
||||
return internal.NewResourceTransformationKey("minify")
|
||||
}
|
||||
|
||||
func (t *minifyTransformation) Transform(ctx *resources.ResourceTransformationCtx) error {
|
||||
@@ -49,11 +50,10 @@ func (t *minifyTransformation) Transform(ctx *resources.ResourceTransformationCt
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Client) Minify(res resource.Resource) (resource.Resource, error) {
|
||||
return c.rs.Transform(
|
||||
res,
|
||||
&minifyTransformation{
|
||||
rs: c.rs,
|
||||
m: c.m},
|
||||
)
|
||||
func (c *Client) Minify(res resources.ResourceTransformer) (resource.Resource, error) {
|
||||
return res.Transform(&minifyTransformation{
|
||||
rs: c.rs,
|
||||
m: c.m,
|
||||
})
|
||||
|
||||
}
|
||||
|
43
resources/resource_transformers/minifier/minify_test.go
Normal file
43
resources/resource_transformers/minifier/minify_test.go
Normal file
@@ -0,0 +1,43 @@
|
||||
// Copyright 2019 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 minifier
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/gohugoio/hugo/resources/resource"
|
||||
|
||||
qt "github.com/frankban/quicktest"
|
||||
"github.com/gohugoio/hugo/resources/resource_transformers/htesting"
|
||||
)
|
||||
|
||||
func TestTransform(t *testing.T) {
|
||||
c := qt.New(t)
|
||||
|
||||
spec, err := htesting.NewTestResourceSpec()
|
||||
c.Assert(err, qt.IsNil)
|
||||
client := New(spec)
|
||||
|
||||
r, err := htesting.NewResourceTransformerForSpec(spec, "hugo.html", "<h1> Hugo Rocks! </h1>")
|
||||
c.Assert(err, qt.IsNil)
|
||||
|
||||
transformed, err := client.Minify(r)
|
||||
c.Assert(err, qt.IsNil)
|
||||
|
||||
c.Assert(transformed.RelPermalink(), qt.Equals, "/hugo.min.html")
|
||||
content, err := transformed.(resource.ContentProvider).Content()
|
||||
c.Assert(err, qt.IsNil)
|
||||
c.Assert(content, qt.Equals, "<h1>Hugo Rocks!</h1>")
|
||||
|
||||
}
|
Reference in New Issue
Block a user