carioca 2.1.6 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59956550392bbf8603dd8426a0595afb7cd207bb6929adac7a183eca58acc400
-  data.tar.gz: 95addcdb4fde913f5ec4dc4a15184634a24c27522e4f93a26b5912c55561d0db
+  metadata.gz: 5d835f54ee7bbeee2d8536aa2baaee5ea96800e6c044b52ba15a5f9c711dad72
+  data.tar.gz: 3bed4c3fbe420f22f3e4949b5b9c9eae874475f941f9c6ede40c8b72a801f9bc
 SHA512:
-  metadata.gz: a26bacd589861a1543184a73791c3ea37ac0f05742efe82a414a5dc243f448824d10d9973f5b1c73fc8208fc167c004d8e67d82390c9bf6583695d673e645bf0
-  data.tar.gz: 48001979dde2a20fe79c140f72739b2d9d7dd93523082edd11c85f720225e14428fd6873e4e81c68d82c78fd51b43858e8156819ee76f78a4ae1044c69fede9e
+  metadata.gz: da28ddf9bc986db91af0ed59825e42753dbe8c1dd86dbf6a0412faa5af64b917624c7a0b12648fadf12f11e8b42b7c81aa74a4e70e4c4c8e50b0a6adbf919304
+  data.tar.gz: b487f45e3a31842aa06994721e5856ba14c0406f2267c08a5184915b737444508bf97031c94d4f0864ef1abf6697e14f887ad594c746b6fa704759c8d3554623

data/VERSION

@@ -1 +1 @@
-2.1.6
+2.1.8

data/lib/carioca/services/finisher.rb

@@ -12,6 +12,17 @@ module Carioca
       end
     end
 
+
+    class AlternativeCatcher < StandardError
+      attr_reader :return_case, :data
+
+      def initialize(*arg, return_case: :status_ko, data: nil)
+        super(*arg)
+        @return_case = return_case
+        @data = data
+      end
+    end
+
     # Exiter namespace
     class Finisher
       DEFAULT_FINISHERS_SPECS = {
@@ -95,12 +106,17 @@ module Carioca
           data = yield if block_given?
           result = structured ? do_return(return_case:).merge({ data: }) : data
         rescue StandardError => e
-          key = e.respond_to?(:error_case) ? e.error_case : :status_ko
-          more = e.respond_to?(:error_case) ? e.message : "#{e.class} : #{e.message}"
-          result = do_return return_case: key, more:
+          key = :status_ko
+          more = "#{e.class} : #{e.message}"
+          if e.respond_to?(:error_case)
+            result = do_return(return_case: e.error_case, more: e.message)
+          elsif e.respond_to?(:return_case)
+            result = structured ? do_return(return_case: e.return_case, more: e.message).merge({ data: e.data}) : e.data
+          else  
+            result = do_return(return_case: :status_ko, more: "#{e.class.to_s} : #{e.message}")
+          end
         end
         if status && structured && json
-          p result
           { status: result[:code], data: JSON.pretty_generate(JSON.parse(result.to_json)) }
         elsif json
           JSON.pretty_generate(JSON.parse(result.to_json)) if json
@@ -109,6 +125,11 @@ module Carioca
         end
       end
 
+      def secure_alternative(message: , return_case: :accepted, data: )
+        raise AlternativeCatcher.new(message, return_case: return_case, data: data)
+      end
+
+
       def secure_execute!(exit_case: :success_exit)
         begin
           more = yield

data/samples/test.rb

@@ -175,28 +175,55 @@ puts test
 output.item 'api return, no-json, no-structured but with secure_raise'
 test = finisher.secure_api_return(return_case: :status_ok, structured: false, json: false) do
   finisher.secure_raise message: 'error !', error_case: :status_ko
-  'test'
+    { test: 'test'}
 end
 puts test
 
 output.item 'api return, json, structured but with secure_raise'
 test = finisher.secure_api_return(return_case: :status_ok, structured: true, json: true) do
   finisher.secure_raise message: 'error !', error_case: :status_ko
-  'test'
+  test = { test: 'test'}
+  test
 end
 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'
+  test = { test: 'test' }
+  test
+end
+puts test[:status]
+puts test[:data]
+
+
+output.item 'api return, json, structured with alternative'
+test = finisher.secure_api_return(return_case: :status_ok, structured: true, json: true) do
+  test = { test: 'test' }
+  finisher.secure_alternative message: "test alernative", return_case: :accepted, data: test
+  test
 end
 puts test[:status]
 puts test[:data]
 
+
+output.item 'api return, json, structured with alternative'
+test = finisher.secure_api_return(return_case: :status_ok, structured: false, json: false) do
+  test = { test: 'test' }
+  finisher.secure_alternative message: "test alernative", return_case: :accepted, data: test
+  test
+end
+puts test
+
 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'
+  { test: 'test'}
+end
+puts test
+
+output.item 'api return, json, structured but raising unknown case'
+test = finisher.secure_api_return(return_case: :status_ok, structured: true, json: true, status: false) do
+  raise "Boom"
 end
 puts test
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carioca
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.8
 platform: ruby
 authors:
 - Romain GEORGES
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge