Merge pull request #117 from TTWShell/release/2.0.3

fix set response code = 0 err

Author: TTWShell

docs/changelog.rst

@@ -1,6 +1,11 @@
 Change history
 ==============
 
+2.0.3 (2021-07-08)
+******************
+
+* Fix set response.xxxResult code = 0.
+
 2.0.2 (2021-07-08)
 ******************
 

hobbit_core/response.py

@@ -64,7 +64,8 @@ def __init__(self, response=None, status=None, headers=None,
             'Error response, must include keys: code, data, detail, message'
         super(Result, self).__init__(
             response=dumps(response, indent=0, separators=(',', ':')) + '\n',
-            status=status or self.status, headers=headers, mimetype=mimetype,
+            status=status if status is not None else self.status,
+            headers=headers, mimetype=mimetype,
             content_type=content_type, direct_passthrough=direct_passthrough)
 
 
@@ -76,7 +77,8 @@ class SuccessResult(Result):
     def __init__(self, message: str = '', code: Optional[int] = None,
                  detail: Any = None, status: Optional[int] = None, data=None):
         super(SuccessResult, self).__init__(
-            gen_response(code or self.status, message, detail, data),
+            gen_response(code if code is not None else self.status,
+                         message, detail, data),
             status or self.status)
 
 
@@ -88,7 +90,9 @@ class FailedResult(Result):
     def __init__(self, message: str = '', code: Optional[int] = None,
                  detail: Any = None):
         super(FailedResult, self).__init__(
-            gen_response(code or self.status, message, detail), self.status)
+            gen_response(
+                code if code is not None else self.status, message, detail),
+            self.status)
 
 
 class UnauthorizedResult(FailedResult):

setup.py

@@ -32,7 +32,7 @@ def gen_data(data_root='static'):
 
 setup(
     name='hobbit-core',
-    version='2.0.2',
+    version='2.0.3',
     python_requires='>=3.6, <4',
     description='Hobbit - A flask project generator.',
     long_description=long_description,

tests/test_response.py

@@ -18,7 +18,7 @@ class TestResponse(BaseTest):
         ((1, '测试', ['1'], []), {
             'code': '1', 'message': '测试', 'detail': ['1'], 'data': []}),
     ])
-    def test_gen_response(self, input_, excepted):
+    def test_gen_response(self, app, input_, excepted):
         assert excepted == gen_response(*input_)
 
     def test_result(self):
@@ -34,7 +34,7 @@ def test_result(self):
         result = Result(response, status=201)
         assert result.status_code == 201
 
-    def test_success_result(self):
+    def test_success_result(self, app):
         # assert status can rewrite
         excepted = b'{\n"code":"200",\n"data":null,\n"detail":null,\n"message":"message"\n}\n'  # NOQA
         result = SuccessResult('message', status=301)
@@ -45,6 +45,14 @@ def test_success_result(self):
         result = SuccessResult()
         assert result.status_code == 200
 
+        app.config['HOBBIT_USE_CODE_ORIGIN_TYPE'] = True
+        result = SuccessResult(code=0)
+        assert b'"code":0' in result.data
+
+        app.config['HOBBIT_USE_CODE_ORIGIN_TYPE'] = False
+        result = SuccessResult(code=0)
+        assert b'"code":"0"' in result.data
+
     def test_failed_result(self):
         result = FailedResult()
         assert result.status_code == 400