Methods refactored to use _sessionpost(), tox.ini file added

[diaspy.git] / diaspy / models.py

diff --git a/diaspy/models.py b/diaspy/models.py
index 572c2882f859818be70160338fb5dd243cf8df33..aa0d632daead03a7a2901c11ce63d9d4dc7fb750 100644 (file)
--- a/diaspy/models.py
+++ b/diaspy/models.py
@@ -1,4 +1,4 @@
-import requests
+#!/usr/bin/env python3
 
 
 class Post:
@@ -6,93 +6,79 @@ class Post:
 
     .. note::
         Remember that you need to have access to the post.
-
+        Remember that you also need to be logged in.
     """
-
     def __init__(self, post_id, client):
         """
         :param post_id: id or guid of the post
         :type post_id: str
         :param client: client object used to authenticate
         :type client: client.Client
-
-        .. note::
-            The login function of the client should be called,
-            before calling any of the post functions.
-
         """
         self._client = client
         self.post_id = post_id
 
     def get_data(self):
-        r = self._client.session.get(self._client.pod +
-                                     '/posts/' +
-                                     self.post_id +
-                                     '.json')
+        """This function retrieves data of the post.
+        """
+        r = self._client._sessionget('posts/{1}.json'.format(self.post_id))
         if r.status_code == 200:
             return r.json()
         else:
-            raise Exception('wrong status code: ' + str(r.status_code))
+            raise Exception('wrong status code: {0}'.format(r.status_code))
 
     def like(self):
-        """This function likes a post
+        """This function likes a post.
+        It abstracts the 'Like' functionality.
 
         :returns: dict -- json formatted like object.
-
         """
-
         data = {'authenticity_token': self._client.get_token()}
 
-        r = self._client.session.post(self._client.pod +
-                                      '/posts/' +
-                                      self.post_id +
-                                      '/likes',
+        r = self._client._sessionpost('posts/{0}/likes'.format(self.post_id),
                                       data=data,
                                       headers={'accept': 'application/json'})
 
         if r.status_code != 201:
-            raise Exception(str(r.status_code) + ': Post could not be liked.')
+            raise Exception('{0}: Post could not be liked.'
+                            .format(r.status_code))
 
         return r.json()
 
     def delete_like(self):
         """This function removes a like from a post
-
         """
-
         data = {'authenticity_token': self._client.get_token()}
 
         post_data = self.get_data()
 
-        r = self._client.session.delete(self._client.pod + '/posts/' +
-                                        self.post_id +
-                                        '/likes/' +
-                                        str(post_data['interactions']
-                                            ['likes'][0]['id']),
+        r = self._client.session.delete('{0}/posts/{1}/likes/{2}'
+                                        .format(self._client.pod,
+                                                self.post_id,
+                                                post_data['interactions']
+                                                         ['likes'][0]['id']),
                                         data=data)
 
         if r.status_code != 204:
-            raise Exception(str(r.status_code) +
-                            ': Like could not be removed.')
+            raise Exception('{0}: Like could not be removed.'
+                            .format(r.status_code))
 
     def reshare(self):
         """This function reshares a post
 
         """
-
         post_data = self.get_data()
 
         data = {'root_guid': post_data['guid'],
                 'authenticity_token': self._client.get_token()}
 
-        r = self._client.session.post(self._client.pod +
-                                      '/reshares',
+        r = self._client._sessionpost('reshares',
                                       data=data,
                                       headers={'accept': 'application/json'})
 
         if r.status_code != 201:
-            raise Exception(str(r.status_code) +
-                            ': Post could not be reshared.')
+            raise Exception('{0}: Post could not be reshared.'
+                            .format(r.status_code))
 
         return r.json()
 
@@ -103,20 +89,16 @@ class Post:
         :type text: str
 
         """
-
         data = {'text': text,
                 'authenticity_token': self._client.get_token()}
 
-        r = self._client.session.post(self._client.pod +
-                                      '/posts/' +
-                                      self.post_id +
-                                      '/comments',
+        r = self._client._sessionpost('posts/{0}/comments'.format(self.post_id),
                                       data=data,
                                       headers={'accept': 'application/json'})
 
         if r.status_code != 201:
-            raise Exception(str(r.status_code) +
-                            ': Comment could not be posted.')
+            raise Exception('{0}: Comment could not be posted.'
+                            .format(r.status_code))
 
         return r.json()
 
@@ -127,28 +109,25 @@ class Post:
         :type comment_id: str
 
         """
-
         data = {'authenticity_token': self._client.get_token()}
 
-        r = self._client.session.delete(self._client.pod + '/posts/' +
-                                        self.post_id +
-                                        '/comments/' +
-                                        comment_id,
+        r = self._client.session.delete('{0}/posts/{1}/comments/{2}'
+                                        .format(self._client.pod,
+                                                self.post_id,
+                                                comment_id),
                                         data=data,
                                         headers={'accept': 'application/json'})
 
         if r.status_code != 204:
-            raise Exception(str(r.status_code) +
-                            ': Comment could not be deleted.')
+            raise Exception('{0}: Comment could not be deleted.'
+                            .format(r.status_code))
 
     def delete(self):
         """ This function deletes this post
-
         """
-
         data = {'authenticity_token': self._client.get_token()}
-
-        r = self._client.session.delete(self._client.pod + '/posts/' +
-                                        self.post_id,
+        r = self._client.session.delete('{0}/posts/{1}'.format(self._client.pod, self.post_id),
                                         data=data,
                                         headers={'accept': 'application/json'})
+        if r.status_code != 204:
+            raise Exception('{0}: Post could not be deleted'.format(r.status_code))