From b469be7dbb56cbc2b38cfe5a101ced4441192751 Mon Sep 17 00:00:00 2001
From: Marek Isalski <maz@from-this-height.tenebrae.faelix.org>
Date: Tue, 19 Jun 2018 18:02:46 +0200
Subject: [PATCH] error handling and timeouts

---
 fulcrmpy/apiv2.py | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/fulcrmpy/apiv2.py b/fulcrmpy/apiv2.py
index 1e575cd..7286feb 100644
--- a/fulcrmpy/apiv2.py
+++ b/fulcrmpy/apiv2.py
@@ -29,6 +29,8 @@ class APIv2( object ):
             if not path.startswith( "/" ):
                 path = "/" + path
             path = self.api_path + path
+        if not path.endswith( "/" ):
+            path = path + "/"
         return path
 
     def normalize_url( self, url, no_d = False, query = None ):
@@ -58,6 +60,26 @@ class APIv2( object ):
         new_url = urlqueryparse.set_query_fields( url, new_query )
         return new_url
 
+    def get( self, url, query = None, _countdown = 5 ):
+        url = self.normalize_url( url, query = query )
+        return self.make_request( url, data = None, method = 'GET', _countdown = _countdown )
+
+    def post( self, url, data, query = None, _countdown = 5 ):
+        url = self.normalize_url( url, query = query )
+        return self.make_request( url, data = data, method = 'POST', _countdown = _countdown )
+
+    def patch( self, url, data, query = None, _countdown = 5 ):
+        url = self.normalize_url( url, query = query )
+        return self.make_request( url, data = data, method = 'PATCH', _countdown = _countdown )
+
+    def put( self, url, data, query = None, _countdown = 5 ):
+        url = self.normalize_url( url, query = query )
+        return self.make_request( url, data = data, method = 'PUT', _countdown = _countdown )
+
+    def delete( self, url, query = None, _countdown = 5 ):
+        url = self.normalize_url( url, query = query )
+        return self.make_request( url, data = None, method = 'DELETE', _countdown = _countdown )
+
     def make_request( self, url, data, method, _countdown = 5 ):
         method = { 'POST': requests.post,
                    'PATCH': requests.patch,
@@ -67,9 +89,9 @@ class APIv2( object ):
 
         try:
             if data:
-                request = method( url, data = json.dumps( data ), auth = self.auth )
+                request = method( url, data = json.dumps( data ), auth = self.auth, timeout = 10.0 )
             else:
-                request = method( url, auth = self.auth )
+                request = method( url, auth = self.auth, timeout = 10.0 )
         except requests.exceptions.ConnectionError:
             if _countdown > 0:
                 time.sleep( 2 ** ( 5 - _countdown ) )
@@ -82,7 +104,7 @@ class APIv2( object ):
             except:
                 return None
         else:
-            raise ValueError( request.text )
+            request.raise_for_status()
 
     def get_one( self, url, no_d = False, query = None ):
         url = self.normalize_url( url, no_d = no_d, query = query )