yhttp-dbmanager 2.8.1__tar.gz → 3.0.2__tar.gz

{yhttp_dbmanager-2.8.1/yhttp_dbmanager.egg-info → yhttp_dbmanager-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yhttp-dbmanager
-Version: 2.8.1
+Version: 3.0.2
 Summary: Database manager command line interface and API for yhttp.
 Home-page: http://github.com/yhttp/yhttp-dbmanager
 Author: Vahid Mardani
@@ -22,7 +22,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: yhttp<5,>=3.5.2
+Requires-Dist: yhttp<6,>=5
 Requires-Dist: psycopg2
 
 # yhttp-dbmanager
@@ -33,7 +33,7 @@ API.
 ## Contribution
 
 ### Dependencies
-Install `postgreslq` brefore use of this project.
+Install `postgresql` brefore use of this project.
 ```bash
 apt install postgresql
 ```
@@ -82,12 +82,17 @@ make test
 
 Execute specific test(s) using wildcard:
 ```bash
-make test U=db*
+make test F=tests/test_db*
+make test F=tests/test_form.py::test_querystringform
 ```
 
-Execute all tests and report coverage result:
+*refer to* [pytest documentation](https://docs.pytest.org/en/7.1.x/how-to/usage.html#how-to-invoke-pytest)
+*for more info about invoking tests.*
+
+Execute tests and report coverage result:
 ```bash
 make cover
+make cover F=tests/test_static.py
 make cover-html
 ```
 
@@ -118,7 +123,7 @@ Execute:
 ```bash
 make clean
 ```
-to clean-up previous dist/* and build/* directories.
+to clean-up previous `dist/*` and `build/*` directories.
 
 
 ### PyPI

{yhttp_dbmanager-2.8.1 → yhttp_dbmanager-3.0.2}/README.md

@@ -6,7 +6,7 @@ API.
 ## Contribution
 
 ### Dependencies
-Install `postgreslq` brefore use of this project.
+Install `postgresql` brefore use of this project.
 ```bash
 apt install postgresql
 ```
@@ -55,12 +55,17 @@ make test
 
 Execute specific test(s) using wildcard:
 ```bash
-make test U=db*
+make test F=tests/test_db*
+make test F=tests/test_form.py::test_querystringform
 ```
 
-Execute all tests and report coverage result:
+*refer to* [pytest documentation](https://docs.pytest.org/en/7.1.x/how-to/usage.html#how-to-invoke-pytest)
+*for more info about invoking tests.*
+
+Execute tests and report coverage result:
 ```bash
 make cover
+make cover F=tests/test_static.py
 make cover-html
 ```
 
@@ -91,7 +96,7 @@ Execute:
 ```bash
 make clean
 ```
-to clean-up previous dist/* and build/* directories.
+to clean-up previous `dist/*` and `build/*` directories.
 
 
 ### PyPI

{yhttp_dbmanager-2.8.1 → yhttp_dbmanager-3.0.2}/setup.py

@@ -1,7 +1,8 @@
-from setuptools import setup
 import os.path
 import re
 
+from setuptools import setup, find_namespace_packages
+
 
 # reading package's version (same way sqlalchemy does)
 with open(
@@ -17,7 +18,7 @@ with open(
 
 
 dependencies = [
-    'yhttp >= 3.5.2, < 5',
+    'yhttp >= 5, < 6',
     'psycopg2',
 ]
 
@@ -32,7 +33,11 @@ setup(
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',  # This is important!
     install_requires=dependencies,
-    packages=['yhttp.ext.dbmanager'],
+    packages=find_namespace_packages(
+        where='./',
+        include=['yhttp.ext.dbmanager'],
+        exclude=['tests']
+    ),
     license='MIT',
     classifiers=[
         'Environment :: Console',

{yhttp_dbmanager-2.8.1 → yhttp_dbmanager-3.0.2}/tests/test_cli.py

@@ -1,7 +1,10 @@
+import os
+
 from bddcli import Given, Application as CLIApplication, status, stderr, \
     when, stdout
 import easycli
-from yhttp import Application
+from yhttp.core import Application
+
 from yhttp.ext.dbmanager import install
 
 
@@ -20,10 +23,16 @@ db:
 install(app, cliarguments=[Bar])
 
 
-def test_applicationcli():
+def test_applicationcli(cicd):
     app.ready()
     cliapp = CLIApplication('example', 'tests.test_cli:app.climain')
-    with Given(cliapp, 'db'):
+    env = os.environ.copy()
+    if cicd:
+        env.setdefault('YHTTP_DB_DEFAULT_HOST', 'localhost')
+        env.setdefault('YHTTP_DB_DEFAULT_ADMINUSER', 'postgres')
+        env.setdefault('YHTTP_DB_DEFAULT_ADMINPASS', 'postgres')
+
+    with Given(cliapp, 'db', environ=env):
         assert stderr == ''
         assert status == 0
 

yhttp_dbmanager-3.0.2/tests/test_dbmanager.py

@@ -0,0 +1,22 @@
+DBNAME = 'yhttp-postgesql-testing'
+
+
+def test_dbmanager(dbmanager):
+    # Cleanup
+    dbmanager.dropifexists(DBNAME)
+
+    assert dbmanager.exists('postgres')
+    assert not dbmanager.exists(DBNAME)
+
+    dbmanager.create(DBNAME)
+    assert dbmanager.exists(DBNAME)
+
+    dbmanager.create(DBNAME, dropifexists=True)
+    assert dbmanager.exists(DBNAME)
+
+    dbmanager.drop(DBNAME)
+    assert not dbmanager.exists(DBNAME)
+
+    dbmanager.create(DBNAME)
+    dbmanager.dropifexists(DBNAME)
+    assert not dbmanager.exists(DBNAME)

{yhttp_dbmanager-2.8.1 → yhttp_dbmanager-3.0.2}/tests/test_dburi.py

@@ -11,7 +11,7 @@ def test_dburi():
     assert uri.user == 'bar'
     assert uri.password == 'baz'
     assert uri.host == 'qux'
-    assert uri.dbname == 'quux.thud'
+    assert uri.database == 'quux.thud'
     assert uri.dumps() == uristr
 
     # Invalid uri
@@ -26,7 +26,7 @@ def test_dburi():
     assert uri.user == 'bar'
     assert uri.password == ''
     assert uri.host == 'qux'
-    assert uri.dbname == 'quux.thud'
+    assert uri.database == 'quux.thud'
     assert uri.dumps() == uristr
 
     # Without username and password
@@ -36,7 +36,7 @@ def test_dburi():
     assert uri.user == ''
     assert uri.password == ''
     assert uri.host == 'qux'
-    assert uri.dbname == 'quux.thud'
+    assert uri.database == 'quux.thud'
     assert uri.dumps() == uristr
 
     # Without username, password and host
@@ -46,5 +46,18 @@ def test_dburi():
     assert uri.user == ''
     assert uri.password == ''
     assert uri.host == ''
-    assert uri.dbname == 'quux.thud'
+    assert uri.database == 'quux.thud'
     assert uri.dumps() == uristr
+
+
+def test_dburi_todict():
+    uristr = 'foo://bar:baz@qux/quux.thud'
+    uri = DatabaseURI.loads(uristr)
+
+    assert uri.todict() == dict(
+        provider='foo',
+        user='bar',
+        password='baz',
+        host='qux',
+        database='quux.thud'
+    )

{yhttp_dbmanager-2.8.1 → yhttp_dbmanager-3.0.2}/tests/test_install.py

@@ -1,7 +1,7 @@
-from yhttp import Application
-from yhttp.ext.dbmanager import install
-
 import pytest
+from yhttp.core import Application
+
+from yhttp.ext.dbmanager import install
 
 
 app = Application()

{yhttp_dbmanager-2.8.1 → yhttp_dbmanager-3.0.2}/yhttp/ext/dbmanager/__init__.py

@@ -1,8 +1,8 @@
 # flake8: noqa
-from .cli import DatabaseCLI
+from .cli import DatabaseCommand
 from .install import install
 from .dbmanager import PostgresqlManager
 from .uri import DatabaseURI
 
 
-__version__ = '2.8.1'
+__version__ = '3.0.2'

{yhttp_dbmanager-2.8.1 → yhttp_dbmanager-3.0.2}/yhttp/ext/dbmanager/cli.py

@@ -50,7 +50,7 @@ class DatabaseAdministrativeCommand(SubCommand):
             user=args.user,
             password=password,
             host=args.host,
-            dbname=args.database
+            database=args.database
         )
 
     def getappdbinfo(self, args):
@@ -65,7 +65,7 @@ class CreateDatabase(DatabaseAdministrativeCommand):
 
     def __call__(self, args):
         uri = self.getappdbinfo(args)
-        self.getdbmanager(args).create(uri.dbname, owner=uri.user)
+        self.getdbmanager(args).create(uri.database, owner=uri.user)
 
 
 class DropDatabase(DatabaseAdministrativeCommand):
@@ -74,10 +74,10 @@ class DropDatabase(DatabaseAdministrativeCommand):
 
     def __call__(self, args):
         uri = self.getappdbinfo(args)
-        self.getdbmanager(args).drop(uri.dbname)
+        self.getdbmanager(args).drop(uri.database)
 
 
-class DatabaseCLI(SubCommand):
+class DatabaseCommand(SubCommand):
     __command__ = 'database'
     __aliases__ = ['db']
     __arguments__ = [

{yhttp_dbmanager-2.8.1 → yhttp_dbmanager-3.0.2}/yhttp/ext/dbmanager/dbmanager.py

@@ -29,10 +29,11 @@ class DatabaseManager(metaclass=abc.ABCMeta):
 
 class PostgresqlManager(DatabaseManager):
 
-    def __init__(self, host=None, dbname='postgres', user=None, password=None):
+    def __init__(self, host=None, database='postgres', user=None,
+                 password=None):
         self.connection = psycopg2.connect(
             host=host,
-            dbname=dbname,
+            dbname=database,
             user=user,
             password=password
         )

{yhttp_dbmanager-2.8.1 → yhttp_dbmanager-3.0.2}/yhttp/ext/dbmanager/install.py

@@ -1,10 +1,10 @@
-from .cli import DatabaseCLI
+from .cli import DatabaseCommand
 
 
 def install(app, cliarguments=None):
-    app.cliarguments.append(DatabaseCLI)
+    app.cliarguments.append(DatabaseCommand)
     if cliarguments:
-        DatabaseCLI.__arguments__.extend(cliarguments)
+        DatabaseCommand.__arguments__.extend(cliarguments)
 
     @app.when
     def ready(app):

{yhttp_dbmanager-2.8.1 → yhttp_dbmanager-3.0.2}/yhttp/ext/dbmanager/uri.py

@@ -3,24 +3,24 @@ import re
 
 URIPATTERN = re.compile(
     r'(?P<provider>.*)://(?P<user>.*):(?P<password>.*)@(?P<host>.*)/'
-    r'(?P<dbname>.*)'
+    r'(?P<database>.*)'
 )
 
 
 class DatabaseURI:
-    def __init__(self, provider, dbname, host='', user='', password=''):
+    def __init__(self, provider, database, host='', user='', password=''):
         assert provider
-        assert dbname
+        assert database
 
         self.provider = provider
         self.host = host
-        self.dbname = dbname
+        self.database = database
         self.user = user
         self.password = password
 
     def dumps(self):
         return f'{self.provider}://{self.user}:{self.password}@{self.host}' \
-            f'/{self.dbname}'
+            f'/{self.database}'
 
     @classmethod
     def loads(cls, uri):
@@ -31,11 +31,20 @@ class DatabaseURI:
         u = match.groupdict()
 
         assert u.get('provider')
-        assert u.get('dbname')
+        assert u.get('database')
         return cls(
             u.get('provider'),
-            u.get('dbname'),
+            u.get('database'),
             u.get('host'),
             u.get('user'),
             u.get('password'),
         )
+
+    def todict(self):
+        return dict(
+            provider=self.provider,
+            user=self.user,
+            password=self.password,
+            host=self.host,
+            database=self.database
+        )

{yhttp_dbmanager-2.8.1 → yhttp_dbmanager-3.0.2/yhttp_dbmanager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yhttp-dbmanager
-Version: 2.8.1
+Version: 3.0.2
 Summary: Database manager command line interface and API for yhttp.
 Home-page: http://github.com/yhttp/yhttp-dbmanager
 Author: Vahid Mardani
@@ -22,7 +22,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: yhttp<5,>=3.5.2
+Requires-Dist: yhttp<6,>=5
 Requires-Dist: psycopg2
 
 # yhttp-dbmanager
@@ -33,7 +33,7 @@ API.
 ## Contribution
 
 ### Dependencies
-Install `postgreslq` brefore use of this project.
+Install `postgresql` brefore use of this project.
 ```bash
 apt install postgresql
 ```
@@ -82,12 +82,17 @@ make test
 
 Execute specific test(s) using wildcard:
 ```bash
-make test U=db*
+make test F=tests/test_db*
+make test F=tests/test_form.py::test_querystringform
 ```
 
-Execute all tests and report coverage result:
+*refer to* [pytest documentation](https://docs.pytest.org/en/7.1.x/how-to/usage.html#how-to-invoke-pytest)
+*for more info about invoking tests.*
+
+Execute tests and report coverage result:
 ```bash
 make cover
+make cover F=tests/test_static.py
 make cover-html
 ```
 
@@ -118,7 +123,7 @@ Execute:
 ```bash
 make clean
 ```
-to clean-up previous dist/* and build/* directories.
+to clean-up previous `dist/*` and `build/*` directories.
 
 
 ### PyPI

yhttp_dbmanager-3.0.2/yhttp_dbmanager.egg-info/requires.txt

@@ -0,0 +1,2 @@
+yhttp<6,>=5
+psycopg2

yhttp_dbmanager-2.8.1/tests/test_dbmanager.py

@@ -1,28 +0,0 @@
-from yhttp.ext.dbmanager import PostgresqlManager
-
-
-DBNAME = 'yhttp-postgesql-testing'
-
-
-def test_dbmanager():
-    # Instance with postgres identity framework.
-    dbm = PostgresqlManager()
-
-    # Cleanup
-    dbm.dropifexists(DBNAME)
-
-    assert dbm.exists('postgres')
-    assert not dbm.exists(DBNAME)
-
-    dbm.create(DBNAME)
-    assert dbm.exists(DBNAME)
-
-    dbm.create(DBNAME, dropifexists=True)
-    assert dbm.exists(DBNAME)
-
-    dbm.drop(DBNAME)
-    assert not dbm.exists(DBNAME)
-
-    dbm.create(DBNAME)
-    dbm.dropifexists(DBNAME)
-    assert not dbm.exists(DBNAME)

yhttp_dbmanager-2.8.1/yhttp_dbmanager.egg-info/requires.txt

@@ -1,2 +0,0 @@
-yhttp<5,>=3.5.2
-psycopg2