Allow adding text to TwiML nodes (#422)

ekarson · web-flow · commit e4e6ae3c51b9 · 2018-06-14T09:36:52.000-07:00
* Allow appending plain text to twiml nodes

* add test for voice

* missing newlines!
diff --git a/tests/unit/twiml/__init__.py b/tests/unit/twiml/__init__.py
@@ -18,7 +18,7 @@ def strip(self, xml):
     @raises(TwiMLException)
     def test_append_fail(self):
         t = TwiML()
-        t.append('foobar')
+        t.append(12345)
 
     def test_format_language_none(self):
         language = None
diff --git a/tests/unit/twiml/test_messaging_response.py b/tests/unit/twiml/test_messaging_response.py
@@ -88,3 +88,25 @@ def test_redirect(self):
             self.strip(r),
             '<?xml version="1.0" encoding="UTF-8"?><Response><Redirect>example.com</Redirect></Response>'
         )
+
+
+class TestText(TwilioTest):
+    def test_text(self):
+        r = MessagingResponse()
+        r.append('No tags!')
+
+        assert_equal(
+            self.strip(r),
+            '<?xml version="1.0" encoding="UTF-8"?><Response>No tags!</Response>'
+        )
+
+    def text_mixed(self):
+        r = MessagingResponse()
+        r.append('before')
+        r.append(Body('Content'))
+        r.append('after')
+
+        assert_equal(
+            self.strip(r),
+            '<?xml version="1.0" encoding="UTF-8"?><Response>before<Body>Content</Body>after</Response>'
+        )
diff --git a/tests/unit/twiml/test_voice_response.py b/tests/unit/twiml/test_voice_response.py
@@ -602,3 +602,25 @@ def test_nested_say_play_pause(self):
             self.strip(r),
             '<?xml version="1.0" encoding="UTF-8"?><Response><Gather><Say>Hey</Say><Play>hey.mp3</Play><Pause /></Gather></Response>'
         )
+
+
+class TestText(TwilioTest):
+    def test_text(self):
+        r = VoiceResponse()
+        r.append('No tags!')
+
+        assert_equal(
+            self.strip(r),
+            '<?xml version="1.0" encoding="UTF-8"?><Response>No tags!</Response>'
+        )
+
+    def text_mixed(self):
+        r = VoiceResponse()
+        r.append('before')
+        r.say('Content')
+        r.append('after')
+
+        assert_equal(
+            self.strip(r),
+            '<?xml version="1.0" encoding="UTF-8"?><Response>before<Say>Content</Say>after</Response>'
+        )
diff --git a/twilio/twiml/__init__.py b/twilio/twiml/__init__.py
@@ -1,11 +1,3 @@
-# coding=utf-8
-"""
-This code was generated by
-\ / _    _  _|   _  _
- | (_)\/(_)(_|\/| |(/_  v1.0.0
-      /       /
-"""
-
 import json
 import re
 import xml.etree.ElementTree as ET
@@ -79,10 +71,7 @@ def append(self, verb):
 
         :returns: self
         """
-        if not isinstance(verb, TwiML):
-            raise TwiMLException('Only appending of TwiML is allowed')
-
-        self.verbs.append(verb)
+        self.nest(verb)
         return self
 
     def nest(self, verb):
@@ -93,8 +82,8 @@ def nest(self, verb):
 
         :returns: the TwiML verb
         """
-        if not isinstance(verb, TwiML):
-            raise TwiMLException('Only nesting of TwiML is allowed')
+        if not isinstance(verb, TwiML) and not isinstance(verb, str):
+            raise TwiMLException('Only nesting of TwiML and strings are allowed')
 
         self.verbs.append(verb)
         return verb
@@ -118,7 +107,16 @@ def xml(self):
 
             el.text = self.value
 
+        last_child = None
+
         for verb in self.verbs:
-            el.append(verb.xml())
+            if isinstance(verb, str):
+                if last_child:
+                    last_child.tail = verb
+                else:
+                    el.text = verb
+            else:
+                last_child = verb.xml()
+                el.append(last_child)
 
         return el
