aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuwn <[email protected]>2022-05-18 02:11:39 +0000
committerFuwn <[email protected]>2022-05-18 02:11:39 +0000
commit11cabcc6ea048c665e41db5fb210ee9515b0cf29 (patch)
treefa63b8678bac6d66ed1e195bd3af7f8795284b21
parentci(tests): add ast tests (diff)
downloadgerm-0.2.1.tar.xz
germ-0.2.1.zip
ci(tests): add convert tests0.2.1
Adding these tests also exposed an issue within the Markdown converter! The issue was that if a Markdown file **did not** have whitespace lines between elements, no whitespace lines were inserted at all into the converted result, leaving everything on one massive line (except lists).
-rw-r--r--src/convert/markdown.rs18
-rw-r--r--tests/convert.rs70
2 files changed, 79 insertions, 9 deletions
diff --git a/src/convert/markdown.rs b/src/convert/markdown.rs
index ccd2304..9bc0e6c 100644
--- a/src/convert/markdown.rs
+++ b/src/convert/markdown.rs
@@ -25,21 +25,21 @@ pub fn convert(source: Vec<Node>) -> String {
// this AST tree to an alternative markup format.
for node in source {
match node {
- Node::Text(text) => markdown.push_str(&text),
+ Node::Text(text) => markdown.push_str(&format!("{}\n", text)),
Node::Link {
to,
text,
} =>
markdown.push_str(&*text.map_or_else(
- || format!("<{}>", to),
- |text| format!("[{}]({})", text, to),
+ || format!("<{}>\n", to),
+ |text| format!("[{}]({})\n", text, to),
)),
Node::Heading {
level,
text,
} => {
markdown.push_str(&format!(
- "{} {}",
+ "{} {}\n",
match level {
1 => "#",
2 => "##",
@@ -50,20 +50,20 @@ pub fn convert(source: Vec<Node>) -> String {
));
}
Node::List(items) =>
- markdown.push_str(
- &items
+ markdown.push_str(&format!("{}\n",
+ items
.into_iter()
.map(|i| format!("- {}", i))
.collect::<Vec<String>>()
- .join("\n"),
+ .join("\n"),),
),
- Node::Blockquote(text) => markdown.push_str(&format!("> {}", text)),
+ Node::Blockquote(text) => markdown.push_str(&format!("> {}\n", text)),
Node::PreformattedText {
alt_text,
text,
} => {
markdown.push_str(&format!(
- "```{}\n{}```",
+ "```{}\n{}```\n",
alt_text.unwrap_or_else(|| "".to_string()),
text
));
diff --git a/tests/convert.rs b/tests/convert.rs
new file mode 100644
index 0000000..5ad16ca
--- /dev/null
+++ b/tests/convert.rs
@@ -0,0 +1,70 @@
+// This file is part of Germ <https://github.com/gemrest/germ>.
+// Copyright (C) 2022-2022 Fuwn <[email protected]>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 3.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// Copyright (C) 2022-2022 Fuwn <[email protected]>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#[cfg(test)]
+mod test {
+ use germ::convert::{Target, from_string};
+
+ #[test]
+ fn convert_from_string_to_html_single_line() {
+ assert_eq!(
+ from_string("hi", &Target::HTML),
+ "<p>hi</p>",
+ );
+ }
+
+ #[test]
+ fn convert_from_string_to_html_multi_line() {
+ assert_eq!(
+ from_string("hi\n# hi", &Target::HTML),
+ "<p>hi</p><h1>hi</h1>",
+ );
+ }
+
+ #[test]
+ fn convert_from_string_to_html_single_link() {
+ assert_eq!(
+ from_string("=> /to hello !", &Target::HTML),
+ "<a href=\"/to\">hello !</a><br>",
+ );
+ }
+
+ #[test]
+ fn convert_from_string_to_markdown_single_line() {
+ assert_eq!(
+ from_string("hi", &Target::Markdown),
+ "hi\n",
+ );
+ }
+
+ #[test]
+ fn convert_from_string_to_markdown_multi_line() {
+ assert_eq!(
+ from_string("hi\n# hi", &Target::Markdown),
+ "hi\n# hi\n",
+ );
+ }
+
+ #[test]
+ fn convert_from_string_to_markdown_single_link() {
+ assert_eq!(
+ from_string("=> /to hello !", &Target::Markdown),
+ "[hello !](/to)\n",
+ );
+ }
+}