arunssvm
diff --git a/‎requirements.txt
Lines changed: 2 additions & 0 deletions b/‎requirements.txt
Lines changed: 2 additions & 0 deletions
diff --git a/‎tests/test_base_resource.py
Lines changed: 32 additions & 1 deletion b/‎tests/test_base_resource.py
Lines changed: 32 additions & 1 deletion
diff --git a/‎twilio/rest/resources.py
Lines changed: 22 additions & 12 deletions b/‎twilio/rest/resources.py
Lines changed: 22 additions & 12 deletions
@@ -5,3 +5,5 @@ nose
 pyjwt
 simplejson
 unittest2
+coverage
+nosexcover
@@ -6,7 +6,7 @@
     import unittest2 as unittest
 else:
     import unittest
-from mock import Mock
+from mock import Mock, patch
 from nose.tools import assert_equals
 from nose.tools import raises
 from twilio.rest.resources import Resource
@@ -45,9 +45,40 @@ def testListResourceInit(self):
     def testKeyValue(self):
         self.assertEquals(self.r.key, self.r.name.lower())
 
+    def testIterNoKey(self):
+        self.r.request = Mock()
+        self.r.request.return_value = Mock(), {}
+
+        with self.assertRaises(StopIteration):
+            self.r.iter().next()
+
+    def testIterOneItem(self):
+        self.r.request = Mock()
+        self.r.request.return_value = Mock(), {self.r.key: [{'sid': 'foo'}]}
+
+        items = self.r.iter()
+        items.next()
+
+        with self.assertRaises(StopIteration):
+            items.next()
+  
+    def testIterNoNextPage(self):
+        self.r.request = Mock()
+        self.r.request.return_value = Mock(), {self.r.key: []}
+
+        with self.assertRaises(StopIteration):
+            self.r.iter().next()
+ 
     def testKeyValue(self):
         self.r.key = "Hey"
         self.assertEquals(self.r.key, "Hey")
+ 
+    def testInstanceLoading(self):
+        instance = self.r.load_instance({"sid": "foo"})
+
+        self.assertIsInstance(instance, InstanceResource)
+        self.assertEquals(instance.sid, "foo")
+
 
     def testInstanceLoading(self):
         instance = self.r.load_instance({"sid": "foo"})
 
@@ -5,7 +5,7 @@
 from twilio import TwilioException
 from twilio import TwilioRestException
 from urllib import urlencode
-from urlparse import urlparse
+from urlparse import urlparse, parse_qs
 
 # import json
 try:
@@ -356,18 +356,28 @@ def count(self):
     def iter(self, **kwargs):
         """
         Return all instance resources using an iterator
-        Can only be called on classes which implement list()
-
-        TODO Make this use the next_url instead
         """
-        p = 0
-        try:
-            while True:
-                for r in self.list(page=p, **kwargs):
-                    yield r
-                p += 1
-        except TwilioRestException:
-            pass
+        next_uri = self.uri
+        params = transform_params(kwargs)
+
+        while next_uri:
+            try:
+                resp, page = self.request("GET", next_uri, params=params)
+
+                if self.key not in page:
+                    raise StopIteration()
+
+                for ir in page[self.key]:
+                    yield self.load_instance(ir)
+
+                if not page.get('next_page_uri', ''):
+                    raise StopIteration()
+
+                o = urlparse(page['next_page_uri'])
+                params.update(parse_qs(o.query))
+            except TwilioRestException:
+                raise StopIteration()
+
 
     def load_instance(self, data):
         instance = self.instance(self, data[self.instance.id_key])