Merge ddd985e into ecbf573

.coveralls

@@ -0,0 +1,2 @@
+service_name: travis-pro
+repo_token: 2y9uUcnjo63T3NMTcQAwUYGTesVKs0SPI

.travis.yml

@@ -1,17 +1,15 @@
-# This file was autogenerated and will overwrite each time you run travis_pypi_setup.py
-deploy:
-  true:
-    python: 2.7
-    repo: reclamador/pylleida
-    tags: true
-  password:
-    secure: TXenmQjBn5HHpWZaKwoAuMaJSBHNP7aa+1i2kg8kJ+DxrF6AZm5nCxDW2MCPWFu5WtQQoEEBsIFxR6ZwMphjitrsGobQpz1ecJVmlPWvWljyHtm+7WA96Nfj+eOQr+ekj+Pc6a+1vgRv0u4/SI7qqOlAhM8kEidfxwkx0haKOAlad1U4AgB3qfK0MGpyWiJayoNDrUF6JZs9pWh6iK/jcGwpmgH7zsmO29IJ2FuRgxmTQpFQTqjV0X0VCIKKBHERgYO4105X7UmxxR5LB4FHk8GOhvN02iOHfyLborgRL0RUXxfF/CETi5GnF6X5SXe1AwcrnqRlyAdI7MYQDh5dWwJKFIRQNh6jukzw2oLQbVL7Rf/K+qq3NBMyF+Xpsa30/EIMbiYeMtrnwRK6och5MlOjqkRyUuw3Y5oI0gQokNAE0SCGJXg+5LbvcjlEpbEJCRp3JQFc/JD5WNROd1pvPuwJ030s750AIc6upcDyD3IR+r4G4jDtFkz4KuvjChJrJx3tSKSKwXA++f3+wMAQOAcNAd5cINYAL+2WOWtXAwOB7E863uSlY/aIOlnHtcZcwFqmhvpj/C/OPJ/UXFXBJC5TQtDBugx7QUvOHptJ3WHJpKh7BmlpBgCNmZW6Q6wSF03ZsNZvzQwx4+i95xZvAyG1E04goWaUI60zkFrSYEg=
-  provider: pypi
-  user: nick13jaremek
-install:
-    - pip install -r requirements_dev.txt
-    - pip install -r requirements.txt
 language: python
 python:
-- 2.7
-script: tox
+  - 2.7
+  - 3.5
+
+# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
+install:
+    - pip install coveralls
+    - pip install -r requirements.txt
+    - pip install -r requirements_dev.txt
+script:
+    - flake8 pylleida
+    - coverage run --source pylleida setup.py test
+after_success:
+    - coveralls

README.rst

@@ -7,7 +7,10 @@ pylleida
         :target: https://pypi.python.org/pypi/pylleida
 
 .. image:: https://img.shields.io/travis/nick13jaremek/pylleida.svg
-        :target: https://travis-ci.org/nick13jaremek/pylleida
+        :target: https://travis-ci.org/reclamador/pylleida
+
+.. image:: https://coveralls.io/repos/github/reclamador/pylleida/badge.svg?branch=master
+        :target: https://coveralls.io/github/reclamador/pylleida?branch=master
 
 .. image:: https://readthedocs.org/projects/pylleida/badge/?version=latest
         :target: https://pylleida.readthedocs.io/en/latest/?badge=latest

pylleida/__init__.py

@@ -1,11 +1,4 @@
 # -*- coding: utf-8 -*-
-
-"""Top-level package for pylleida."""
-
-__author__ = """NickM. Jaremek"""
-__email__ = 'nick13jaremek@gmail.com'
-__version__ = '0.2.1'
-
 from pylleida.api.mail_cert import MailCertApi
 
 

requirements_dev.txt

@@ -5,7 +5,5 @@ watchdog==0.8.3
 flake8==2.6.0
 tox==2.3.1
 coverage==4.1
-Sphinx==1.4.8
-cryptography==1.7
-PyYAML==3.11
+mock
 

setup.cfg

@@ -15,7 +15,9 @@ replace = __version__ = '{new_version}'
 universal = 1
 
 [flake8]
-exclude = docs
+exclude = docs, .tox, tests
+max-line-length = 120
+
 
 [aliases]
 

setup.py

@@ -45,6 +45,7 @@
         'Natural Language :: English',
         "Programming Language :: Python :: 2",
         'Programming Language :: Python :: 2.7'
+        'Programming Language :: Python :: 3.5'
     ],
     test_suite='tests',
     tests_require=test_requirements,

tests/test_pylleida.py

@@ -5,7 +5,9 @@
 
 
 import unittest
+import mock
 from pylleida import PyLleida
+import json
 
 
 class TestPylleida(unittest.TestCase):
@@ -15,5 +17,52 @@ def setUp(self):
     def tearDown(self):
         pass
 
+    @mock.patch('xmltodict.parse')
+    @mock.patch('requests.post')
+    def test_base_api_post(self, mock_requests_post, mock_xmltodict_parse):
+        mock_xmltodict_parse.return_value = '{"var": 1}'
+        self.client.mailcert.post('https//endpoint', 'list_pdf.xml', {'param1': 1, 'param2': 2})
+        mock_requests_post.assert_called_once_with('https//endpoint', data=mock.ANY,
+                                                   headers={'content-type': 'application/x-www-form-urlencoded'},
+                                                   timeout=60.0)
+        mock_xmltodict_parse.assert_called_once()
+
     def test_has_mailcert_api(self):
         self.assertIsNotNone(self.client.mailcert)
+
+    def test_mailcert_api_attributes(self):
+        self.assertEqual(self.client.mailcert.username, 'foo')
+        self.assertEqual(self.client.mailcert.password, 'bar')
+
+    @mock.patch('pylleida.api.BaseApi.post')
+    def test_mailcert_api_get_default_settings(self, mock_api_post):
+        self.client.mailcert.get_default_settings()
+        mock_api_post.assert_called_once_with(endpoint='https://tsa.lleida.net/cgi-bin/mailcertapi.cgi',
+                                                   template_name='get_default_settings.xml', in_params={})
+
+    @mock.patch('pylleida.api.BaseApi.post')
+    def test_mailcert_list_pdf(self, mock_api_post):
+        params = {'date_min': None, 'file_type': None, 'mail_to': 'to@email.com', 'row_order': None,
+                  'file_id_max': None, 'subjrw': None, 'mail_message_id': None, 'mail_from': 'from@email.com',
+                  'file_id_min': None,
+                  'only_last_file_id': False, 'date_max': None}
+        self.client.mailcert.list_pdf(mail_from='from@email.com', mail_to='to@email.com')
+        mock_api_post.assert_called_once_with(endpoint='https://tsa.lleida.net/cgi-bin/mailcertapi.cgi',
+                                              template_name='list_pdf.xml', in_params=params)
+
+
+    @mock.patch('pylleida.api.BaseApi.post')
+    def test_mailcert_download_pdf(self, mock_api_post):
+        params = {'file_id': 'fileid'}
+        self.client.mailcert.download_pdf(file_id='fileid')
+        mock_api_post.assert_called_once_with(endpoint='https://tsa.lleida.net/cgi-bin/mailcertapi.cgi',
+                                              template_name='download_pdf.xml', in_params=params)
+
+
+
+
+
+
+
+
+

tox.ini

@@ -1,9 +1,10 @@
 [tox]
-envlist = py27, flake8
+envlist = py27, py35, flake8
 
 [travis]
 python =
     2.7: py27
+    3.5: py35
 
 [testenv:flake8]
 basepython=python
@@ -13,7 +14,8 @@ commands=flake8 --ignore=E501 pylleida
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}
-
-commands = python setup.py test
-
-deps = -r{toxinidir}/requirements.txt
+commands =
+    coverage run --source pylleida setup.py test
+deps=
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/requirements_dev.txt