instance improvements

Author: Yordy Gelvez

README.md

@@ -7,9 +7,20 @@ git+git://github.com/GearPlug/pipedrive-python
 ```
 
 ## Usage
+If you are not going to use the authentication flow, just instance the library like this:
 ```
 from pipedrive.client import Client
-client = Client('CLIENT_ID', 'CLIENT_SECRET', 'OPTIONAL - access_token')
+client = Client()
+```
+If on the contrary you will use it, send "oauth=True" in the main instance like this:
+```
+from pipedrive.client import Client
+client = Client('CLIENT_ID', 'CLIENT_SECRET', oauth=True)
+```
+
+And to make requests send the access token
+```
+client.set_token(access_token)
 ```
 #### Get authorization url
 ```
@@ -26,11 +37,6 @@ token = client.exchange_code('REDIRECT_URL', 'CODE')
 token = client.refresh_token('REFRESH TOKEN')
 ```
 
-#### Set token
-```
-token = client.set_token('TOKEN')
-```
-
 #### Get recent changes
 ```
 token = client.get_recent_changes(since_timestamp="YYYY-MM-DD HH:MM:SS")

pipedrive/client.py

@@ -7,14 +7,15 @@ class Client:
     flow_base_url = "https://oauth.pipedrive.com/oauth/"
     oauth_end = "authorize?"
     token_end = "token"
-    api_base_url = ""
-    example_url = "https://api-proxy.pipedrive.com"
+    api_base_url = "https://companydomain.pipedrive.com/"
+    api_version = "v1/"
     header = {"Accept": "application/json, */*", "content-type": "application/json"}
 
-    def __init__(self, client_id=None, client_secret=None, token=None):
+    def __init__(self, client_id=None, client_secret=None, oauth=False):
         self.client_id = client_id
         self.client_secret = client_secret
-        self.token = token
+        self.oauth = oauth
+        self.token = None
 
     def make_request(self, method, endpoint, data=None, json=None, **kwargs):
         """
@@ -26,9 +27,11 @@ def make_request(self, method, endpoint, data=None, json=None, **kwargs):
             :return:
         """
         if self.token:
-            self.header["Authorization"] = "Bearer " + self.token
-            url = '{0}{1}'.format(self.api_base_url, endpoint)
-
+            if self.oauth:
+                self.header["Authorization"] = "Bearer " + self.token
+                url = '{0}{1}{2}'.format(self.api_base_url, self.api_version, endpoint)
+            else:
+                url = '{0}{1}{2}?api_token={3}'.format(self.api_base_url, self.api_version, endpoint, self.token)
             if method == "get":
                 response = requests.request(method, url, headers=self.header, params=kwargs)
             else:
@@ -413,7 +416,3 @@ def delete_hook_subscription(self, hook_id):
             return self._delete(url)
         else:
             raise Exception("The attributes necessary to delete the webhook were not obtained.")
-
-
-
-

setup.py

@@ -1,8 +1,15 @@
+import os
 from setuptools import setup
 
+
+def read(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+
 setup(name='pipedrive',
       version='0.1',
       description='API wrapper for Pipedrive written in Python',
+      long_description=read('README.md'),
       url='https://github.com/GearPlug/pipedrive-python',
       author='Yordy Gelvez',
       author_email='[email protected]',