canfig 0.0.9 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb0af652bc6aced0a5a7be703c93267bbef555c28f821c565c9c5b14f93b6d20
-  data.tar.gz: cb3541d3ca774f5f7a331f75238ecef6231b62be3776b50ae52cac3b12182c6b
+  metadata.gz: f5cf1818dc05ca85705475f4f667a025716f351f6c846b17ad2ca8d71ca94967
+  data.tar.gz: 0b94d7c75bbb9e4cb443ee07094881af53b42dca689c5373fc28b04fb76f5fd9
 SHA512:
-  metadata.gz: aab3a3c345efea85b20c75e8aec11ccd62baab19e8dcfa5b5870406a2731e6894311a21273b10cfea3476f037185b300e862e027a19bf8314fbb9300054d2b78
-  data.tar.gz: ebc54005799b649dbecc527bd30f6bbad0149ad4fc022b2998323b0fe6b7888df12ffc1050a9884caee2ee14e30093f315408ed08e657b4e3a8dc657e3449459
+  metadata.gz: c07a4de23a58dffad06507b3dcadbae8c5ba77b24ab841a98ce1064c37b1caf55726502c9ca2d4abeab8ce753b7869b9aea52c316ce5309a972d15673ea973e3
+  data.tar.gz: 3e7ac47e76ece7eb4311fbca9b3786ba445a6ed59b4e520aaaf44350f567c5c420762f7770bd2dc78e9d8f5a43c614d154ed9a6c37bf3a56305a649cd881f4bb

data/lib/canfig/config.rb

@@ -37,8 +37,13 @@ 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 = default if val.blank?
+        val = env(val, default, &block) if val && ENV.key?(val.to_s)
+        val = eval(val) if val == 'true' || val == 'false'
+        val
+      end
     end
 
     def clear(*keys)
@@ -53,7 +58,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

@@ -2,19 +2,33 @@ module Canfig
   class EnvConfig < OpenConfig
     attr_reader :namespace
 
-    def initialize(namespace=nil, **options, &block)
-      @namespace = namespace ? "#{namespace.to_s.underscore.upcase.gsub(/_$/, '')}_" : namespace
-      super(**options, &block)
+    def configure_with_args(argh)
+      save_state! do
+        argh.symbolize_keys.each { |key,val| env(key, val) }
+      end
     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)
-      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 = default if val.blank?
+        val = env(val, default, &block) if val && ENV.key?(val.to_s)
+        val = eval(val) if val == 'true' || val == 'false'
+        val
+      end
+    end
+
+    protected
+
+    def initialize(namespace=nil, **attributes, &block)
+      @namespace = namespace ? "#{namespace.to_s.underscore.upcase.gsub(/_$/, '')}_" : namespace
+      super(**attributes, &block)
     end
   end
 end

data/lib/canfig/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canfig
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.14
 platform: ruby
 authors:
 - Mark Rebec
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport