bbk-utils 1.0.1.97943 → 1.0.1.97958

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb2395b2a2bf76b7d8b86eda8feb6ead04cff838c4b2a91d157fe796b4221e8c
-  data.tar.gz: 046f488594f017991f0255ca9b6b5a1d030ec180541ab0ff5e88b0d872261d92
+  metadata.gz: 5a9dd5f6805e9488cae5ff150b2f7ea51a8eca58336d43428f16a6f7a34990cf
+  data.tar.gz: 3d6f9115d2e8def51a08249497a52b4750c6b7ccf6c62bd83d7ceb163f3153ee
 SHA512:
-  metadata.gz: ba1b4600ac72aa1dbb36ae7834288d664f6aceba8348a9911b96caa1b272300d2145e6b345b75b3176af8960cbadce6d0372250013a056632c5746e308964f39
-  data.tar.gz: 80eb064b959a9f704829852772e40c7f37643417a567fdf390b766b84e953bc111cfeb03d2ff1766a074a4792f1dd06e7dbbbea1a9397b28cd303ef48c66bf8c
+  metadata.gz: 97152af15bb34e112bba23897a836428fec883b5b7b8017bbbe8d241a058d3b0b00685cad35c18f089e5a5abcb08ca46ea81dad9311e01dd2703eabae5e0f4a9
+  data.tar.gz: cae731d7f2cb468e5b311e889db29d04ee82cae9b7b956099cc03ecdde90a9a42ea9f7437d87ef4263af84346513e59f3970c8da7a6d2ff436ada6373ad29ad8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bbk-utils (1.0.1.97943)
+    bbk-utils (1.0.1.97958)
       activesupport (>= 6.0)
       russian
 

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
@@ -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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbk-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.1.97943
+  version: 1.0.1.97958
 platform: ruby
 authors:
 - Samoilenko Yuri