Merge branch 'release/2.1.0'

* release/2.1.0:
  bump version
  add support for simulate parameter for batch endpoints. slow down tests. send emails in post body instead of params for batch create
  Update .travis.yml

Author: eberquist

.travis.yml

@@ -1,8 +1,6 @@
 language: python
 
 python:
-  - "3.4"
-  - "3.5"
   - "3.6"
   - "3.7"
   - "3.8"

VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

emailable/client.py

@@ -11,49 +11,56 @@ def __init__(self, api_key):
     self.base_url = 'https://api.emailable.com/v1/'
 
   def verify(self, email, smtp=True, accept_all=False, timeout=None):
-    params = {
-      'api_key': self.api_key,
-      'email': email,
-      'smtp': str(smtp).lower(),
-      'accept_all': str(accept_all).lower(),
-      'timeout': timeout
+    options = {
+      'params': {
+        'api_key': self.api_key,
+        'email': email,
+        'smtp': str(smtp).lower(),
+        'accept_all': str(accept_all).lower(),
+        'timeout': timeout
+      }
     }
 
     url = self.base_url + 'verify'
-    return self.__request('get', url, params)
-
-  def batch(self, emails, callback_url = None):
-    if isinstance(emails, list):
-      emails = ','.join(emails)
+    return self.__request('get', url, options)
 
-    params = {
+  def batch(self, emails, callback_url=None, simulate=None):
+    options = {
+      'params': {
         'api_key': self.api_key,
-        'emails': emails,
-        'url': callback_url
+        'url': callback_url,
+        'simulate': simulate
+      },
+      'json': {
+        'emails': emails
+      }
     }
     url = self.base_url + 'batch'
-    return self.__request('post', url, params)
+    return self.__request('post', url, options)
 
-  def batch_status(self, batch_id):
-    params = {
+  def batch_status(self, batch_id, simulate=None):
+    options = {
+      'params': {
         'api_key': self.api_key,
-        'id': batch_id
+        'id': batch_id,
+        'simulate': simulate
+      }
     }
 
     url = self.base_url + 'batch'
-    return self.__request('get', url, params)
+    return self.__request('get', url, options)
 
   def account(self):
-    params = {
+    options = {
+      'params': {
         'api_key': self.api_key
+      }
     }
 
     url = self.base_url + 'account'
-    return self.__request('get', url, params)
-
-  def __request(self, method, url, params):
-    options = { 'params': params }
+    return self.__request('get', url, options)
 
+  def __request(self, method, url, options):
     try:
       response = requests.request(method, url, **options)
       response.raise_for_status()

tests/test_client.py

@@ -1,10 +1,12 @@
 from unittest import TestCase
 import emailable
+import time
 
 class TestClient(TestCase):
   def setUp(self):
     self.client = emailable.Client('test_7aff7fc0142c65f86a00')
     self.response = self.client.verify('[email protected]')
+    time.sleep(0.25)
 
   def test_invalid_api_key(self):
     client = emailable.Client('test_7aff7fc0141c65f86a00')
@@ -21,10 +23,10 @@ def test_missing_api_key(self):
       self.client.verify,
       '[email protected]'
     )
-  
+
   def test_verify_returns_response(self):
     self.assertIsInstance(self.response, emailable.Response)
-  
+
   def test_verification_role(self):
     response = self.client.verify('[email protected]')
     self.assertTrue(response.role)
@@ -54,9 +56,12 @@ def test_batch_creation(self):
       ['[email protected]', '[email protected]']
     )
     self.assertIsNotNone(response.id)
-  
+
   def test_batch_status(self):
-    response = self.client.batch_status('5cff27400000000000000000')
+    response = self.client.batch(
+      ['[email protected]', '[email protected]']
+    )
+    response = self.client.batch_status(response.id)
     self.assertIsNotNone(response.emails)
     self.assertIsNotNone(response.id)
     self.assertIsNotNone(response.reason_counts)