talexander/duster
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix a bug w.r.t. quoting and escaping boolean values with filters.

Browse Source
This commit is contained in:
Tom Alexander 2020-05-23 19:34:38 -04:00
parent bd7866e973
commit 71378ed37d
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/test_cases/filters/README.md
View File

@ -6,3 +6,8 @@ Dust automatically applies the `|h` filter to html escape unless `|s` is applied
Iterate over all filters Iterate over all filters
If `|s` is not present append `|h`, otherwise, leave filters as-in If `|s` is not present append `|h`, otherwise, leave filters as-in
During render, `|s` does nothing, so we can just remove it on the dust side to prevent confusion. During render, `|s` does nothing, so we can just remove it on the dust side to prevent confusion.
Quoting
-------
Oddly enough, `boolean|j|js` gets no quotes (meaning `boolean|j` remains a boolean) but `boolean|h|js` does get quotes (meaning that `boolean|h` becomes a string)

3
src/bin.rs
View File

@ -189,6 +189,9 @@ fn apply_filter(
(serde_json::Value::String(string), Filter::JavascriptStringEncode) => { (serde_json::Value::String(string), Filter::JavascriptStringEncode) => {
Ok(serde_json::Value::String(javascript_escape(string))) Ok(serde_json::Value::String(javascript_escape(string)))
} }
(serde_json::Value::Bool(boolean), Filter::JavascriptStringEncode) => {
Ok(serde_json::Value::Bool(*boolean))
}
(_, Filter::JavascriptStringEncode) => Ok(serde_json::Value::String(javascript_escape( (_, Filter::JavascriptStringEncode) => Ok(serde_json::Value::String(javascript_escape(
&json_value.render(&Vec::new())?, &json_value.render(&Vec::new())?,
))), ))),

1
src/renderer/renderer.rs
View File

@ -525,6 +525,7 @@ mod tests {
use crate::renderer::context_element::Renderable; use crate::renderer::context_element::Renderable;
use crate::renderer::context_element::Walkable; use crate::renderer::context_element::Walkable;
use crate::renderer::CompareContextElement; use crate::renderer::CompareContextElement;
use std::cmp::Ordering;
impl ContextElement for String {} impl ContextElement for String {}