From f863045f01bb9190a5ec439432e72ee300ec430c Mon Sep 17 00:00:00 2001 From: Paul Makepeace Date: Thu, 28 Apr 2011 18:00:04 +0000 Subject: [PATCH] Fix swapped args in do_raw. Add project_url(). Test fix & RefineProject.export() --- google/refine/refine.py | 8 ++++++-- tests/test_refine.py | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/google/refine/refine.py b/google/refine/refine.py index 8be64b7..ba36539 100644 --- a/google/refine/refine.py +++ b/google/refine/refine.py @@ -224,11 +224,15 @@ class RefineProject: self.get_models() def project_name(self): - return Refine(self.server).get_project_name(project_id) + return Refine(self.server).get_project_name(self.project_id) + + def project_url(self): + """Return a URL to the project.""" + return '%s/project?project=%s' % (self.server.server, self.project_id) def do_raw(self, command, data): """Issue a command to the server & return a response object.""" - return self.server.urlopen(command, self.project_id, data) + return self.server.urlopen(command, data, self.project_id) def do_json(self, command, data=None, include_engine=True): """Issue a command to the server, parse & return decoded JSON.""" diff --git a/tests/test_refine.py b/tests/test_refine.py index e10625b..b00ed10 100644 --- a/tests/test_refine.py +++ b/tests/test_refine.py @@ -48,6 +48,12 @@ class RefineTest(refinetest.RefineTestCase): def test_delete_project(self): self.assertTrue(self.project.delete()) + def test_open_export(self): + fp = refine.RefineProject(self.project.project_url()).export() + line = fp.next() + self.assertTrue('email' in line) + fp.close() + if __name__ == '__main__': unittest.main()