carioca 2.1.2 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be2b88dd938c21c9b0daaec80430070451b11375dcf39e88de5eb2315f4150e2
-  data.tar.gz: af8b96e10bb4a5ab5d55d445fe17a82408ac04bc587df94261b2b636269cd78e
+  metadata.gz: 29233bcd6718731dae76436b23f4a2d0f4cba32630c2fa11009b5c44cba63453
+  data.tar.gz: caea68819fafbe93e864dd63da838806afbdbb14da4d2415af644826afb64cf6
 SHA512:
-  metadata.gz: b313b4231fb1cfa5c0d64f13c6c9ac21a94adc16a2ef43404b06ced4667461302b06e18de275d54b55600686c9d0e5c6926ae63e9f921b89814f5da66f221e9d
-  data.tar.gz: 5fb2116c63723ffded942c036e5f42f62de73f1abbeac62c18cb0303b8b1b8b7e66b315f2503f8a34d66f2f158bb8db9b8228bbf8a19f320a3f9d82dff7f53b9
+  metadata.gz: e2ce4b9ba9e0744e20ff4e11bbb2fda7b2813dd4589ec5a950a71799b7c2aa7cfb638bd5f38cd9e2c14b95730b3bd70b31282da9756075a23933842dcf652ce6
+  data.tar.gz: 9650779eed46522a43c7ebd0ff0089ac97b22b481a7c45885bcd2410d45f639808cd3d5eafe6ed37c1badf157d91d60f12a8324a02cc6b8170974884eb1cb9b7

data/VERSION

@@ -1 +1 @@
-2.1.2
+2.1.4

data/lib/carioca/mixin.rb

@@ -6,7 +6,7 @@ module Carioca
       create_methods(service) { return Carioca::Registry.get.get_service name: service }
     end
 
-    def register(service:, definition:)
+    def add(service:, definition:)
       Carioca::Registry.get.add service: service, definition: definition
     end
 

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/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "carioca", "~> 2.1"
+
+gem "uuid", "~> 2.3"

data/samples/test.rb

@@ -157,16 +157,19 @@ sanitycheck = Carioca::Registry.get.get_service name: :sanitycheck
 sanitycheck.run
 
 puts "\nTest 14 : Service SecureStore init or access"
-securestore = Carioca::Registry.get.get_service name: :securestore
+puts "skipped"
+#securestore = Carioca::Registry.get.get_service name: :securestore
 
 
 puts "\nTest 15 : Service SecureStore getting previous data"
-res = (securestore.data.empty?)? "first time" : securestore.data.to_s
-output.info res
+#res = (securestore.data.empty?)? "first time" : securestore.data.to_s
+#output.info res
+puts "skipped"
 
 puts "\nTest 16 : Service SecureStore setting new data"
-securestore.data[:time] = Time.now
-securestore.save!
+#securestore.data[:time] = Time.now
+#securestore.save!
+puts "skipped"
 
 puts "\nTest 17 : Service finisher : test all cases"
 output.item "flat api return, no-json, no-structured"
@@ -188,12 +191,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"
@@ -202,4 +214,4 @@ finisher.secure_execute! exit_case: :success_exit do
   puts 'finishing action'
   #finisher.secure_raise message: "error !", error_case: :status_ko
   'message'
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carioca
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.4
 platform: ruby
 authors:
 - Romain GEORGES
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2024-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -235,7 +235,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -284,6 +283,7 @@ files:
 - lib/carioca/services/toolbox.rb
 - lib/carioca/validator.rb
 - lib/carioca/version.rb
+- samples/Gemfile
 - samples/Rakefile
 - samples/config/carioca.registry
 - samples/config/locales/en.yml
@@ -315,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: 'Carioca : Container And Registry with Inversion Of Control for your Applications'

data/Gemfile.lock

@@ -1,132 +0,0 @@
-PATH
-  remote: .
-  specs:
-    carioca (2.1.0)
-      deep_merge (~> 1.2)
-      i18n (~> 1.10)
-      locale (~> 2.1)
-      pastel (~> 0.8.0)
-      ps-ruby (~> 0.0.4)
-      tty-prompt (~> 0.23.1)
-      version (~> 1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    bundle-audit (0.1.0)
-      bundler-audit
-    bundler-audit (0.9.1)
-      bundler (>= 1.2.0, < 3)
-      thor (~> 1.0)
-    code_statistics (0.2.13)
-    concurrent-ruby (1.2.2)
-    cyclonedx-ruby (1.1.0)
-      json (~> 2.2)
-      nokogiri (~> 1.8)
-      ostruct (~> 0.1)
-      rest-client (~> 2.0)
-    deep_merge (1.2.2)
-    diff-lcs (1.5.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    http-accept (1.7.0)
-    http-cookie (1.0.5)
-      domain_name (~> 0.5)
-    i18n (1.14.1)
-      concurrent-ruby (~> 1.0)
-    json (2.6.2)
-    locale (2.1.3)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
-    mini_portile2 (2.8.2)
-    netrc (0.11.0)
-    nokogiri (1.15.2)
-      mini_portile2 (~> 2.8.2)
-      racc (~> 1.4)
-    nokogiri (1.15.2-arm64-darwin)
-      racc (~> 1.4)
-    ostruct (0.5.5)
-    parallel (1.22.1)
-    parser (3.1.2.0)
-      ast (~> 2.4.1)
-    pastel (0.8.0)
-      tty-color (~> 0.5)
-    ps-ruby (0.0.4)
-    racc (1.7.1)
-    rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.5.0)
-    rest-client (2.1.0)
-      http-accept (>= 1.7.0, < 2.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    rexml (3.2.5)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
-    rubocop (1.32.0)
-      json (~> 2.3)
-      parallel (~> 1.10)
-      parser (>= 3.1.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.19.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.19.1)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    thor (1.2.2)
-    tty-color (0.6.0)
-    tty-cursor (0.7.1)
-    tty-prompt (0.23.1)
-      pastel (~> 0.8)
-      tty-reader (~> 0.8)
-    tty-reader (0.9.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.8)
-      wisper (~> 2.0)
-    tty-screen (0.8.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.2.0)
-    version (1.1.1)
-    webrick (1.7.0)
-    wisper (2.0.1)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
-    yard-rspec (0.1)
-      yard
-
-PLATFORMS
-  arm64-darwin-20
-  ruby
-
-DEPENDENCIES
-  bundle-audit (~> 0.1.0)
-  carioca!
-  code_statistics (~> 0.2.13)
-  cyclonedx-ruby (~> 1.1)
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop (~> 1.32)
-  yard (~> 0.9.27)
-  yard-rspec (~> 0.1)
-
-BUNDLED WITH
-   2.3.24