opencultureconsulting
/
openrefine-client
mirror of https://github.com/opencultureconsulting/openrefine-client.git
2
0
Fork 0
Code Issues Releases Activity

Add RefineServer.url() staticmethod to report the Refine server's url

This commit is contained in:
Paul Makepeace 2011-06-10 12:53:46 +00:00
parent 294f3f2690
commit 316b60b387
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
google/refine/refine.py
View File

@ -40,9 +40,17 @@ REFINE_PORT = os.environ.get('GOOGLE_REFINE_PORT', '3333')
class RefineServer(object): class RefineServer(object):
"""Communicate with a Refine server.""" """Communicate with a Refine server."""
@staticmethod
def url():
"""Return the URL to the Refine server."""
server='http://%s' % REFINE_HOST
if REFINE_PORT != '80':
server += ':' + REFINE_PORT
return server
def __init__(self, server=None): def __init__(self, server=None):
if server is None: if server is None:
server='http://%s:%s' % (REFINE_HOST, REFINE_PORT) server=self.url()
self.server = server[:-1] if server.endswith('/') else server self.server = server[:-1] if server.endswith('/') else server
def urlopen(self, command, data=None, project_id=None): def urlopen(self, command, data=None, project_id=None):

5
tests/test_refine.py
View File

@ -17,8 +17,9 @@ from tests import refinetest
class RefineServerTest(refinetest.RefineTestCase): class RefineServerTest(refinetest.RefineTestCase):
def test_init(self): def test_init(self):
self.assertEqual(self.server.server, server_url = 'http://%s:%s' % (refine.REFINE_HOST, refine.REFINE_PORT)
'http://%s:%s' % (refine.REFINE_HOST, refine.REFINE_PORT)) self.assertEqual(self.server.server, server_url)
self.assertEqual(refine.RefineServer.url(), server_url)
# strip trailing / # strip trailing /
server = refine.RefineServer('http://refine.example/') server = refine.RefineServer('http://refine.example/')
self.assertEqual(server.server, 'http://refine.example') self.assertEqual(server.server, 'http://refine.example')