or other things already there
temp_header.title += &text;
header_created = true;
- return Event::Html(Owned(String::new()));
+ return Event::Html(Borrowed(""));
}
// if we are in the middle of a code block
@@ -93,7 +102,7 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result<(Strin
}
Event::Start(Tag::CodeBlock(ref info)) => {
if !context.config.highlight_code {
- return Event::Html(Owned("".to_string()));
+ return Event::Html(Borrowed(""));
}
let theme = &THEME_SET.themes[&context.config.highlight_theme];
@@ -101,7 +110,7 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result<(Strin
Ok(h) => highlighter = Some(h),
Err(err) => {
error = Some(format!("Could not load syntax: {}", err).into());
- return Event::Html(Owned(String::new()));
+ return Event::Html(Borrowed(""));
}
}
let snippet = start_coloured_html_snippet(theme);
@@ -109,11 +118,11 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result<(Strin
}
Event::End(Tag::CodeBlock(_)) => {
if !context.config.highlight_code {
- return Event::Html(Owned("
\n".to_string()));
+ return Event::Html(Borrowed("
\n"));
}
// reset highlight and close the code block
highlighter = None;
- Event::Html(Owned("".to_string()))
+ Event::Html(Borrowed(""))
}
Event::Start(Tag::Image(src, title)) => {
if is_colocated_asset_link(&src) {
@@ -139,7 +148,7 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result<(Strin
Ok(url) => url,
Err(_) => {
error = Some(format!("Relative link {} not found.", link).into());
- return Event::Html(Owned(String::new()));
+ return Event::Html(Borrowed(""));
}
}
} else if is_colocated_asset_link(&link) {
@@ -167,7 +176,7 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result<(Strin
format!("", fixed_link, title)
};
temp_header.push(&html);
- return Event::Html(Owned(String::new()));
+ return Event::Html(Borrowed(""));
}
Event::Start(Tag::Link(Owned(fixed_link), title))
@@ -175,28 +184,28 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result<(Strin
Event::End(Tag::Link(_, _)) => {
if in_header {
temp_header.push("");
- return Event::Html(Owned(String::new()));
+ return Event::Html(Borrowed(""));
}
event
}
Event::Start(Tag::Code) => {
if in_header {
temp_header.push("");
- return Event::Html(Owned(String::new()));
+ return Event::Html(Borrowed(""));
}
event
}
Event::End(Tag::Code) => {
if in_header {
temp_header.push("");
- return Event::Html(Owned(String::new()));
+ return Event::Html(Borrowed(""));
}
event
}
Event::Start(Tag::Header(num)) => {
in_header = true;
temp_header = TempHeader::new(num);
- Event::Html(Owned(String::new()))
+ Event::Html(Borrowed(""))
}
Event::End(Tag::Header(_)) => {
// End of a header, reset all the things and return the stringified
@@ -208,6 +217,10 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result<(Strin
temp_header = TempHeader::default();
Event::Html(Owned(val))
}
+ Event::Html(ref markup) if markup.contains("") => {
+ has_summary = true;
+ Event::Html(Borrowed(CONTINUE_READING))
+ }
_ => event,
}
});
@@ -215,11 +228,14 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result<(Strin
cmark::html::push_html(&mut html, parser);
}
- match error {
- Some(e) => Err(e),
- None => Ok((
- html.replace("", "").replace("", ""),
- make_table_of_contents(&headers)
- )),
+ if let Some(e) = error {
+ return Err(e)
+ } else {
+ html = html.replace("", "").replace("", "");
+ Ok(Rendered {
+ summary_len: if has_summary { html.find(CONTINUE_READING) } else { None },
+ body: html,
+ toc: make_table_of_contents(&headers)
+ })
}
}
diff --git a/components/rendering/tests/markdown.rs b/components/rendering/tests/markdown.rs
index 93e6f646..a383450c 100644
--- a/components/rendering/tests/markdown.rs
+++ b/components/rendering/tests/markdown.rs
@@ -22,7 +22,7 @@ fn can_do_render_content_simple() {
let config = Config::default();
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, Path::new("something"), InsertAnchor::None);
let res = render_content("hello", &context).unwrap();
- assert_eq!(res.0, "hello
\n");
+ assert_eq!(res.body, "hello
\n");
}
#[test]
@@ -34,7 +34,7 @@ fn doesnt_highlight_code_block_with_highlighting_off() {
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, Path::new("something"), InsertAnchor::None);
let res = render_content("```\n$ gutenberg server\n```", &context).unwrap();
assert_eq!(
- res.0,
+ res.body,
"$ gutenberg server\n
\n"
);
}
@@ -47,7 +47,7 @@ fn can_highlight_code_block_no_lang() {
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, Path::new("something"), InsertAnchor::None);
let res = render_content("```\n$ gutenberg server\n$ ping\n```", &context).unwrap();
assert_eq!(
- res.0,
+ res.body,
"\n$ gutenberg server\n$ ping\n
"
);
}
@@ -60,7 +60,7 @@ fn can_highlight_code_block_with_lang() {
let context = RenderContext::new(&tera_ctx, &config, "", &permalinks_ctx, Path::new("something"), InsertAnchor::None);
let res = render_content("```python\nlist.append(1)\n```", &context).unwrap();
assert_eq!(
- res.0,
+ res.body,
"\nlist.append(1)\n
"
);
}
@@ -74,7 +74,7 @@ fn can_higlight_code_block_with_unknown_lang() {
let res = render_content("```yolo\nlist.append(1)\n```", &context).unwrap();
// defaults to plain text
assert_eq!(
- res.0,
+ res.body,
"\nlist.append(1)\n"
);
}
@@ -89,8 +89,8 @@ Hello
{{ youtube(id="ub36ffWAqgQ") }}
"#, &context).unwrap();
- assert!(res.0.contains("Hello
\n"));
- assert!(res.0.contains(r#"