bbk-utils 1.1.0.149110 → 1.1.0.181866

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5a90e5fb2e9e12fcce7025e4db9358853b9b277c43660cb23d168dabd2957ed
-  data.tar.gz: 9133ac9e0fca489c65abe5b6702429fbb750537b1f092d5a6b0481caaf8c746c
+  metadata.gz: d1a8c300322287bbbf395a5006d97201575d85569bee0977c0dff202ff57df2a
+  data.tar.gz: 546cdd733680ba4d991cf1ec2fd86029bc911983416e0b34d130a9a9ea2ac5e1
 SHA512:
-  metadata.gz: 760c5aedb896030e63fde2ba5ad280f0e2ecc5ad19834c6e72fd7a6eb9551549b7750d085253a72999a49633f08862dc6eb5af9053615d70cf07fa9c41a381f7
-  data.tar.gz: f83185cf18a0658798b325ce78308d72e29585aea238340a90c33b9c56e654886d717b5bd1886617052f0fb4a5f646a2f176f1b177fafc2c4efba1c543b64cc3
+  metadata.gz: 93e8581c5c069019f59c42d6ba23319a3831e3a51e99ee64510a351663d9943546f786bab3b4728ea616a955d5ad2745c15a1102a40f0021cae82d2c3978eb4f
+  data.tar.gz: b1274cb1d916382beb6e016787e97606b454a72eff52207020a886f2b329129f3c4d76a7998b702b0f70e4014ef9a0d42b2433da7631b592f7d8d64997baa287

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    bbk-utils (1.1.0.149110)
+    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)
@@ -48,7 +48,7 @@ GEM
     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/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/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.1.0.149110
+  version: 1.1.0.181866
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-06 00:00:00.000000000 Z
+date: 2023-08-31 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