Merge pull request twilio#291 from MikeBenza/add-messages-iter

codejudas · web-flow · commit 3f59c627c1e5 · 2016-11-16T13:48:52.000-08:00
Add iter function to messages resource
diff --git a/tests/test_messages.py b/tests/test_messages.py
@@ -5,6 +5,7 @@
 from six import u
 
 from twilio.rest.resources import Messages
+from twilio.rest.resources import ListResource
 
 DEFAULT = {
     'From': None,
@@ -38,6 +39,16 @@ def test_list_before(self):
             self.params['DateSent<'] = "2011-01-01"
             mock.assert_called_with(self.params)
 
+    def test_iter_params(self):
+        with patch.object(ListResource, 'iter') as mock:
+            self.resource.iter(before=date(2016, 1, 1), after=date(2011, 1, 1), date_sent=date(2016, 2, 1), to="+15005551212", from_="+15005559999")
+            self.params['DateSent<'] = "2016-01-01"
+            self.params['DateSent>'] = "2011-01-01"
+            self.params['DateSent'] = "2016-02-01"
+            self.params['To'] = "+15005551212"
+            self.params['From'] = "+15005559999"
+            mock.assert_called_with(**self.params)
+
     def test_create(self):
         with patch.object(self.resource, 'create_instance') as mock:
             self.resource.create(
diff --git a/twilio/rest/resources/messages.py b/twilio/rest/resources/messages.py
@@ -142,6 +142,22 @@ def list(self, from_=None, before=None, after=None, date_sent=None, **kw):
         kw["DateSent"] = parse_date(date_sent)
         return self.get_instances(kw)
 
+    @normalize_dates
+    def iter(self, from_=None, to=None, before=None, after=None,
+             date_sent=None, **kwargs):
+        """
+        Returns an iterator of :class:`Message` resources.
+
+        :param date after: Only list calls started after this datetime
+        :param date before: Only list calls started before this datetime
+        """
+        kwargs["From"] = from_
+        kwargs["To"] = to
+        kwargs["DateSent<"] = before
+        kwargs["DateSent>"] = after
+        kwargs["DateSent"] = parse_date(date_sent)
+        return super(Messages, self).iter(**kwargs)
+
     def update(self, sid, **kwargs):
         """ Updates the message for the given sid
         :param sid: The sid of the message to update.
