1 files changed, 58 insertions, 16 deletions

diff --git a/src/writer.rs b/src/writer.rs
index 9e770c7..4881f57 100644
--- a/src/writer.rs
+++ b/src/writer.rs
@@ -23,19 +23,24 @@ impl<W: AsyncWrite + Unpin> Writer<W> {
     }
 
     pub async fn write_start(&mut self, element: Element) -> Result<()> {
-        let mut namespace_declarations_stack: Vec<_> = self
+        let namespace_declarations_stack: Vec<_> = self
             .namespace_declarations
             .iter()
             .flatten()
             .chain(&element.namespace_declarations)
             .collect();
-        let name_namespace_declaration = namespace_declarations_stack
-            .iter()
-            .rfind(|namespace_declaration| {
-                namespace_declaration.namespace == element.name.namespace
-            })
-            .ok_or(Error::UndeclaredNamespace(element.name.namespace.clone()))?;
-        let prefix = &name_namespace_declaration.prefix;
+
+        let prefix;
+        if let Some(namespace) = &element.name.namespace {
+            let name_namespace_declaration = namespace_declarations_stack
+                .iter()
+                .rfind(|namespace_declaration| namespace_declaration.namespace == *namespace)
+                .ok_or(Error::UndeclaredNamespace(namespace.clone()))?;
+            prefix = name_namespace_declaration.prefix.as_ref();
+        } else {
+            prefix = None
+        }
+
         let name;
         if let Some(prefix) = &prefix {
             name = xml::QName::PrefixedName(xml::PrefixedName {
@@ -48,8 +53,6 @@ impl<W: AsyncWrite + Unpin> Writer<W> {
             )?)
         }
 
-        namespace_declarations_stack.push(name_namespace_declaration);
-
         let mut attributes = Vec::new();
 
         for namespace_declaration in &element.namespace_declarations {
@@ -67,6 +70,39 @@ impl<W: AsyncWrite + Unpin> Writer<W> {
             attributes.push(xml_attribute);
         }
 
+        for (name, value) in &element.attributes {
+            let prefix;
+            if let Some(namespace) = &name.namespace {
+                let name_namespace_declaration = namespace_declarations_stack
+                    .iter()
+                    .rfind(|namespace_declaration| namespace_declaration.namespace == *namespace)
+                    .ok_or(Error::UndeclaredNamespace(namespace.clone()))?;
+                prefix = name_namespace_declaration.prefix.as_ref();
+            } else {
+                prefix = None
+            }
+
+            let att_name;
+            if let Some(prefix) = &prefix {
+                att_name = xml::QName::PrefixedName(xml::PrefixedName {
+                    prefix: xml::Prefix::parse_full(prefix)?,
+                    local_part: xml::LocalPart::parse_full(&element.name.local_name)?,
+                })
+            } else {
+                att_name = xml::QName::UnprefixedName(xml::UnprefixedName::parse_full(
+                    &element.name.local_name,
+                )?)
+            }
+
+            let value = xml::AttValue::from(value.as_str());
+
+            let xml_attribute = xml::Attribute::Attribute {
+                name: att_name,
+                value,
+            };
+            attributes.push(xml_attribute);
+        }
+
         let s_tag = xml::STag { name, attributes };
 
         s_tag.write(&mut self.inner).await?;
@@ -82,12 +118,18 @@ impl<W: AsyncWrite + Unpin> Writer<W> {
             let e_tag;
             let namespace_declarations_stack: Vec<_> =
                 self.namespace_declarations.iter().flatten().collect();
-            let namespace_declaration = namespace_declarations_stack
-                .iter()
-                .rfind(|namespace_declaration| namespace_declaration.namespace == name.namespace)
-                // will always be in this vector
-                .unwrap();
-            let prefix = &namespace_declaration.prefix;
+
+            let prefix;
+            if let Some(namespace) = &name.namespace {
+                let name_namespace_declaration = namespace_declarations_stack
+                    .iter()
+                    .rfind(|namespace_declaration| namespace_declaration.namespace == *namespace)
+                    .ok_or(Error::UndeclaredNamespace(namespace.clone()))?;
+                prefix = name_namespace_declaration.prefix.as_ref();
+            } else {
+                prefix = None
+            }
+
             if let Some(prefix) = &prefix {
                 e_tag = xml::ETag {
                     name: xml::QName::PrefixedName(xml::PrefixedName {