Support maps/object returned by func.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gtmpl"
-version = "0.5.4"
+version = "0.5.5"
 authors = ["Florian Merz <flomerz@gmail.com>"]
 description = "The Golang Templating Language for Rust"
 license = "MIT"

README.md

@@ -22,7 +22,7 @@ seamless integration of Rust application into the world of devops tools around
 Add the following dependency to your Cargo manifest…
 ```toml
 [dependencies]
-gtmpl = "0.5.4"
+gtmpl = "0.5.5"
 ```
 
 and look at the docs:
@@ -137,7 +137,7 @@ there might be some convenient additions:
 Enable `gtmpl_dynamic_template` in your `Cargo.toml`:
 ```toml
 [dependencies.gtmpl]
-version = "0.5.2"
+version = "0.5.5"
 features = ["gtmpl_dynamic_template"]
 
 ```

src/exec.rs

@@ -240,9 +240,11 @@ impl<'a, 'b, T: Write> State<'a, 'b, T> {
         fin: &Option<Value>,
     ) -> Result<Value, String> {
         let mut arg_vals = vec![];
-        for arg in &args[1..] {
-            let val = self.eval_arg(ctx, arg)?;
-            arg_vals.push(val);
+        if !args.is_empty() {
+            for arg in &args[1..] {
+                let val = self.eval_arg(ctx, arg)?;
+                arg_vals.push(val);
+            }
         }
         if let Some(ref f) = *fin {
             arg_vals.push(f.clone());
@@ -276,6 +278,7 @@ impl<'a, 'b, T: Write> State<'a, 'b, T> {
             Nodes::Variable(ref n) => self.eval_variable_node(n, &[], &None),
             Nodes::Pipe(ref n) => self.eval_pipeline(ctx, n),
             // Nodes::Identifier
+            Nodes::Identifier(ref n) => self.eval_function(ctx, n, &[], &None),
             Nodes::Chain(ref n) => self.eval_chain_node(ctx, n, &[], &None),
             Nodes::String(ref n) => Ok(n.value.clone()),
             Nodes::Bool(ref n) => Ok(n.value.clone()),
@@ -567,7 +570,7 @@ mod tests_mocked {
     }
 
     #[test]
-    fn test_funtion_via_dot() {
+    fn test_function_via_dot() {
         #[derive(Gtmpl)]
         struct Foo {
             foo: Func,
@@ -608,6 +611,24 @@ mod tests_mocked {
         assert_eq!(String::from_utf8(w).unwrap(), "43");
     }
 
+    #[test]
+    fn test_function_ret_map() {
+        fn map(_: &[Value]) -> Result<Value, String> {
+            let mut h = HashMap::new();
+            h.insert("field".to_owned(), 1);
+            Ok(h.into())
+        }
+
+        let data = Context::empty();
+        let mut w: Vec<u8> = vec![];
+        let mut t = Template::default();
+        t.add_func("map", map);
+        assert!(t.parse(r#"{{map.field}}"#).is_ok());
+        let out = t.execute(&mut w, &data);
+        assert!(out.is_ok());
+        assert_eq!(String::from_utf8(w).unwrap(), "1");
+    }
+
     #[test]
     fn test_dot_value() {
         #[derive(Gtmpl, Clone)]

src/node.rs

@@ -429,7 +429,8 @@ impl ChainNode {
         }
     }
 
-    pub fn add(&mut self, val: String) {
+    pub fn add(&mut self, val: &str) {
+        let val = val.trim_left_matches('.').to_owned();
         self.field.push(val);
     }
 }
@@ -443,8 +444,7 @@ impl Display for ChainNode {
             return Err(e);
         }
         for field in &self.field {
-            // fields are prefixed with .
-            if let Err(e) = write!(f, "{}", field) {
+            if let Err(e) = write!(f, ".{}", field) {
                 return Err(e);
             }
         }

src/parse.rs

@@ -630,14 +630,14 @@ impl Parser {
                         _ => {}
                     };
                     let mut chain = ChainNode::new(self.tree_id, next.pos, n);
-                    chain.add(next.val);
+                    chain.add(&next.val);
                     while self
                         .peek()
                         .map(|p| p.typ == ItemType::ItemField)
                         .unwrap_or(false)
                     {
                         let field = self.next().unwrap();
-                        chain.add(field.val);
+                        chain.add(&field.val);
                     }
                     let n = match typ {
                         NodeType::Field => Nodes::Field(FieldNode::new(