Skip to content

Commit

Permalink
Rename tornadocouch as trombi
Browse files Browse the repository at this point in the history
  • Loading branch information
Jyrki Pulliainen authored and Petri Lehtinen committed Feb 16, 2010
1 parent c99a200 commit 8647dfa
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 43 deletions.
68 changes: 34 additions & 34 deletions test/test_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@
import urllib
import functools

import tornadocouch
import tornadocouch.errors
import trombi
import trombi.errors

@with_ioloop
@with_couchdb
def test_create_db(baseurl, ioloop):
def create_callback(db):
assert isinstance(db, tornadocouch.Database)
assert isinstance(db, trombi.Database)
f = urllib.urlopen('%s_all_dbs' % baseurl)
eq(json.load(f), [db.name])
ioloop.stop()


s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
s.create('couchdb-database', callback=create_callback)
ioloop.start()

@with_ioloop
@with_couchdb
def test_db_exists(baseurl, ioloop):
s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)

def first_callback(db):
s.create(
Expand All @@ -41,7 +41,7 @@ def first_callback(db):
)

def create_errback(errno, msg):
eq(errno, tornadocouch.errors.PRECONDITION_FAILED)
eq(errno, trombi.errors.PRECONDITION_FAILED)
eq(msg, "Database already exists: 'couchdb-database'")
f = urllib.urlopen('%s_all_dbs' % baseurl)
eq(json.load(f), ['couchdb-database'])
Expand All @@ -54,18 +54,18 @@ def create_errback(errno, msg):
@with_couchdb
def test_invalid_db_name(baseurl, ioloop):
def errback(errno, msg):
eq(errno, tornadocouch.errors.INVALID_DATABASE_NAME)
eq(errno, trombi.errors.INVALID_DATABASE_NAME)
eq(msg, "Invalid database name: 'this name is invalid'")
ioloop.stop()

s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
s.create('this name is invalid', callback=lambda x: x, errback=errback)
ioloop.start()

@with_ioloop
@with_couchdb
def test_delete_db(baseurl, ioloop):
s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
def create_callback(db):
s.delete('testdatabase', callback=delete_callback)

Expand All @@ -81,11 +81,11 @@ def delete_callback():
@with_couchdb
def test_delete_db_not_exists(baseurl, ioloop):
def delete_errback(errno, msg):
eq(errno, tornadocouch.errors.NOT_FOUND)
eq(errno, trombi.errors.NOT_FOUND)
eq(msg, "Database does not exist: 'testdatabase'")
ioloop.stop()

s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
s.delete('testdatabase', callback=None, errback=delete_errback)
ioloop.start()

Expand All @@ -100,21 +100,21 @@ def create_second(db):

def list_callback(databases):
databases = list(databases)
assert all(isinstance(x, tornadocouch.Database) for x in databases)
assert all(isinstance(x, trombi.Database) for x in databases)
eq(
['testdb2', 'testdb1'],
[x.name for x in databases],
)
ioloop.stop()

s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
s.create('testdb1', callback=create_first)
ioloop.start()

@with_ioloop
@with_couchdb
def test_open_database(baseurl, ioloop):
s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)

def create_callback(db):
s.load('testdb1', callback=load_callback)
Expand All @@ -130,10 +130,10 @@ def load_callback(db):
@with_ioloop
@with_couchdb
def test_open_nonexisting_database(baseurl, ioloop):
s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)

def load_errback(errno, msg):
eq(errno, tornadocouch.errors.NOT_FOUND)
eq(errno, trombi.errors.NOT_FOUND)
eq(msg, "Database not found: 'testdb1'")
ioloop.stop()

Expand All @@ -143,10 +143,10 @@ def load_errback(errno, msg):
@with_ioloop
@with_couchdb
def test_open_database_bad_name(baseurl, ioloop):
s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)

def load_errback(errno, msg):
eq(errno, tornadocouch.errors.INVALID_DATABASE_NAME)
eq(errno, trombi.errors.INVALID_DATABASE_NAME)
eq(msg, "Invalid database name: 'not a valid name'")
ioloop.stop()

Expand All @@ -163,14 +163,14 @@ def create_db_callback(db):
)

def create_doc_callback(doc):
assert isinstance(doc, tornadocouch.Document)
assert isinstance(doc, trombi.Document)
assert doc.id
assert doc.rev

eq(doc['testvalue'], 'something')
ioloop.stop()

s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
s.create('testdb', callback=create_db_callback)
ioloop.start()

Expand All @@ -185,15 +185,15 @@ def create_db_callback(db):
)

def create_doc_callback(doc):
assert isinstance(doc, tornadocouch.Document)
assert isinstance(doc, trombi.Document)
assert doc.id
assert doc.rev

eq(doc.id, 'something/with/slash')
eq(doc['testvalue'], 'something')
ioloop.stop()

s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
s.create('testdb', callback=create_db_callback)
ioloop.start()

Expand All @@ -210,14 +210,14 @@ def create_doc_callback(doc, db=None):
db.load(doc.id, callback=load_doc_callback)

def load_doc_callback(doc):
assert isinstance(doc, tornadocouch.Document)
assert isinstance(doc, trombi.Document)
assert doc.id
assert doc.rev

eq(doc['testvalue'], 'something')
ioloop.stop()

s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
s.create('testdb', callback=create_db_callback)
ioloop.start()

Expand All @@ -232,7 +232,7 @@ def create_db_callback(db):
)

def create_doc_callback(doc):
assert isinstance(doc, tornadocouch.Document)
assert isinstance(doc, trombi.Document)
eq(doc.id, 'testid')
assert '_id' not in doc
assert '_rev' not in doc
Expand All @@ -248,7 +248,7 @@ def create_doc_callback(doc):
})
ioloop.stop()

s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
s.create('testdb', callback=create_db_callback)
ioloop.start()

Expand All @@ -270,11 +270,11 @@ def create_1st_doc_callback(doc, db):
errback=create_doc_error,
)
def create_doc_error(errno, msg):
eq(errno, tornadocouch.errors.CONFLICT)
eq(errno, trombi.errors.CONFLICT)
eq(msg, 'Document update conflict.')
ioloop.stop()

s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
s.create('testdb', callback=create_db_callback)
ioloop.start()

Expand All @@ -286,11 +286,11 @@ def create_db_callback(db):
db.load('foo', callback=None, errback=load_errback)

def load_errback(errno, msg):
eq(errno, tornadocouch.errors.NOT_FOUND)
eq(errno, trombi.errors.NOT_FOUND)
eq(msg, 'missing')
ioloop.stop()

s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
s.create('testdb', callback=create_db_callback)
ioloop.start()

Expand All @@ -315,7 +315,7 @@ def data_callback(doc):



s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
s.create('testdb', callback=create_db_callback)
ioloop.start()

Expand All @@ -341,7 +341,7 @@ def data_callback(doc):



s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
s.create('testdb', callback=create_db_callback)
ioloop.start()

Expand All @@ -366,7 +366,7 @@ def data_callback(data):
eq(data, 'some textual data')
ioloop.stop()

s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
s.create('testdb', callback=create_db_callback)
ioloop.start()

Expand All @@ -392,7 +392,7 @@ def delete_callback(doc):
eq(f.getcode(), 404)
ioloop.stop()

s = tornadocouch.Server(baseurl, io_loop=ioloop)
s = trombi.Server(baseurl, io_loop=ioloop)
s.create('testdb', callback=create_db_callback)
ioloop.start()

1 change: 0 additions & 1 deletion tornadocouch/__init__.py
View file

This file was deleted.

1 change: 1 addition & 0 deletions trombi/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from trombi.client import *
16 changes: 8 additions & 8 deletions tornadocouch/client.py → trombi/client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
except ImportError:
import simplejson as json

import tornadocouch.errors
import trombi.errors

class Server(object):
def __init__(self, baseurl, io_loop=None):
Expand All @@ -22,7 +22,7 @@ def default_errback(self, error, msg):

def _invalid_db_name(self, name, errback):
errback(
tornadocouch.errors.INVALID_DATABASE_NAME,
trombi.errors.INVALID_DATABASE_NAME,
'Invalid database name: %r' % name,
)

Expand All @@ -39,7 +39,7 @@ def _create_callback(response):
callback(Database(self, name))
elif response.code == 412:
errback(
tornadocouch.errors.PRECONDITION_FAILED,
trombi.errors.PRECONDITION_FAILED,
'Database already exists: %r' % name
)
else:
Expand All @@ -65,7 +65,7 @@ def _really_callback(response):
callback(Database(self, name))
elif response.code == 404:
return errback(
tornadocouch.errors.NOT_FOUND,
trombi.errors.NOT_FOUND,
'Database not found: %r' % name
)

Expand All @@ -80,7 +80,7 @@ def _really_callback(response):
if response.code == 200:
callback()
elif response.code == 404:
errback(tornadocouch.errors.NOT_FOUND,
errback(trombi.errors.NOT_FOUND,
'Database does not exist: %r' % name)

self.client.fetch(
Expand Down Expand Up @@ -124,11 +124,11 @@ def _really_callback(response):
callback(doc)
elif response.code == 409:
errback(
tornadocouch.errors.CONFLICT,
trombi.errors.CONFLICT,
content['reason']
)
else:
errback(tornadocouch.errors.SERVER_ERROR,
errback(trombi.errors.SERVER_ERROR,
response.body)

url = '%s/%s' % (self.server.baseurl, self.name)
Expand All @@ -155,7 +155,7 @@ def _really_callback(response):
doc = Document(self, data.items())
callback(doc)
elif response.code == 404:
errback(tornadocouch.errors.NOT_FOUND, data['reason'])
errback(trombi.errors.NOT_FOUND, data['reason'])

doc_id = urllib.quote(doc_id, safe='')
self.server.client.fetch(
Expand Down
0 tornadocouch/errors.py → trombi/errors.py
View file
File renamed without changes.

0 comments on commit 8647dfa

Please sign in to comment.