carioca 2.1.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efd32c21848d7ab53724150ebbee9a3347662416fe0ee84ae46f3dd8f80cf4ac
-  data.tar.gz: 5a34be69f6405a4eae679b26117872f3be4f74181fd188e455044181c2b2b1a3
+  metadata.gz: 99e25d909400997565234d097e571a9600cca99dca0880e493ea74a6547573ae
+  data.tar.gz: 6c3f581e92b5e9e2f6e91f9f466f2d22ec462ef20ca6799eb1a0304d039a44b6
 SHA512:
-  metadata.gz: e9cc6b8643cfc08f0bdb0066dfa1c7344be07474f1138bb2dec79710a2dac2b2f0a828fae2e236196b5137f01e66fc3e3a0693035ad2b1330ef265966c9309e4
-  data.tar.gz: 8963f1b087355b09c8b364d359d2757c17b561db2f0e9e04d93fc84dd6684bac11ffe533757124ebe44bc7c35616b61c3187f21a4e0bf50f142c5dfd23d3a1e9
+  metadata.gz: b9f9bda2f074633447842b10c9cde5ffdf8c157fc9a3e78398b7a70311425b5a2ce8243ef685b03333b9be850d1103bffab5fc2dba69d51fecc6810b74dfce82
+  data.tar.gz: 4baf6ce65f7efc84e72c13b66a8ccbacf08a68c4d783770736c5f344d6848440dc11d2894d07474da38e73b777ac668dff5cfb18f3f5f4d29b77ab115df65022

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.1.3

data/config/locales/en.yml

@@ -39,6 +39,10 @@ en:
       already_exist: "Object already exist"
       status_ok: "Status OK"
       status_ko: "Status KO"
+      no_content: "No content found"
+      bad_request: "Bad request"
+      created: "Content Successfully created"
+      accepted: "Request accepted"
     bad_usage: "Case must be a return or an exit"
   setup:
     error: "Setup operation failed"

data/config/locales/fr.yml

@@ -39,6 +39,10 @@ fr:
       already_exist: "L'objet existé déjà"
       status_ok: "Status OK"
       status_ko: "Status KO"
+      no_content: "Pas de contenu trouvé"
+      bad_request: "Requête incorrecte"
+      created: "Contenu créé avec succès"
+      accepted: "Requête acceptée"
     bad_usage: "return_case et exit_case sont incompatibles"
   setup:
     error: "Opération en echec durant le setup"

data/lib/carioca/services/finisher.rb

@@ -32,12 +32,16 @@ module Carioca
             error_exit: { code: 50, key: 'finisher.messages.error_exit' },
             # events
             interrupt: { code: 330, key: 'finisher.messages.interrupt' },
-            # request
+            # request & API
             not_found: { code: 404, key: 'finisher.messages.not_found' },
             already_exist: { code: 408, key: 'finisher.messages.already_exist' },
-            # daemon
+            # daemon & API
             status_ok: { code: 200, key: 'finisher.messages.status_ok' },
-            status_ko: { code: 500, key: 'finisher.messages.status_ko' }
+            created: { code: 201, key: 'finisher.messages.created' },
+            accepted: { code: 202, key: 'finisher.messages.accepted' },
+            bad_request: { code: 400, key: 'finisher.messages.bad_request' },
+            status_ko: { code: 500, key: 'finisher.messages.status_ko' },
+            no_content: { code: 204, key: 'finisher.messages.no_content' },
           }
 
   
@@ -88,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?
@@ -98,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carioca
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Romain GEORGES
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge