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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yhttp-dbmanager
-Version: 2.8.1
+Version: 3.0.0
 Summary: Database manager command line interface and API for yhttp.
 Home-page: http://github.com/yhttp/yhttp-dbmanager
 Author: Vahid Mardani
@@ -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
 ```
@@ -118,7 +118,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.0}/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
 ```
@@ -91,7 +91,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.0}/setup.py

@@ -1,7 +1,8 @@
-from setuptools import setup
 import os.path
 import re
 
+from setuptools import setup
+
 
 # reading package's version (same way sqlalchemy does)
 with open(

{yhttp_dbmanager-2.8.1 → yhttp_dbmanager-3.0.0}/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.0}/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.0'

{yhttp_dbmanager-2.8.1 → yhttp_dbmanager-3.0.0}/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.0}/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.0}/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.0}/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.0/yhttp_dbmanager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yhttp-dbmanager
-Version: 2.8.1
+Version: 3.0.0
 Summary: Database manager command line interface and API for yhttp.
 Home-page: http://github.com/yhttp/yhttp-dbmanager
 Author: Vahid Mardani
@@ -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
 ```
@@ -118,7 +118,7 @@ Execute:
 ```bash
 make clean
 ```
-to clean-up previous dist/* and build/* directories.
+to clean-up previous `dist/*` and `build/*` directories.
 
 
 ### PyPI