Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity
caddy/middleware/markdown/markdown_test.go

231 lines
5.3 KiB
Go
Raw Normal View History

Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
package markdown
import (
Markdown: Watch for file changes. Removed sitegen dependency for links.
2015-08-04 17:35:09 -05:00
"bufio"
Fixup and address most of the feedback.
2016-04-30 22:09:25 -05:00
"io/ioutil"
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
"net/http"
"net/http/httptest"
Change date of the files in test to serve the static file and not generate a new one
2015-07-29 11:00:08 -05:00
"os"
Fix more tests, and fix template parsing.
2016-04-11 01:17:01 -05:00
"path/filepath"
Added a test on markdown for the default template
2015-07-21 10:45:32 -05:00
"strings"
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
"testing"
Fixup and address most of the feedback.
2016-04-30 22:09:25 -05:00
"text/template"
Change date of the files in test to serve the static file and not generate a new one
2015-07-29 11:00:08 -05:00
"time"
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
Moved test files to testdata folder. Changed the tests accordingly.
2015-07-23 02:35:46 -05:00
"github.com/mholt/caddy/middleware"
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
"github.com/russross/blackfriday"
)
func TestMarkdown(t *testing.T) {
Fix more tests, and fix template parsing.
2016-04-11 01:17:01 -05:00
rootDir := "./testdata"
f := func(filename string) string {
return filepath.ToSlash(rootDir + string(filepath.Separator) + filename)
}
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
md := Markdown{
Fix more tests, and fix template parsing.
2016-04-11 01:17:01 -05:00
Root: rootDir,
FileSys: http.Dir(rootDir),
Use markdown.Config as pointer everywhere * As value mutex was copied and therefore synchronization worked wrong * It's pretty big structure with reference types, so copying create unnecessary pressure on GC Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-09-10 17:12:46 -05:00
Configs: []*Config{
Address various lint and gocyclo warnings. Fixes #253
2015-10-09 17:35:34 -05:00
{
Revamp markdown processing. Nuke pre-generation. This may come back in the form of a more general caching layer at some later stage. Nuke index generation. This should likely be rethought and re-implemented.
2016-04-10 19:20:09 -05:00
Renderer: blackfriday.HtmlRenderer(0, "", ""),
PathScope: "/blog",
Extensions: map[string]struct{}{
Fix gofmt -s and ineffassign.
2016-04-16 19:07:06 -05:00
".md": {},
Revamp markdown processing. Nuke pre-generation. This may come back in the form of a more general caching layer at some later stage. Nuke index generation. This should likely be rethought and re-implemented.
2016-04-10 19:20:09 -05:00
},
Fix more tests, and fix template parsing.
2016-04-11 01:17:01 -05:00
Styles: []string{},
Scripts: []string{},
Template: setDefaultTemplate(f("markdown_tpl.html")),
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
},
Implement .DocFlags directive and tests. It holds all the boolean-typed front matter values.
2016-02-22 05:53:47 -05:00
{
Revamp markdown processing. Nuke pre-generation. This may come back in the form of a more general caching layer at some later stage. Nuke index generation. This should likely be rethought and re-implemented.
2016-04-10 19:20:09 -05:00
Renderer: blackfriday.HtmlRenderer(0, "", ""),
PathScope: "/docflags",
Extensions: map[string]struct{}{
Fix gofmt -s and ineffassign.
2016-04-16 19:07:06 -05:00
".md": {},
Revamp markdown processing. Nuke pre-generation. This may come back in the form of a more general caching layer at some later stage. Nuke index generation. This should likely be rethought and re-implemented.
2016-04-10 19:20:09 -05:00
},
Fix more tests, and fix template parsing.
2016-04-11 01:17:01 -05:00
Styles: []string{},
Scripts: []string{},
Template: setDefaultTemplate(f("docflags/template.txt")),
Implement .DocFlags directive and tests. It holds all the boolean-typed front matter values.
2016-02-22 05:53:47 -05:00
},
Address various lint and gocyclo warnings. Fixes #253
2015-10-09 17:35:34 -05:00
{
Revamp markdown processing. Nuke pre-generation. This may come back in the form of a more general caching layer at some later stage. Nuke index generation. This should likely be rethought and re-implemented.
2016-04-10 19:20:09 -05:00
Renderer: blackfriday.HtmlRenderer(0, "", ""),
PathScope: "/log",
Extensions: map[string]struct{}{
Fix gofmt -s and ineffassign.
2016-04-16 19:07:06 -05:00
".md": {},
Revamp markdown processing. Nuke pre-generation. This may come back in the form of a more general caching layer at some later stage. Nuke index generation. This should likely be rethought and re-implemented.
2016-04-10 19:20:09 -05:00
},
Fix more tests, and fix template parsing.
2016-04-11 01:17:01 -05:00
Styles: []string{"/resources/css/log.css", "/resources/css/default.css"},
Scripts: []string{"/resources/js/log.js", "/resources/js/default.js"},
Template: GetDefaultTemplate(),
Added a test on markdown for the default template
2015-07-21 10:45:32 -05:00
},
Address various lint and gocyclo warnings. Fixes #253
2015-10-09 17:35:34 -05:00
{
Revamp markdown processing. Nuke pre-generation. This may come back in the form of a more general caching layer at some later stage. Nuke index generation. This should likely be rethought and re-implemented.
2016-04-10 19:20:09 -05:00
Renderer: blackfriday.HtmlRenderer(0, "", ""),
PathScope: "/og",
Extensions: map[string]struct{}{
Fix gofmt -s and ineffassign.
2016-04-16 19:07:06 -05:00
".md": {},
Merge branch 'master' of https://github.com/mholt/caddy
2015-07-29 16:43:26 -05:00
},
Fix more tests, and fix template parsing.
2016-04-11 01:17:01 -05:00
Styles: []string{},
Scripts: []string{},
Template: setDefaultTemplate(f("markdown_tpl.html")),
Added test on markdown static files generation
2015-07-29 09:21:35 -05:00
},
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
},
IndexFiles: []string{"index.html"},
Moved test files to testdata folder. Changed the tests accordingly.
2015-07-23 02:35:46 -05:00
Next: middleware.HandlerFunc(func(w http.ResponseWriter, r *http.Request) (int, error) {
t.Fatalf("Next shouldn't be called")
return 0, nil
}),
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
}
req, err := http.NewRequest("GET", "/blog/test.md", nil)
if err != nil {
t.Fatalf("Could not create HTTP request: %v", err)
}
rec := httptest.NewRecorder()
md.ServeHTTP(rec, req)
if rec.Code != http.StatusOK {
t.Fatalf("Wrong status, expected: %d and got %d", http.StatusOK, rec.Code)
}
respBody := rec.Body.String()
expectedBody := `<!DOCTYPE html>
<html>
<head>
markdown: Enable tables, fenced code, and strikethrough (closes #294)
2015-10-29 10:59:14 -05:00
<title>Markdown test 1</title>
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
</head>
<body>
Included files in Markdown templates have access to document vars (fixes #660) Refactor how middleware.Context includes files
2016-03-07 17:32:07 -05:00
<h1>Header for: Markdown test 1</h1>
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
Welcome to A Caddy website!
<h2>Welcome on the blog</h2>
<p>Body</p>
markdown: Enable tables, fenced code, and strikethrough (closes #294)
2015-10-29 10:59:14 -05:00
<pre><code class="language-go">func getTrue() bool {
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
return true
}
markdown: Enable tables, fenced code, and strikethrough (closes #294)
2015-10-29 10:59:14 -05:00
</code></pre>
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
</body>
</html>
`
Markdown: Watch for file changes. Removed sitegen dependency for links.
2015-08-04 17:35:09 -05:00
if !equalStrings(respBody, expectedBody) {
Added a test on markdown for the default template
2015-07-21 10:45:32 -05:00
t.Fatalf("Expected body: %v got: %v", expectedBody, respBody)
}
Implement .DocFlags directive and tests. It holds all the boolean-typed front matter values.
2016-02-22 05:53:47 -05:00
req, err = http.NewRequest("GET", "/docflags/test.md", nil)
if err != nil {
t.Fatalf("Could not create HTTP request: %v", err)
}
rec = httptest.NewRecorder()
md.ServeHTTP(rec, req)
if rec.Code != http.StatusOK {
t.Fatalf("Wrong status, expected: %d and got %d", http.StatusOK, rec.Code)
}
respBody = rec.Body.String()
expectedBody = `Doc.var_string hello
Doc.var_bool <no value>
DocFlags.var_string <no value>
DocFlags.var_bool true`
if !equalStrings(respBody, expectedBody) {
t.Fatalf("Expected body: %v got: %v", expectedBody, respBody)
}
Added a test on markdown for the default template
2015-07-21 10:45:32 -05:00
req, err = http.NewRequest("GET", "/log/test.md", nil)
if err != nil {
t.Fatalf("Could not create HTTP request: %v", err)
}
rec = httptest.NewRecorder()
md.ServeHTTP(rec, req)
if rec.Code != http.StatusOK {
t.Fatalf("Wrong status, expected: %d and got %d", http.StatusOK, rec.Code)
}
respBody = rec.Body.String()
expectedBody = `<!DOCTYPE html>
<html>
<head>
markdown: Enable tables, fenced code, and strikethrough (closes #294)
2015-10-29 10:59:14 -05:00
<title>Markdown test 2</title>
Added a test on markdown for the default template
2015-07-21 10:45:32 -05:00
<meta charset="utf-8">
<link rel="stylesheet" href="/resources/css/log.css">
Fix more tests, and fix template parsing.
2016-04-11 01:17:01 -05:00
<link rel="stylesheet" href="/resources/css/default.css">
Added a test on markdown for the default template
2015-07-21 10:45:32 -05:00
<script src="/resources/js/log.js"></script>
Fix more tests, and fix template parsing.
2016-04-11 01:17:01 -05:00
<script src="/resources/js/default.js"></script>
Better default template.
2016-04-12 20:53:15 -05:00
</head>
Added a test on markdown for the default template
2015-07-21 10:45:32 -05:00
<body>
<h2>Welcome on the blog</h2>
<p>Body</p>
markdown: Enable tables, fenced code, and strikethrough (closes #294)
2015-10-29 10:59:14 -05:00
<pre><code class="language-go">func getTrue() bool {
Added a test on markdown for the default template
2015-07-21 10:45:32 -05:00
return true
}
markdown: Enable tables, fenced code, and strikethrough (closes #294)
2015-10-29 10:59:14 -05:00
</code></pre>
Added a test on markdown for the default template
2015-07-21 10:45:32 -05:00
</body>
</html>`
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
Markdown: Watch for file changes. Removed sitegen dependency for links.
2015-08-04 17:35:09 -05:00
if !equalStrings(respBody, expectedBody) {
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
t.Fatalf("Expected body: %v got: %v", expectedBody, respBody)
}
Added test on markdown static files generation
2015-07-29 09:21:35 -05:00
req, err = http.NewRequest("GET", "/og/first.md", nil)
if err != nil {
t.Fatalf("Could not create HTTP request: %v", err)
}
rec = httptest.NewRecorder()
Change date of the files in test to serve the static file and not generate a new one
2015-07-29 11:00:08 -05:00
currenttime := time.Now().Local().Add(-time.Second)
Fix gofmt -s and ineffassign.
2016-04-16 19:07:06 -05:00
_ = os.Chtimes("testdata/og/first.md", currenttime, currenttime)
Change date of the files in test to serve the static file and not generate a new one
2015-07-29 11:00:08 -05:00
currenttime = time.Now().Local()
Fix gofmt -s and ineffassign.
2016-04-16 19:07:06 -05:00
_ = os.Chtimes("testdata/og_static/og/first.md/index.html", currenttime, currenttime)
Markdown: generate static sites after links.
2015-08-05 03:55:04 -05:00
time.Sleep(time.Millisecond * 200)
Added test on markdown static files generation
2015-07-29 09:21:35 -05:00
md.ServeHTTP(rec, req)
if rec.Code != http.StatusOK {
t.Fatalf("Wrong status, expected: %d and got %d", http.StatusOK, rec.Code)
}
respBody = rec.Body.String()
expectedBody = `<!DOCTYPE html>
<html>
<head>
<title>first_post</title>
</head>
<body>
Included files in Markdown templates have access to document vars (fixes #660) Refactor how middleware.Context includes files
2016-03-07 17:32:07 -05:00
<h1>Header for: first_post</h1>
Added test on markdown static files generation
2015-07-29 09:21:35 -05:00
Markdown: generate static sites after links.
2015-08-05 03:55:04 -05:00
Welcome to title!
Added test on markdown static files generation
2015-07-29 09:21:35 -05:00
<h1>Test h1</h1>
</body>
</html>`
Markdown: Watch for file changes. Removed sitegen dependency for links.
2015-08-04 17:35:09 -05:00
if !equalStrings(respBody, expectedBody) {
Added test on markdown static files generation
2015-07-29 09:21:35 -05:00
t.Fatalf("Expected body: %v got: %v", expectedBody, respBody)
}
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 00:58:34 -05:00
}
Markdown: Watch for file changes. Removed sitegen dependency for links.
2015-08-04 17:35:09 -05:00
func equalStrings(s1, s2 string) bool {
s1 = strings.TrimSpace(s1)
s2 = strings.TrimSpace(s2)
in := bufio.NewScanner(strings.NewReader(s1))
for in.Scan() {
txt := strings.TrimSpace(in.Text())
if !strings.HasPrefix(strings.TrimSpace(s2), txt) {
return false
}
s2 = strings.Replace(s2, txt, "", 1)
}
return true
}
Fixup and address most of the feedback.
2016-04-30 22:09:25 -05:00
func setDefaultTemplate(filename string) *template.Template {
buf, err := ioutil.ReadFile(filename)
if err != nil {
return nil
}
return template.Must(GetDefaultTemplate().Parse(string(buf)))
}
Reference in a new issue Copy permalink