mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-21 21:35:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename CSV option from comma to delimiter

Browse Source 
See #5555
This commit is contained in:
Bjørn Erik Pedersen
2018-12-23 21:08:12 +01:00
parent 2efc1a64c3
commit ce06bdb16a
6 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tpl/transform/unmarshal.go
View File

@@ -116,12 +116,12 @@ func decodeDecoder(m map[string]interface{}) (metadecoders.Decoder, error) {
// mapstructure does not support string to rune conversion, so do that manually.
// See https://github.com/mitchellh/mapstructure/issues/151
for k, v := range m {
if strings.EqualFold(k, "Comma") {
if strings.EqualFold(k, "Delimiter") {
r, err := stringToRune(v)
if err != nil {
return opts, err
}
opts.Comma = r
opts.Delimiter = r
delete(m, k)
} else if strings.EqualFold(k, "Comment") {

6
tpl/transform/unmarshal_test.go
View File

@@ -118,7 +118,7 @@ func TestUnmarshal(t *testing.T) {
assert.Equal(5, len(first))
assert.Equal("Ford", first[1])
}},
{testContentResource{key: "r1", content: `a;b;c`, mime: media.CSVType}, map[string]interface{}{"comma": ";"}, func(r [][]string) {
{testContentResource{key: "r1", content: `a;b;c`, mime: media.CSVType}, map[string]interface{}{"delimiter": ";"}, func(r [][]string) {
assert.Equal(r, [][]string{[]string{"a", "b", "c"}})
}},
@@ -126,13 +126,13 @@ func TestUnmarshal(t *testing.T) {
assert.Equal(r, [][]string{[]string{"a", "b", "c"}})
}},
{"a;b;c", map[string]interface{}{"comma": ";"}, func(r [][]string) {
{"a;b;c", map[string]interface{}{"delimiter": ";"}, func(r [][]string) {
assert.Equal(r, [][]string{[]string{"a", "b", "c"}})
}},
{testContentResource{key: "r1", content: `
% This is a comment
a;b;c`, mime: media.CSVType}, map[string]interface{}{"CommA": ";", "Comment": "%"}, func(r [][]string) {
a;b;c`, mime: media.CSVType}, map[string]interface{}{"DElimiter": ";", "Comment": "%"}, func(r [][]string) {
assert.Equal(r, [][]string{[]string{"a", "b", "c"}})
}},