Merge pull request #38 from msifd/feat/namespace

Add namespace support for element and attribute names

maud_macros/src/parse.rs

@@ -49,6 +49,9 @@ macro_rules! question {
 macro_rules! semi {
     () => (TokenTree::Token(_, Token::Semi))
 }
+macro_rules! colon {
+    () => (TokenTree::Token(_, Token::Colon))
+}
 macro_rules! comma {
     () => (TokenTree::Token(_, Token::Comma))
 }
@@ -545,8 +548,8 @@ impl<'cx, 'a, 'i> Parser<'cx, 'a, 'i> {
         Ok(())
     }
 
-    /// Parses a HTML element or attribute name.
-    fn name(&mut self) -> PResult<String> {
+    /// Parses ident with minuses.
+    fn ident_with_minuses(&mut self) -> PResult<String> {
         let mut s = match *self.input {
             [ident!(_, name), ..] => {
                 self.shift(1);
@@ -562,6 +565,20 @@ impl<'cx, 'a, 'i> Parser<'cx, 'a, 'i> {
         Ok(s)
     }
 
+    /// Parses a HTML element or attribute name.
+    fn name(&mut self) -> PResult<String> {
+        let mut s = match self.ident_with_minuses() {
+            Ok(ident) => ident,
+            Err(e) => return Err(e),
+        };
+        if let [colon!(), ident!(_, _), ..] = *self.input {
+            self.shift(1);
+            s.push(':');
+            s.push_str(self.ident_with_minuses().unwrap().as_str());
+        }
+        Ok(s)
+    }
+
     /// Parses the given token tree, returning a vector of statements.
     fn block(&mut self, sp: Span, tts: &[TokenTree]) -> PResult<Vec<Stmt>> {
         let mut parse = Parser {

maud_macros/tests/tests.rs

@@ -87,6 +87,13 @@ mod elements {
         html!(s, div readonly? input type="checkbox" checked? /).unwrap();
         assert_eq!(s, r#"<div readonly><input type="checkbox" checked></div>"#);
     }
+
+    #[test]
+    fn namespaces() {
+        let mut s = String::new();
+        html!(s, pon-pon:controls-alpha a on:click="yay()" "Yay!").unwrap();
+        assert_eq!(s, r#"<pon-pon:controls-alpha><a on:click="yay()">Yay!</a></pon-pon:controls-alpha>"#);
+    }
 }
 
 mod splices {