bbk-utils 1.1.0.181866 → 1.1.0.274232

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1a8c300322287bbbf395a5006d97201575d85569bee0977c0dff202ff57df2a
-  data.tar.gz: 546cdd733680ba4d991cf1ec2fd86029bc911983416e0b34d130a9a9ea2ac5e1
+  metadata.gz: aa5bf79355f0502dac8a98c8787110d2b01005c65b75fa2324c2cd60e8acbebd
+  data.tar.gz: ae180dd77410662e8e51844d3b66196b4a25447228b7c517b5f11895c029e796
 SHA512:
-  metadata.gz: 93e8581c5c069019f59c42d6ba23319a3831e3a51e99ee64510a351663d9943546f786bab3b4728ea616a955d5ad2745c15a1102a40f0021cae82d2c3978eb4f
-  data.tar.gz: b1274cb1d916382beb6e016787e97606b454a72eff52207020a886f2b329129f3c4d76a7998b702b0f70e4014ef9a0d42b2433da7631b592f7d8d64997baa287
+  metadata.gz: b59a647ba32ba9cd150beeb1c5aa9dd3c387f4695162099fb30278bc6237d534ab086a7d6415fd0da62ec187804a4679704bcf00e4723fe0c1948213da42bb91
+  data.tar.gz: 8b806d3b3871d8713a564a35b75ceadb72e8e7336c6fec1362772233b4b48cf86aa0f88d9183dc5803fc28253d222dae45200b7c685f0c8d089d604a2e94aa3a

data/Gemfile.lock

@@ -1,17 +1,25 @@
 PATH
   remote: .
   specs:
-    bbk-utils (1.1.0.181866)
+    bbk-utils (1.1.0.274232)
       activesupport (>= 7.0)
       russian
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.7.2)
+    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.19.0)
+    logger (1.6.1)
+    minitest (5.25.1)
+    mutex_m (0.3.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)
+
+          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)
+              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
 
@@ -254,7 +257,7 @@ module BBK
 
           # Если данные есть, либо указан тип (нужно для того чтобы переменная была нужного типа)
           if content.present? || item[:type].present?
-            if file = item[:file]
+            if (file = item[:file])
               dirname = File.dirname(file)
               FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
               File.write(file, content)
@@ -273,7 +276,11 @@ module BBK
           elsif item[:required]
             required!(item)
           else
-            item[:value] = content
+            item[:value] = if (file = item[:file]).present? && File.exist?(file)
+              file
+            else
+              content
+            end
           end
         rescue StandardError => e
           msg = "Failed processing #{item[:env]} parameter. #{e.inspect}"

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/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.181866
+  version: 1.1.0.274232
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport