Skip to content

Commit c61e925

Browse files
cydaveKeats
authored andcommitted
Implement replace_re filter (#2163)
* Implement replace_re filter * Cargo fmt * add regex caching * cargo fmt * update docs, update unit test * rename replace_re -> regex_replace
1 parent c0dd38b commit c61e925

File tree

3 files changed

+78
-1
lines changed

3 files changed

+78
-1
lines changed

components/templates/src/filters.rs

+69-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
use std::borrow::Cow;
22
use std::collections::HashMap;
33
use std::hash::BuildHasher;
4+
use std::sync::{Arc, Mutex};
45

56
use config::Config;
7+
68
use libs::base64::engine::{general_purpose::STANDARD as standard_b64, Engine};
9+
use libs::regex::Regex;
710
use libs::tera::{
811
to_value, try_get_value, Error as TeraError, Filter as TeraFilter, Result as TeraResult, Tera,
912
Value,
@@ -78,6 +81,53 @@ pub fn base64_decode<S: BuildHasher>(
7881
Ok(to_value(as_str).unwrap())
7982
}
8083

84+
#[derive(Debug)]
85+
pub struct RegexReplaceFilter {
86+
re_cache: Arc<Mutex<HashMap<String, Regex>>>,
87+
}
88+
89+
impl RegexReplaceFilter {
90+
pub fn new() -> Self {
91+
return Self { re_cache: Arc::new(Mutex::new(HashMap::new())) };
92+
}
93+
}
94+
95+
impl TeraFilter for RegexReplaceFilter {
96+
fn filter(&self, value: &Value, args: &HashMap<String, Value>) -> TeraResult<Value> {
97+
let text = try_get_value!("regex_replace", "value", String, value);
98+
let pattern = match args.get("pattern") {
99+
Some(val) => try_get_value!("regex_replace", "pattern", String, val),
100+
None => {
101+
return Err(TeraError::msg(
102+
"Filter `regex_replace` expected an arg called `pattern`",
103+
))
104+
}
105+
};
106+
let rep = match args.get("rep") {
107+
Some(val) => try_get_value!("regex_replace", "rep", String, val),
108+
None => {
109+
return Err(TeraError::msg("Filter `regex_replace` expected an arg called `rep`"))
110+
}
111+
};
112+
113+
let mut cache = self.re_cache.lock().expect("re_cache lock");
114+
let replaced = {
115+
match cache.get(&pattern) {
116+
Some(pat) => pat.replace_all(&text, &rep),
117+
None => {
118+
let pat = Regex::new(&pattern)
119+
.map_err(|e| format!("`regex_replace`: failed to compile regex: {}", e))?;
120+
let replaced = pat.replace_all(&text, &rep);
121+
cache.insert(pattern, pat);
122+
replaced
123+
}
124+
}
125+
};
126+
127+
Ok(to_value(replaced).unwrap())
128+
}
129+
}
130+
81131
#[derive(Debug)]
82132
pub struct NumFormatFilter {
83133
default_language: String,
@@ -114,7 +164,9 @@ mod tests {
114164

115165
use libs::tera::{to_value, Filter, Tera};
116166

117-
use super::{base64_decode, base64_encode, MarkdownFilter, NumFormatFilter};
167+
use super::{
168+
base64_decode, base64_encode, MarkdownFilter, NumFormatFilter, RegexReplaceFilter,
169+
};
118170
use config::Config;
119171

120172
#[test]
@@ -251,6 +303,22 @@ mod tests {
251303
}
252304
}
253305

306+
#[test]
307+
fn regex_replace_filter() {
308+
let value = "Springsteen, Bruce";
309+
let expected = "Bruce Springsteen";
310+
let pattern = r"(?P<last>[^,\s]+),\s+(?P<first>\S+)";
311+
let rep = "$first $last";
312+
let mut args = HashMap::new();
313+
args.insert("pattern".to_string(), to_value(pattern).unwrap());
314+
args.insert("rep".to_string(), to_value(rep).unwrap());
315+
let regex_replace = RegexReplaceFilter::new();
316+
let result = regex_replace.filter(&to_value(value).unwrap(), &args);
317+
assert!(result.is_ok());
318+
assert_eq!(result.unwrap(), to_value(expected).unwrap());
319+
assert!(regex_replace.re_cache.lock().unwrap().contains_key(pattern));
320+
}
321+
254322
#[test]
255323
fn num_format_filter() {
256324
let tests = vec![

components/templates/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ pub static ZOLA_TERA: Lazy<Tera> = Lazy::new(|| {
2828
.unwrap();
2929
tera.register_filter("base64_encode", filters::base64_encode);
3030
tera.register_filter("base64_decode", filters::base64_decode);
31+
tera.register_filter("regex_replace", filters::RegexReplaceFilter::new());
3132
tera
3233
});
3334

docs/content/documentation/templates/overview.md

+8
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,14 @@ Encode the variable to base64.
8686
### base64_decode
8787
Decode the variable from base64.
8888

89+
### regex_replace
90+
Replace text via regular expressions.
91+
92+
```jinja2
93+
{{ "World Hello" | regex_replace(pattern=`(?P<subject>\w+), (?P<greeting>\w+)`, rep=`$greeting $subject`) }}
94+
<!-- Hello World -->
95+
```
96+
8997
### num_format
9098
Format a number into its string representation.
9199

0 commit comments

Comments
 (0)