shelfdb 0.2.1__tar.gz → 0.2.2__tar.gz

usr/local/bin/shelfdb

@@ -0,0 +1,12 @@
+#!/usr/bin/python3
+# EASY-INSTALL-ENTRY-SCRIPT: 'shelfdb==0.2.2','console_scripts','shelfdb'
+__requires__ = 'shelfdb==0.2.2'
+import re
+import sys
+from pkg_resources import load_entry_point
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
+    sys.exit(
+        load_entry_point('shelfdb==0.2.2', 'console_scripts', 'shelfdb')()
+    )

{shelfdb-0.2.1 → usr/local/lib/python3.6/site-packages}/shelfdb/server.py

@@ -1,5 +1,4 @@
-import asyncio, shelfdb, dill, re, sys, json, argparse
-from shelfdb.shelf import ChainQuery
+import asyncio, uvloop, shelfdb, dill, re, sys, json, argparse, os
 
 
 class QueryHandler():
@@ -85,14 +84,17 @@ class QueryHandler():
 
         if isinstance(self.chain_query, shelfdb.shelf.ShelfQuery):
             entries = []
-            # Keep only dict value from entry.copy() into entries
-            [entries.append(entry.copy()) for entry in self.chain_query]
+            for entry in self.chain_query:
+                if isinstance(entry, dict):
+                    # Keep only dict value from entry.copy() into entries
+                    entries.append(entry.copy())
             return entries
         elif isinstance(self.chain_query, shelfdb.shelf.Entry):
             return self.chain_query.copy()
         else:
             return self.chain_query
 
+
 async def handler(reader, writer):
     queries = await reader.read(-1)
     try:
@@ -111,27 +113,31 @@ async def handler(reader, writer):
     await writer.drain()
     writer.close()
 
+
 def main():
-    global args
+    arg = argparse.ArgumentParser(description='ShelfDB Asyncio Server')
+    arg.add_argument(
+        '--host', nargs='?', type=str, default='0.0.0.0', help='server host')
+    arg.add_argument(
+        '--port', nargs='?', type=int, default=17000, help='server port')
+    arg.add_argument(
+        '--db', nargs='?', default='db', help='server database')
+    arg = arg.parse_args()
+    start_server(arg.host, arg.port, arg.db)
+
+
+def start_server(host='127.0.0.1', port=17000, db_name='db'):
     global db
-    args = argparse.ArgumentParser(description='ShelfDB Asyncio Server')
-    args.add_argument('--host', nargs='?', type=str, default='0.0.0.0',
-        help='server host')
-    args.add_argument('--port', nargs='?', type=int, default=17000,
-        help='server port')
-    args.add_argument('--db', nargs='?', default='db',
-        help='server database')
-
-    args = args.parse_args()
-    db = shelfdb.open(args.db)
-
+    db = shelfdb.open(db_name)
+    asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
     loop = asyncio.get_event_loop()
-    server = asyncio.start_server(handler, args.host, args.port, loop=loop)
+    server = asyncio.start_server(handler, host, port, loop=loop)
     server = loop.run_until_complete(server)
 
     # Serve requests until Ctrl+C is pressed
     print('Serving on {}'.format(server.sockets[0].getsockname()))
-    print('Database : ' + args.db)
+    print('Database :', db_name)
+    print('pid :', os.getpid())
     try:
         loop.run_forever()
     except KeyboardInterrupt:
@@ -143,5 +149,6 @@ def main():
     loop.run_until_complete(server.wait_closed())
     loop.close()
 
+
 if __name__ == '__main__':
     main()

{shelfdb-0.2.1 → usr/local/lib/python3.6/site-packages}/shelfdb/shelf.py

@@ -3,7 +3,6 @@
 import shelve, os, uuid
 from datetime import datetime
 from itertools import islice
-from collections import deque
 from functools import reduce
 
 
@@ -20,8 +19,10 @@ class DB():
         """Get ``ShelfQuery`` object. create shelf file named ``shelf_name``
         to store entries if needed.
         """
-        if (not shelf_name in self._shelf or
-                isinstance(self._shelf[shelf_name]._shelf.dict, shelve._ClosedDict)):
+        if (shelf_name not in self._shelf or
+                isinstance(
+                    self._shelf[shelf_name]._shelf.dict,
+                    shelve._ClosedDict)):
             shelf = shelve.open(os.path.join(self.path, shelf_name))
             self._shelf[shelf_name] = ShelfQuery(self, shelf)
         return self._shelf[shelf_name]
@@ -238,7 +239,7 @@ class Entry(dict):
         self.update(entry)
 
     def _save(self):
-        entry = self.copy() # store only dict data.
+        entry = self.copy()  # store only dict data.
         self._shelf[self._id] = entry
 
     def delete(self):

{shelfdb-0.2.1 → usr/local/lib/python3.6/site-packages}/shelfdb/test_shelf.py

@@ -108,7 +108,6 @@ class ShelfQuery(unittest.TestCase):
             .first(lambda u: u['name'] == user['name'])
         self.assertIsNone(user)
 
-
     def tearDown(self):
         self.db.close()
         shutil.rmtree('test_data')

{shelfdb-0.2.1/shelfdb.egg-info → usr/local/lib/python3.6/site-packages/shelfdb-0.2.2-py3.6.egg-info}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 1.1
 Name: shelfdb
-Version: 0.2.1
+Version: 0.2.2
 Summary: Python dict/json DB, Done right for Efficiency and Simplicity
 Home-page: https://github.com/nitipit/shelfdb
 Author: Nitipit Nontasuwan
 Author-email: nitipit@gmail.com
 License: MIT
-Description: Python dict/json DB, Done right for Efficiency and Simplicity
+Description-Content-Type: UNKNOWN
+Description: Python dict/json DB `done right` to make your job done
 Keywords: dict json database
 Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6

usr/local/lib/python3.6/site-packages/shelfdb-0.2.2-py3.6.egg-info/requires.txt

@@ -0,0 +1,2 @@
+uvloop
+dill

shelfdb-0.2.1/LICENSE

@@ -1,7 +0,0 @@
-Copyright 2017 Nitipit Nontasuwan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

shelfdb-0.2.1/MANIFEST.in

@@ -1,2 +0,0 @@
-include LICENSE
-include README.rst

shelfdb-0.2.1/PKG-INFO

@@ -1,12 +0,0 @@
-Metadata-Version: 1.1
-Name: shelfdb
-Version: 0.2.1
-Summary: Python dict/json DB, Done right for Efficiency and Simplicity
-Home-page: https://github.com/nitipit/shelfdb
-Author: Nitipit Nontasuwan
-Author-email: nitipit@gmail.com
-License: MIT
-Description: Python dict/json DB, Done right for Efficiency and Simplicity
-Keywords: dict json database
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 3.5

shelfdb-0.2.1/README.rst

@@ -1,77 +0,0 @@
-*******
-ShelfDB
-*******
-
-.. image:: https://raw.githubusercontent.com/nitipit/shelfdb/master/shelfdb.png
-
-Python dict/json DB **Done Right** for **Efficiency** and **Simplicity**.
-
-Features
-========
-- Very simple Pyton dict/json Database.
-- Chainable Query.
-- Can remote process on Database Server.
-- Asyncio Server.
-
-Install
-=======
-::
-
-    $ pip install shelfdb
-
-Quick Start
-===========
-::
-
-    import shelfdb
-    db = shelfdb.open('db') # Get database
-    db.shelf('user') # get table/shelf 'user' from database 'db'
-
-    # Insert a user
-    db.shelf('user').insert({'name': 'Edgar', 'sex': 'm'})
-
-    # Get the first user whose name is 'admin'
-    db.shelf('user').first(lambda user: user['name'] == 'admin')
-
-    # Get all user whose sex are 'f'
-    users = db.shelf('user').filter(lambda user: user['sex'] == 'f')
-
-    # print() all users whose sex are 'f'
-    for user in users:
-        print(user)
-
-Asyncio Server
-==============
-.. code-block:: bash
-
-    $ shelfdb
-    Serving on ('127.0.0.1', 17000)
-
-ShelfQuery Client
------------------
-::
-
-    $ pip install shelfquery
-
-::
-
-    import shelfquery
-
-    # Connect to DB, default host = '127.0.0.1', port = 17000, db = 'db'
-    db = shelfquery.connect()
-
-    # Make a query
-    query = db.shelf('user').first(lambda user: user['name'] == 'admin')
-
-    # Send query to Database Server and keep result in `user`
-    user = query.run()
-
-Learn More
-==========
-See documentation at https://pythonhosted.org/shelfdb
-
-GitHub
-======
-**ShelfDB :** `https://github.com/nitipit/shelfdb <https://github.com/nitipit/shelfdb>`_
-
-**ShelfQuery :** `https://github.com/nitipit/shelfquery <https://github.com/nitipit/shelfquery>`_

shelfdb-0.2.1/setup.cfg

@@ -1,5 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-tag_svn_revision = 0
-

shelfdb-0.2.1/setup.py

@@ -1,24 +0,0 @@
-from setuptools import setup, find_packages
-
-
-setup(
-    name='shelfdb',
-    version='0.2.1',
-    description='Python dict/json DB, Done right for Efficiency and Simplicity',
-    long_description='Python dict/json DB, Done right for Efficiency and Simplicity',
-    url='https://github.com/nitipit/shelfdb',
-    author='Nitipit Nontasuwan',
-    author_email='nitipit@gmail.com',
-    license='MIT',
-    classifiers=[
-        'Programming Language :: Python :: 3.5',
-    ],
-    keywords='dict json database',
-    packages=find_packages(),
-    install_requires=['dill',],
-    entry_points={
-        'console_scripts': [
-            'shelfdb=shelfdb.server:main',
-        ],
-    },
-)

shelfdb-0.2.1/shelfdb.egg-info/requires.txt

@@ -1 +0,0 @@
-dill