Response data renamed

Author: p1c2u

openapi_core/validators.py

@@ -45,9 +45,9 @@ def __init__(self, errors, body=None, parameters=None):
 
 class ResponseValidationResult(BaseValidationResult):
 
-    def __init__(self, errors, body=None, headers=None):
+    def __init__(self, errors, data=None, headers=None):
         super(ResponseValidationResult, self).__init__(errors)
-        self.body = body
+        self.data = data
         self.headers = headers
 
 
@@ -137,15 +137,15 @@ def __init__(self, spec):
 
     def validate(self, request, response):
         errors = []
-        body = None
+        data = None
         headers = {}
 
         try:
             server = self.spec.get_server(request.full_url_pattern)
         # don't process if server errors
         except OpenAPIMappingError as exc:
             errors.append(exc)
-            return ResponseValidationResult(errors, body, headers)
+            return ResponseValidationResult(errors, data, headers)
 
         operation_pattern = request.full_url_pattern.replace(
             server.default_url, '')
@@ -156,14 +156,14 @@ def validate(self, request, response):
         # don't process if operation errors
         except OpenAPIMappingError as exc:
             errors.append(exc)
-            return ResponseValidationResult(errors, body, headers)
+            return ResponseValidationResult(errors, data, headers)
 
         try:
             operation_response = operation.get_response(str(response.status))
         # don't process if invalid response status code
         except InvalidResponse as exc:
             errors.append(exc)
-            return ResponseValidationResult(errors, body, headers)
+            return ResponseValidationResult(errors, data, headers)
 
         if operation_response.content:
             try:
@@ -172,19 +172,19 @@ def validate(self, request, response):
                 errors.append(exc)
             else:
                 try:
-                    raw_body = self._get_raw_body(response)
+                    raw_data = self._get_raw_data(response)
                 except MissingBody as exc:
                     errors.append(exc)
                 else:
                     try:
-                        body = media_type.unmarshal(raw_body)
+                        data = media_type.unmarshal(raw_data)
                     except OpenAPIMappingError as exc:
                         errors.append(exc)
 
-        return ResponseValidationResult(errors, body, headers)
+        return ResponseValidationResult(errors, data, headers)
 
-    def _get_raw_body(self, response):
-        if not response.body:
-            raise MissingBody("Missing required response body")
+    def _get_raw_data(self, response):
+        if not response.data:
+            raise MissingBody("Missing required response data")
 
-        return response.body
+        return response.data

openapi_core/wrappers.py

@@ -116,8 +116,8 @@ class BaseOpenAPIResponse(object):
 
 class MockResponse(BaseOpenAPIRequest):
 
-    def __init__(self, body, status=200, mimetype='application/json'):
-        self.body = body
+    def __init__(self, data, status=200, mimetype='application/json'):
+        self.data = data
 
         self.status = status
         self.mimetype = mimetype
@@ -129,8 +129,8 @@ def __init__(self, response):
         self.response = response
 
     @property
-    def body(self):
-        return self.response.text
+    def data(self):
+        return self.response.data
 
     @property
     def status(self):

tests/integration/test_validators.py

@@ -181,7 +181,7 @@ def test_invalid_server(self, validator):
 
         assert len(result.errors) == 1
         assert type(result.errors[0]) == InvalidServer
-        assert result.body is None
+        assert result.data is None
         assert result.headers == {}
 
     def test_invalid_operation(self, validator):
@@ -192,7 +192,7 @@ def test_invalid_operation(self, validator):
 
         assert len(result.errors) == 1
         assert type(result.errors[0]) == InvalidOperation
-        assert result.body is None
+        assert result.data is None
         assert result.headers == {}
 
     def test_invalid_response(self, validator):
@@ -203,7 +203,7 @@ def test_invalid_response(self, validator):
 
         assert len(result.errors) == 1
         assert type(result.errors[0]) == InvalidResponse
-        assert result.body is None
+        assert result.data is None
         assert result.headers == {}
 
     def test_invalid_content_type(self, validator):
@@ -214,7 +214,7 @@ def test_invalid_content_type(self, validator):
 
         assert len(result.errors) == 1
         assert type(result.errors[0]) == InvalidContentType
-        assert result.body is None
+        assert result.data is None
         assert result.headers == {}
 
     def test_missing_body(self, validator):
@@ -225,7 +225,7 @@ def test_missing_body(self, validator):
 
         assert len(result.errors) == 1
         assert type(result.errors[0]) == MissingBody
-        assert result.body is None
+        assert result.data is None
         assert result.headers == {}
 
     def test_invalid_media_type_value(self, validator):
@@ -236,7 +236,7 @@ def test_invalid_media_type_value(self, validator):
 
         assert len(result.errors) == 1
         assert type(result.errors[0]) == InvalidMediaTypeValue
-        assert result.body is None
+        assert result.data is None
         assert result.headers == {}
 
     def test_get_pets(self, validator):
@@ -254,5 +254,5 @@ def test_get_pets(self, validator):
         result = validator.validate(request, response)
 
         assert result.errors == []
-        assert result.body == response_json
+        assert result.data == response_json
         assert result.headers == {}

tests/integration/test_wrappers.py

@@ -92,7 +92,7 @@ def test_url_rule(self, request_factory, environ, request):
         assert openapi_request.mimetype == request.mimetype
 
 
-class TetsFlaskOpenAPIResponse(object):
+class TestFlaskOpenAPIResponse(object):
 
     @pytest.fixture
     def response_factory(self):
@@ -105,6 +105,7 @@ def test_invalid_server(self, response_factory):
 
         openapi_response = FlaskOpenAPIResponse(response)
 
-        assert openapi_response.body == response.text
+        assert openapi_response.response == response
+        assert openapi_response.data == response.data
         assert openapi_response.status == response.status
         assert openapi_response.mimetype == response.mimetype