Fix some key values issue + serde_json change

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.17.1 (unreleased)
+
+- Make `get_random` use isize instead of i32 and bad error message
+- Fix variables lookup when the evaluated key has a `.` or quotes
+
 ## 1.17.0 (2022-08-14)
 
 - Fix bug where operands in `in` operation were escaped before comparison

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tera"
-version = "1.17.0"
+version = "1.17.1"
 authors = ["Vincent Prouillet <hello@prouilletvincent.com>"]
 license = "MIT"
 readme = "README.md"

src/context.rs

@@ -144,7 +144,17 @@ impl ValueRender for Value {
     fn render(&self, write: &mut impl Write) -> std::io::Result<()> {
         match *self {
             Value::String(ref s) => write!(write, "{}", s),
-            Value::Number(ref i) => write!(write, "{}", i),
+            Value::Number(ref i) => {
+                if let Some(v) = i.as_i64() {
+                    write!(write, "{}", v)
+                } else if let Some(v) = i.as_u64() {
+                    write!(write, "{}", v)
+                } else if let Some(v) = i.as_f64() {
+                    write!(write, "{}", v)
+                } else {
+                    unreachable!()
+                }
+            }
             Value::Bool(i) => write!(write, "{}", i),
             Value::Null => Ok(()),
             Value::Array(ref a) => {

src/renderer/processor.rs

@@ -37,7 +37,7 @@ fn evaluate_sub_variables<'a>(key: &str, call_stack: &CallStack<'a>) -> Result<S
             }
             Ok(post_var) => {
                 let post_var_as_str = match *post_var {
-                    Value::String(ref s) => s.to_string(),
+                    Value::String(ref s) => format!(r#""{}""#, s),
                     Value::Number(ref n) => n.to_string(),
                     _ => {
                         return Err(Error::msg(format!(
@@ -764,7 +764,11 @@ impl<'a> Processor<'a> {
                         if res.is_nan() {
                             None
                         } else {
-                            Number::from_f64(res)
+                            if res.round() == res && res.is_finite() {
+                                Some(Number::from(res as i64))
+                            } else {
+                                Number::from_f64(res)
+                            }
                         }
                     }
                     MathOperator::Add => {

src/renderer/tests/square_brackets.rs

@@ -92,3 +92,23 @@ fn var_access_by_loop_index_with_set() {
     );
     assert!(res.is_ok());
 }
+
+
+// https://github.com/Keats/tera/issues/754
+#[test]
+fn can_get_value_if_key_contains_period() {
+    let mut context = Context::new();
+    context.insert("name", "Mt. Robson Provincial Park");
+    let mut map = HashMap::new();
+    map.insert("Mt. Robson Provincial Park".to_string(), "hello".to_string());
+    context.insert("tag_info", &map);
+
+    let res = Tera::one_off(
+        r#"{{ tag_info[name] }}"#,
+        &context,
+        true,
+    );
+    assert!(res.is_ok());
+    let res = res.unwrap();
+    assert_eq!(res, "hello");
+}