From 5e544bb827f2ead7eeed8d49ecf2bec1f6ba2862 Mon Sep 17 00:00:00 2001
From: Paul Makepeace <Paul.Makepeace@realprogrammers.com>
Date: Fri, 10 Jun 2011 17:49:06 +0000
Subject: [PATCH] Move get_version() to RefineServer & add RefineServer.version
 lazy property

---
 google/refine/refine.py | 20 +++++++++++++-------
 tests/test_refine.py    |  5 ++++-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/google/refine/refine.py b/google/refine/refine.py
index 9413a5e..5bf6725 100644
--- a/google/refine/refine.py
+++ b/google/refine/refine.py
@@ -52,6 +52,7 @@ class RefineServer(object):
         if server is None:
             server=self.url()
         self.server = server[:-1] if server.endswith('/') else server
+        self.__version = None     # see version @property below
 
     def urlopen(self, command, data=None, params=None, project_id=None):
         """Open a Refine URL and with optional query params and POST data.
@@ -100,6 +101,18 @@ class RefineServer(object):
                 response.get('message', response.get('stack', response)))
         return response
 
+    def get_version(self):
+        """Return version data.
+
+        {"revision":"r1836","full_version":"2.0 [r1836]",
+         "full_name":"Google Refine 2.0 [r1836]","version":"2.0"}"""
+        return self.urlopen_json('get-version')
+
+    @property
+    def version(self):
+        if self.__version is None:
+            self.__version = self.get_version()['version']
+        return self.__version
 
 class Refine:
     """Class representing a connection to a Refine server."""
@@ -109,13 +122,6 @@ class Refine:
         else:
             self.server = RefineServer(server)
 
-    def get_version(self):
-        """Return version data.
-
-        {"revision":"r1836","full_version":"2.0 [r1836]",
-         "full_name":"Google Refine 2.0 [r1836]","version":"2.0"}"""
-        return self.server.urlopen_json('get-version')
-
     def list_projects(self):
         """Return a dict of projects indexed by id.
 
diff --git a/tests/test_refine.py b/tests/test_refine.py
index 4f0df39..3b81d8f 100644
--- a/tests/test_refine.py
+++ b/tests/test_refine.py
@@ -29,10 +29,13 @@ class RefineServerTest(refinetest.RefineTestCase):
         self.assertTrue(isinstance(projects, dict))
 
     def test_get_version(self):
-        version_info = self.refine.get_version()
+        version_info = self.server.get_version()
         for item in ('revision', 'version', 'full_version', 'full_name'):
             self.assertTrue(item in version_info)
 
+    def test_version(self):
+        self.assertTrue(self.server.version in ('2.0', '2.1'))
+
 
 class RefineTest(refinetest.RefineTestCase):
     project_file = 'duplicates.csv'