Fix everything; Bump ver. 0.2.0

Author: ingmferrer

README.md

@@ -6,50 +6,46 @@ TypeForm API wrapper written in python.
 pip install typeform-python
 ```
 
-## Requirements
-- requests
-
-
 ## Usage
-### Simple access with API KEY
 ```
 from typeform.client import Client
 
-client = Client('API_KEY')
+client = Client('CLIENT_KEY', 'CLIENT_SECRET')
+```
+
+Get authorization url
 ```
-### Authorized Access
+url = client.authorization_url('REDIRECT_URI', ['forms:write', 'forms:read'])
 ```
-from typeform.client import Client
-client = Client('TOKEN')
 
-To get the TOKEN follow the documentation
- 
-https://developer.typeform.com/get-started/scopes/
+Exchange the code for a token
+```
+token = client.exchange_code('REDIRECT_URI', 'CODE')
 ```
 
-Get form ID
+Set the token
 ```
-client.get_form_uid('URL_FORM')
+client.set_access_token('TOKEN')
 ```
 
-Get form information
+Get form ID
 ```
-client.get_form_information('UID, URL')
+client.get_form_uid('FORM_URL')
 ```
 
-Get form stats
+Get form information
 ```
-client.get_form_stats('UID, URL')
+client.get_form_information('FORM_UID')
 ```
 
 Get form questions
 ```
-client.get_form_questions('UID, URL')
+client.get_form_questions('FORM_UID')
 ```
 
 Get form metadata
 ```
-client.get_form_metadata('UID, URL')
+client.get_form_metadata('FORM_UID', 'SINCE', 'UNTIL')
 ```
 
 Get all forms
@@ -59,18 +55,22 @@ client.get_forms()
 
 Create Webhook
 ```
-client.create_webhook(url_webhook, tag_webhook, uid)
+client.create_webhook('WEBHOOK_URL', 'WEBHOOK_TAG', 'FORM_UID')
 ```
-Delete Webhook
+
+View Webhook
 ```
-client.create_webhook(tag_webhook, uid)
+client.view_webhook('WEBHOOK_TAG', 'FORM_UID')
 ```
 
-View Webhook
+Delete Webhook
 ```
-client.create_webhook(tag_webhook, uid)
+client.delete_webhook('WEBHOOK_TAG', 'FORM_UID')
 ```
 
+## Requirements
+- requests
+
 ## TODO
 - create_form
 - Update_form

setup.py

@@ -7,7 +7,7 @@ def read(fname):
 
 
 setup(name='typeform-python',
-      version='0.1.1',
+      version='0.2.0',
       description='API wrapper for Typeform written in Python',
       long_description=read('README.md'),
       url='https://github.com/GearPlug/typeform-python',

tests/test_client.py

@@ -1,32 +1,31 @@
 import os
-from unittest import TestCase
-from typeform.client import Client, ClientAuth
 from datetime import datetime, timedelta
+from unittest import TestCase
+
+from typeform.client import Client
 
 
 class TypeformTestCases(TestCase):
     def setUp(self):
-        self.access_token = os.environ.get('token')
-        self.api_key = os.environ.get('apikey')
-        self.form_id = os.environ.get('form_id')
-        self.url_webhook = os.environ.get('url_webhook')
-        self.client=Client(access_token=self.access_token)
+        self.client_id = os.environ.get('CLIENT_ID')
+        self.client_secret = os.environ.get('CLIENT_SECRET')
+        self.access_token = os.environ.get('ACCESS_TOKEN')
+        self.form_id = os.environ.get('FORM_ID')
+        self.webhook_url = os.environ.get('WEBHOOK_URL')
+        self.client = Client(self.client_id, self.client_secret)
+        self.client.set_access_token(self.access_token)
 
     def test_create_webhook(self):
-        result_create = self.client.create_webhook(url_webhook=self.url_webhook,uid=self.form_id, tag_webhook=1)
-        result_view = self.client.view_webhook(tag_webhook=1, uid=self.form_id)
-        self.client.delete_webhook(tag_webhook=1, uid=self.form_id)
-        self.assertEqual(result_create['id'],result_view['id'])
+        result_create = self.client.create_webhook(webhook_url=self.webhook_url, form_uid=self.form_id, webhook_tag=1)
+        result_view = self.client.view_webhook(form_uid=self.form_id, webhook_tag=1)
+        self.client.delete_webhook(form_uid=self.form_id, webhook_tag=1)
+        self.assertEqual(result_create['id'], result_view['id'])
 
     def test_delete_webhook(self):
-        result_create = self.client.create_webhook(url_webhook=self.url_webhook,uid=self.form_id, tag_webhook=1)
-        self.client.delete_webhook(tag_webhook=1, uid=self.form_id)
-        try:
-            result_view = self.client.view_webhook(tag_webhook=1, uid=self.form_id)
-            result = False
-        except:
-            result = True
-        self.assertTrue(result)
+        result_create = self.client.create_webhook(webhook_url=self.webhook_url, form_uid=self.form_id, webhook_tag=1)
+        self.client.delete_webhook(webhook_tag=1, form_uid=self.form_id)
+        result_view = self.client.view_webhook(form_uid=self.form_id, webhook_tag=1)
+        self.assertFalse(result_view)
 
     def test_get_forms(self):
         result = self.client.get_forms()
@@ -37,25 +36,19 @@ def test_get_forms(self):
         self.assertEqual(_form, self.form_id)
 
     def test_get_form_information(self):
-        result = self.client.get_form_information(uid=self.form_id)
+        result = self.client.get_form_information(form_uid=self.form_id)
         self.assertIsInstance(result, dict)
         self.assertEqual(result['id'], self.form_id)
 
     def test_get_form_questions(self):
-        result = self.client.get_form_questions(uid=self.form_id)
+        result = self.client.get_form_questions(form_uid=self.form_id)
         self.assertIsInstance(result, list)
         self.assertIn('title', result[0])
 
     def test_get_form_metadata(self):
         since = (datetime.utcnow() - timedelta(days=1)).isoformat()
         until = datetime.utcnow().isoformat()
-        result = self.client.get_form_metadata(uid=self.form_id, since=since, until=until)
+        result = self.client.get_form_metadata(form_uid=self.form_id, since=since, until=until)
         self.assertIsInstance(result, list)
-        self.assertIsInstance(result[0],dict)
+        self.assertIsInstance(result[0], dict)
         self.assertIn('answers', result[0])
-
-
-
-
-
-