bbk-utils 1.1.0.149110 → 1.1.0.273317

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5a90e5fb2e9e12fcce7025e4db9358853b9b277c43660cb23d168dabd2957ed
-  data.tar.gz: 9133ac9e0fca489c65abe5b6702429fbb750537b1f092d5a6b0481caaf8c746c
+  metadata.gz: 92bd4633caa38405fd9ec5f01f101842716c0808c3bc86776c4880d0120006c1
+  data.tar.gz: 3593415e0eec611b5ca305a4d5ba6f59c92591943b00c9c96415f5bfc6441b4a
 SHA512:
-  metadata.gz: 760c5aedb896030e63fde2ba5ad280f0e2ecc5ad19834c6e72fd7a6eb9551549b7750d085253a72999a49633f08862dc6eb5af9053615d70cf07fa9c41a381f7
-  data.tar.gz: f83185cf18a0658798b325ce78308d72e29585aea238340a90c33b9c56e654886d717b5bd1886617052f0fb4a5f646a2f176f1b177fafc2c4efba1c543b64cc3
+  metadata.gz: 90f54d3498b381d24f737147ce5eaf7f5ca717a44c2e830ff307fa41616f5866e5c2f3dba3fe1495904b15da1480d24691f90113c97ede2ea1d4e04c7c7d532c
+  data.tar.gz: 3306151c09eba11399f139134d65457d52d355fd7b23a59cb056ba2a6f901c4e7744d47acb0d56fe5d86ce3441ad1dde05589f46a3b2beb6d2fbdec0d113f399

data/Gemfile.lock

@@ -1,17 +1,25 @@
 PATH
   remote: .
   specs:
-    bbk-utils (1.1.0.149110)
+    bbk-utils (1.1.0.273317)
       activesupport (>= 7.0)
       russian
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.5)
+    activesupport (7.1.5)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
       tzinfo (~> 2.0)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
@@ -21,14 +29,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.8)
     byebug (11.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.4.4)
     docile (1.4.0)
+    drb (2.2.1)
     equalizer (0.0.11)
     erubis (2.7.0)
     faker (2.19.0)
@@ -48,7 +61,9 @@ GEM
     kwalify (0.7.2)
     launchy (2.5.0)
       addressable (~> 2.7)
-    minitest (5.18.0)
+    logger (1.6.1)
+    minitest (5.25.1)
+    mutex_m (0.2.0)
     parallel (1.21.0)
     parser (3.0.3.1)
       ast (~> 2.4.1)
@@ -106,6 +121,7 @@ GEM
       virtus (~> 1.0)
     russian (0.6.0)
       i18n (>= 0.5.0)
+    securerandom (0.3.2)
     sexp_processor (4.16.0)
     simplecov (0.21.2)
       docile (~> 1.1)

data/lib/bbk/utils/config.rb

@@ -4,7 +4,7 @@ module BBK
   module Utils
     class Config
 
-      PREFIX_SEP = '_'.freeze
+      PREFIX_SEP = '_'
 
       attr_accessor :store, :name
       attr_reader :prefix, :env_prefix, :parent
@@ -60,8 +60,11 @@ module BBK
         @env_prefix = normalize_key(@prefixes.join(PREFIX_SEP))
       end
 
-      def map(env, file, required: true, desc: nil, bool: false, key: nil)
-        @store[full_prefixed_key(env)] = {
+      def map(env, file, required: true, desc: nil, bool: false, key: nil, rewrite: true)
+        conf_key = full_prefixed_key(env)
+        return if @store.key?(conf_key) && !rewrite
+
+        @store[conf_key] = {
           env:      full_prefixed_key(key || env),
           file:     file,
           required: required,
@@ -71,11 +74,14 @@ module BBK
         }
       end
 
-      def require(env, desc: nil, bool: false, type: nil, key: nil)
+      def require(env, desc: nil, bool: false, type: nil, key: nil, rewrite: true)
         raise ArgumentError.new('Specified type and bool') if bool && type.present?
 
         type = BBK::Config::BooleanCaster.singleton_method(:cast) if bool
-        @store[full_prefixed_key(env)] = {
+        conf_key = full_prefixed_key(env)
+        return if @store.key?(conf_key) && !rewrite
+
+        @store[conf_key] = {
           env:      full_prefixed_key(key || env),
           file:     nil,
           required: true,
@@ -85,11 +91,14 @@ module BBK
         }
       end
 
-      def optional(env, default: nil, desc: nil, bool: false, type: nil, key: nil)
+      def optional(env, default: nil, desc: nil, bool: false, type: nil, key: nil, rewrite: true)
         raise ArgumentError.new('Specified type and bool') if bool && type.present?
 
         type = BBK::Utils::Config::BooleanCaster.singleton_method(:cast) if bool
-        @store[full_prefixed_key(env)] = {
+        conf_key = full_prefixed_key(env)
+        return if @store.key?(conf_key) && !rewrite
+
+        @store[conf_key] = {
           env:      full_prefixed_key(key || env),
           file:     nil,
           required: false,
@@ -104,17 +113,16 @@ module BBK
         @store.each_value do |item|
           process(source, item)
         end
-        @subconfigs.each {|sub| sub.run!(source)}
+        @subconfigs.each {|sub| sub.run!(source) }
         nil
       end
 
-      def subconfig(prefix: , name: nil)
+      def subconfig(prefix:, name: nil)
         raise ArgumentError.new("Subconfig with prefix #{prefix} already exists") if @subconfigs.any? {|sub| sub.prefix == prefix.to_s }
+
         sub = self.class.new(name: name, prefix: prefix, parent: self)
         @subconfigs << sub
-        if block_given?
-          yield sub
-        end
+        yield sub if block_given?
         sub
       end
 
@@ -187,48 +195,43 @@ module BBK
 
       protected
 
-      def prefixes
-        @prefixes
-      end
+        attr_reader :prefixes
 
-      def get(key, search_up: false, search_down: false)
-        normalized_key = normalize_key(key)
-        if @store.key?(normalized_key)
-          return @store[normalized_key]
-        end
-        prefix_key = full_prefixed_key(key)
-        if @store.key?(prefix_key)
-          return @store[prefix_key]
-        end
-        if search_down
-          sub_prefixed_keys(key).each do |pref_key|
-            if @store.key?(pref_key)
-              return @store[pref_key]
-            end
+        def get(key, search_up: false, search_down: false)
+          normalized_key = normalize_key(key)
+          return @store[normalized_key] if @store.key?(normalized_key)
+
+          prefix_key = full_prefixed_key(key)
+          return @store[prefix_key] if @store.key?(prefix_key)
 
-            subconf = @subconfigs.find {|sub| pref_key.starts_with?(sub.env_prefix)}
-            next if subconf.nil?
-            return subconf.get(pref_key, search_up: false, search_down: true)
+          if search_down
+            sub_prefixed_keys(key).each do |pref_key|
+              return @store[pref_key] if @store.key?(pref_key)
+
+              subconf = @subconfigs.find {|sub| pref_key.starts_with?(sub.env_prefix) }
+              next if subconf.nil?
+
+              return subconf.get(pref_key, search_up: false, search_down: true)
+            end
           end
+          return @parent.get(key, search_up: true, search_down: false) if search_up && @parent
+
+          raise KeyError.new("There is no such key: #{key} in config!")
         end
-        if search_up && @parent
-          return @parent.get(key, search_up: true, search_down: false)
-        end
-        raise KeyError.new("There is no such key: #{key} in config!")
-      end
 
-      def store_with_subconfigs
-        res = @store.dup
-        @subconfigs.each do |sub|
-          res = res.merge(sub.store_with_subconfigs)
+        def store_with_subconfigs
+          res = @store.dup
+          @subconfigs.each do |sub|
+            res = res.merge(sub.store_with_subconfigs)
+          end
+          res
         end
-        res
-      end
 
       private
 
         def normalize_key(key)
           return nil if key.nil?
+
           key.to_s.upcase.gsub('-', '_')
         end
 

data/lib/bbk/utils/env_helper.rb

@@ -6,9 +6,11 @@ module BBK
   module Utils
     module EnvHelper
 
-      def self.prepare_database_envs(env)
-        uri = build_uri_with_defaults(env)
-        apply_env_from_uri(env, uri)
+      DEFAULT_DATABASE_PREFIX = 'DATABASE'
+
+      def self.prepare_database_envs(env, prefix: DEFAULT_DATABASE_PREFIX)
+        uri = build_uri_with_defaults(env, prefix: prefix)
+        apply_env_from_uri(env, uri, prefix: prefix)
         env
       end
 
@@ -30,38 +32,38 @@ module BBK
         env
       end
 
-      def self.build_uri_with_defaults(env)
-        ::URI.parse(env['DATABASE_URL'] || '').tap do |uri|
-          uri.scheme    = env.fetch('DATABASE_ADAPTER', uri.scheme) || 'postgresql'
-          uri.user      = env.fetch('DATABASE_USER',    uri.user) || 'postgres'
-          uri.password  = env.fetch('DATABASE_PASS',    uri.password)
-          uri.hostname  = env.fetch('DATABASE_HOST',    uri.hostname) || 'db'
-          uri.port      = env.fetch('DATABASE_PORT',    uri.port) || 5432
+      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
 
-          name = env.fetch('DATABASE_NAME', uri.path) || ''
+          name = env.fetch(prefixed_key(prefix, 'NAME'), uri.path) || ''
           name = "/#{name}" unless name.start_with?('/')
           uri.path = name
 
           if uri.query
             params = URI.decode_www_form(uri.query).to_h
-            params['pool'] = env.fetch('DATABASE_POOL', params['pool'])
+            params['pool'] = env.fetch(prefixed_key(prefix, 'POOL'), params['pool'])
             uri.query = URI.encode_www_form(params)
           end
         end
       end
 
-      def self.apply_env_from_uri(env, uri)
-        env['DATABASE_URL'] = uri.to_s
-        env['DATABASE_ADAPTER'] = uri.scheme
-        env['DATABASE_USER'] = uri.user
-        env['DATABASE_PASS'] = uri.password
-        env['DATABASE_HOST'] = uri.hostname
-        env['DATABASE_PORT'] = uri.port.to_s
-        env['DATABASE_NAME'] = uri.path[1..-1]
+      def self.apply_env_from_uri(env, uri, prefix: DEFAULT_DATABASE_PREFIX)
+        env[prefixed_key(prefix, 'URL')] = uri.to_s
+        env[prefixed_key(prefix, 'ADAPTER')] = uri.scheme
+        env[prefixed_key(prefix, 'USER')] = uri.user
+        env[prefixed_key(prefix, 'PASS')] = uri.password
+        env[prefixed_key(prefix, 'HOST')] = uri.hostname
+        env[prefixed_key(prefix, 'PORT')] = uri.port.to_s
+        env[prefixed_key(prefix, 'NAME')] = uri.path[1..-1]
 
         if uri.query
           params = URI.decode_www_form(uri.query).to_h
-          env['DATABASE_POOL'] = params['pool']
+          env[prefixed_key(prefix, 'POOL')] = params['pool']
         end
       end
 
@@ -105,6 +107,11 @@ module BBK
         env['MQ_VHOST'] = vhost
       end
 
+
+      def self.prefixed_key(prefix, name)
+        [prefix, name].select(&:present?).join('_')
+      end
+
     end
   end
 end

data/sig/bbk/config.rbs

@@ -17,7 +17,7 @@ module BBK
 
       type typeCaster = _CallableCaster | _ClassCaster
       type configItem = {env: String, file: String?, required: bool, desc: String?, bool: bool, value: untyped, default: untyped, type: typeCaster?}
-      type envSource = _ENV | ENVClass
+      type envSource = ENVClass | _ENV
 
       attr_accessor store: untyped
       attr_accessor name: String?
@@ -25,9 +25,9 @@ module BBK
       def self.instance: () -> instance
       
       def initialize: (?name: String?, ?prefix: String?, ?parent: BBK::Utils::Config?) -> void
-      def map: (envSource env, String file, ?required: bool, ?desc: String, ?bool: bool, ?key: String) -> void
-      def require: (envSource env, ?desc: String?, ?bool: bool, ?type: typeCaster, ?key: String?) -> void
-      def optional: (envSource env, ?default: untyped, ?desc: String, ?bool: bool, ?type: typeCaster, ?key: String) -> void
+      def map: (envSource env, String file, ?required: bool, ?desc: String, ?bool: bool, ?key: String, ?rewrite: bool) -> void
+      def require: (envSource env, ?desc: String?, ?bool: bool, ?type: typeCaster, ?key: String?, ?rewrite: bool) -> void
+      def optional: (envSource env, ?default: untyped, ?desc: String, ?bool: bool, ?type: typeCaster, ?key: String, ?rewrite: bool) -> void
 
       def run!: (?envSource source) -> void
       def []: (String key) -> untyped

data/sig/bbk/env_helper.rbs

@@ -2,11 +2,11 @@ module BBK
   module Utils
     module EnvHelper
 
-      def self.prepare_database_envs: (Hash[String, untyped]|::_ENV env ) -> (Hash[String,untyped]|::_ENV)
+      def self.prepare_database_envs: (Hash[String, untyped]|::_ENV env, ?prefix: String) -> (Hash[String,untyped]|::_ENV)
       def self.prepare_mq_envs: (Hash[String, untyped]|::_ENV env) -> (Hash[String, untyped]|::_ENV)
       def self.prepare_jaeger_envs: (Hash[String, untyped]|::_ENV env) -> (Hash[String, untyped]|::_ENV)
-      def self.build_uri_with_defaults: (Hash[String, untyped]|::_ENV env) -> URI::Generic
-      def self.apply_env_from_uri: (Hash[String, untyped]|::_ENV env, URI::Generic uri) -> void
+      def self.build_uri_with_defaults: (Hash[String, untyped]|::_ENV env, ?prefix: String) -> URI::Generic
+      def self.apply_env_from_uri: (Hash[String, untyped]|::_ENV env, URI::Generic uri, ?prefix: String) -> void
       def self.build_mq_uri_with_defaults: (Hash[String, untyped]|::_ENV env) -> Array[URI::Generic]
       def self.apply_mq_env_from_uri: (Hash[String, untyped]|::_ENV env, Array[URI::Generic] uris) -> void
     end

data/sig/env.rbs

@@ -1,4 +1,4 @@
 interface _ENV
-  def []: (String) -> String
+  def []: (String) -> String?
   def []=: (String) -> String
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbk-utils
 version: !ruby/object:Gem::Version
-  version: 1.1.0.149110
+  version: 1.1.0.273317
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-06 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Support classes for BBK stack