bbk-utils 1.0.1.97943 → 1.0.1.100401

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb2395b2a2bf76b7d8b86eda8feb6ead04cff838c4b2a91d157fe796b4221e8c
-  data.tar.gz: 046f488594f017991f0255ca9b6b5a1d030ec180541ab0ff5e88b0d872261d92
+  metadata.gz: e1e16290b04a83d41d0dc06d5d334e8beee2cdefc6b83956c0f7a19daa7cfe0a
+  data.tar.gz: adb5a43274bfcfbedafbfd218933983145215ce76d8b85a0b00b3168fe0ae5fc
 SHA512:
-  metadata.gz: ba1b4600ac72aa1dbb36ae7834288d664f6aceba8348a9911b96caa1b272300d2145e6b345b75b3176af8960cbadce6d0372250013a056632c5746e308964f39
-  data.tar.gz: 80eb064b959a9f704829852772e40c7f37643417a567fdf390b766b84e953bc111cfeb03d2ff1766a074a4792f1dd06e7dbbbea1a9397b28cd303ef48c66bf8c
+  metadata.gz: e0d0be218d2a7e656e426d00a0a8a92e6b39de71f867dc7c3a8290c183d6b7a4121f4fa3838c36d3ce90b3a43aacceba09accac4c68bd04d05c6b2548bd94cf1
+  data.tar.gz: 830704fde73252acf5b6651113be88ecbeeb28ef84bcc9b4b75cfa9c1c40441896a9930ffee48c112f82580a8c8a7846183d64cbe2711a3694e0af55dff2f6c7

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    bbk-utils (1.0.1.97943)
+    bbk-utils (1.0.1.100401)
       activesupport (>= 6.0)
       russian
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3.1)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)

data/lib/bbk/utils/config.rb

@@ -9,6 +9,8 @@ module BBK
       attr_accessor :store, :name
       attr_reader :prefix, :env_prefix, :parent
 
+      class KeyError < StandardError; end
+
       class BooleanCaster
 
         FALSE_VALUES = [
@@ -116,7 +118,7 @@ module BBK
       end
 
       def [](key)
-        self.get(key, search_up: true, search_down: true)
+        self.get(key, search_up: true, search_down: true)[:value]
       end
 
       def []=(key, value)
@@ -133,12 +135,13 @@ 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
@@ -160,7 +163,7 @@ module BBK
       end
 
       def as_json(*_args)
-        values = store_with_subconfigs.sort_by do |item|
+        values = store_with_subconfigs.sort_by do |_key, item|
           [item[:file].present? ? 0 : 1, item[:required] ? 0 : 1]
         end.reduce({}) do |ret, item|
           ret.merge(item[:env] => item)
@@ -190,16 +193,16 @@ module BBK
       def get(key, search_up: false, search_down: false)
         normalized_key = normalize_key(key)
         if @store.key?(normalized_key)
-          return @store[normalized_key][:value]
+          return @store[normalized_key]
         end
         prefix_key = full_prefixed_key(key)
         if @store.key?(prefix_key)
-          return @store[prefix_key][:value]
+          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][:value]
+              return @store[pref_key]
             end
 
             subconf = @subconfigs.find {|sub| pref_key.starts_with?(sub.env_prefix)}
@@ -210,7 +213,7 @@ module BBK
         if search_up && @parent
           return @parent.get(key, search_up: true, search_down: false)
         end
-        raise "There is no such key: #{key} in config!"
+        raise KeyError.new("There is no such key: #{key} in config!")
       end
 
       def store_with_subconfigs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbk-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.1.97943
+  version: 1.0.1.100401
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport