canfig 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70fda774961e755691e8a4783071ce7298b694933c4db7b2227b8563c1afeae7
-  data.tar.gz: 87b8c4825bf0e9b3e8d03a97c5e2f3c0643e67cca4703f48eea4e44411304959
+  metadata.gz: ba430bd04920933ac504636144cb797457e51446c1850c02ce8ba76a2fab1136
+  data.tar.gz: 9b38d00d36ab5928c606a5aa869cb26597276743d9433f558b079dd8487ce2ec
 SHA512:
-  metadata.gz: 4ad137615641ae7ca8c67716720f34c3e4068e92117887eb1f9fe786aa33175da0457d128236477fef4052391106b276ce4b8e278fd8825879e2139ea3d0972f
-  data.tar.gz: 2811ee9abc222199f3fdba1b5398f4e938891faf756f24080c7514e6c853668ea56c47b73847b04922d72f59bac3262f5479ba69d7da040a106d674fe5f7a124
+  metadata.gz: acf50db63b8d815cb835fc8ae8213e009040aecb68f17d1c09e760ef5fe10087af3eb5c9db91507385fc62617c1bc146b6bc4113addde3e803b5c5fd072c5414
+  data.tar.gz: d97d1a93681dfe5c13ef6ea893eb2817cf5a6484a18b77ef40b2ea2da99fd12b2f54823c441f78d2db848e017091f0600e42b61dd20fa80e701549032890edac

data/lib/canfig/config.rb

@@ -39,7 +39,7 @@ module Canfig
     def env(key, default=nil, &block)
       @state[key] ||= begin
         val = ENV.fetch(key.to_s.underscore.upcase, default, &block)
-        val && ENV.key?(val) ? env(val, default, &block) : val
+        val && ENV.key?(val.to_s) ? env(val, default, &block) : val
       end
     end
 

data/lib/canfig/env_config.rb

@@ -2,9 +2,12 @@ module Canfig
   class EnvConfig < OpenConfig
     attr_reader :namespace
 
-    def initialize(namespace=nil, **options, &block)
+    def initialize(namespace=nil, **attributes, &block)
       @namespace = namespace ? "#{namespace.to_s.underscore.upcase.gsub(/_$/, '')}_" : namespace
-      super(**options, &block)
+      super(*attributes.keys, &block)
+      attributes.each do |key,val|
+        env(key, val)
+      end
     end
 
     def get(key, default=nil, &block)
@@ -12,9 +15,12 @@ module Canfig
     end
 
     def env(key, default=nil, &block)
-      key = key.to_s.underscore.upcase
-      key = key.gsub(/^#{namespace}/, '') if namespace
-      super("#{namespace}#{key}", default, &block)
+      @state[key.to_sym] ||= begin
+        key = key.to_s.underscore.upcase
+        key = key.gsub(/^#{namespace}/, '') if namespace
+        val = ENV.fetch("#{namespace}#{key}", default, &block)
+        val && ENV.key?(val.to_s) ? env(val, default, &block) : val
+      end
     end
   end
 end

data/lib/canfig/version.rb

@@ -1,3 +1,3 @@
 module Canfig
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canfig
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Mark Rebec