confg 2.0.0 → 2.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d70e2bf601f771c6cc956dab4f21ca2afed56dcdf7159b24e5f17dfa4a8937b
-  data.tar.gz: 4c710349770ca65473e363e949f2f27c071ca0d214dff3d3c509806c55b4cb9b
+  metadata.gz: fc9f4292ee8c5e8816455c7a49dd1bdd70d7fec552df2da425d98c03867fecab
+  data.tar.gz: eddb359546e89a16143da84ecf344d83162b460c62615e4ce3ad1995f0d3b74d
 SHA512:
-  metadata.gz: 34a799c1d347f3dadc3030e526b14a964753810d663b76107383145891943592254e886fbe5a53b527dbec6cd08676e572513c0d8fa9e9f76818e7d2d52608a5
-  data.tar.gz: cfda628b0bcfa7fffb1bed93cf987241bfebddff79f2c9ddc6d37fa494f877a334ddfb276e6a7e36f922a187ef110c168c564c5f585151b2391536832447cf42
+  metadata.gz: 17aac0fec22fbedeb2340a7d90b84d9e3eae13952aed5104785426b9e60229976ca2e84b3f024bad1cc37e0c531c4b8f8b77a334fa8765f63596bcafaee8cae4
+  data.tar.gz: 61ab852e489d70b2d16e67ff7bd11393828d42bb9667785eea99bc4c4844f8c06225c2a7bc052d01fef989f237d06233707edc6dc34c3cf560502d36c929ca83

data/lib/confg.rb

@@ -8,6 +8,10 @@ module Confg
 
   class << self
 
+    def cache
+      @cache ||= {}
+    end
+
     def root
       return @root if defined?(@root)
 
@@ -27,12 +31,13 @@ module Confg
       self
     end
 
-    def configure
-      @configuration ||= ::Confg::Configuration.new(env: env, root: root)
-      yield @configuration if block_given?
-      @configuration
+    def config(env: self.env, root: self.root)
+      config_key = "#{env}--#{root}"
+      out = (cache[config_key] ||= ::Confg::Configuration.new(env: env, root: root))
+      yield out if block_given?
+      out
     end
-    alias config configure
+    alias configure config
 
     def method_missing(method_name, *args, &block)
       config.send(method_name, *args, &block)
@@ -65,7 +70,7 @@ module Confg
     end
 
     def reset!
-      remove_instance_variable("@configuration") if defined?(@configuration)
+      remove_instance_variable("@cache") if defined?(@cache)
       remove_instance_variable("@env") if defined?(@env)
       remove_instance_variable("@root") if defined?(@root)
     end

data/lib/confg/configuration.rb

@@ -3,19 +3,18 @@
 require "yaml"
 
 module Confg
-  class Configuration < ::SimpleDelegator
+  class Configuration
 
-    attr_reader :confg_env, :confg_root
+    attr_reader :confg_env, :confg_root, :confg_data
 
     def initialize(env: Confg.env, root: Confg.root)
       @confg_env = env.to_s
       @confg_root = Pathname.new(root)
-
-      super({})
+      @confg_data = {}
     end
 
     def inspect
-      "#<#{self.class.name} #{__getobj__.inspect}>"
+      "#<#{self.class.name} #{confg_data.inspect}>"
     end
 
     def tmp(key, value)
@@ -34,24 +33,28 @@ module Confg
     alias merge! merge
 
     def to_h
-      __getobj__.transform_values do |v|
+      confg_data.transform_values do |v|
         v.is_a?(self.class) ? v.to_h : v
       end
     end
 
+    def key?(key)
+      confg_data.key?(key.to_s)
+    end
+
     def get(key)
       fetch(key) { nil }
     end
     alias [] get
 
     def fetch(key, &block)
-      __getobj__.fetch(key.to_s, &block)
+      confg_data.fetch(key.to_s, &block)
     end
 
     def set(key, value = nil)
-      __getobj__[key.to_s] = case value
+      confg_data[key.to_s] = case value
       when ::Hash
-        open_block(key) do |child|
+        open(key) do |child|
           value.each_pair do |k, v|
             child.set(k, v)
           end
@@ -62,6 +65,12 @@ module Confg
     end
     alias []= set
 
+    def open(key)
+      inner = get(key) || spawn_child
+      yield(inner)
+      set(key, inner)
+    end
+
     def load_key(key)
       # loads yaml file with given key
       load_yaml(key, key: key)
@@ -95,32 +104,28 @@ module Confg
     end
     alias load_yml load_yaml
 
-    def method_missing(method_name, *args, &block)
-      key = method_name.to_s
+    def method_missing(key, *args, &block)
+      key = key.to_s
+      return set(key[0...-1], args[0]) if key.end_with?("=")
+      return fetch(key) if key?(key)
 
-      if __getobj__.respond_to?(key)
-        super
-      elsif key.end_with?("=") && !args.empty?
-        set(key[0...-1], args[0])
-      elsif block_given?
-        open_block(key, &block)
-      else
-        fetch(key)
+      begin
+        confg_data.send(key, *args, &block)
+      rescue NoMethodError => e
+        raise KeyError, "Unrecognized key `#{key}`", e.backtrace
       end
     end
 
-    def respond_to_missing?(*_args)
-      true
+    def respond_to_missing?(key, include_private = false)
+      key = key.to_s
+      return true if key.end_with?("=")
+      return true if key?(key)
+
+      confg_data.respond_to?(key, include_private)
     end
 
     protected
 
-    def open_block(key)
-      inner = get(key) || spawn_child
-      yield(inner)
-      set(key, inner)
-    end
-
     def find_config_yaml(path)
       path = path.to_s
       # give it back if it starts with a slash

data/lib/confg/version.rb

@@ -2,6 +2,6 @@
 
 module Confg
 
-  VERSION = "2.0.0"
+  VERSION = "2.1.0.rc1"
 
 end

data/test/confg_test.rb

@@ -15,7 +15,7 @@ class ConfgTest < Minitest::Test
   end
 
   def test_a_child_block_can_be_opened
-    config.foo do |child|
+    config.open :foo do |child|
       child.bar = "baz"
     end
 
@@ -65,4 +65,16 @@ class ConfgTest < Minitest::Test
     }, config.to_h)
   end
 
+  def test_top_level_configs_are_cached_in_root_namespace
+    ::Confg.send :reset!
+    assert_equal({}, ::Confg.cache)
+
+    default_config = ::Confg.config(env: "test", root: "/")
+    custom_config = ::Confg.config(env: "foobar", root: "/Users/x/")
+
+    refute_equal default_config.object_id, custom_config.object_id
+    assert_equal 2, ::Confg.cache.size
+    assert_equal %w[test--/ foobar--/Users/x/], ::Confg.cache.keys
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: confg
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0.rc1
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,9 +99,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: