Add support for xml: namespaced properties (#435)

twilio · Jul 23, 2018 · 465d3c5 · 465d3c5
1 parent 9a17435
commit 465d3c5
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/src/Twilio/TwiML/TwiML.cs b/src/Twilio/TwiML/TwiML.cs
@@ -5,13 +5,13 @@
 using System.Xml.Linq;
 using Twilio.Exceptions;
 
-namespace Twilio.TwiML 
+namespace Twilio.TwiML
 {
 
     /// <summary>
     /// Base class for all TwiML Objects.
     /// </summary>
-    public class TwiML 
+    public class TwiML
     {
         /// <summary>
         /// Tag name
@@ -78,7 +78,7 @@ public T Nest<T>(T childElem) where T : TwiML
             this.Children.Add(childElem);
             return childElem;
         }
-        
+
         /// <summary>
         /// Add a generic child TwiML object
         /// </summary>
@@ -121,7 +121,20 @@ protected virtual XNode ToXml()
             var elem = new XElement(this.TagName, this.GetElementBody());
 
             this.GetElementAttributes().ForEach(attr => elem.Add(attr));
-            this.Options.ForEach(e => elem.Add(new XAttribute(e.Key, e.Value)));
+
+            this.Options.ForEach(e =>
+            {
+                if (e.Key.StartsWith("xml:"))
+                {
+                    var attribute = new XAttribute(XNamespace.Xml + e.Key.Substring(4), e.Value);
+                    elem.Add(attribute);
+                }
+                else
+                {
+                    elem.Add(new XAttribute(e.Key, e.Value));
+                }
+            });
+
             this.Children.ForEach(child => elem.Add(child.ToXml()));
 
             return elem;
@@ -146,7 +159,7 @@ public string ToString(SaveOptions formattingOptions = SaveOptions.None)
     /// <summary>
     /// StringWriter which overrides default encoding to use UTF8.
     /// </summary>
-    public class Utf8StringWriter : StringWriter 
+    public class Utf8StringWriter : StringWriter
     {
         public override Encoding Encoding => Encoding.UTF8;
     }

diff --git a/test/Twilio.Test/TwiML/BodyTest.cs b/test/Twilio.Test/TwiML/BodyTest.cs
@@ -8,11 +8,11 @@
 using Twilio.Converters;
 using Twilio.TwiML.Messaging;
 
-namespace Twilio.Tests.TwiML 
+namespace Twilio.Tests.TwiML
 {
 
     [TestFixture]
-    public class BodyTest : TwilioTest 
+    public class BodyTest : TwilioTest
     {
         [Test]
         public void TestEmptyElement()
@@ -94,6 +94,19 @@ public void TestMixedContent()
                 elem.ToString()
             );
         }
+
+        [Test]
+        public void TestXmlNamespace()
+        {
+            var elem = new Body();
+            elem.SetOption("xml:lang", "en-US");
+
+            Assert.AreEqual(
+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>" + Environment.NewLine +
+                "<Body xml:lang=\"en-US\"></Body>",
+                elem.ToString()
+            );
+        }
     }
 
 }