Merge pull request #1 from ghpxi/master

update and add new items, remove deprecated code

Author: Raman Barkholenka

README.md

@@ -1,25 +1,26 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
 from pyadmitad import client, transport
 
 
-def get_authorizing_client(access_token, user_agent=None, debug=False):
+def get_oauth_client_token(access_token, user_agent=None, debug=False):
     """
     Creates a client using an access token.
+
     """
-    http_transport = transport.HttpTransport(
-        access_token, user_agent=user_agent, debug=debug)
+    http_transport = transport.HttpTransport(access_token, user_agent=user_agent, debug=debug)
     return client.Client(http_transport)
 
 
-def get_oauth_client_client(
-        client_id, client_secret, scopes, user_agent=None, debug=False):
+def get_oauth_client_client(client_id, client_secret, scopes, user_agent=None, debug=False):
+    """
+    Creates a client using a client_id and client_secret.
+
+    """
     auth = transport.oauth_client_authorization({
         'client_id': client_id,
         'client_secret': client_secret,
         'scopes': scopes
     })
-    return get_authorizing_client(
-        auth['access_token'], user_agent=user_agent, debug=debug)
-
-
-def get_oauth_client(access_token, user_agent=None, debug=False):
-    return get_authorizing_client(access_token, user_agent=user_agent, debug=debug)
+    return get_oauth_client_token(auth['access_token'], user_agent=user_agent, debug=debug)

pyadmitad/api.py

@@ -1,13 +1,7 @@
-from pyadmitad import items
-
-
-class FailedRequest(Exception):
+# coding: utf-8
+from __future__ import unicode_literals
 
-    def __init__(self, error):
-        self.error = error
-
-    def __str__(self):
-        return repr(self.error)
+from pyadmitad import items
 
 
 class Client(object):

pyadmitad/client.py

@@ -1,13 +1,21 @@
-CURRENCIES = ('USD', 'RUB', 'EUR')
+# coding: utf-8
+from __future__ import unicode_literals
+
 # API date-format
-DATE_FORMAT = "%d.%m.%Y"
-LONG_DATE_FORMAT = "%d.%m.%Y %H:%M:%S"
+DATE_FORMAT = '%d.%m.%Y'
+LONG_DATE_FORMAT = '%d.%m.%Y %H:%M:%S'
+
+SUPPORTED_LANGUAGES = ('ru', 'en', 'de', 'pl', 'es', 'tr')
 
 # default values
 DEFAULT_REQUEST_TIMEOUT = 60
 DEFAULT_LANGUAGE = 'ru'
-MAX_PAGINATION_LIMIT = 200
-SUB_ID_MAX_LENGTH = 50
+DEFAULT_PAGINATION_LIMIT = 20
+DEFAULT_PAGINATION_OFFSET = 0
+
+# constants
+MAX_PAGINATION_LIMIT = 500
+MAX_SUB_ID_LENGTH = 250
 
 # urls
 BASE_URL = 'https://api.admitad.com/'

pyadmitad/constants.py

@@ -1,8 +1,12 @@
+# coding: utf-8
+from __future__ import unicode_literals
 
 
 class HttpException(Exception):
 
     def __init__(self, status, message, content):
+        super(HttpException, self).__init__()
+
         self.status = status
         self.message = message
         self.content = content
@@ -19,6 +23,8 @@ def __repr__(self):
 class ConnectionException(Exception):
 
     def __init__(self, content):
+        super(ConnectionException, self).__init__()
+
         self.content = content
 
     def __str__(self):
@@ -31,6 +37,8 @@ def __repr__(self):
 class JsonException(Exception):
 
     def __init__(self, content):
+        super(JsonException, self).__init__()
+
         self.content = content
 
     def __str__(self):
@@ -43,6 +51,8 @@ def __repr__(self):
 class ApiException(Exception):
 
     def __init__(self, content):
+        super(ApiException, self).__init__()
+
         self.content = content
 
     def __str__(self):

pyadmitad/exceptions.py

@@ -1,16 +1,20 @@
 from pyadmitad.items.me import *
+from pyadmitad.items.websites import *
 from pyadmitad.items.auxiliary import *
+from pyadmitad.items.announcements import *
+from pyadmitad.items.news import *
+from pyadmitad.items.links import *
+from pyadmitad.items.landings import *
+from pyadmitad.items.deeplinks import *
+from pyadmitad.items.referrals import *
+from pyadmitad.items.payments import *
 from pyadmitad.items.coupons import *
-from pyadmitad.items.websites import *
 from pyadmitad.items.statistics import *
-from pyadmitad.items.referrals import *
 from pyadmitad.items.banners import *
 from pyadmitad.items.campaigns import *
-from pyadmitad.items.announcements import *
-from pyadmitad.items.payments import *
-from pyadmitad.items.landings import *
 from pyadmitad.items.optcodes import *
-from pyadmitad.items.news import *
-from pyadmitad.items.deeplinks import *
-from pyadmitad.items.links import *
 from pyadmitad.items.lost_orders import *
+from pyadmitad.items.arecords import *
+from pyadmitad.items.retag import *
+from pyadmitad.items.broken_links import *
+from pyadmitad.items.tickets import *

pyadmitad/items/__init__.py

@@ -1,33 +1,43 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
 from pyadmitad.items.base import Item
 
-__all__ = (
+
+__all__ = [
     'Announcements',
-)
+]
 
 
 class Announcements(Item):
     """
     List of announcements
 
-    Required scope - "announcements"
     """
+
+    SCOPE = 'announcements'
+
     URL = Item.prepare_url('announcements')
-    SINGLE_URL = Item.prepare_url('announcements/%(id)s')
+    SINGLE_URL = Item.prepare_url('announcements/%(announcement_id)s')
 
     def get(self, **kwargs):
         """
-        res = client.Announcements.get()
-        res = client.Announcements.get(limit=1, offset=2)
+        Args:
+            limit (int)
+            offset (int)
+
         """
-        kwargs['url'] = self.URL
-        return self.transport.set_method('GET').set_pagination(**kwargs).request(**kwargs)
+        return self.transport.get().set_pagination(**kwargs).request(url=self.URL)
 
     def getOne(self, _id, **kwargs):
         """
-        Here _id is an announcement id
+        Args:
+            _id (int)
 
-        res = client.Announcements.getOne(2)
         """
-        kwargs['url'] = self.SINGLE_URL
-        kwargs['id'] = self.sanitize_id(_id)
-        return self.transport.set_method('GET').request(**kwargs)
+        request_data = {
+            'url': self.SINGLE_URL,
+            'announcement_id': Item.sanitize_id(_id)
+        }
+
+        return self.transport.get().request(**request_data)

pyadmitad/items/announcements.py

@@ -0,0 +1,41 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+from pyadmitad.items.base import Item
+
+
+__all__ = [
+    'Arecords'
+]
+
+
+class Arecords(Item):
+
+    SCOPE = 'arecords'
+
+    URL = Item.prepare_url('arecords')
+    FOR_WEBSITE_URL = Item.prepare_url('arecords/%(website_id)s')
+
+    def get(self, **kwargs):
+        """
+        Args:
+            limit (int)
+            offset (int)
+
+        """
+
+        return self.transport.get().set_pagination(**kwargs).request(url=self.URL)
+
+    def getForWebsite(self, website_id, **kwargs):
+        """
+        Args:
+            website_id (int)
+
+        """
+
+        request_data = {
+            'url': self.FOR_WEBSITE_URL,
+            'website_id': Item.sanitize_id(website_id)
+        }
+
+        return self.transport.get().request(**request_data)