Skip to content

Commit

Permalink
Rename DNS to DSN(Data source name) quantmind#306
Browse files Browse the repository at this point in the history
  • Loading branch information
fabiocerqueira committed Jan 11, 2018
1 parent 2a67842 commit 0c94513
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 20 deletions.
4 changes: 2 additions & 2 deletions docs/apps/data/clients.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ function with a valid :ref:`connection string <connection-string>`::
'redis'
>>> store.database
'11'
>>> store.dns
>>> store.dsn
'redis://user:password@127.0.0.1:6500/11'

Additional parameters can be passed via the connection string or as key-valued
parameters. For example::

>>> store = create_store('redis://user:password@127.0.0.1:6500/11',
namespace='test_')
>>> store.dns
>>> store.dsn
'redis://user:password@127.0.0.1:6500/11?namespace=test_'


Expand Down
1 change: 1 addition & 0 deletions docs/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ dev
django
Django
dns
dsn
ds
eg
epilog
Expand Down
6 changes: 3 additions & 3 deletions pulsar/apps/data/channels.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ def __init__(self, store, namespace=None):
self.namespace = '%s%s' % (
self.namespace, self.namespace_delimiter
)
self.dns = store.buildurl(namespace=self.namespace)
self.dsn = store.buildurl(namespace=self.namespace)

def __repr__(self):
return self.dns
return self.dsn

def __str__(self):
return self.__repr__()
Expand Down Expand Up @@ -114,7 +114,7 @@ def _loop(self):
return self.store._loop

def __repr__(self):
return self.dns
return self.dsn

def __len__(self):
return len(self.channels)
Expand Down
6 changes: 3 additions & 3 deletions pulsar/apps/data/pulsards/startds.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ async def start_store(app, url, workers=0, **kw):
cfg = await send('arbiter', 'run', start_pulsar_ds,
host, workers)
store._host = cfg.addresses[0]
dns = store.buildurl()
store = create_store(dns, **kw)
app.cfg.set('data_store', store.dns)
dsn = store.buildurl()
store = create_store(dsn, **kw)
app.cfg.set('data_store', store.dsn)


def localhost(host):
Expand Down
2 changes: 1 addition & 1 deletion pulsar/apps/data/redis/store.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def namespace(self):
return '%s:' % n if n else ''

def key(self):
return (self._dns, self._encoding)
return (self._dsn, self._encoding)

def client(self):
'''Get a :class:`.RedisClient` for the Store'''
Expand Down
16 changes: 8 additions & 8 deletions pulsar/apps/data/store.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def __init__(self, host=None, database=None,
self._password = password
self._urlparams = {}
self._init(**kw)
self._dns = self.buildurl()
self._dsn = self.buildurl()

@property
def database(self):
Expand All @@ -89,7 +89,7 @@ def database(self):
@database.setter
def database(self, value):
self._database = value
self._dns = self.buildurl()
self._dsn = self.buildurl()

@property
def encoding(self):
Expand All @@ -98,24 +98,24 @@ def encoding(self):
return self._encoding

@property
def dns(self):
'''Domain name server'''
return self._dns
def dsn(self):
'''Data source name'''
return self._dsn

@property
def urlparams(self):
"""url parameters in dns query"""
"""url parameters in dsn query"""
return self._urlparams

@classmethod
def register(cls):
pass

def __str__(self):
return self._dns
return self._dsn

def __repr__(self):
return 'Store(dns="%s")' % self
return 'Store(dsn="%s")' % self

def database_create(self, dbname=None, **kw):
'''Create a new database in this store.
Expand Down
2 changes: 1 addition & 1 deletion tests/stores/channels.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def channels(self, **kw):
kw['protocol'] = Json()
return self.store.channels(**kw)

def test_channels_dns(self):
def test_channels_dsn(self):
channels = self.channels()
self.assertEqual(channels.namespace, '%s_' % self.namespace())
channels = self.channels(namespace='foo')
Expand Down
4 changes: 2 additions & 2 deletions tests/stores/test_pulsards.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ async def test_move(self):
eq(await c.move(key, db), False)
eq(await c.set(key, 'ciao'), True)
eq(await c.move(key, db), True)
s2 = self.create_store(self.store.dns, database=db)
s2 = self.create_store(self.store.dsn, database=db)
c2 = s2.client()
eq(await c2.get(key), b'ciao')
eq(await c.exists(key), False)
Expand Down Expand Up @@ -1267,6 +1267,6 @@ def test_store_methods(self):
self.assertEqual(store.database, 8)
store.database = 10
self.assertEqual(store.database, 10)
self.assertTrue(store.dns.startswith('%s/10?' % self.pulsards_uri))
self.assertTrue(store.dsn.startswith('%s/10?' % self.pulsards_uri))
self.assertEqual(store.encoding, 'utf-8')
self.assertTrue(repr(store))

0 comments on commit 0c94513

Please sign in to comment.