complex_config 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a62d35017801f81211c900cfd841264193155e1f89ebc27c387b7649da6dbcc
-  data.tar.gz: 96cdc260febe8d2dff2f479421dcf7e94e61de4dacf77ee2ca30372c069e390c
+  metadata.gz: 165c452b58cc6363fb33d5e653b53eb4c2adcecafe8ee8f7d1be75991cd5c40b
+  data.tar.gz: 31eaf3a82ef3fd2779a1b95933370286ee4b5762d4ebafb4aae1c6b654782fa2
 SHA512:
-  metadata.gz: aae99c356a7467495f3311dd0aaca592078164458183076aae3fd3688d65d7d0e0b37bf209cb6b0873715240b9d6b1105e04dbbd60ce80d0d53566e5a67a07a5
-  data.tar.gz: a63690e1401e3df9bdc29cc6f9441812521bad478fb43ee4ed6be79d7bc39a220a56c90de3862b8d4510cd9ad04d48d534a92bcb0769500b8b7cb16c900f0328
+  metadata.gz: 8e72982da3fe131846d289c924fe817ddc77632c84770903ead2e02cdd3fbf03c379b73d015b5de85d066cbc3f97590d926f2dbeeb36599540dbb0c41347175c
+  data.tar.gz: faf171a9be237df8297e89bc26d81afe5d7dffabaac70690cc8976bce86e105b7d008fbd3f7e7a0ec786b9f85de326e9e59ec2c4438c7b0a88e5edf4181d337d

data/.gitignore

@@ -7,3 +7,4 @@ Gemfile.lock
 coverage
 errors.lst
 pkg
+tags

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 2.0
   - 2.1
   - 2.2
   - 2.3

data/Rakefile

@@ -12,7 +12,7 @@ GemHadar do
   executables 'complex_config'
   test_dir    'spec'
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', 'coverage', '.rvmrc',
-    '.AppleDouble', '.DS_Store', '.byebug_history', 'errors.lst'
+    '.AppleDouble', '.DS_Store', '.byebug_history', 'errors.lst', 'tags'
 
   readme      'README.md'
   title       "#{name.camelize} -- configuration library"

data/VERSION

@@ -1 +1 @@
-0.17.0
+0.17.1

data/complex_config.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: complex_config 0.17.0 ruby lib
+# stub: complex_config 0.17.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "complex_config".freeze
-  s.version = "0.17.0"
+  s.version = "0.17.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2019-03-18"
+  s.date = "2019-11-27"
   s.description = "This library allows you to access configuration files via a simple interface".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["complex_config".freeze]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/flori/complex_config".freeze
   s.licenses = ["Apache-2.0".freeze]
   s.rdoc_options = ["--title".freeze, "ComplexConfig -- configuration library".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "3.0.3".freeze
+  s.rubygems_version = "3.0.6".freeze
   s.summary = "configuration library".freeze
   s.test_files = ["spec/complex_config/config_spec.rb".freeze, "spec/complex_config/encryption_spec.rb".freeze, "spec/complex_config/key_source_spec.rb".freeze, "spec/complex_config/plugins_spec.rb".freeze, "spec/complex_config/provider_spec.rb".freeze, "spec/complex_config/settings_spec.rb".freeze, "spec/complex_config/shortcuts_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
+      s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
       s.add_development_dependency(%q<rake>.freeze, [">= 0"])
       s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<tins>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<mize>.freeze, ["~> 0.3", ">= 0.3.4"])
     else
-      s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
+      s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
       s.add_dependency(%q<rake>.freeze, [">= 0"])
       s.add_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_dependency(%q<rspec>.freeze, [">= 0"])
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mize>.freeze, ["~> 0.3", ">= 0.3.4"])
     end
   else
-    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
+    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
     s.add_dependency(%q<rake>.freeze, [">= 0"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])

data/lib/complex_config/provider.rb

@@ -106,7 +106,7 @@ class ComplexConfig::Provider
       shared = shared.to_h
       settings.each do |key, value|
         if value.is_a? ComplexConfig::Settings
-          value.attributes_update(shared)
+          value.attributes_update_if_nil(shared)
         elsif value.nil?
           settings[key] = ComplexConfig::Settings.build(nil, shared.dup)
         end

data/lib/complex_config/settings.rb

@@ -76,6 +76,15 @@ class ComplexConfig::Settings < BasicObject
     @table.update(other.table)
   end
 
+  def attributes_update_if_nil(other)
+    unless other.is_a? self.class
+      other = self.class.from_hash(other)
+    end
+    @table.update(other.table) do |key, oldval, newval|
+      @table.key?(key) ? oldval : newval
+    end
+  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.17.0'
+  VERSION         = '0.17.1'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/spec/complex_config/provider_spec.rb

@@ -314,8 +314,8 @@ RSpec.describe ComplexConfig::Provider do
 
     it 'can share values' do
       expect(described_class['config'].development.shared).to eq true
-      expect(described_class['config'].test.shared).to eq true
-      expect(described_class['config'].staging.shared).to eq true
+      expect(described_class['config'].test.shared).to eq nil
+      expect(described_class['config'].staging.shared).to eq false
     end
   end
 end

data/spec/config/config.yml

@@ -9,8 +9,10 @@ development:
     pi:  <%= Math::PI %>
 
 staging:
+  shared: false
 
 test:
+  shared: null
   config:
     foo: false
     bar: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: complex_config
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: configuration library