Refactor considering optional wrap node in json response.

Author: Hugo Camino

pyms/flask/services/requests.py

@@ -6,8 +6,6 @@
 
 from pyms.flask.services.driver import DriverService
 
-DATA = 'data'
-
 
 class Service(DriverService):
     service = "requests"
@@ -26,7 +24,7 @@ def insert_trace_headers(self, headers):
 
         :rtype: dict
         """
-        self._tracer = current_app.tracer
+
         try:
             # FLASK https://github.com/opentracing-contrib/python-flask
             span = self._tracer.get_span()
@@ -46,6 +44,7 @@ def _get_headers(self, headers):
         if not headers:
             headers = {}
 
+        self._tracer = current_app.tracer
         if self._tracer:
             headers = self.insert_trace_headers(headers)
 
@@ -63,6 +62,23 @@ def _build_url(url, path_params=None):
 
         return url.format_map(path_params)
 
+    def parse_response(self, response):
+        """Parses response's json object. Checks configuration in order to parse a concrete node or the whole response.
+
+        :param response: request's response that contains a valid json
+
+        :rtype: dict
+        """
+
+        try:
+            data = response.json()
+            if self.config.data:
+                data = data.get(self.config.data, {})
+            return data
+        except ValueError:
+            current_app.logger.warning("Response.content is not a valid json {}".format(response.content))
+            return {}
+
     def get(self, url, path_params=None, params=None, headers=None, **kwargs):
         """Sends a GET request.
 
@@ -99,15 +115,7 @@ def get_for_object(self, url, path_params=None, params=None, headers=None, **kwa
         """
 
         response = self.get(url, path_params=path_params, params=params, headers=headers, **kwargs)
-
-        try:
-            data = response.json()
-            if self.config.data:
-                data = data.get(self.config.data, {})
-            return data
-        except ValueError:
-            current_app.logger.warning("Response.content is not a valid json {}".format(response.content))
-            return {}
+        return self.parse_response(response)
 
     def post(self, url, path_params=None, data=None, json=None, headers=None, **kwargs):
         """Sends a POST request.
@@ -147,12 +155,7 @@ def post_for_object(self, url, path_params=None, data=None, json=None, headers=N
         """
 
         response = self.post(url, path_params=path_params, data=data, json=json, headers=headers, **kwargs)
-
-        try:
-            return response.json().get(DATA, {})
-        except ValueError:
-            current_app.logger.warning("Response.content is not a valid json {}".format(response.content))
-            return {}
+        return self.parse_response(response)
 
     def put(self, url, path_params=None, data=None, headers=None, **kwargs):
         """Sends a PUT request.
@@ -192,12 +195,7 @@ def put_for_object(self, url, path_params=None, data=None, headers=None, **kwarg
         """
 
         response = self.put(url, path_params=path_params, data=data, headers=headers, **kwargs)
-
-        try:
-            return response.json().get(DATA, {})
-        except ValueError:
-            current_app.logger.warning("Response.content is not a valid json {}".format(response.content))
-            return {}
+        return self.parse_response(response)
 
     def delete(self, url, path_params=None, headers=None, **kwargs):
         """Sends a DELETE request.

tests/tests_rest_template.py tests/tests_requests.pytests/tests_rest_template.py renamed to tests/tests_requests.py

@@ -10,7 +10,7 @@
 from pyms.flask.app import Microservice
 
 
-class RequestTests(unittest.TestCase):
+class RequestServiceTests(unittest.TestCase):
     """Test common rest operations wrapper.
     """