Basic long form vars works

Author: tyler

esi/src/lib.rs

@@ -10,6 +10,7 @@ use fastly::http::request::PendingRequest;
 use fastly::http::{header, Method, StatusCode, Url};
 use fastly::{mime, Body, Request, Response};
 use log::{debug, error, trace};
+use quick_xml::events::Event as XmlEvent;
 use std::collections::{HashMap, VecDeque};
 use std::io::{BufRead, Write};
 
@@ -469,6 +470,39 @@ fn event_receiver(
                 // TODO: long form
             }
         }
+        Event::VarsContent(event) => {
+            let mut buf = vec![];
+            let mut cur = event.iter().peekable();
+            while let Some(c) = cur.next() {
+                if *c == b'$' {
+                    if cur.peek() == Some(&&b'(') {
+                        println!("Found a variable!");
+                        cur.next();
+
+                        let mut varbuf = vec![];
+                        while let Some(vc) = cur.next() {
+                            if *vc == b')' {
+                                break;
+                            }
+                            varbuf.push(*vc)
+                        }
+
+                        match String::from_utf8(varbuf) {
+                            Ok(name) => {
+                                if let Some(value) = variables.get(&name) {
+                                    let value = value.to_owned();
+                                    queue.push_back(Element::Raw(value.into_bytes()));
+                                }
+                            }
+                            Err(e) => println!("Failed to parse variable: {}", e),
+                        }
+                    }
+                } else {
+                    buf.push(*c);
+                }
+            }
+            queue.push_back(Element::Raw(buf));
+        }
         Event::XML(event) => {
             debug!("pushing content to buffer, len: {}", queue.len());
             let mut buf = vec![];

esi/src/parse.rs

@@ -47,6 +47,7 @@ pub enum Tag<'a> {
 #[allow(clippy::upper_case_acronyms)]
 pub enum Event<'e> {
     XML(XmlEvent<'e>),
+    VarsContent(XmlEvent<'e>),
     ESI(Tag<'e>),
 }
 
@@ -220,10 +221,15 @@ where
                 break;
             }
             Ok(e) => {
+                let event = if open_vars {
+                    Event::VarsContent(e.into_owned())
+                } else {
+                    Event::XML(e.into_owned())
+                };
                 if *depth == 0 {
-                    callback(Event::XML(e.into_owned()))?;
+                    callback(event)?;
                 } else {
-                    task.push(Event::XML(e.into_owned()));
+                    task.push(event);
                 }
             }
             _ => {}

examples/esi_vars_example/src/index.html

@@ -12,11 +12,12 @@ <h1>My Variable Website</h1>
       <esi:assign name="test" value="YES" />
       Check (short form): YES=<esi:vars name="test" /><br>
       Check (long form): YES=<esi:vars>$(test)</esi:vars><br>
-
+      
       Updating variable to "PERHAPS"...<br>
       <esi:assign name="test" value="PERHAPS" />
       Check (short form): PERHAPS=<esi:vars name="test" /><br>
       Check (long form): PERHAPS=<esi:vars>$(test)</esi:vars><br>
+      
     </div>
   </body>
 </html>