Update resource links

.. to match the recently URI changes

committer: Ralf Schlatterbeck <[email protected]>

Author: kinggreedy

roundup/rest.py

@@ -238,7 +238,8 @@ def __init__(self, client, db):
         protocol = 'http'
         host = self.client.env['HTTP_HOST']
         tracker = self.client.env['TRACKER_NAME']
-        self.base_path = '%s://%s/%s/rest/' % (protocol, host, tracker)
+        self.base_path = '%s://%s/%s/rest' % (protocol, host, tracker)
+        self.data_path = self.base_path + '/data'
 
     def props_from_args(self, cl, args, itemid=None):
         """Construct a list of properties from the given arguments,
@@ -393,7 +394,7 @@ def get_collection(self, class_name, input):
             raise Unauthorised('Permission to view %s denied' % class_name)
 
         class_obj = self.db.getclass(class_name)
-        class_path = self.base_path + class_name
+        class_path = '%s/%s/' % (self.data_path, class_name)
 
         # Handle filtering and pagination
         filter_props = {}
@@ -494,7 +495,7 @@ def get_element(self, class_name, item_id, input):
         result = {
             'id': item_id,
             'type': class_name,
-            'link': self.base_path + class_name + item_id,
+            'link': '%s/%s/%s' % (self.data_path, class_name, item_id),
             'attributes': dict(result)
         }
 
@@ -537,8 +538,8 @@ def get_attribute(self, class_name, item_id, attr_name, input):
         result = {
             'id': item_id,
             'type': type(data),
-            'link': "%s%s%s/%s" %
-                    (self.base_path, class_name, item_id, attr_name),
+            'link': "%s/%s/%s/%s" %
+                    (self.data_path, class_name, item_id, attr_name),
             'data': data
         }
 
@@ -597,7 +598,7 @@ def post_collection(self, class_name, input):
             raise UsageError("Must provide the %s property." % msg)
 
         # set the header Location
-        link = self.base_path + class_name + item_id
+        link = '%s/%s/%s' % (self.data_path, class_name, item_id)
         self.client.setHeader("Location", link)
 
         # set the response body
@@ -650,7 +651,7 @@ def put_element(self, class_name, item_id, input):
         result = {
             'id': item_id,
             'type': class_name,
-            'link': self.base_path + class_name + item_id,
+            'link': '%s/%s/%s' % (self.data_path, class_name, item_id),
             'attribute': result
         }
         return 200, result
@@ -701,7 +702,7 @@ def put_attribute(self, class_name, item_id, attr_name, input):
         result = {
             'id': item_id,
             'type': class_name,
-            'link': self.base_path + class_name + item_id,
+            'link': '%s/%s/%s' % (self.data_path, class_name, item_id),
             'attribute': result
         }
 
@@ -885,7 +886,7 @@ def patch_element(self, class_name, item_id, input):
             result = {
                 'id': item_id,
                 'type': class_name,
-                'link': self.base_path + class_name + item_id,
+                'link': '%s/%s/%s' % (self.data_path, class_name, item_id),
                 'result': result
             }
         else:
@@ -914,7 +915,7 @@ def patch_element(self, class_name, item_id, input):
             result = {
                 'id': item_id,
                 'type': class_name,
-                'link': self.base_path + class_name + item_id,
+                'link': '%s/%s/%s' % (self.data_path, class_name, item_id),
                 'attribute': result
             }
         return 200, result
@@ -980,7 +981,7 @@ def patch_attribute(self, class_name, item_id, attr_name, input):
         result = {
             'id': item_id,
             'type': class_name,
-            'link': self.base_path + class_name + item_id,
+            'link': '%s/%s/%s' % (self.data_path, class_name, item_id),
             'attribute': result
         }
         return 200, result

test/test_rest.py

@@ -146,7 +146,7 @@ def testFilter(self):
             status=self.db.status.lookup('open'),
             priority=self.db.priority.lookup('critical')
         )
-        base_path = self.dummy_client.env['PATH_INFO'] + 'issue'
+        base_path = self.dummy_client.env['PATH_INFO'] + 'data/issue/'
 
         # Retrieve all issue status=open
         form = cgi.FieldStorage()