bbk-utils 1.1.2.304819 → 1.1.4.347221

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '049d051da4626f8c633a7ac067acaedd75f77f62345587c74f7a1fbd752af07e'
-  data.tar.gz: 56bd4a0736bff72b6c3d54ca47585b41117ae0b05e44ebc353d0c5dfbc422bb2
+  metadata.gz: e601361c651d61761ffbe5cd14b0162a1478d8719040fe23e69f372a6e6e2f22
+  data.tar.gz: 6a2e93d96f97fd5686d6e1a66e57dc86ae918d92a0914154cd2f4f85ca725af3
 SHA512:
-  metadata.gz: 398384ac2f5e39ad66f65fb6d225a605f647e3a6ef7075bf9e959d34fdb78bfefb70d59ab254b642f9946a1aa039ccc8675b18f6e9210365bccbeaeac872ee71
-  data.tar.gz: 851de34e925bda605eb432bb212284303bd2af7172b588e1b81b1fd405df51899293b6dadf63719644ef2b41fa944d9ca74c8fa432ed421c280e229020dc90f2
+  metadata.gz: d0cb09b8b53016c4462a441bc640fdee4d9ff8bb0bf35c4d2c71c647b88643157788536f1689031beb42ec2b2dfdd4ef620aa3ac1489737820a6c4a83cf4f423
+  data.tar.gz: 17281a82684e76a490f8dd8140684648c4317dc9fbee6dfc9eaa3d9f75b019f828c48604de28b1399c8904f7aa8cb2be00ac2aea43cbd37f6014c3c8102c6b55

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bbk-utils (1.1.2.304819)
+    bbk-utils (1.1.4.347221)
       activesupport (>= 7.0)
       russian
       securerandom (~> 0.3.2)
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.5.1)
+    activesupport (7.1.6)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -30,19 +30,19 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (3.3.1)
     byebug (11.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.2.2)
-    connection_pool (2.5.3)
+    connection_pool (2.5.5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.6.0)
     docile (1.4.0)
-    drb (2.2.1)
+    drb (2.2.3)
     equalizer (0.0.11)
     erubis (2.7.0)
     faker (2.19.0)
@@ -63,7 +63,7 @@ GEM
     launchy (2.5.0)
       addressable (~> 2.7)
     logger (1.7.0)
-    minitest (5.25.5)
+    minitest (5.26.1)
     mutex_m (0.3.0)
     parallel (1.21.0)
     parser (3.0.3.1)

data/lib/bbk/utils/config.rb

@@ -5,6 +5,7 @@ module BBK
     class Config
 
       PREFIX_SEP = '_'
+      FILTERED_VALUE = '[FILTERED]'
 
       attr_accessor :store, :name
       attr_reader :prefix, :env_prefix, :parent
@@ -78,7 +79,7 @@ module BBK
         }
       end
 
-      def require(env, desc: nil, bool: false, type: nil, key: nil, rewrite: true)
+      def require(env, desc: nil, bool: false, type: nil, key: nil, rewrite: true, secure: false)
         raise ArgumentError.new('Specified type and bool') if bool && type.present?
 
         type = BBK::Config::BooleanCaster.singleton_method(:cast) if bool
@@ -91,11 +92,12 @@ module BBK
           required: true,
           desc:     desc,
           bool:     bool,
-          type:     type
+          type:     type,
+          secure:   secure
         }
       end
 
-      def optional(env, default: nil, desc: nil, bool: false, type: nil, key: nil, rewrite: true)
+      def optional(env, default: nil, desc: nil, bool: false, type: nil, key: nil, rewrite: true, secure: false)
         raise ArgumentError.new('Specified type and bool') if bool && type.present?
 
         type = BBK::Utils::Config::BooleanCaster.singleton_method(:cast) if bool
@@ -109,7 +111,8 @@ module BBK
           default:  default,
           desc:     desc,
           bool:     true,
-          type:     type
+          type:     type,
+          secure:   secure
         }
       end
 
@@ -313,15 +316,26 @@ module BBK
 
         def print_item(item, padding)
           line = padding + wrap_required(item)
-          line += " (=#{item[:default]})" if item[:default].present?
+          if item[:default].present?
+            def_value = if item[:secure]
+              FILTERED_VALUE
+            else
+              item[:default]
+            end
+            line += " (=#{def_value})"
+          end
 
           line = if item[:desc].present?
             "#{line.ljust(50)} #{item[:desc]}"
           else
             line
           end
-
-          "#{line}\n#{padding * 2}-> #{item[:value].inspect}"
+          value = if item[:secure]
+            FILTERED_VALUE
+          else
+            item[:value].inspect
+          end
+          "#{line}\n#{padding * 2}-> #{value}"
         end
 
         def wrap_required(item)

data/lib/bbk/utils/env_helper.rb

@@ -33,22 +33,24 @@ module BBK
       end
 
       def self.build_uri_with_defaults(env, prefix: DEFAULT_DATABASE_PREFIX)
-        ::URI.parse(env[prefixed_key(prefix, 'URL')] || '').tap do |uri|
-          uri.scheme    = env.fetch(prefixed_key(prefix, 'ADAPTER'), uri.scheme) || 'postgresql'
-          uri.user      = env.fetch(prefixed_key(prefix, 'USER'), uri.user) || 'postgres'
-          uri.password  = env.fetch(prefixed_key(prefix, 'PASS'),    uri.password)
-          uri.hostname  = env.fetch(prefixed_key(prefix, 'HOST'),    uri.hostname) || 'db'
-          uri.port      = env.fetch(prefixed_key(prefix, 'PORT'),    uri.port) || 5432
+        ::URI.parse(env[prefixed_key(prefix, 'URL')] || '').then do |uri|
+          result = uri.clone
+          result.scheme    = env.fetch(prefixed_key(prefix, 'ADAPTER'), uri.scheme) || 'postgresql'
+          result.hostname  = env.fetch(prefixed_key(prefix, 'HOST'),    uri.hostname) || 'db'
+          result.port      = env.fetch(prefixed_key(prefix, 'PORT'),    uri.port) || 5432
+          result.user      = env.fetch(prefixed_key(prefix, 'USER'), uri.user) || 'postgres'
+          result.password  = env.fetch(prefixed_key(prefix, 'PASS'), uri.password)
 
           name = env.fetch(prefixed_key(prefix, 'NAME'), uri.path) || ''
           name = "/#{name}" unless name.start_with?('/')
-          uri.path = name
+          result.path = name
 
           if uri.query
             params = URI.decode_www_form(uri.query).to_h
             params['pool'] = env.fetch(prefixed_key(prefix, 'POOL'), params['pool'])
-            uri.query = URI.encode_www_form(params)
+            result.query = URI.encode_www_form(params)
           end
+          result
         end
       end
 
@@ -76,17 +78,19 @@ module BBK
                            URI.parse(url).hostname || 'mq').split(/[;|]/)].flatten.select(&:present?).uniq
 
         hosts.map do |host|
-          URI.parse(url).tap do |uri|
-            uri.scheme   = uri.scheme || 'amqps'
-            uri.hostname = host
-            uri.port     = env.fetch('MQ_PORT', uri.port) || 5671
-            uri.user     = env.fetch('MQ_USER', uri.user)
-            uri.password = env.fetch('MQ_PASS', uri.password)
+          URI.parse(url).then do |uri|
+            result = uri.clone
+            result.scheme   = uri.scheme || 'amqps'
+            result.hostname = host
+            result.port     = env.fetch('MQ_PORT', uri.port) || 5671
+            result.user     = env.fetch('MQ_USER', uri.user)
+            result.password = env.fetch('MQ_PASS', uri.password)
 
             vhost = [env.fetch('MQ_VHOST', uri.path), '/'].find(&:present?)
             vhost = "/#{vhost}" unless vhost.start_with?('/')
 
-            uri.path = vhost
+            result.path = vhost
+            result
           end
         end
       end
@@ -107,7 +111,6 @@ module BBK
         env['MQ_VHOST'] = vhost
       end
 
-
       def self.prefixed_key(prefix, name)
         [prefix, name].select(&:present?).join('_')
       end

data/lib/bbk/utils/version.rb

@@ -3,7 +3,7 @@
 module BBK
   module Utils
 
-    VERSION = '1.1.2'.freeze
+    VERSION = '1.1.4'
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbk-utils
 version: !ruby/object:Gem::Version
-  version: 1.1.2.304819
+  version: 1.1.4.347221
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-20 00:00:00.000000000 Z
+date: 2025-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport