canfig 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70fda774961e755691e8a4783071ce7298b694933c4db7b2227b8563c1afeae7
-  data.tar.gz: 87b8c4825bf0e9b3e8d03a97c5e2f3c0643e67cca4703f48eea4e44411304959
+  metadata.gz: ef8277d97dee3f851bbc261e27c250272de6cc7fe862391918a9edb10a99b714
+  data.tar.gz: 85a61547bf9119ad5b31d3f1c488ac6bc7a6be8e945971444b7e3829cc2a29c7
 SHA512:
-  metadata.gz: 4ad137615641ae7ca8c67716720f34c3e4068e92117887eb1f9fe786aa33175da0457d128236477fef4052391106b276ce4b8e278fd8825879e2139ea3d0972f
-  data.tar.gz: 2811ee9abc222199f3fdba1b5398f4e938891faf756f24080c7514e6c853668ea56c47b73847b04922d72f59bac3262f5479ba69d7da040a106d674fe5f7a124
+  metadata.gz: 1c5d4e0a71d5e8a3923f51229c7e925895f80cd3dce206528b6cdad4090ee548a1aad874098ecd8b5526f7bacf27d8cfae706422d64528447eaa274dba71db61
+  data.tar.gz: 5628f2e515406cbb1362a36d54dc7b6b67118c350e2b6276ca104ac8115a2449ac4426aba2a18651112449adc7fc93a48c1ff1d6e4f2e9a1ff792e5866d96f4b

data/lib/canfig/config.rb

@@ -28,24 +28,37 @@ module Canfig
       end
     end
 
+    def thread_configs
+      Thread.current[:_canfig_configs] ||= {}
+      Thread.current[:_canfig_configs]
+    end
+
+    def state
+      thread_configs[object_id] ||= {}
+      thread_configs[object_id]
+    end
+
     def set(key, val)
       raise NoMethodError, "undefined method `#{key.to_s}=' for #{self.to_s}" unless allowed?(key)
 
       save_state! do
-        @state[key] = val
+        state[key] = val
       end
     end
 
     def env(key, default=nil, &block)
-      @state[key] ||= begin
+      state[key] ||= begin
         val = ENV.fetch(key.to_s.underscore.upcase, default, &block)
-        val && ENV.key?(val) ? env(val, default, &block) : val
+        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)
       save_state! do
-        keys.each { |key| @state[key] = nil }
+        keys.each { |key| state[key] = nil }
       end
     end
 
@@ -55,7 +68,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] || (block_given? ? yield : default)
+      state[key] || (block_given? ? yield : default)
     end
 
     def [](key)
@@ -63,11 +76,11 @@ module Canfig
     end
 
     def to_h
-      Hash[@allowed.map { |key| [key, @state[key]] }]
+      Hash[@allowed.map { |key| [key, state[key]] }]
     end
 
     def changed
-      Hash[@allowed.map { |key| [key, [@saved_state[key], @state[key]]] if @saved_state[key] != @state[key] }.compact]
+      Hash[@allowed.map { |key| [key, [@saved_state[key], state[key]]] if @saved_state[key] != state[key] }.compact]
     end
 
     def changed?(key)
@@ -122,7 +135,6 @@ module Canfig
 
     def initialize(*args, **options, &block)
       @allowed = (args.map(&:to_sym) + options.symbolize_keys.keys).uniq
-      @state = {}
       enable_state_saves!
       configure options, &block
     end

data/lib/canfig/env_config.rb

@@ -2,9 +2,10 @@ 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 get(key, default=nil, &block)
@@ -12,9 +13,22 @@ 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 = 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.10'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canfig
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Mark Rebec
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -77,7 +77,7 @@ files:
 homepage: http://github.com/markrebec/canfig
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -93,13 +93,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Dead simple canned configuration for gems or whatever
 test_files:
-- spec/spec_helper.rb
-- spec/fixtures/config.yml
-- spec/canfig/config_spec.rb
 - spec/canfig/open_config_spec.rb
 - spec/canfig/yaml_spec.rb
+- spec/canfig/config_spec.rb
+- spec/fixtures/config.yml
+- spec/spec_helper.rb
 - spec/canfig_spec.rb