complex_config 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1e16fcfcf116bb2445f1d8fb1fc677197da1d8c
-  data.tar.gz: '06978e3eb0ed46f22947227102a38bf3e9ab6c41'
+  metadata.gz: f00c1e6723f460cadcdb4e628f8770101db83723
+  data.tar.gz: 133f3d106b681fae18fa001f9bbf4386770d6ebd
 SHA512:
-  metadata.gz: 2d60eea98b9281b66ab1e7c92a9ac3c5ac137cb3d756fc25c159e4cf3ddbde84c2139d8727246699c8f354995615043b40e9b48d43eb2ed914520bff52f11c15
-  data.tar.gz: 8a6bdda64bded3126bdc64cbbe8e38b62c6d86721cb2902cce97b03a6a49216de76971164cfc57da0da63bd4ae54d10ace59264920997e0e7d67d4f253d16fd5
+  metadata.gz: 703e77e3fd176f17a40f1840941c19e74af32411ed2fb518193fa76b495a9977212fc6eab567a4d93a4a6dc1478bc5c2af12194a333fe702acac95474051104a
+  data.tar.gz: b27c4493969d30fa486dd87c2237f5c6f0f3e98cb197e5def3a18928126c05b1857231b019875d7e307ebbc6b3329be9930a9a693d096d3eed2a9916c25dc7dc

data/VERSION

@@ -1 +1 @@
-0.11.0
+0.11.1

data/complex_config.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: complex_config 0.11.0 ruby lib
+# stub: complex_config 0.11.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "complex_config".freeze
-  s.version = "0.11.0"
+  s.version = "0.11.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/lib/complex_config/provider.rb

@@ -57,22 +57,31 @@ class ComplexConfig::Provider
   end
 
   def config(pathname, name = nil)
-    data =
-      if enc_pathname = pathname.to_s + '.enc' and File.exist?(enc_pathname)
-        key = key(pathname)
-        text = IO.binread(enc_pathname)
-        # TODO merge with pathname w/o .enc
-        ComplexConfig::Encryption.new(key).decrypt(text)
-      else
-        IO.binread(pathname)
+    datas = []
+    if File.exist?(pathname)
+      datas << IO.binread(pathname)
+    end
+    if enc_pathname = pathname.to_s + '.enc' and File.exist?(enc_pathname)
+      key = key(pathname)
+      text = IO.binread(enc_pathname)
+      datas << ComplexConfig::Encryption.new(key).decrypt(text)
+    end
+    datas.empty? and raise ComplexConfig::ConfigurationFileMissing,
+      "configuration file #{pathname.inspect} is missing"
+    results = datas.map { |d| evaluate(pathname, d) }
+    hashes = results.map { |r| ::YAML.load(r, pathname) }
+    settings = ComplexConfig::Settings.build(name, hashes.first)
+    hashes[1..-1]&.each { |h| settings.attributes_update(h) }
+    if shared = settings.shared?
+      shared = shared.to_h
+      settings.each do |key, value|
+        if value.is_a? ComplexConfig::Settings
+          value.attributes_update(shared)
+        end
       end
-    result = evaluate(pathname, data)
-    hash = ::YAML.load(result, pathname)
-    ComplexConfig::Settings.build(name, hash).tap do |settings|
-      deep_freeze? and settings.deep_freeze
     end
-  rescue ::Errno::ENOENT => e
-    raise ComplexConfig::ComplexConfigError.wrap(:ConfigurationFileMissing, e)
+    deep_freeze? and settings.deep_freeze
+    settings
   rescue ::Psych::SyntaxError => e
     raise ComplexConfig::ComplexConfigError.wrap(:ConfigurationSyntaxError, e)
   end

data/lib/complex_config/settings.rb

@@ -69,6 +69,13 @@ class ComplexConfig::Settings < BasicObject
     @table.values
   end
 
+  def attributes_update(other)
+    unless other.is_a? self.class
+      other = self.class.from_hash(other)
+    end
+    @table.update(other.table)
+  end
+
   def replace_attributes(hash)
     @table = self.class.from_hash(hash).table
     self

data/lib/complex_config/version.rb

@@ -1,6 +1,6 @@
 module ComplexConfig
   # ComplexConfig version
-  VERSION         = '0.11.0'
+  VERSION         = '0.11.1'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: complex_config
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Florian Frank