canfig 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb0af652bc6aced0a5a7be703c93267bbef555c28f821c565c9c5b14f93b6d20
-  data.tar.gz: cb3541d3ca774f5f7a331f75238ecef6231b62be3776b50ae52cac3b12182c6b
+  metadata.gz: 70fda774961e755691e8a4783071ce7298b694933c4db7b2227b8563c1afeae7
+  data.tar.gz: 87b8c4825bf0e9b3e8d03a97c5e2f3c0643e67cca4703f48eea4e44411304959
 SHA512:
-  metadata.gz: aab3a3c345efea85b20c75e8aec11ccd62baab19e8dcfa5b5870406a2731e6894311a21273b10cfea3476f037185b300e862e027a19bf8314fbb9300054d2b78
-  data.tar.gz: ebc54005799b649dbecc527bd30f6bbad0149ad4fc022b2998323b0fe6b7888df12ffc1050a9884caee2ee14e30093f315408ed08e657b4e3a8dc657e3449459
+  metadata.gz: 4ad137615641ae7ca8c67716720f34c3e4068e92117887eb1f9fe786aa33175da0457d128236477fef4052391106b276ce4b8e278fd8825879e2139ea3d0972f
+  data.tar.gz: 2811ee9abc222199f3fdba1b5398f4e938891faf756f24080c7514e6c853668ea56c47b73847b04922d72f59bac3262f5479ba69d7da040a106d674fe5f7a124

data/lib/canfig/config.rb

@@ -37,8 +37,10 @@ module Canfig
     end
 
     def env(key, default=nil, &block)
-      val = ENV.fetch(key.to_s.underscore.upcase, default, &block)
-      val && ENV.key?(val) ? env(val, default, &block) : val
+      @state[key] ||= begin
+        val = ENV.fetch(key.to_s.underscore.upcase, default, &block)
+        val && ENV.key?(val) ? env(val, default, &block) : val
+      end
     end
 
     def clear(*keys)
@@ -53,7 +55,7 @@ module Canfig
 
     def get(key, default=nil, &block)
       raise NoMethodError, "undefined method `#{key.to_s}' for #{self.to_s}" unless allowed?(key)
-      @state[key] ||= env(key, default, &block)
+      @state[key] || (block_given? ? yield : default)
     end
 
     def [](key)

data/lib/canfig/env_config.rb

@@ -7,8 +7,8 @@ module Canfig
       super(**options, &block)
     end
 
-    def set(key, val)
-      raise NotImplementedError, "You cannot set values on a Canfig::EnvConfig"
+    def get(key, default=nil, &block)
+      super || env(key, default, &block)
     end
 
     def env(key, default=nil, &block)

data/lib/canfig/version.rb

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

metadata

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