Bumped v0.8.0

vishr · vishr · commit 9de19fd813de · 2017-09-20T19:06:31.000-07:00
Signed-off-by: Vishal Rana &lt;vr@labstack.com&gt;
diff --git a/README.md b/README.md
@@ -13,15 +13,14 @@
 Create a file `app.py` with the following content:
 
 ```python
-from labstack import Client
-
-client = Client('<ACCOUNT_ID>', '<API_KEY>')
-store = client.store()
-doc = store.insert('users', {
-  name: 'Jack',
-  location: 'Disney'
-})
-print(doc)
+from labstack import Client, JetMessage
+
+client = Client('ACCOUNT_ID', '<API_KEY>')
+jet = client.jet()
+message = JetMessage('jack@labstack.com', 'LabStack', 'Hello')
+message.body = 'hello'
+message.add_inline('walle.png')
+message = jet.send(message)
 ```
 
 From terminal run your app:
@@ -30,4 +29,4 @@ From terminal run your app:
 python app.py
 ```
 
-## [Docs](https://labstack.com/docs) | [Forum](https://forum.labstack.com)
+## [Documentation](https://labstack.com/docs) | [Forum](https://forum.labstack.com)
diff --git a/labstack/__init__.py b/labstack/__init__.py
@@ -1,4 +1,2 @@
 from .client import Client 
-from .email import EmailMessage, EmailError
-from .log  import Level, LogError
-from .store import StoreError
+from .jet import JetMessage, JetError
diff --git a/labstack/client.py b/labstack/client.py
@@ -1,8 +1,6 @@
 import requests
-from .message import _Message
-from .email import _Email
-from .log import _Log
-from .store import _Store
+from .hub import _Hub
+from .jet import _Jet
 
 class _Interceptor(requests.auth.AuthBase):
   def __init__(self, api_key):
@@ -19,16 +17,9 @@ def __init__(self, account_id, api_key):
     self.api_key = api_key
     self.interceptor = _Interceptor(api_key)
 
-  def message(self, client_id):
-    return _Message(self.account_id, self.api_key, client_id)
+  def hub(self, client_id):
+    return _Hub(self.account_id, self.api_key, client_id)
 
-  def email(self):
-    return _Email(self.interceptor)
-
-  def log(self):
-    log = _Log(self.interceptor)
-    return log
-  
-  def store(self):
-    return _Store(self.interceptor)
+  def jet(self):
+    return _Jet(self.interceptor)
   
diff --git a/labstack/hub.py b/labstack/hub.py
@@ -1,6 +1,6 @@
 import paho.mqtt.client as mqtt
 
-class _Message():
+class _Hub():
   def __init__(self, account_id, api_key, client_id):
     self.account_id = account_id
     self.client = mqtt.Client(client_id=client_id, clean_session=True)
@@ -12,10 +12,10 @@ def connect_handler(client, userdata, flags, rc):
       handler()
     self.client.on_connect = connect_handler
 
-  def data_handler(self, handler):
-    def data_handler(client, userdata, msg):
+  def message_handler(self, handler):
+    def message_handler(client, userdata, msg):
       handler(msg.topic, msg.payload)
-    self.client.on_message = data_handler
+    self.client.on_message = message_handler
 
   def publish(self, topic, message):
     self.client.publish('{}/{}'.format(self.account_id, topic), message)
diff --git a/labstack/jet.py b/labstack/jet.py
@@ -4,21 +4,21 @@
 import json
 from .common import API_URL
 
-class _Email():
+class _Jet():
   def __init__(self, interceptor):
-    self.path = '/email'
+    self.path = '/jet'
     self.interceptor = interceptor 
     
   def send(self, message):
     message._add_inlines()
     message._add_attachments()
-    r = requests.post(API_URL + self.path, auth=self.interceptor, data=message.to_json())
+    r = requests.post('{}{}/send'.format(API_URL, self.path), auth=self.interceptor, data=message.to_json())
     data = r.json()
     if not 200 <= r.status_code < 300:
-      raise EmailError(data['code'], data['message'])
-    return EmailMessage.from_json(data) 
+      raise JetError(data['code'], data['message'])
+    return JetMessage.from_json(data) 
 
-class EmailMessage():
+class JetMessage():
   def __init__(self, to, from_, subject):
     self._inlines = []
     self._attachments = []
@@ -64,13 +64,13 @@ def to_json(self):
 
   @classmethod
   def from_json(self, message):
-    em = EmailMessage(message['to'], message['from'], message['subject'])
+    em = JetMessage(message['to'], message['from'], message['subject'])
     em.id = message['id']
     em.time = message['time']
     em.status = message['status']
     return em
     
-class EmailError(Exception):
+class JetError(Exception):
   def __init__(self, code, message):
     self.code = code
     self.message = message
diff --git a/labstack/log.py b/labstack/log.py
diff --git a/labstack/store.py b/labstack/store.py
diff --git a/setup.py b/setup.py
@@ -2,10 +2,10 @@
 
 setup(
   name='labstack',
-  version='0.7.1',
+  version='0.8.0',
   description='Official Python client library for the LabStack platform',
   long_description='`<https://github.com/labstack/labstack-python>`_',
-  keywords='labstack cube email log mqtt store',
+  keywords='labstack, email as a service, http analytics, pub/sub messaging',
   url='https://github.com/labstack/labstack-python',
   author='Vishal Rana',
   author_email='vr@labstack.com',
