Implement delete_subscription

Author: Aubruz

Setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name="mainframe-bot-api",
-    version="1.1.13",
+    version="1.2.0",
     author="aubruz",
     author_email="[email protected]",
     packages=find_packages(),
@@ -21,9 +21,6 @@
         'Intended Audience :: Developers',
         'Topic :: Software Development :: Build Tools',
         'License :: OSI Approved :: MIT License',
-
-        # Specify the Python versions you support here. In particular, ensure
-        # that you indicate whether you support Python 2, Python 3 or both.
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',

mainframe/client.py

@@ -25,10 +25,8 @@ def send_message(self, conversation_id, message='', subscription_id=None, messag
          """
         data = {'conversation_id': conversation_id, "message": message}
 
-        # if ($message instanceof UIPayload){
-        # $json["data"] = $message->toArray();
-        # }else{
-        # }
+        # if message instanceof UIPayload){
+        # self.json["data"] = message.get();
 
         if subscription_id is not None:
             data['subscription_id'] = subscription_id
@@ -56,11 +54,11 @@ def edit_subscription(self, subscription_token, label):
 
         return self._make_call('edit_subscription', data)
 
-    def delete_subscription(self, subscription_token, label, message=None):
+    def delete_subscription(self, conversation_id, subscription_id, message=None):
         """Delete a subscription"""
         data = {
-            'subscription_token': subscription_token,
-            'label': label,
+            'conversation_id': conversation_id,
+            'subscription_id': subscription_id,
         }
 
         if message is not None:

mainframe/component.py

@@ -7,12 +7,12 @@ def __init__(self):
         super().__init__()
         self.can_have_children = False
         self.must_have_children = False
-        self.type = ''
-        self.props = {}
+        self.json['type'] = ''
+        self.json['props'] = {}
 
     def _can_have_children(self):
         self.can_have_children = True
-        self.props['children'] = []
+        self.json['props']['children'] = []
 
         return self
 
@@ -23,13 +23,10 @@ def _must_have_children(self):
         return self
 
     def _set_type(self, component_type):
-        self.type = component_type
-
+        self.json['type'] = component_type
         return self
 
     def _add_props(self, props: dict, append=False):
-        if self.json.get('props') is None:
-            self.json['props'] = {}
         for property_key, property_value in props.items():
             if append:
                 self.json['props'][property_key].append(property_value)
@@ -42,13 +39,13 @@ def _add_props(self, props: dict, append=False):
         return self
 
     def _get_prop(self, prop):
-        return self.json.get(prop)
+        return self.json['props'].get(prop)
 
     def add_children(self, component):
         if self.can_have_children:
             if isinstance(component, Component):
-                self._add_props({'children': component.get()})
+                self._add_props({'children': component.get()}, True)
             else:
-                self._add_props({'children': component})
+                self._add_props({'children': component}, True)
 
         return self

mainframe/response.py

@@ -14,7 +14,7 @@ def add_button(self, button):
         return self
 
     def set_render(self, component):
-        self.json['render'].append(component.get())
+        self.json['render'] = component.get()
 
         return self
 
@@ -27,7 +27,7 @@ def __init__(self, url):
         self.json['type'] = 'authentication'
 
     def add_payload(self, payload):
-        self.json['payload'] = payload.get()
+        self.json['payload'] = payload
 
         return self