aboutsummaryrefslogtreecommitdiffhomepage
path: root/parser/metadecoders
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <[email protected]>2019-05-03 09:16:58 +0200
committerBjørn Erik Pedersen <[email protected]>2019-07-24 09:35:53 +0200
commit9f5a92078a3f388b52d597b5a59af5c933a112d2 (patch)
tree0b2b07e5b3a3f21877bc5585a4bdd76306a09dde /parser/metadecoders
parent47953148b6121441d0147c960a99829c53b5a5ba (diff)
downloadhugo-9f5a92078a3f388b52d597b5a59af5c933a112d2.tar.gz
hugo-9f5a92078a3f388b52d597b5a59af5c933a112d2.zip
Add Hugo Modules
This commit implements Hugo Modules. This is a broad subject, but some keywords include: * A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project. * A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects. * Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running. * Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions. * A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`. All of the above is backed by Go Modules. Fixes #5973 Fixes #5996 Fixes #6010 Fixes #5911 Fixes #5940 Fixes #6074 Fixes #6082 Fixes #6092
Diffstat (limited to 'parser/metadecoders')
-rw-r--r--parser/metadecoders/decoder.go26
-rw-r--r--parser/metadecoders/decoder_test.go32
2 files changed, 58 insertions, 0 deletions
diff --git a/parser/metadecoders/decoder.go b/parser/metadecoders/decoder.go
index e7b0e3c97..f90dc5703 100644
--- a/parser/metadecoders/decoder.go
+++ b/parser/metadecoders/decoder.go
@@ -82,6 +82,32 @@ func (d Decoder) UnmarshalFileToMap(fs afero.Fs, filename string) (map[string]in
return d.UnmarshalToMap(data, format)
}
+// UnmarshalStringTo tries to unmarshal data to a new instance of type typ.
+func (d Decoder) UnmarshalStringTo(data string, typ interface{}) (interface{}, error) {
+ data = strings.TrimSpace(data)
+ // We only check for the possible types in YAML, JSON and TOML.
+ switch typ.(type) {
+ case string:
+ return data, nil
+ case map[string]interface{}:
+ format := d.FormatFromContentString(data)
+ return d.UnmarshalToMap([]byte(data), format)
+ case []interface{}:
+ // A standalone slice. Let YAML handle it.
+ return d.Unmarshal([]byte(data), YAML)
+ case bool:
+ return cast.ToBoolE(data)
+ case int:
+ return cast.ToIntE(data)
+ case int64:
+ return cast.ToInt64E(data)
+ case float64:
+ return cast.ToFloat64E(data)
+ default:
+ return nil, errors.Errorf("unmarshal: %T not supportedd", typ)
+ }
+}
+
// Unmarshal will unmarshall data in format f into an interface{}.
// This is what's needed for Hugo's /data handling.
func (d Decoder) Unmarshal(data []byte, f Format) (interface{}, error) {
diff --git a/parser/metadecoders/decoder_test.go b/parser/metadecoders/decoder_test.go
index 146df5069..7cb66d736 100644
--- a/parser/metadecoders/decoder_test.go
+++ b/parser/metadecoders/decoder_test.go
@@ -90,6 +90,38 @@ func TestUnmarshalToInterface(t *testing.T) {
}
+func TestUnmarshalStringTo(t *testing.T) {
+ assert := require.New(t)
+
+ d := Default
+
+ expectMap := map[string]interface{}{"a": "b"}
+
+ for i, test := range []struct {
+ data string
+ to interface{}
+ expect interface{}
+ }{
+ {"a string", "string", "a string"},
+ {`{ "a": "b" }`, make(map[string]interface{}), expectMap},
+ {"32", int64(1234), int64(32)},
+ {"32", int(1234), int(32)},
+ {"3.14159", float64(1), float64(3.14159)},
+ {"[3,7,9]", []interface{}{}, []interface{}{3, 7, 9}},
+ {"[3.1,7.2,9.3]", []interface{}{}, []interface{}{3.1, 7.2, 9.3}},
+ } {
+ msg := fmt.Sprintf("%d: %T", i, test.to)
+ m, err := d.UnmarshalStringTo(test.data, test.to)
+ if b, ok := test.expect.(bool); ok && !b {
+ assert.Error(err, msg)
+ } else {
+ assert.NoError(err, msg)
+ assert.Equal(test.expect, m, msg)
+ }
+
+ }
+}
+
func TestStringifyYAMLMapKeys(t *testing.T) {
cases := []struct {
input interface{}