Skip to content

Commit

Permalink
add support for svg file extension
Browse files Browse the repository at this point in the history
  • Loading branch information
marvinjuette committed Nov 7, 2023
1 parent 02602fd commit 3ac87a2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
7 changes: 5 additions & 2 deletions askama_derive/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ pub(crate) fn get_template_source(tpl_path: &Path) -> std::result::Result<String
static CONFIG_FILE_NAME: &str = "askama.toml";
static DEFAULT_SYNTAX_NAME: &str = "default";
static DEFAULT_ESCAPERS: &[(&[&str], &str)] = &[
(&["html", "htm", "xml"], "::askama::Html"),
(&["html", "htm", "svg", "xml"], "::askama::Html"),
(&["md", "none", "txt", "yml", ""], "::askama::Text"),
(&["j2", "jinja", "jinja2"], "::askama::Html"),
];
Expand Down Expand Up @@ -564,7 +564,10 @@ mod tests {
config.escapers,
vec![
(str_set(&["js"]), "::askama::Js".into()),
(str_set(&["html", "htm", "xml"]), "::askama::Html".into()),
(
str_set(&["html", "htm", "svg", "xml"]),
"::askama::Html".into()
),
(
str_set(&["md", "none", "txt", "yml", ""]),
"::askama::Text".into()
Expand Down
5 changes: 4 additions & 1 deletion askama_derive/src/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ pub(crate) fn extension_to_mime_type(ext: &str) -> Mime {
basic_type
}

const TEXT_TYPES: [(Mime, Mime); 6] = [
const TEXT_TYPES: [(Mime, Mime); 7] = [
(mime::TEXT_PLAIN, mime::TEXT_PLAIN_UTF_8),
(mime::TEXT_HTML, mime::TEXT_HTML_UTF_8),
(mime::TEXT_CSS, mime::TEXT_CSS_UTF_8),
Expand All @@ -358,6 +358,7 @@ const TEXT_TYPES: [(Mime, Mime); 6] = [
mime::APPLICATION_JAVASCRIPT,
mime::APPLICATION_JAVASCRIPT_UTF_8,
),
(mime::IMAGE_SVG, mime::IMAGE_SVG),
];

#[cfg(test)]
Expand All @@ -369,10 +370,12 @@ mod tests {
assert_eq!(extension(Path::new("foo-bar.txt")), Some("txt"));
assert_eq!(extension(Path::new("foo-bar.html")), Some("html"));
assert_eq!(extension(Path::new("foo-bar.unknown")), Some("unknown"));
assert_eq!(extension(Path::new("foo-bar.svg")), Some("svg"));

assert_eq!(extension(Path::new("foo/bar/baz.txt")), Some("txt"));
assert_eq!(extension(Path::new("foo/bar/baz.html")), Some("html"));
assert_eq!(extension(Path::new("foo/bar/baz.unknown")), Some("unknown"));
assert_eq!(extension(Path::new("foo/bar/baz.svg")), Some("svg"));
}

#[test]
Expand Down

0 comments on commit 3ac87a2

Please sign in to comment.