bbk-utils 1.0.1.89770 → 1.0.1.97958

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9a7afa5a8879bb88c539dd0d11b2c4e57321cfb729de3bd5fe1e31d4becea87
-  data.tar.gz: d57ebc66b8468c354b0124dc3ada3eba12738b67863d3bab9010c562fdf8a8df
+  metadata.gz: 5a9dd5f6805e9488cae5ff150b2f7ea51a8eca58336d43428f16a6f7a34990cf
+  data.tar.gz: 3d6f9115d2e8def51a08249497a52b4750c6b7ccf6c62bd83d7ceb163f3153ee
 SHA512:
-  metadata.gz: b0adb7b4527d8bff9241d7c6bc7da35749cfbc872dcfc1cf1d68efb4752a4c479a950cf26da1a8dc9a2b68137f743fbc152fc9daa2e1887208663ec2683b0d6c
-  data.tar.gz: 22e33eac745da9ba63d698218013ce1621dd7a75e4a6ca63030e0566699ec8a206f144b0552fee4c1b0b7f8e6f9f502450cf2559f60514e66c8a19163cbc715a
+  metadata.gz: 97152af15bb34e112bba23897a836428fec883b5b7b8017bbbe8d241a058d3b0b00685cad35c18f089e5a5abcb08ca46ea81dad9311e01dd2703eabae5e0f4a9
+  data.tar.gz: cae731d7f2cb468e5b311e889db29d04ee82cae9b7b956099cc03ecdde90a9a42ea9f7437d87ef4263af84346513e59f3970c8da7a6d2ff436ada6373ad29ad8

data/Gemfile.lock

@@ -1,19 +1,18 @@
 PATH
   remote: .
   specs:
-    bbk-utils (1.0.1.89770)
-      activesupport (~> 6.0)
+    bbk-utils (1.0.1.97958)
+      activesupport (>= 6.0)
       russian
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.6)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
@@ -49,7 +48,7 @@ GEM
     kwalify (0.7.2)
     launchy (2.5.0)
       addressable (~> 2.7)
-    minitest (5.16.2)
+    minitest (5.16.3)
     parallel (1.21.0)
     parser (3.0.3.1)
       ast (~> 2.4.1)
@@ -125,7 +124,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     thread_safe (0.3.6)
     tty-which (0.4.2)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     virtus (1.0.5)
@@ -133,7 +132,6 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby

data/lib/bbk/utils/config.rb

@@ -4,7 +4,12 @@ module BBK
   module Utils
     class Config
 
+      PREFIX_SEP = '_'.freeze
+
       attr_accessor :store, :name
+      attr_reader :prefix, :env_prefix, :parent
+
+      class KeyError < StandardError; end
 
       class BooleanCaster
 
@@ -29,8 +34,8 @@ module BBK
 
       end
 
-      def self.instance
-        @instance ||= new
+      def self.instance(prefix: nil)
+        @instance ||= new(prefix: prefix)
       end
 
       class << self
@@ -40,14 +45,23 @@ module BBK
 
       end
 
-      def initialize(name = nil)
+      def initialize(name: nil, prefix: nil, parent: nil)
         @name = name
         @store = {}
+        @parent = parent
+        @subconfigs = []
+        @prefix = normalize_key(prefix)
+        @prefixes = if parent.nil?
+          [@prefix]
+        else
+          parent.prefixes.dup + [@prefix]
+        end.compact
+        @env_prefix = normalize_key(@prefixes.join(PREFIX_SEP))
       end
 
       def map(env, file, required: true, desc: nil, bool: false, key: nil)
-        @store[env.to_s.upcase] = {
-          env:      (key || env).to_s.upcase,
+        @store[full_prefixed_key(env)] = {
+          env:      full_prefixed_key(key || env),
           file:     file,
           required: required,
           desc:     desc,
@@ -60,8 +74,8 @@ module BBK
         raise ArgumentError.new('Specified type and bool') if bool && type.present?
 
         type = BBK::Config::BooleanCaster.singleton_method(:cast) if bool
-        @store[env.to_s.upcase] = {
-          env:      (key || env).to_s.upcase,
+        @store[full_prefixed_key(env)] = {
+          env:      full_prefixed_key(key || env),
           file:     nil,
           required: true,
           desc:     desc,
@@ -74,8 +88,8 @@ module BBK
         raise ArgumentError.new('Specified type and bool') if bool && type.present?
 
         type = BBK::Utils::Config::BooleanCaster.singleton_method(:cast) if bool
-        @store[env.to_s.upcase] = {
-          env:      (key || env).to_s.upcase,
+        @store[full_prefixed_key(env)] = {
+          env:      full_prefixed_key(key || env),
           file:     nil,
           required: false,
           default:  default,
@@ -89,10 +103,22 @@ module BBK
         @store.each_value do |item|
           process(source, item)
         end
+        @subconfigs.each {|sub| sub.run!(source)}
+        nil
+      end
+
+      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
+        sub
       end
 
       def [](key)
-        @store[normalize_key(key)][:value]
+        self.get(key, search_up: true, search_down: true)[:value]
       end
 
       def []=(key, value)
@@ -109,19 +135,20 @@ module BBK
       end
 
       def fetch(key, default = nil)
-        # store.fetch(key.to_s.upcase, default)
-        if (field = store[key.to_s.upcase]).present? && field.key?(:value)
-          field[:value]
+        if (rec = self.get(key, search_up: true, search_down: true)) && rec.key?(:value)
+          rec[:value]
         else
           default
         end
+      rescue KeyError
+        default
       end
 
       def to_s
         result = StringIO.new
         result.puts "Environment variables#{@name ? " for #{@name}" : ''}:"
         padding = ' ' * 3
-        sorted = @store.values.sort_by do |item|
+        sorted = store_with_subconfigs.values.sort_by do |item|
           [item[:file].present? ? 0 : 1, item[:required] ? 0 : 1]
         end
 
@@ -136,7 +163,7 @@ module BBK
       end
 
       def as_json(*_args)
-        values = @store.values.sort_by do |item|
+        values = store_with_subconfigs.sort_by do |item|
           [item[:file].present? ? 0 : 1, item[:required] ? 0 : 1]
         end.reduce({}) do |ret, item|
           ret.merge(item[:env] => item)
@@ -153,13 +180,72 @@ module BBK
         JSON.parse(to_json).to_yaml
       end
 
+      def root?
+        @parent.nil?
+      end
+
+      protected
+
+      def prefixes
+        @prefixes
+      end
+
+      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
+
+            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
+        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)
+        end
+        res
+      end
+
       private
 
         def normalize_key(key)
-          k = key.to_s.upcase
-          raise "There is no such key: #{k} in config!" unless @store.key?(k)
+          return nil if key.nil?
+          key.to_s.upcase
+        end
 
-          k
+        def full_prefixed_key(key)
+          p_key = if env_prefix.empty?
+            [key.to_s]
+          else
+            [env_prefix, key.to_s]
+          end.join(PREFIX_SEP)
+          normalize_key(p_key)
+        end
+
+        def sub_prefixed_keys(key)
+          Enumerator.new do |yielder|
+            @prefixes.size.downto(0).each do |last_index|
+              yielder << [*@prefixes[0...last_index], normalize_key(key)].compact.join(PREFIX_SEP)
+            end
+          end
         end
 
         def process(source, item)

data/sig/bbk/config.rbs

@@ -24,7 +24,7 @@ module BBK
 
       def self.instance: () -> instance
       
-      def initialize: (?String name) -> void
+      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
@@ -41,7 +41,7 @@ module BBK
 
       private
 
-      def normalize_key: (string key) -> String
+      def normalize_key: (String? key) -> String?
       def process: (envSource source, configItem item) -> void
 
       def required!: (configItem item) -> void

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: bbk-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.1.89770
+  version: 1.0.1.97958
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency