diff options
| -rw-r--r-- | hugolib/helpers.go | 32 | ||||
| -rw-r--r-- | hugolib/page.go | 39 | ||||
| -rw-r--r-- | hugolib/page_test.go | 28 |
3 files changed, 77 insertions, 22 deletions
diff --git a/hugolib/helpers.go b/hugolib/helpers.go index c814a6289..9695f6310 100644 --- a/hugolib/helpers.go +++ b/hugolib/helpers.go @@ -20,6 +20,7 @@ import ( "github.com/kr/pretty" "html/template" "os" + "os/exec" "reflect" "regexp" "strconv" @@ -28,6 +29,8 @@ import ( ) var sanitizeRegexp = regexp.MustCompile("[^a-zA-Z0-9./_-]") +var summaryLength = 70 +var summaryDivider = []byte("<!--more-->") // TODO: Make these wrappers private // Wrapper around Fprintf taking verbose flag in account. @@ -329,3 +332,32 @@ func TruncateWordsToWholeSentence(s string, max int) string { func MakePermalink(domain string, path string) string { return strings.TrimRight(domain, "/") + "/" + strings.TrimLeft(path, "/") } + +func getSummaryString(content []byte) ([]byte, bool) { + if (bytes.Contains(content, summaryDivider)) { + return bytes.Split(content, summaryDivider)[0], false + } else { + plainContent := StripHTML(StripShortcodes(string(content))) + return []byte(TruncateWordsToWholeSentence(plainContent, summaryLength)), true + } +} + +func getRstContent(content []byte) string { + cleanContent := bytes.Replace(content, summaryDivider, []byte(""), 1) + + cmd := exec.Command("rst2html.py", "--leave-comments") + cmd.Stdin = bytes.NewReader(cleanContent) + var out bytes.Buffer + cmd.Stdout = &out + if err := cmd.Run(); err != nil { + fmt.Println(err) + } + + rstLines := strings.Split(out.String(), "\n") + for i, line := range rstLines { + if strings.HasPrefix(line, "<body>") { + rstLines = (rstLines[i+1 : len(rstLines)-3]) + } + } + return strings.Join(rstLines, "\n") +} diff --git a/hugolib/page.go b/hugolib/page.go index ef3b2f4f6..2f0c866ee 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -26,7 +26,6 @@ import ( "io/ioutil" "launchpad.net/goyaml" "os" - "os/exec" "path/filepath" "sort" "strings" @@ -55,8 +54,6 @@ type Page struct { Node } -const summaryLength = 70 - type File struct { FileName, OutFile, Extension string } @@ -476,27 +473,25 @@ func (page *Page) parse(reader io.Reader) error { func (page *Page) convertMarkdown(lines io.Reader) { b := new(bytes.Buffer) b.ReadFrom(lines) - content := string(blackfriday.MarkdownCommon(b.Bytes())) - page.Content = template.HTML(content) - page.Summary = template.HTML(TruncateWordsToWholeSentence(StripHTML(StripShortcodes(content)), summaryLength)) + content := b.Bytes() + page.Content = template.HTML(string(blackfriday.MarkdownCommon(content))) + summary, plain := getSummaryString(content) + if plain { + page.Summary = template.HTML(string(summary)) + } else { + page.Summary = template.HTML(string(blackfriday.MarkdownCommon(summary))) + } } func (page *Page) convertRestructuredText(lines io.Reader) { - cmd := exec.Command("rst2html.py") - cmd.Stdin = lines - var out bytes.Buffer - cmd.Stdout = &out - if err := cmd.Run(); err != nil { - fmt.Println(err) - } - - rstLines := strings.Split(out.String(), "\n") - for i, line := range rstLines { - if strings.HasPrefix(line, "<body>") { - rstLines = (rstLines[i+1 : len(rstLines)-3]) - } + b := new(bytes.Buffer) + b.ReadFrom(lines) + content := b.Bytes() + page.Content = template.HTML(getRstContent(content)) + summary, plain := getSummaryString(content) + if plain { + page.Summary = template.HTML(string(summary)) + } else { + page.Summary = template.HTML(getRstContent(summary)) } - content := strings.Join(rstLines, "\n") - page.Content = template.HTML(content) - page.Summary = template.HTML(TruncateWordsToWholeSentence(StripHTML(StripShortcodes(content)), summaryLength)) } diff --git a/hugolib/page_test.go b/hugolib/page_test.go index d55edac62..ec1695fb7 100644 --- a/hugolib/page_test.go +++ b/hugolib/page_test.go @@ -91,6 +91,15 @@ layout: buzfoo --- type and layout set` +var SIMPLE_PAGE_WITH_SUMMARY_DELIMITER = `--- +title: Simple +--- +Simple Page + +<!--more--> +Some more text +` + func checkError(t *testing.T, err error, expected string) { if err == nil { t.Fatalf("err is nil") @@ -130,6 +139,12 @@ func checkPageContent(t *testing.T, page *Page, content string) { } } +func checkPageSummary(t *testing.T, page *Page, summary string) { + if page.Summary != template.HTML(summary) { + t.Fatalf("Page summary is: `%s`. Expected `%s`", page.Summary, summary) + } +} + func checkPageType(t *testing.T, page *Page, pageType string) { if page.Type() != pageType { t.Fatalf("Page type is: %s. Expected: %s", page.Type(), pageType) @@ -149,6 +164,19 @@ func TestCreateNewPage(t *testing.T) { } checkPageTitle(t, p, "Simple") checkPageContent(t, p, "<p>Simple Page</p>\n") + checkPageSummary(t, p, "Simple Page") + checkPageType(t, p, "page") + checkPageLayout(t, p, "page/single.html") +} + +func TestPageWithDelimiter(t *testing.T) { + p, err := ReadFrom(strings.NewReader(SIMPLE_PAGE_WITH_SUMMARY_DELIMITER), "simple") + if err != nil { + t.Fatalf("Unable to create a page with frontmatter and body content: %s", err) + } + checkPageTitle(t, p, "Simple") + checkPageContent(t, p, "<p>Simple Page</p>\n\n<!--more-->\n\n<p>Some more text</p>\n") + checkPageSummary(t, p, "<p>Simple Page</p>\n") checkPageType(t, p, "page") checkPageLayout(t, p, "page/single.html") } |