complex_config 0.18.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e73e68945dd80153f4d2b7bdf6230188c2f818116b1be2b5d15275f6a60bd4cf
-  data.tar.gz: 9b26daedb74a7ec7b964949157b090e132f2578caee5bc5017a8e9846e0737ae
+  metadata.gz: 3486d5210e50100d17dea40922e6958c06898ba4ec70d3830b58b50160ecdeba
+  data.tar.gz: ee463ae5164fee75e2a4454b1176b1d31903026924297aca8371814cf6e1649d
 SHA512:
-  metadata.gz: 34f7301a12996a624fda778cf814601324e7241fd955bd19b32d37cec572ee3cf0550ac2868851094bc2badfa86b79ede0614beb2f3f90c9c24a2d6535985b63
-  data.tar.gz: 62dd718af441e486f1ccf0c54201f4ca34cc46e02dd853956d331e8fbe903b3025e94734c84ec3cb854ae273cc009bcb3aefa874c48a4c0d786c6bbf16d0e807
+  metadata.gz: 6ea338ae3b2f8b9ea408d0a2e439afd14f21ba29937f82d33d01f3db6c155513e16108d3647345e3c05031c6ba06433ab9db7d626ba5be427758be6ad51f1981
+  data.tar.gz: 3cba305f3824ff5da2592283ce698ff7f06d28fe1c9c61caabd6fc77c7f0601664a7a4213bf8b47a14adb88bdb29ee43a44b4220ca9305b441678905d94c2b77

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.0.2

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - 2.5
   - 2.6
   - 2.7
+  - 3.0
   - ruby-head
   - jruby-head
 sudo: false

data/VERSION

@@ -1 +1 @@
-0.18.1
+0.19.2

data/complex_config.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: complex_config 0.18.1 ruby lib
+# stub: complex_config 0.19.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "complex_config".freeze
-  s.version = "0.18.1"
+  s.version = "0.19.2"
 
   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 = "2020-08-26"
+  s.date = "2021-10-28"
   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]
   s.extra_rdoc_files = ["README.md".freeze, "lib/complex_config.rb".freeze, "lib/complex_config/config.rb".freeze, "lib/complex_config/encryption.rb".freeze, "lib/complex_config/errors.rb".freeze, "lib/complex_config/key_source.rb".freeze, "lib/complex_config/plugins.rb".freeze, "lib/complex_config/plugins/enable.rb".freeze, "lib/complex_config/plugins/money.rb".freeze, "lib/complex_config/plugins/uri.rb".freeze, "lib/complex_config/provider.rb".freeze, "lib/complex_config/provider/shortcuts.rb".freeze, "lib/complex_config/proxy.rb".freeze, "lib/complex_config/railtie.rb".freeze, "lib/complex_config/rude.rb".freeze, "lib/complex_config/settings.rb".freeze, "lib/complex_config/shortcuts.rb".freeze, "lib/complex_config/version.rb".freeze]
-  s.files = [".gitignore".freeze, ".rspec".freeze, ".travis.yml".freeze, ".utilsrc".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/complex_config".freeze, "complex_config.gemspec".freeze, "config/products.yml".freeze, "lib/complex_config.rb".freeze, "lib/complex_config/config.rb".freeze, "lib/complex_config/encryption.rb".freeze, "lib/complex_config/errors.rb".freeze, "lib/complex_config/key_source.rb".freeze, "lib/complex_config/plugins.rb".freeze, "lib/complex_config/plugins/enable.rb".freeze, "lib/complex_config/plugins/money.rb".freeze, "lib/complex_config/plugins/uri.rb".freeze, "lib/complex_config/provider.rb".freeze, "lib/complex_config/provider/shortcuts.rb".freeze, "lib/complex_config/proxy.rb".freeze, "lib/complex_config/railtie.rb".freeze, "lib/complex_config/rude.rb".freeze, "lib/complex_config/settings.rb".freeze, "lib/complex_config/shortcuts.rb".freeze, "lib/complex_config/version.rb".freeze, "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/config/broken_config.yml".freeze, "spec/config/config.yml".freeze, "spec/config/master.key".freeze, "spec/config/with-key-file.yml.enc".freeze, "spec/config/with-key-file.yml.key".freeze, "spec/config/without-key-file.yml.enc".freeze, "spec/spec_helper.rb".freeze]
+  s.files = [".gitignore".freeze, ".rspec".freeze, ".tool-versions".freeze, ".travis.yml".freeze, ".utilsrc".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/complex_config".freeze, "complex_config.gemspec".freeze, "config/products.yml".freeze, "lib/complex_config.rb".freeze, "lib/complex_config/config.rb".freeze, "lib/complex_config/encryption.rb".freeze, "lib/complex_config/errors.rb".freeze, "lib/complex_config/key_source.rb".freeze, "lib/complex_config/plugins.rb".freeze, "lib/complex_config/plugins/enable.rb".freeze, "lib/complex_config/plugins/money.rb".freeze, "lib/complex_config/plugins/uri.rb".freeze, "lib/complex_config/provider.rb".freeze, "lib/complex_config/provider/shortcuts.rb".freeze, "lib/complex_config/proxy.rb".freeze, "lib/complex_config/railtie.rb".freeze, "lib/complex_config/rude.rb".freeze, "lib/complex_config/settings.rb".freeze, "lib/complex_config/shortcuts.rb".freeze, "lib/complex_config/version.rb".freeze, "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/config/broken_config.yml".freeze, "spec/config/config.yml".freeze, "spec/config/config_with_alias.yml".freeze, "spec/config/master.key".freeze, "spec/config/with-key-file.yml.enc".freeze, "spec/config/with-key-file.yml.key".freeze, "spec/config/without-key-file.yml.enc".freeze, "spec/spec_helper.rb".freeze]
   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.1.2".freeze
+  s.rubygems_version = "3.2.22".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]
 

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)
@@ -99,7 +99,12 @@ class ComplexConfig::Provider
         "configuration file #{pathname.to_s.inspect} is missing"
     end
     results = datas.map { |d| evaluate(pathname, d) }
-    hashes = results.map { |r| ::YAML.load(r, pathname) }
+    hashes =
+      if ::Psych::VERSION < "4"
+        results.map { |r| ::YAML.load(r, pathname) }
+      else
+        results.map { |r| ::YAML.load(r, filename: pathname, aliases: true) }
+      end
     settings = ComplexConfig::Settings.build(name, hashes.shift)
     hashes.each { |h| settings.attributes_update(h) }
     if shared = settings.shared?
@@ -169,10 +174,18 @@ class ComplexConfig::Provider
     self
   end
 
-  def evaluate(pathname, data)
-    erb = ::ERB.new(data, nil, '-')
-    erb.filename = pathname.to_s
-    erb.result
+  if RUBY_VERSION >= "3"
+    def evaluate(pathname, data)
+      erb = ::ERB.new(data, trim_mode: '-')
+      erb.filename = pathname.to_s
+      erb.result
+    end
+  else
+    def evaluate(pathname, data)
+      erb = ::ERB.new(data, nil, '-')
+      erb.filename = pathname.to_s
+      erb.result
+    end
   end
 
   def env

data/lib/complex_config/settings.rb

@@ -111,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
@@ -187,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
@@ -197,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.18.1'
+  VERSION         = '0.19.2'
   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

@@ -269,6 +269,18 @@ RSpec.describe ComplexConfig::Provider do
     end
   end
 
+  context 'handling configuration files with aliases (considered unsafe)' do
+    before do
+      described_class.config_dir = Pathname.new(__FILE__) + '../../config'
+    end
+
+    it 'reads yaml files with aliases just fine' do
+      expect(
+        described_class.config(asset('config_with_alias.yml')).specific.extended
+      ).to be true
+    end
+  end
+
   context 'evaluating configuration files with ERB' do
     it 'evaluates a config file correctly' do
       expect(

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_with_alias.yml

@@ -0,0 +1,6 @@
+common: &common
+  extended: true
+
+specific:
+  <<: *common
+  foo: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: complex_config
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -155,6 +155,7 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".rspec"
+- ".tool-versions"
 - ".travis.yml"
 - ".utilsrc"
 - COPYING
@@ -191,6 +192,7 @@ files:
 - spec/complex_config/shortcuts_spec.rb
 - spec/config/broken_config.yml
 - spec/config/config.yml
+- spec/config/config_with_alias.yml
 - spec/config/master.key
 - spec/config/with-key-file.yml.enc
 - spec/config/with-key-file.yml.key
@@ -219,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: configuration library