Default use_db_cache to True, refactoring

Author: phillmac

orbitdbapi/__init__.py

@@ -1 +1 @@
-__version__ = '0.1.0.rc.1.dev5'
+__version__ = '0.1.0.rc.1.dev6'

orbitdbapi/client.py

@@ -9,10 +9,12 @@ def __init__ (self, **kwargs):
         self.logger = logging.getLogger(__name__)
         self.__config = kwargs
         self.__base_url = self.__config.get('base_url')
-        self.__use_db_cache = self.__config.get('use_db_cache')
+        self.__use_db_cache = self.__config.get('use_db_cache', True)
         self.__session = requests.Session()
 
-
+    @property
+    def use_db_cache(self):
+        return self.__use_db_cache
 
     def _do_request(self, *args, **kwargs):
         try:
@@ -41,9 +43,9 @@ def _call(self, method, endpoint, body=None):
     def list_dbs(self):
         return self._call('get', 'dbs')
 
-    def db(self, dbname, params=None):
-        return DB(self, self.open_db(urlquote(dbname, safe=''), params), **self.__config)
+    def db(self, dbname, **kwargs):
+        return DB(self, self.open_db(dbname, **kwargs), **self.__config)
 
-    def open_db(self, dbname, params=None):
-        endpoint = '/'.join(['db', dbname])
-        return self._call('post', endpoint, params)
+    def open_db(self, dbname, **kwargs):
+        endpoint = '/'.join(['db', urlquote(dbname, safe='')])
+        return self._call('post', endpoint, kwargs)

orbitdbapi/db.py

@@ -14,12 +14,11 @@ def __init__(self, client, params, **kwargs):
         self.__id = params['id']
         self.__id_safe = urlquote(self.__id, safe='')
         self.__type = params['type']
-        self.__use_cache = kwargs.get('use_db_cache')
+        self.__use_cache = kwargs.get('use_db_cache', client.use_db_cache)
         self.__enforce_caps = kwargs.get('__enforce_caps', True)
         self.logger = logging.getLogger(__name__)
+        self.__index_by = self.index_by
 
-        if hasattr( self.params, 'indexBy'):
-            self.__index_by = self.__params.indexBy
 
     def clear_cache(self):
         self.__cache = {}
@@ -34,7 +33,7 @@ def cache_remove(self, item):
             del self.__cache[item]
 
     @property
-    def indexBy(self):
+    def index_by(self):
         return self.__params.get('indexBy')
 
     @property
@@ -82,7 +81,7 @@ def incrementable(self):
 
     @property
     def indexed(self):
-        return hasattr(self, '__index_by')
+        return 'indexBy' in self.__params
 
     def info(self):
         endpoint = '/'.join(['db', self.__id_safe])
@@ -112,7 +111,7 @@ def put(self,  item, cache=None):
             raise CapabilityError('Db {} does not have put capability'.format(self.__dbname))
         if cache is None: cache = self.__use_cache
         if cache:
-            if hasattr(self, '__index_by'):
+            if self.indexed:
                 if hasattr(item, self.__index_by):
                     index_val = getattr(item, self.__index_by)
                 else: