github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-23 19:10:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Metadata variables flattened.

Browse Source 
Fix race condition on parsers.
Added page links generator.
This commit is contained in:
Abiola Ibrahim
2015-07-28 05:21:09 +01:00
parent e043bbdd62
commit e240cd5ba2
9 changed files with 268 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
middleware/markdown/metadata_test.go
View File

@ -11,13 +11,11 @@ import (
var TOML = [4]string{`
title = "A title"
template = "default"
[variables]
name = "value"
`,
`+++
title = "A title"
template = "default"
[variables]
name = "value"
+++
Page content
@ -25,7 +23,6 @@ Page content
`+++
title = "A title"
template = "default"
[variables]
name = "value"
`,
`title = "A title" template = "default" [variables] name = "value"`,
@ -34,38 +31,31 @@ name = "value"
var YAML = [4]string{`
title : A title
template : default
variables :
name : value
name : value
`,
`---
title : A title
template : default
variables :
name : value
name : value
---
Page content
`,
`---
title : A title
template : default
variables :
name : value
name : value
`,
`title : A title template : default variables : name : value`,
}
var JSON = [4]string{`
"title" : "A title",
"template" : "default",
"variables" : {
"name" : "value"
}
"name" : "value"
`,
`{
"title" : "A title",
"template" : "default",
"variables" : {
"name" : "value"
}
"name" : "value"
}
Page content
`,
@ -73,17 +63,13 @@ Page content
{
"title" : "A title",
"template" : "default",
"variables" : {
"name" : "value"
}
"name" : "value"
`,
`
{{
"title" : "A title",
"template" : "default",
"variables" : {
"name" : "value"
}
"name" : "value"
}
`,
}
@ -96,9 +82,13 @@ func check(t *testing.T, err error) {
func TestParsers(t *testing.T) {
expected := Metadata{
Title: "A title",
Template: "default",
Variables: map[string]string{"name": "value"},
Title: "A title",
Template: "default",
Variables: map[string]string{
"name": "value",
"title": "A title",
"template": "default",
},
}
compare := func(m Metadata) bool {
if m.Title != expected.Title {
@ -112,7 +102,7 @@ func TestParsers(t *testing.T) {
return false
}
}
return len(m.Variables) == 1
return len(m.Variables) == len(expected.Variables)
}
data := []struct {
@ -120,9 +110,9 @@ func TestParsers(t *testing.T) {
testData [4]string
name string
}{
{&JSONMetadataParser{}, JSON, "json"},
{&YAMLMetadataParser{}, YAML, "yaml"},
{&TOMLMetadataParser{}, TOML, "toml"},
{&JSONMetadataParser{metadata: Metadata{Variables: make(map[string]string)}}, JSON, "json"},
{&YAMLMetadataParser{metadata: Metadata{Variables: make(map[string]string)}}, YAML, "yaml"},
{&TOMLMetadataParser{metadata: Metadata{Variables: make(map[string]string)}}, TOML, "toml"},
}
for _, v := range data {