# HG changeset patch
# User zaitsev.serge
# Date 1441215326 0
# Node ID ed40ca93db1e42c61b95f71c81da1d0d1a572d48
# Parent e3c902a7380df1a755bb7c14eb1d3e5a8f0f6fcf
added explicit yaml separator, fixed amber compilation sequence
diff -r e3c902a7380d -r ed40ca93db1e testdata/blog/.test/index.html
--- a/testdata/blog/.test/index.html Wed Sep 02 17:05:09 2015 +0000
+++ b/testdata/blog/.test/index.html Wed Sep 02 17:35:26 2015 +0000
@@ -0,0 +1,17 @@
+
+
+ My blog
+
+
+
+ Here goes list of posts
+
+
+
diff -r e3c902a7380d -r ed40ca93db1e testdata/blog/about.md
--- a/testdata/blog/about.md Wed Sep 02 17:05:09 2015 +0000
+++ b/testdata/blog/about.md Wed Sep 02 17:35:26 2015 +0000
@@ -1,5 +1,6 @@
title: About myself
date: 28-08-2015
+---
# {{title}}
diff -r e3c902a7380d -r ed40ca93db1e testdata/blog/posts/hello.md
--- a/testdata/blog/posts/hello.md Wed Sep 02 17:05:09 2015 +0000
+++ b/testdata/blog/posts/hello.md Wed Sep 02 17:35:26 2015 +0000
@@ -1,5 +1,6 @@
title: First post
date: 28-08-2015
+---
# {{title}}
diff -r e3c902a7380d -r ed40ca93db1e testdata/blog/posts/update.md
--- a/testdata/blog/posts/update.md Wed Sep 02 17:05:09 2015 +0000
+++ b/testdata/blog/posts/update.md Wed Sep 02 17:35:26 2015 +0000
@@ -1,5 +1,6 @@
title: Second post
date: 29-08-2015
+---
# {{title}}
diff -r e3c902a7380d -r ed40ca93db1e zs.go
--- a/zs.go Wed Sep 02 17:05:09 2015 +0000
+++ b/zs.go Wed Sep 02 17:35:26 2015 +0000
@@ -16,7 +16,7 @@
"github.com/eknkc/amber"
"github.com/russross/blackfriday"
"github.com/yosssi/gcss"
- "gopkg.in/yaml.v1"
+ "gopkg.in/yaml.v2"
)
const (
@@ -115,17 +115,21 @@
v["url"] = path[:len(path)-len(filepath.Ext(path))] + ".html"
v["output"] = filepath.Join(PUBDIR, v["url"])
- if sep := strings.Index(s, "\n\n"); sep == -1 {
+ delim := "\n---\n"
+ if sep := strings.Index(s, delim); sep == -1 {
return v, s, nil
} else {
header := s[:sep]
- body := s[sep+len("\n\n"):]
+ body := s[sep+len(delim):]
+
vars := Vars{}
if err := yaml.Unmarshal([]byte(header), &vars); err != nil {
fmt.Println("ERROR: failed to parse header", err)
+ return nil, "", err
} else {
for key, value := range vars {
v[key] = value
+ log.Println(key, value)
}
}
if strings.HasPrefix(v["url"], "./") {
@@ -226,12 +230,9 @@
if err != nil {
return err
}
- if body, err = render(body, v); err != nil {
- return err
- }
-
a := amber.New()
if err := a.Parse(body); err != nil {
+ fmt.Println(body)
return err
}
@@ -239,6 +240,16 @@
if err != nil {
return err
}
+
+ htmlBuf := &bytes.Buffer{}
+ if err := t.Execute(htmlBuf, v); err != nil {
+ return err
+ }
+
+ if body, err = render(string(htmlBuf.Bytes()), v); err != nil {
+ return err
+ }
+
if w == nil {
f, err := os.Create(filepath.Join(PUBDIR, renameExt(path, ".amber", ".html")))
if err != nil {
@@ -247,7 +258,8 @@
defer f.Close()
w = f
}
- return t.Execute(w, vars)
+ _, err = io.WriteString(w, body)
+ return err
}
// Compiles .gcss into .css
diff -r e3c902a7380d -r ed40ca93db1e zs_test.go
--- a/zs_test.go Wed Sep 02 17:05:09 2015 +0000
+++ b/zs_test.go Wed Sep 02 17:35:26 2015 +0000
@@ -53,7 +53,7 @@
`
foo: bar
title: Hello, world!
-
+---
Some content in markdown
`: Vars{
"foo": "bar",
@@ -63,8 +63,9 @@
"output": filepath.Join(PUBDIR, "test.html"),
"__content": "Some content in markdown\n",
},
- `url: "example.com/foo.html"
-
+ `
+url: "example.com/foo.html"
+---
Hello
`: Vars{
"url": "example.com/foo.html",