Merge branch 'master' into drop-python2-support

Author: marcel corso gonzalez

README.md

@@ -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('YOUR_ACCESS_KEY', 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

@@ -6,9 +6,10 @@
 
 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
@@ -32,8 +31,6 @@
 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:
-
-    def __init__(self, access_key, http_client=None, features=[]):
+class Client(object):
+    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}))

tests/test_verify.py

@@ -24,6 +24,14 @@ def test_verify_create(self):
 
         http_client.request.assert_called_once_with('verify', 'POST', {'recipient': '31612345678'})
 
+    def test_verify_create_email(self):
+        http_client = Mock()
+        http_client.request.return_value = '{}'
+
+        Client('', http_client).verify_create_email('[email protected]', '[email protected]')
+
+        http_client.request.assert_called_once_with('verify', 'POST', {'recipient': '[email protected]', 'originator': '[email protected]', 'type': 'email'})
+
     def test_verify_verify(self):
         http_client = Mock()
         http_client.request.return_value = '{"id": "verify-id","href": "https://rest.messagebird.com/verify/verify-id","recipient": 31612345678,"reference": "MyReference","messages": {"href": "https://rest.messagebird.com/messages/63b168423592d681641eb07b76226648"},"status": "verified","createdDatetime": "2017-05-30T12:39:50+00:00","validUntilDatetime": "2017-05-30T12:40:20+00:00"}'