Released v0.7

Bug-fixes and improvements:
* Closes #5
* Closes #1
* Adds Client (beta)
* Added several schemas
* Lighter string representation -> should avoid delays in the analysis
  with plugins that have 'heavy' attributes

Backwards-incompatible changes:
* Context in headers by default
* All schemas include a "@type" argument that is used for autodetection
  in the client

... And possibly many more, this is still <1.0

tests/test_cli.py

@@ -1,6 +1,11 @@
 import logging
 from functools import partial
 
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
+
 logger = logging.getLogger(__name__)
 
 from unittest import TestCase
@@ -11,9 +16,12 @@ from senpy.models import Error
 class CLITest(TestCase):
     def test_basic(self):
         self.assertRaises(Error, partial(main_function, []))
-        res = main_function(['--input', 'test'])
-        assert 'entries' in res
-        res = main_function(['--input', 'test', '--algo', 'rand'])
-        assert 'entries' in res
-        assert 'analysis' in res
-        assert res['analysis'][0]['name'] == 'rand'
+
+        with patch('senpy.extensions.Senpy.analyse') as patched:
+            main_function(['--input', 'test'])
+
+        patched.assert_called_with(input='test')
+        with patch('senpy.extensions.Senpy.analyse') as patched:
+            main_function(['--input', 'test', '--algo', 'rand'])
+
+        patched.assert_called_with(input='test', algo='rand')

tests/test_client.py

@@ -0,0 +1,42 @@
+from unittest import TestCase
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
+
+from senpy.client import Client
+from senpy.models import Results, Error
+
+
+class Call(dict):
+
+    def __init__(self, obj):
+        self.obj = obj.jsonld()
+
+    def json(self):
+        return self.obj
+
+
+class ModelsTest(TestCase):
+    def setUp(self):
+        self.host = '0.0.0.0'
+        self.port = 5000
+
+    def test_client(self):
+        endpoint = 'http://dummy/'
+        client = Client(endpoint)
+        success = Call(Results())
+        with patch('requests.request', return_value=success) as patched:
+            resp = client.analyse('hello')
+            assert isinstance(resp, Results)
+        patched.assert_called_with(url=endpoint + '/',
+                                   method='GET',
+                                   params={'input': 'hello'})
+        error = Call(Error('Nothing'))
+        with patch('requests.request', return_value=error) as patched:
+            resp = client.analyse(input='hello', algorithm='NONEXISTENT')
+            assert isinstance(resp, Error)
+        patched.assert_called_with(url=endpoint + '/',
+                                   method='GET',
+                                   params={'input': 'hello',
+                                           'algorithm': 'NONEXISTENT'})

tests/test_models.py

@@ -11,7 +11,9 @@ from pprint import pprint
 
 class ModelsTest(TestCase):
     def test_jsonld(self):
-        prueba = {"id": "test", "analysis": [], "entries": []}
+        prueba = {"id": "test",
+                  "analysis": [],
+                  "entries": []}
         r = Results(**prueba)
         print("Response's context: ")
         pprint(r.context)
@@ -28,11 +30,11 @@ class ModelsTest(TestCase):
         assert "id" not in j
 
         r6 = Results(**prueba)
-        r6.entries.append(
-            Entry({
-                "@id": "ohno",
-                "nif:isString": "Just testing"
-            }))
+        e = Entry({
+            "@id": "ohno",
+            "nif:isString": "Just testing"
+        })
+        r6.entries.append(e)
         logging.debug("Reponse 6: %s", r6)
         assert ("marl" in r6.context)
         assert ("entries" in r6.context)

tests/test_plugins.py

@@ -44,7 +44,6 @@ class PluginsTest(TestCase):
         a = ShelfDummyPlugin(
             info={'name': 'default_shelve_file',
                   'version': 'test'})
-        assert os.path.dirname(a.shelf_file) == tempfile.gettempdir()
         a.activate()
         assert os.path.isfile(a.shelf_file)
         os.remove(a.shelf_file)