carioca 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be2b88dd938c21c9b0daaec80430070451b11375dcf39e88de5eb2315f4150e2
-  data.tar.gz: af8b96e10bb4a5ab5d55d445fe17a82408ac04bc587df94261b2b636269cd78e
+  metadata.gz: 99e25d909400997565234d097e571a9600cca99dca0880e493ea74a6547573ae
+  data.tar.gz: 6c3f581e92b5e9e2f6e91f9f466f2d22ec462ef20ca6799eb1a0304d039a44b6
 SHA512:
-  metadata.gz: b313b4231fb1cfa5c0d64f13c6c9ac21a94adc16a2ef43404b06ced4667461302b06e18de275d54b55600686c9d0e5c6926ae63e9f921b89814f5da66f221e9d
-  data.tar.gz: 5fb2116c63723ffded942c036e5f42f62de73f1abbeac62c18cb0303b8b1b8b7e66b315f2503f8a34d66f2f158bb8db9b8228bbf8a19f320a3f9d82dff7f53b9
+  metadata.gz: b9f9bda2f074633447842b10c9cde5ffdf8c157fc9a3e78398b7a70311425b5a2ce8243ef685b03333b9be850d1103bffab5fc2dba69d51fecc6810b74dfce82
+  data.tar.gz: 4baf6ce65f7efc84e72c13b66a8ccbacf08a68c4d783770736c5f344d6848440dc11d2894d07474da38e73b777ac668dff5cfb18f3f5f4d29b77ab115df65022

data/VERSION

@@ -1 +1 @@
-2.1.2
+2.1.3

data/lib/carioca/services/finisher.rb

@@ -92,7 +92,7 @@ module Carioca
         end
 
 
-        def secure_api_return(data: nil, return_case: nil, structured: false, json: true)
+        def secure_api_return(data: nil, return_case: nil, structured: false, json: true, status: true)
             result = {}
             begin
               data = yield if block_given?
@@ -102,8 +102,14 @@ module Carioca
               more  = (e.respond_to? :error_case)? e.message : "#{e.class.to_s} : #{e.message}"
               result = do_return return_case: key, more: more
             end
-            result = JSON.pretty_generate(JSON.parse(result.to_json)) if json
-            return result
+            if status and structured and json then
+              p result
+              return {status: result[:code], data: JSON.pretty_generate(JSON.parse(result.to_json))}
+            elsif json then
+              return JSON.pretty_generate(JSON.parse(result.to_json)) if json
+            else
+              return result
+            end
           end
 
 

data/samples/test.rb

@@ -188,12 +188,21 @@ test = finisher.secure_api_return(return_case: :status_ok, structured: true, jso
   finisher.secure_raise message: "error !", error_case: :status_ko
  "test"
 end
-puts test
+puts test[:status]
+puts test[:data]
 
 output.item "api return, json, structured"
 test = finisher.secure_api_return(return_case: :status_ok, structured: true, json: true) do 
    "test"
 end
+puts test[:status]
+puts test[:data]
+
+
+output.item "api return, json, structured with status=false"
+test = finisher.secure_api_return(return_case: :status_ok, structured: true, json: true, status: false) do 
+   "test"
+end
 puts test
 
 puts "\nTest 18 : Service finisher : exit case in success"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carioca
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Romain GEORGES