canfig 0.0.6 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 19205ebc7b976f9e5d9f15a0a891699687f48c28
-  data.tar.gz: a1832b75a3870d72dbc3c303c2a1c154bd51db34
+SHA256:
+  metadata.gz: ba430bd04920933ac504636144cb797457e51446c1850c02ce8ba76a2fab1136
+  data.tar.gz: 9b38d00d36ab5928c606a5aa869cb26597276743d9433f558b079dd8487ce2ec
 SHA512:
-  metadata.gz: ffce29c8ae20dfc4714b4a447f542cb4310f8fa12297b3eb35afc8669b5853d82df314fc7b2244ccf4c3a0877df5f389edd245345954b10f2f6c468e29552dc4
-  data.tar.gz: 4c60c5327c9207c5811d08bd73700f5ac3cdc8ff0f817123b3935ff557b7d7c1ee42ce59955c4e6b9f9850657930fdb985568e23ecf54b60f91a109372f374d6
+  metadata.gz: acf50db63b8d815cb835fc8ae8213e009040aecb68f17d1c09e760ef5fe10087af3eb5c9db91507385fc62617c1bc146b6bc4113addde3e803b5c5fd072c5414
+  data.tar.gz: d97d1a93681dfe5c13ef6ea893eb2817cf5a6484a18b77ef40b2ea2da99fd12b2f54823c441f78d2db848e017091f0600e42b61dd20fa80e701549032890edac

data/lib/canfig.rb

@@ -1,9 +1,11 @@
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/hash/keys'
+require 'active_support/inflector'
 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

@@ -36,13 +36,26 @@ module Canfig
       end
     end
 
+    def env(key, default=nil, &block)
+      @state[key] ||= begin
+        val = ENV.fetch(key.to_s.underscore.upcase, default, &block)
+        val && ENV.key?(val.to_s) ? env(val, default, &block) : val
+      end
+    end
+
+    def clear(*keys)
+      save_state! do
+        keys.each { |key| @state[key] = nil }
+      end
+    end
+
     def []=(key, val)
       set key, val
     end
 
-    def get(key)
+    def get(key, default=nil, &block)
       raise NoMethodError, "undefined method `#{key.to_s}' for #{self.to_s}" unless allowed?(key)
-      @state[key]
+      @state[key] || (block_given? ? yield : default)
     end
 
     def [](key)
@@ -99,7 +112,7 @@ module Canfig
         opt = meth.to_s.gsub(/=/,'').to_sym
         return set(opt, args.first) if allowed?(opt)
       else
-        return @state[meth] if allowed?(meth)
+        return get(meth, *args, &block) if allowed?(meth)
       end
 
       super
@@ -107,8 +120,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,26 @@
+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)
+      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 && ENV.key?(val.to_s) ? env(val, default, &block) : val
+      end
+    end
+  end
+end

data/lib/canfig/instance.rb

@@ -5,7 +5,7 @@ module Canfig
     end
 
     def configure(&block)
-      @configuration.configure &block
+      configuration.configure &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.6'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canfig
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.11
 platform: ruby
 authors:
 - Mark Rebec
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2020-12-30 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
@@ -76,7 +77,7 @@ files:
 homepage: http://github.com/markrebec/canfig
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,15 +92,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.1.2
+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_spec.rb
-- spec/fixtures/config.yml
-- spec/spec_helper.rb