bbk-utils 1.0.1.147183 → 1.1.0.181866

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9e803d8681188bee3d02f0136ca8e23e879895bde7d7f36f954430c17ae375f
-  data.tar.gz: 917d6a58f8b48a3162c46504c9ea5a499b9c4444d8ed3e016e107f7d9e1a73a6
+  metadata.gz: d1a8c300322287bbbf395a5006d97201575d85569bee0977c0dff202ff57df2a
+  data.tar.gz: 546cdd733680ba4d991cf1ec2fd86029bc911983416e0b34d130a9a9ea2ac5e1
 SHA512:
-  metadata.gz: 6ab6b068166a4bd68677644cac4f00a810f54e921353bdad6e7772aac947d55c9618c447c6277ff899b249122fb1de98bd2153147ada6a8ed3318e774cf33e8c
-  data.tar.gz: 12b7f0f487d56d9edd31183f7d428ed9a7bf5639c5e6496cabccb306e8d3cc764eca18c373513b4982323b2f9bf2ee0b51d379afc7b661cd16ab411a4ff53874
+  metadata.gz: 93e8581c5c069019f59c42d6ba23319a3831e3a51e99ee64510a351663d9943546f786bab3b4728ea616a955d5ad2745c15a1102a40f0021cae82d2c3978eb4f
+  data.tar.gz: b1274cb1d916382beb6e016787e97606b454a72eff52207020a886f2b329129f3c4d76a7998b702b0f70e4014ef9a0d42b2433da7631b592f7d8d64997baa287

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    bbk-utils (1.0.1.147183)
-      activesupport (>= 6.0)
+    bbk-utils (1.1.0.181866)
+      activesupport (>= 7.0)
       russian
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.5)
+    activesupport (7.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -24,7 +24,7 @@ GEM
     byebug (11.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.4.4)
@@ -42,13 +42,13 @@ GEM
       path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.8)
-    i18n (1.8.11)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     kwalify (0.7.2)
     launchy (2.5.0)
       addressable (~> 2.7)
-    minitest (5.18.0)
+    minitest (5.19.0)
     parallel (1.21.0)
     parser (3.0.3.1)
       ast (~> 2.4.1)

data/lib/bbk/utils/combined_logger.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+module BBK
+  module Utils
+    class CombinedLogger
+
+      include ::Logger::Severity
+
+      attr_reader :loggers, :progname, :level, :formatter
+
+      def self.new(*args, **kwargs)
+        ActiveSupport::TaggedLogging.new(super)
+      end
+
+      def initialize(progname, *loggers, formatter: LogFormatter.new, level: Logger::Severity::INFO)
+        @loggers = loggers
+        self.progname = progname
+        self.level = level
+        self.formatter = formatter
+      end
+
+      def progname=(name)
+        @progname = name
+        @loggers.each {|logger| logger.progname = name}
+      end
+  
+      def formatter=(formatter)
+        @formatter = formatter
+        @loggers.each {|logger| logger.formatter = formatter}
+      end
+  
+      def level=(level)
+        log_level = if  level.is_a?(Integer) || (Integer(level) rescue false)
+          level
+        else
+          self.class.const_get(level.to_s.upcase)
+        end
+        @level = log_level
+        @loggers.each {|logger| logger.level = log_level }
+      end
+
+      alias sev_threshold level
+      alias sev_threshold= level=    
+  
+      %i[debug info warn error fatal].each do |level|
+        define_method(level) do |*args, &block|
+          loggers.each {|logger| logger.send(level, *args, &block)}
+          nil
+        end
+
+        define_method("#{level}?") do
+          self.level <= self.class.const_get(level.upcase.to_sym)
+        end
+
+        define_method("#{level}!") do
+          self.level = self.class.const_get(level.upcase.to_sym)
+        end
+
+      end
+
+      def method_missing(name, *args, **kwargs, &block)
+        @loggers.each {|logger| logger.send(name, *args, **kwargs, &block)}
+        nil
+      end
+  
+      def clone
+        super.tap do |it| 
+          it.instance_variable_set(:@loggers, loggers.map(&:clone)) 
+        end 
+      end
+
+    end
+  end
+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/lib/bbk/utils/version.rb

@@ -3,7 +3,7 @@
 module BBK
   module Utils
 
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'.freeze
 
   end
 end

data/lib/bbk/utils.rb

@@ -5,6 +5,7 @@ require 'active_support/core_ext'
 require 'bbk/utils/config'
 require 'bbk/utils/crypt'
 require 'bbk/utils/logger'
+require 'bbk/utils/combined_logger'
 require 'bbk/utils/proxy_logger'
 require 'bbk/utils/version'
 require 'bbk/utils/xml'

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbk-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.1.147183
+  version: 1.1.0.181866
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: russian
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +219,7 @@ files:
 - bin/console
 - bin/setup
 - lib/bbk/utils.rb
+- lib/bbk/utils/combined_logger.rb
 - lib/bbk/utils/config.rb
 - lib/bbk/utils/crypt.rb
 - lib/bbk/utils/env_helper.rb
@@ -256,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