fix #8 + upd API

setup.py

@@ -14,7 +14,7 @@ setup(
     description=desc,
     long_description=long_desc,
     author='FoxMaSk',
-    author_email='foxmask@trigger-happy.eu',
+    author_email='foxmaskhome@gmail.com',
     url='https://github.com/push-things/wallabag_api',
     download_url="https://github.com/push-things/wallabag_api/archive/wallabag_api-" + version + ".zip",
     packages=find_packages(),

wallabag_api/__init__.py

@@ -1,2 +1,2 @@
-VERSION = (1, 2, 1)  # PEP 386
+VERSION = (1, 2, 3)  # PEP 386
 __version__ = ".".join([str(x) for x in VERSION])

wallabag_api/wallabag.py

@@ -150,8 +150,6 @@ class Wallabag(object):
         """
         # default values
         params = dict({'access_token': self.token,
-                       'archive': 0,
-                       'star': 0,
                        'delete': 0,
                        'sort': 'created',
                        'order': 'desc',
@@ -160,23 +158,14 @@ class Wallabag(object):
                        'tags': '',
                        'since': 0})
 
-        params['archive'] = self.__get_attr(what='archive',
+        if 'archive' in kwargs and int(kwargs['archive']) in (0, 1):
-                                            type_attr=int,
+            params['archive'] = int(kwargs['archive'])
-                                            value_attr=(0, 1),
+        if 'star' in kwargs and int(kwargs['star']) in (0, 1):
-                                            **params)
+            params['star'] = int(kwargs['star'])
-        params['star'] = self.__get_attr(what='star',
+        if 'delete' in kwargs and int(kwargs['delete']) in (0, 1):
-                                         type_attr=int,
+            params['delete'] = int(kwargs['delete'])
-                                         value_attr=(0, 1),
+        if 'order' in kwargs and kwargs['order'] in ('asc', 'desc'):
-                                         **params)
+            params['order'] = kwargs['order']
-        params['delete'] = self.__get_attr(what='delete',
-                                           type_attr=int,
-                                           value_attr=(0, 1),
-                                           **params)
-        params['order'] = self.__get_attr(what='order',
-                                          type_attr=str,
-                                          value_attr=('asc', 'desc'),
-                                          **params)
-
         if 'page' in kwargs and isinstance(kwargs['page'], int):
             params['page'] = kwargs['page']
         if 'perPage' in kwargs and isinstance(kwargs['perPage'], int):
@@ -190,7 +179,8 @@ class Wallabag(object):
 
         return await self.query(path, "get", **params)
 
-    async def post_entries(self, url, title='', tags='', starred=0, archive=0):
+    async def post_entries(self, url, title='', tags='', starred=0, archive=0, content='', language='', published_at='',
+                           authors='', public=1, original_url=''):
         """
         POST /api/entries.{_format}
 
@@ -201,12 +191,20 @@ class Wallabag(object):
         :param tags: tag1,tag2,tag3 a comma-separated list of tags.
         :param starred entry already starred
         :param archive entry already archived
+        :param content additionnal html content
+        :param language
+        :param published_at
+        :param authors
+        :param public
+        :param original_url
         :return result
         """
         params = {'access_token': self.token, 'url': url, 'title': title,
-                  'tags': tags, 'starred': starred, 'archive': archive}
+                  'tags': tags, 'starred': starred, 'archive': archive,
-        if len(tags) > 0 and ',' in tags:
+                  'content': content, 'language': language, 'published_at': published_at,
-            params['tags'] = tags.split(',')
+                  'authors': authors, 'public': public, 'original_url': original_url}
+        if len(tags) > 0 and isinstance(tags, list):
+            params['tags'] = ', '.join(tags)
         path = '/api/entries.{ext}'.format(ext=self.format)
         return await self.query(path, "post", **params)
 

wallabag_api/wallabag_test.py

@@ -1,4 +1,5 @@
 # coding: utf-8
+import datetime
 import unittest
 from wallabag import Wallabag
 
@@ -33,17 +34,23 @@ class TestWallabag(unittest.TestCase):
 
     def create_entry(self):
         title = 'foobar title'
-        url = 'https://smcomm.trigger-happy.eu/'
+        url = 'https://somwhere.over.the.raibow.com/'
         tags = ['foo', 'bar']
         starred = 0
         archive = 0
-        data = self.w.post_entries(url, title, tags, starred, archive)
+        content = '<p>Additional content</p>'
+        language = 'FR'
+        published_at = datetime.datetime.now()
+        authors = 'John Doe'
+        public = 0
+        original_url = 'http://localhost'
+        data = self.w.post_entries(url, title, tags, starred, archive, content, language, published_at, authors,
+                                   public, original_url)
+
         return data
 
     def test_get_entries(self):
-        params = {'archive': 0,
+        params = {'delete': 0,
-                  'star': 0,
-                  'delete': 0,
                   'sort': 'created',
                   'order': 'desc',
                   'page': 1,