canfig 0.0.11 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba430bd04920933ac504636144cb797457e51446c1850c02ce8ba76a2fab1136
-  data.tar.gz: 9b38d00d36ab5928c606a5aa869cb26597276743d9433f558b079dd8487ce2ec
+  metadata.gz: e93bb14cbee7d6538f347e414b773babf038266f19b21e2f8a84ee09c18696de
+  data.tar.gz: 49562f881619ae061b28b42fbc8fbb03791147ba271bf9874a66f2605534b767
 SHA512:
-  metadata.gz: acf50db63b8d815cb835fc8ae8213e009040aecb68f17d1c09e760ef5fe10087af3eb5c9db91507385fc62617c1bc146b6bc4113addde3e803b5c5fd072c5414
-  data.tar.gz: d97d1a93681dfe5c13ef6ea893eb2817cf5a6484a18b77ef40b2ea2da99fd12b2f54823c441f78d2db848e017091f0600e42b61dd20fa80e701549032890edac
+  metadata.gz: 6e01a0997c25733e07ce8d6ad23e02776f45776e19fadb76dd092d8e0cfe9e4feb6105d71d5fdb443454cb848bf36b2a97574db3b35ce71988541b759505c7c7
+  data.tar.gz: a81749b2737652a52f9a93b7f9ad651db82e6e38f1f30e6890b4d20dfba92ed10a31ee2e1f0967f9ccf80c2aed05e983eb6ba6628f491e299b1a1ae7d7875276

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.to_s) ? 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,9 @@ 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_val = state[key]
+      return (block_given? ? yield : default) if state_val.nil?
+      state_val
     end
 
     def [](key)
@@ -63,11 +78,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 +137,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,11 +2,9 @@ module Canfig
   class EnvConfig < OpenConfig
     attr_reader :namespace
 
-    def initialize(namespace=nil, **attributes, &block)
-      @namespace = namespace ? "#{namespace.to_s.underscore.upcase.gsub(/_$/, '')}_" : namespace
-      super(*attributes.keys, &block)
-      attributes.each do |key,val|
-        env(key, val)
+    def configure_with_args(argh)
+      save_state! do
+        argh.symbolize_keys.each { |key,val| env(key, val) }
       end
     end
 
@@ -19,8 +17,18 @@ module Canfig
         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
+        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.11'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canfig
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.1
 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