- add tests

- fix api redirect
- remove forward api
- add version from file

Author: s00d

README.md

@@ -21,7 +21,7 @@ $ pip install git+https://github.com/s00d/onlinesim-python-api
 ```
 ### Example
 ```python
-from onlinesimru import GetFree, GetRent, GetProxy, GetForward, GetUser, GetNumbers
+from onlinesimru import GetFree, GetRent, GetProxy, GetUser, GetNumbers
 
 def main():
     client = GetUser('YOUR_TOKEN')
@@ -33,7 +33,7 @@ main()
 
 ### Example2
 ```python
-from onlinesimru import GetFree, GetRent, GetProxy, GetForward, GetUser, GetNumbers
+from onlinesimru import GetFree, GetRent, GetProxy, GetUser, GetNumbers
 
 def main():
     numbers = GetNumbers('YOUR_TOKEN')

example/simple_start.py

@@ -11,10 +11,6 @@ def main():
     # messages = client.messages(9651622343)
     # print(messages)
 
-    # client = GetForward('111111')
-    # service = client.service()
-    # print(service)
-
     # client = GetUser('111111')
     # balance = client.balance()
     # print(balance)

onlinesimru/Driver.py

@@ -1,11 +1,8 @@
-from onlinesimru import GetForward, GetFree, GetNumbers, GetProxy, GetRent, GetUser
+from onlinesimru import GetFree, GetNumbers, GetProxy, GetRent, GetUser
 from .api import Api
 
 
 class Driver(Api):
-    def forward(self):
-        return GetForward(self.apikey, self.lang, self.lang)
-
     def free(self):
         return GetFree(self.apikey, self.lang, self.lang)
 

onlinesimru/GetForward.py

@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
-from .GetForward import GetForward
 from .GetFree import GetFree
 from .GetNumbers import GetNumbers
 from .GetProxy import GetProxy
 from .GetRent import GetRent
 from .GetUser import GetUser
 from .Driver import Driver
+from ._version import __version__
+
 
 __author__ = "s00d"
-__version__ = "1.0.9"
+__version__ = __version__
 __contact__ = "https://github.com/s00d"

onlinesimru/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.0.11"

onlinesimru/_version.py

@@ -22,12 +22,13 @@ def __init__(self, apikey: str = "", lang: str = "en", dev_id: str = None):
     def _get(self, endpoint: str, params: dict = None):
         if params is None:
             params = {}
-        params["apikey"] = self.apikey
+        if self.apikey != "":
+            params["apikey"] = self.apikey
         params["lang"] = self.lang
         params["dev_id"] = self.dev_id
         payload = {k: v for k, v in params.items() if v is not None}
         response = httpx.get(
-            f"https://onlinesim.ru/api/" + endpoint + ".php",
+            f"https://onlinesim.ru/api" + endpoint + ".php",
             headers=self.headers,
             params=payload,
         )

onlinesimru/api.py

@@ -1,5 +1,6 @@
 from os import path
 from setuptools import setup
+import re
 
 """
 @author: s00d
@@ -9,6 +10,17 @@
 """
 
 
+VERSIONFILE="onlinesimru/_version.py"
+verstrline = open(VERSIONFILE, "rt").read()
+VSRE = r"^__version__ = ['\"]([^'\"]*)['\"]"
+mo = re.search(VSRE, verstrline, re.M)
+if mo:
+    verstr = mo.group(1)
+else:
+    raise RuntimeError("Unable to find version string in %s." % (VERSIONFILE,))
+
+
+
 def long_description():
     """Build the description from README file """
     this_dir = path.abspath(path.dirname(__file__))
@@ -27,7 +39,7 @@ def requirements():
 
 setup(
     name="onlinesimru",
-    version="1.0.9",
+    version=verstr,
     long_description=long_description(),
     long_description_content_type="text/markdown",
     description="Wrapper for automatic reception of SMS-messages by onlinesim.ru",

setup.py

@@ -0,0 +1,41 @@
+import unittest
+
+from onlinesimru import Driver
+
+
+class TestSum(unittest.TestCase):
+    def test_free(self):
+        driver = Driver("90b7beba2e36054e19ec87ec1855ca46")
+        data = driver.free().countries()
+        self.assertIsNotNone(data)
+
+    def test_numbers(self):
+        driver = Driver("90b7beba2e36054e19ec87ec1855ca46")
+        data = driver.numbers().tariffs()
+        self.assertIsNotNone(data)
+        self.assertTrue('7' in data)
+
+    def test_proxy(self):
+        driver = Driver("90b7beba2e36054e19ec87ec1855ca46")
+        data = driver.proxy().tariffs()
+        self.assertIsNotNone(data)
+        self.assertEqual(data['response'], '1')
+
+    def test_rent(self):
+        driver = Driver("90b7beba2e36054e19ec87ec1855ca46")
+        data = driver.rent().tariffs()
+        self.assertIsNotNone(data)
+        self.assertTrue('7' in data)
+
+    def test_user(self):
+        driver = Driver("90b7beba2e36054e19ec87ec1855ca46")
+        data = driver.user().balance()
+        self.assertIsNotNone(data)
+        self.assertEqual(data['response'], '1')
+        self.assertTrue('response' in data)
+        self.assertTrue('balance' in data)
+        self.assertTrue('income' in data)
+
+
+if __name__ == '__main__':
+    unittest.main()