canfig 0.0.8 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28a747df13cf5c6c99fa96a201cb5f300b707a4642a63e5a65a943582a1fdde5
-  data.tar.gz: c917be14d97451e7615943952729ce00cc03b322c62536249a9a5859c88c63d0
+  metadata.gz: 1a5e786da847f0b3b9f6c70578bcdb948f11d59bb7eab3a403ac7c4a900505a8
+  data.tar.gz: 21fa40cda7709f79b6604ea3f8883b84aa1f62f8e8b1bc3a73f5f415a5d4788a
 SHA512:
-  metadata.gz: 4cf03ffeb05d41a42ef388d42013000cc62402befb390b1c188ac8a0acdda9c3e04fea5c63d47dd103258cedc5d36c9ce0d31ef14c079abbbd4842f4d5520589
-  data.tar.gz: 006e3e970b3aec9905abaa038bfca1f470f8b80ce6f8f2c743a729ebbf956d3a08425708d9aa0b486da58b6ea44178c69219c860edf40226bd999606d771aa1d
+  metadata.gz: 2fa3db95500d7b55fe6ceedfda1fa3467b6a6bdf212af67f5fda28fb98155d1522a4dad858165d1d3b58695c083df212a533336646dd2dc5aaa9162a666067d0
+  data.tar.gz: a80a8e1010ee71fd2bdded9c3c661552be8f887eb8a051711204fee0539725f19f484f1e6610224f6b9ac5ad33b4c2ea997e2bca2b3778edcdac40ddd82c4562

data/lib/canfig.rb

@@ -5,6 +5,7 @@ require 'canfig/version'
 require 'canfig/yaml'
 require 'canfig/config'
 require 'canfig/open_config'
+require 'canfig/env_config'
 require 'canfig/module'
 require 'canfig/class'
 require 'canfig/instance'

data/lib/canfig/config.rb

@@ -37,13 +37,16 @@ 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.key?(val.to_s) ? env(val, default, &block) : val
+      end
     end
 
-    def clear(key)
+    def clear(*keys)
       save_state! do
-        @state[key] = nil
+        keys.each { |key| @state[key] = nil }
       end
     end
 
@@ -53,7 +56,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)
@@ -118,8 +121,7 @@ module Canfig
 
     protected
 
-    def initialize(*args, &block)
-      options = args.extract_options!
+    def initialize(*args, **options, &block)
       @allowed = (args.map(&:to_sym) + options.symbolize_keys.keys).uniq
       @state = {}
       enable_state_saves!

data/lib/canfig/env_config.rb

@@ -0,0 +1,32 @@
+module Canfig
+  class EnvConfig < OpenConfig
+    attr_reader :namespace
+
+    def configure_with_args(argh)
+      save_state! do
+        argh.symbolize_keys.each { |key,val| env(key, val) }
+      end
+    end
+
+    def get(key, default=nil, &block)
+      super || env(key, default, &block)
+    end
+
+    def env(key, default=nil, &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.key?(val.to_s) ? env(val, default, &block) : 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/open_config.rb

@@ -1,8 +1,8 @@
 module Canfig
   class OpenConfig < Config
     def set(key, val)
-      super(key, val)
       @allowed << key unless @allowed.include?(key)
+      super(key, val)
     end
 
     def allowed?(opt)

data/lib/canfig/version.rb

@@ -1,3 +1,3 @@
 module Canfig
-  VERSION = '0.0.8'
+  VERSION = '0.0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canfig
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.13
 platform: ruby
 authors:
 - Mark Rebec
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2020-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -62,6 +62,7 @@ files:
 - lib/canfig.rb
 - lib/canfig/class.rb
 - lib/canfig/config.rb
+- lib/canfig/env_config.rb
 - lib/canfig/instance.rb
 - lib/canfig/module.rb
 - lib/canfig/open_config.rb