complex_config 0.17.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a62d35017801f81211c900cfd841264193155e1f89ebc27c387b7649da6dbcc
-  data.tar.gz: 96cdc260febe8d2dff2f479421dcf7e94e61de4dacf77ee2ca30372c069e390c
+  metadata.gz: 4ff2b361ee9d3b06983e6ccdcc847a1ca17dd7b41cdf7bc45fc83bc0261b318c
+  data.tar.gz: a658135bbc6e28aaef43ec7ba14ec70e8cde6bcdf1a897ddae0c26abd1a5f0fb
 SHA512:
-  metadata.gz: aae99c356a7467495f3311dd0aaca592078164458183076aae3fd3688d65d7d0e0b37bf209cb6b0873715240b9d6b1105e04dbbd60ce80d0d53566e5a67a07a5
-  data.tar.gz: a63690e1401e3df9bdc29cc6f9441812521bad478fb43ee4ed6be79d7bc39a220a56c90de3862b8d4510cd9ad04d48d534a92bcb0769500b8b7cb16c900f0328
+  metadata.gz: 750968741f4e6744525b091cd101d8e3344ded32f538e98a99f450c553de9b36e7f18d7275c1efacc4319634b85f78549107c1daa05eb24b560464043b0b02e0
+  data.tar.gz: 2f6a955ac2ee470429390784b2e886655556ac0c06a3a6d440357a295b62d155c4f8ce6622834a2724671cab5e9a4c28c74f46e05631523bb12fa84c0c96d1d0

data/.gitignore

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

data/.travis.yml

@@ -1,11 +1,11 @@
 rvm:
-  - 2.0
   - 2.1
   - 2.2
   - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
   - jruby-head
 sudo: false

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.19.0

data/complex_config.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: complex_config 0.17.0 ruby lib
+# stub: complex_config 0.19.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "complex_config".freeze
-  s.version = "0.17.0"
+  s.version = "0.19.0"
 
   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 = "2021-01-05"
   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,34 +17,25 @@ 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.2.3".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]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    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<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
-      s.add_development_dependency(%q<monetize>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<json>.freeze, [">= 0"])
-      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<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_dependency(%q<rspec>.freeze, [">= 0"])
-      s.add_dependency(%q<monetize>.freeze, [">= 0"])
-      s.add_dependency(%q<json>.freeze, [">= 0"])
-      s.add_dependency(%q<tins>.freeze, [">= 0"])
-      s.add_dependency(%q<mize>.freeze, ["~> 0.3", ">= 0.3.4"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    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"])
+    s.add_development_dependency(%q<monetize>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<json>.freeze, [">= 0"])
+    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"])

data/lib/complex_config/plugins/uri.rb

@@ -2,7 +2,7 @@ require 'uri'
 
 module ComplexConfig::Plugins
   URI = -> id do
-    url = id.to_s
+    url = id.to_s.dup
     if url.sub!(/uri\z/, 'url') and url = ask_and_send(url)
       ::URI.parse(url)
     else

data/lib/complex_config/provider.rb

@@ -65,7 +65,7 @@ class ComplexConfig::Provider
   end
 
   def config_dir
-    @config_dir || (defined?(Rails) && Rails.root || Pathname.pwd) + 'config'
+    @config_dir || (defined?(Rails) && Rails.respond_to?(:root) && Rails.root || Pathname.pwd) + 'config'
   end
 
   def pathname(name)
@@ -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
@@ -176,7 +176,9 @@ class ComplexConfig::Provider
   end
 
   def env
-    @env || defined?(Rails) && Rails.env || ENV['RAILS_ENV'] || 'development'
+    @env || defined?(Rails) && Rails.respond_to?(:env) && Rails.env ||
+      ENV['RAILS_ENV'] ||
+      'development'
   end
 
   attr_writer :env

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
@@ -102,7 +111,7 @@ class ComplexConfig::Settings < BasicObject
   end
 
   def ==(other)
-    to_h == other.to_h
+    other.respond_to?(:to_h) && to_h == other.to_h
   end
 
   def to_yaml
@@ -124,7 +133,7 @@ class ComplexConfig::Settings < BasicObject
   def to_s(pair_sep: ' = ', path_sep: ?.)
     empty? and return self.class.name
     pathes(path_sep: path_sep).inject('') do |result, (path, value)|
-      result << "#{path}#{pair_sep}#{value.inspect}\n"
+      result + "#{path}#{pair_sep}#{value.inspect}\n"
     end
   end
 
@@ -178,7 +187,7 @@ class ComplexConfig::Settings < BasicObject
     freeze
   end
 
-  def [](name)
+  def attribute_get(name)
     if !attribute_set?(name) and
       value = ::ComplexConfig::Provider.apply_plugins(self, name)
     then
@@ -188,6 +197,16 @@ class ComplexConfig::Settings < BasicObject
     end
   end
 
+  alias [] attribute_get
+
+  def attribute_get!(name)
+    if attribute_set?(name)
+      attribute_get(name)
+    else
+      raise ::ComplexConfig::AttributeMissing, "no attribute named #{name.inspect}"
+    end
+  end
+
   def []=(name, value)
     @table[name.to_sym] = value
   end

data/lib/complex_config/version.rb

@@ -1,6 +1,6 @@
 module ComplexConfig
   # ComplexConfig version
-  VERSION         = '0.17.0'
+  VERSION         = '0.19.0'
   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/complex_config/settings_spec.rb

@@ -133,6 +133,11 @@ EOT
     expect(settings.foo.baz?).to be_falsy
   end
 
+  it 'can trigger exception on attribute get' do
+    expect(settings.foo.attribute_get!(:bar)).to be_truthy
+    expect { settings.foo.attribute_get!(:baz) }.to raise_error ComplexConfig::AttributeMissing
+  end
+
   it 'handles arrays correctly' do
     settings = described_class[ary: [ 1, { hsh: 2 }, 3 ]]
     expect(settings.to_h).to eq(ary: [ 1, { hsh: 2 }, 3 ])

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.19.0
 platform: ruby
 authors:
 - Florian Frank
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2021-01-05 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
@@ -200,7 +200,7 @@ homepage: https://github.com/flori/complex_config
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - ComplexConfig -- configuration library
@@ -219,8 +219,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: configuration library
 test_files: