Move @Apiver version extraction code after the input is parsed for

json. Otherwise json input causes issues.

test 400 return code if ;version=1.1.
test for version param in accept header ;version=1
test version in type/vnd.subtype (vnd.json.test-v1)
and @Apiver=1 query param.

Author: rouilj

roundup/rest.py

@@ -1476,24 +1476,6 @@ def dispatch(self, method, uri, input):
                               part[1]['version']))
                     output = self.error_obj(400, msg)
 
-        # check for @apiver in query string
-        try:
-            if not self.api_version:
-                self.api_version = int(input['@apiver'].value)
-        except KeyError:
-            self.api_version = None
-        except ValueError:
-            msg=( "Unrecognized version: %s. "
-                  "See /rest without specifying version "
-                  "for supported versions."%(
-                      input['@apiver'].value))
-            output = self.error_obj(400, msg)
-
-        # FIXME: do we need to raise an error if client did not specify
-        # version? This may be a good thing to require. Note that:
-        # Accept: application/json; version=1 may not be legal but....
-        
-
         # get the request format for response
         # priority : extension from uri (/rest/data/issue.json),
         #            header (Accept: application/json, application/xml)
@@ -1550,6 +1532,23 @@ def dispatch(self, method, uri, input):
         except KeyError:
             pretty_output = True
 
+        # check for @apiver in query string
+        try:
+            if not self.api_version:
+                self.api_version = int(input['@apiver'].value)
+        except KeyError:
+            self.api_version = None
+        except ValueError:
+            msg=( "Unrecognized version: %s. "
+                  "See /rest without specifying version "
+                  "for supported versions."%(
+                      input['@apiver'].value))
+            output = self.error_obj(400, msg)
+
+        # FIXME: do we need to raise an error if client did not specify
+        # version? This may be a good thing to require. Note that:
+        # Accept: application/json; version=1 may not be legal but....
+        
         # Call the appropriate method
         try:
             # If output was defined by a prior error

test/rest_common.py

@@ -715,7 +715,7 @@ def testDispatch(self):
                 "CONTENT_LENGTH": len(body),
                 "REQUEST_METHOD": "PUT"
         }
-        headers={"accept": "application/json",
+        headers={"accept": "application/json; version=1",
                  "content-type": env['CONTENT_TYPE'],
                  "content-length": env['CONTENT_LENGTH'],
                  "if-match": etag
@@ -738,6 +738,20 @@ def testDispatch(self):
         self.assertEqual(self.dummy_client.response_code, 200)
         self.assertEqual(results['data']['attributes']['realname'],
                          'Joe Doe 1')
+
+
+        # substitute the version with an unacceptable version
+        # and verify it returns 400 code.
+        self.headers["accept"] = "application/json; version=1.1"
+        body_file=BytesIO(body)  # FieldStorage needs a file
+        form = client.BinaryFieldStorage(body_file,
+                                headers=headers,
+                                environ=env)
+        self.server.client.request.headers.get=self.get_header
+        results = self.server.dispatch('PUT',
+                            "/rest/data/user/%s/realname"%self.joeid,
+                            form)
+        self.assertEqual(self.server.client.response_code, 400)
         del(self.headers)
 
         # TEST #2
@@ -785,11 +799,12 @@ def testDispatch(self):
         # the results from the db.
         etag = calculate_etag(self.db.user.getnode(self.joeid))
         headers={"if-match": etag,
-                 "accept": "application/json",
+                 "accept": "application/vnd.json.test-v1+json",
         }
         form = cgi.FieldStorage()
         form.list = [
             cgi.MiniFieldStorage('data', 'Joe Doe'),
+            cgi.MiniFieldStorage('@apiver', '1'),
         ]
         self.headers = headers
         self.server.client.request.headers.get = self.get_header