Merge branch 'master' into encoding-fix

Author: marcel corso gonzalez

.gitignore

@@ -59,6 +59,7 @@ target/
 
 # PyCharm
 .idea/
+*.iml
 
 # pyvenv
 venv*/

.travis.yml

@@ -1,14 +1,14 @@
 language: python
 python:
-  - 'pypy2.7'
-  - 'pypy3.5'
-  - '2.7'
-  - '3.4'
+  - 'pypy3.6'
+  - 'pypy3.7'
   - '3.6'
+  - '3.7'
+  - '3.8'
+  - '3.9'
   - 'nightly'
 install:
-  - pip install -r requirements.txt
-  - pip install .
+  - pip install -e .[dev]
 script:
   - coverage run --source=messagebird -m unittest discover -s tests/
   - coverage report --fail-under=80
@@ -17,5 +17,3 @@ script:
 matrix:
   allow_failures:
   - python: 'nightly'
-  - python: 'pypy2.7'
-  - python: 'pypy3.5'

README.md

@@ -35,7 +35,7 @@ import messagebird
 Then, create an instance of **messagebird.Client**:
 
 ```python
-client = messagebird.Client('test_gshuPaZoeEG6ovbc8M79w0QyM')
+client = messagebird.Client('YOUR_ACCESS_KEY')
 ```
 
 Now you can query the API for information or send a request. For example, if we want to request our balance information you'd do something like this:
@@ -78,14 +78,6 @@ To run examples with arguments, try:
 $ python ./examples/voice_create_webhook.py --accessKey accessKeyWhichNotExist --url https://example.com --title HELLO_WEBHOOK --token HELLO_TOKEN
 ```
 
-Conversations WhatsApp Sandbox
--------------
-To use the whatsapp sandbox you need to add `messagebird.Feature.ENABLE_CONVERSATIONS_API_WHATSAPP_SANDBOX` to the list of features you want enabled. Don't forget to replace `YOUR_ACCESS_KEY` with your actual access key.
-
-```python
-  client = messagebird.Client('1ekjMs368KTRlP0z6zfG9P70z', features=[messagebird.Feature.ENABLE_CONVERSATIONS_API_WHATSAPP_SANDBOX])
-```
-
 Documentation
 -------------
 Complete documentation, instructions, and examples are available at:

examples/verify_create_email.py

@@ -0,0 +1,54 @@
+import sys, os
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+
+import messagebird
+
+# ACCESS_KEY   = ''
+# RECIPIENT = ''
+# ORIGINATOR = ''
+
+try:
+  ACCESS_KEY
+except NameError:
+  print('You need to set an ACCESS_KEY constant in this file')
+  sys.exit(1)
+
+try:
+  RECIPIENT 
+except NameError:
+  print('You need to set a RECIPIENT constant in this file')
+  sys.exit(1)
+
+try:
+  ORIGINATOR
+except NameError:
+  print('You need to set a ORIGINATOR constant in this file')
+  sys.exit(1)
+
+try:
+  # Create a MessageBird client with the specified ACCESS_KEY.
+  client = messagebird.Client(ACCESS_KEY)
+
+  # Create a new Verify.
+  verify = client.verify_create_email(RECIPIENT, ORIGINATOR, {
+      'subject': 'your code'
+      })
+
+  # Print the object information.
+  print('\nThe following information was returned as a Verify object:\n')
+  print('  id                  : %s' % verify.id)
+  print('  href                : %s' % verify.href)
+  print('  recipient           : %s' % verify.recipient)
+  print('  reference           : %s' % verify.reference)
+  print('  messages            : %s' % verify.messages)
+  print('  status              : %s' % verify.status)
+  print('  createdDatetime     : %s' % verify.createdDatetime)
+  print('  validUntilDatetime  : %s\n' % verify.validUntilDatetime)
+
+except messagebird.client.ErrorException as e:
+  print('\nAn error occured while requesting a Verify object:\n')
+
+  for error in e.errors:
+    print('  code        : %d' % error.code)
+    print('  description : %s' % error.description)
+    print('  parameter   : %s\n' % error.parameter)

messagebird/__init__.py

@@ -1,2 +1,2 @@
-from messagebird.client import Client, ErrorException, Feature
+from messagebird.client import Client, ErrorException
 from messagebird.signed_request import SignedRequest

messagebird/base.py

@@ -4,11 +4,12 @@
 import json
 
 
-class Base(object):
+class Base:
     def load(self, data):
-        for name, value in list(data.items()):
-            if hasattr(self, name) and not callable(getattr(self, name)):
-                setattr(self, name, value)
+        if data is not None:
+            for name, value in list(data.items()):
+                if hasattr(self, name) and not callable(getattr(self, name)):
+                    setattr(self, name, value)
 
         return self
 

messagebird/client.py

@@ -1,7 +1,6 @@
 import sys
 import json
 import io
-import enum
 
 from messagebird.balance import Balance
 from messagebird.call import Call
@@ -26,14 +25,12 @@
 from messagebird.number import Number, NumberList
 
 ENDPOINT = 'https://rest.messagebird.com'
-CLIENT_VERSION = '1.4.1'
+CLIENT_VERSION = '2.0.0'
 PYTHON_VERSION = '%d.%d.%d' % (sys.version_info[0], sys.version_info[1], sys.version_info[2])
 USER_AGENT = 'MessageBird/ApiClient/%s Python/%s' % (CLIENT_VERSION, PYTHON_VERSION)
 REST_TYPE = 'rest'
 
 CONVERSATION_API_ROOT = 'https://conversations.messagebird.com/v1/'
-CONVERSATION_API_WHATSAPP_SANDBOX_ROOT = 'https://whatsapp-sandbox.messagebird.com/v1/'
-
 CONVERSATION_PATH = 'conversations'
 CONVERSATION_MESSAGES_PATH = 'messages'
 CONVERSATION_WEB_HOOKS_PATH = 'webhooks'
@@ -65,24 +62,18 @@ def __init__(self, errorMessage):
         super(SignleErrorException, self).__init__(errorMessage)
 
 
-class Feature(enum.Enum):
-    ENABLE_CONVERSATIONS_API_WHATSAPP_SANDBOX = 1
-
 
 class Client(object):
-
-    def __init__(self, access_key, http_client=None, features=[]):
+    def __init__(self, access_key, http_client=None):
         self.access_key = access_key
         self.http_client = http_client
 
-        self.conversation_api_root = CONVERSATION_API_WHATSAPP_SANDBOX_ROOT if Feature.ENABLE_CONVERSATIONS_API_WHATSAPP_SANDBOX in features else CONVERSATION_API_ROOT
-
     def _get_http_client(self, type=REST_TYPE):
         if self.http_client:
             return self.http_client
 
         if type == CONVERSATION_TYPE:
-            return HttpClient(self.conversation_api_root, self.access_key, USER_AGENT)
+            return HttpClient(CONVERSATION_API_ROOT, self.access_key, USER_AGENT)
 
         if type == VOICE_TYPE:
             return HttpClient(VOICE_API_ROOT, self.access_key, USER_AGENT)
@@ -294,6 +285,17 @@ def verify_create(self, recipient, params=None):
         params.update({'recipient': recipient})
         return Verify().load(self.request('verify', 'POST', params))
 
+    def verify_create_email(self, recipient, originator, params=None):
+        """Create a new email verification."""
+        if params is None:
+            params = {}
+        params.update({
+            'type' : 'email',
+            'recipient': recipient,
+            'originator': originator
+        })
+        return Verify().load(self.request('verify', 'POST', params))
+
     def verify_verify(self, id, token):
         """Verify the token of a specific verification."""
         return Verify().load(self.request('verify/' + str(id), params={'token': token}))

messagebird/http_client.py

@@ -3,18 +3,15 @@
 
 from messagebird.serde import json_serialize
 
-try:
-    from urllib.parse import urljoin
-except ImportError:
-    from urlparse import urljoin
+from urllib.parse import urljoin
 
 
 class ResponseFormat(Enum):
     text = 1
     binary = 2
 
 
-class HttpClient(object):
+class HttpClient:
     """Used for sending simple HTTP requests."""
 
     def __init__(self, endpoint, access_key, user_agent):

messagebird/signed_request.py

@@ -4,10 +4,7 @@
 import time
 from collections import OrderedDict
 
-try:
-    from urllib.parse import urlencode
-except ImportError:
-    from urllib import urlencode
+from urllib.parse import urlencode
 
 
 class SignedRequest:

setup.py

@@ -2,31 +2,38 @@
 from setuptools import setup
 from io import open
 
-def get_description():
-    working_directory = path.abspath(path.dirname(__file__))
-    readme_path = path.join(working_directory, 'README.md')
-    with open(readme_path, encoding='utf-8') as f:
-        return (f.read(), 'text/markdown')
-
-description, description_content_type = get_description()
+with open('README.md', encoding='utf-8') as f:
+    description = f.read()
 
 setup(
     name                          = 'messagebird',
     packages                      = ['messagebird'],
-    version                       = '1.5.0',
+    version                       = '2.0.0',
     description                   = "MessageBird's REST API",
     author                        = 'MessageBird',
     author_email                  = '[email protected]',
     long_description              = description,
-    long_description_content_type = description_content_type,
+    long_description_content_type = 'text/markdown',
     url                           = 'https://github.com/messagebird/python-rest-api',
-    download_url                  = 'https://github.com/messagebird/python-rest-api/tarball/1.4.1',
+    download_url                  = 'https://github.com/messagebird/python-rest-api/tarball/2.0.0',
     keywords                      = ['messagebird', 'sms'],
     install_requires              = ['requests>=2.4.1', 'python-dateutil>=2.6.0'],
+    extras_require               = {
+        'dev': [
+            'pytest',
+            'pytest-cov',
+            'mock>=2.0',
+            'codecov',
+            'pycodestyle',
+        ]
+    },
     license                       = 'BSD-2-Clause',
     classifiers                   = [
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Operating System :: OS Independent',
     ],
 )