complex_config 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c28ccee05d5a9ac6940f0b73babaca1a93c21e0f55f048bbc77ec000ccabb9f9
-  data.tar.gz: 053fca226196c715755fa82921eb43602d176faa3eb402b783b49d1b7113705e
+  metadata.gz: c28053b61dff2ae48b2da22e7bd5e8f2bcc80f48fdeaf490c9a2a607d4e876c9
+  data.tar.gz: cadf63913aeebf969f0f99d76a6be2e6c06cad5304f40699b96dce0fcd77e8f5
 SHA512:
-  metadata.gz: 7ba5fa43f39da3bef7c836a3ce6df235e1876a47981adb845139b7361118641780b62c5defc1610aa6b5f27d6a1027f337e10e426b8e184fb07363e74ec98449
-  data.tar.gz: 2551fe15c77f3442f99240d86097f3b28b2968e91ca36116ff51517caf12c66ddb096c0136aa968d091e79bc01947c70f3b9656b0ae13d9751c92b77c202d3a8
+  metadata.gz: e00cb460bb319128e56fa2ea8607bdaa93a16bf64c279d2480d417633688e80eb8fc6e2ea905345862dbc8ad2174ef6d30b218742addb055108b9933c07142ee
+  data.tar.gz: 49a16f1422acee6f938c09e4de0fee07861b765c1ada576ecad07bb957f35fc0d6d35119287717af7ad8c4936de874d15a3c661a5069212af763dbfcc7022102

data/README.md

@@ -143,7 +143,9 @@ Here is the `ComplexConfig::Plugins::MONEY` plugin for example:
     end
 
 ## Changes
-
+* 2018-07-06 Release 0.14.0
+  * Better support for rails encryption
+  * Adds `complex_config` executable.
 * 2018-02-23 Release 0.13.3
   Change evaluation order of key sources
 * 2018-02-23 Release 0.13.2

data/VERSION

@@ -1 +1 @@
-0.14.0
+0.14.1

data/complex_config.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: complex_config 0.14.0 ruby lib
+# stub: complex_config 0.14.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "complex_config".freeze
-  s.version = "0.14.0"
+  s.version = "0.14.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 = "2018-06-07"
+  s.date = "2018-12-07"
   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, "TODO.md".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, ".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.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 = "2.7.6".freeze
+  s.rubygems_version = "2.7.8".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]
 
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
       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.4", "~> 0.3"])
+      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"])
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
       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.4", "~> 0.3"])
+      s.add_dependency(%q<mize>.freeze, ["~> 0.3", ">= 0.3.4"])
     end
   else
     s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
@@ -51,6 +51,6 @@ Gem::Specification.new do |s|
     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.4", "~> 0.3"])
+    s.add_dependency(%q<mize>.freeze, ["~> 0.3", ">= 0.3.4"])
   end
 end

data/lib/complex_config/encryption.rb

@@ -30,7 +30,7 @@ class ComplexConfig::Encryption
     encrypted, iv, auth_tag = text.split('--').map { |v| base64_decode(v) }
 
     auth_tag.nil? || auth_tag.bytes.length != 16 and
-      raise ComplexConfig::DecryptionFailed, "auth_tag #{auth_tag.inspect} invalid"
+      raise ComplexConfig::DecryptionFailed, "auth_tag was invalid"
 
     @cipher.decrypt
     @cipher.key = @secret
@@ -42,6 +42,8 @@ class ComplexConfig::Encryption
     decrypted_data << @cipher.final
 
     Marshal.load(decrypted_data)
+  rescue OpenSSL::Cipher::CipherError
+    raise ComplexConfig::DecryptionFailed, "decryption failed with this key"
   end
 
   private

data/lib/complex_config/settings.rb

@@ -113,7 +113,12 @@ class ComplexConfig::Settings < BasicObject
     each.count
   end
 
+  def empty?
+    size == 0
+  end
+
   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"
     end

data/lib/complex_config/version.rb

@@ -1,6 +1,6 @@
 module ComplexConfig
   # ComplexConfig version
-  VERSION         = '0.14.0'
+  VERSION         = '0.14.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/encryption_spec.rb

@@ -24,4 +24,12 @@ RSpec.describe ComplexConfig::Encryption do
   it 'can decrypt' do
     expect(enc.decrypt(encrypted)).to eq value
   end
+
+  it 'raises exception if key is invalid' do
+    enc = described_class.new Tins::Token.new(
+      alphabet: (0..255).map(&:chr).join, bits: secret.size * 8
+    )
+    expect { enc.decrypt(encrypted) }.to\
+      raise_error ComplexConfig::DecryptionFailed
+  end
 end

data/spec/complex_config/plugins_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'complex_config/plugins/enable'
 
-RSpec.describe ComplexConfig::Settings do
+RSpec.describe ComplexConfig::Plugins do
   let :provider do
     ComplexConfig::Provider
   end
@@ -15,7 +15,7 @@ RSpec.describe ComplexConfig::Settings do
     ]
   end
 
-  context ComplexConfig::Plugins::URI do
+  context described_class::URI do
     it 'can return an URL string' do
       expect(settings.foo.test_url).to eq 'http://www.ping.de'
     end
@@ -33,7 +33,7 @@ RSpec.describe ComplexConfig::Settings do
     end
   end
 
-  context ComplexConfig::Plugins::MONEY do
+  context described_class::MONEY do
     it 'can return a Fixnum' do
       expect(settings.foo.cash_in_cents).to eq 100_00
     end

data/spec/complex_config/provider_spec.rb

@@ -2,23 +2,19 @@ require 'spec_helper'
 require 'fileutils'
 
 RSpec.describe ComplexConfig::Provider do
-  let :provider do
-    ComplexConfig::Provider
-  end
-
   reset_new_config = -> * {
-    provider.config_dir = Pathname.new(__FILE__).dirname.dirname + 'config'
-    provider.key = nil
+    described_class.config_dir = Pathname.new(__FILE__).dirname.dirname + 'config'
+    described_class.key = nil
     ENV['COMPLEX_CONFIG_KEY'] = nil
     ENV['RAILS_MASTER_KEY'] = nil
-    FileUtils.rm_f(provider.config_dir + 'new_config.yml')
-    FileUtils.rm_f(provider.config_dir + 'new_config.yml.enc')
-    FileUtils.rm_f(provider.config_dir + 'new_config.yml.key')
+    FileUtils.rm_f(described_class.config_dir + 'new_config.yml')
+    FileUtils.rm_f(described_class.config_dir + 'new_config.yml.enc')
+    FileUtils.rm_f(described_class.config_dir + 'new_config.yml.key')
   }
 
   after do
     instance_eval(&reset_new_config)
-    provider.flush_cache
+    described_class.flush_cache
   end
 
   context 'plugin' do
@@ -37,17 +33,17 @@ RSpec.describe ComplexConfig::Provider do
     end
 
     before do
-      provider.plugins.clear
+      described_class.plugins.clear
     end
 
     it 'can add one' do
-      expect { provider.add_plugin plugin }.to change { provider.plugins.size }.by(1)
+      expect { described_class.add_plugin plugin }.to change { described_class.plugins.size }.by(1)
     end
 
     it 'can apply plugins' do
-      provider.add_plugin plugin
+      described_class.add_plugin plugin
       allow(setting).to receive(:skip).and_throw :skip
-      expect(provider.apply_plugins(setting, :evaluate_plugin)).to eq :evaluated
+      expect(described_class.apply_plugins(setting, :evaluate_plugin)).to eq :evaluated
     end
   end
 
@@ -57,161 +53,161 @@ RSpec.describe ComplexConfig::Provider do
         def self.root
         end
       end
-      provider.config_dir = nil
+      described_class.config_dir = nil
     end
 
     it 'can derive rails root from Rails.root if present' do
       allow(::Rails).to receive(:root).and_return Pathname.new('bar')
       dir = Pathname.new('bar/config')
-      expect(provider.config_dir).to eq dir
+      expect(described_class.config_dir).to eq dir
     end
 
     it 'falls back to current working directory by default' do
-      expect(provider.config_dir).to eq Pathname.pwd + 'config'
+      expect(described_class.config_dir).to eq Pathname.pwd + 'config'
     end
 
     it 'can derive master_key_pathname' do
-      expect(provider.master_key_pathname).to eq\
+      expect(described_class.master_key_pathname).to eq\
       Pathname.pwd.join('config/master.key')
     end
 
     it 'can set master_key_pathname' do
-      provider.master_key_pathname = 'foo'
-      expect(provider.master_key_pathname).to eq 'foo'
+      described_class.master_key_pathname = 'foo'
+      expect(described_class.master_key_pathname).to eq 'foo'
     end
   end
 
   context 'reading configurations' do
     it 'can read a configuration file' do
       expect(
-        provider.config(asset('config.yml'))
+        described_class.config(asset('config.yml'))
       ).to be_a ComplexConfig::Settings
     end
 
     it 'has deep frozen settings' do
-      settings = provider.config(asset('config.yml'))
+      settings = described_class.config(asset('config.yml'))
       expect(settings).to be_frozen
     end
 
     it 'deep freezing can be disabled' do
       begin
-        provider.deep_freeze = false
-        settings = provider.config(asset('config.yml'))
+        described_class.deep_freeze = false
+        settings = described_class.config(asset('config.yml'))
         expect(settings).not_to be_frozen
       ensure
-        provider.deep_freeze = true
+        described_class.deep_freeze = true
       end
     end
 
     it 'handles missing configuration files' do
-      expect { provider.config(asset('nix_config.yml')) }.to\
+      expect { described_class.config(asset('nix_config.yml')) }.to\
         raise_error(ComplexConfig::ConfigurationFileMissing)
     end
 
     it 'handles syntax errors in configuration files' do
-      expect { provider.config(asset('broken_config.yml')) }.to\
+      expect { described_class.config(asset('broken_config.yml')) }.to\
         raise_error(ComplexConfig::ConfigurationSyntaxError)
     end
   end
 
   context 'writing configurations' do
     before do
-      provider.config_dir = Pathname.new(__FILE__).dirname.dirname + 'config'
+      described_class.config_dir = Pathname.new(__FILE__).dirname.dirname + 'config'
     end
 
     let :config do
-      provider.config(asset('config.yml'))
+      described_class.config(asset('config.yml'))
     end
 
     it 'can be written' do
-      provider.write_config('new_config', value: config)
-      expect(provider.config(asset('new_config.yml'))).to eq config
+      described_class.write_config('new_config', value: config)
+      expect(described_class.config(asset('new_config.yml'))).to eq config
     end
 
     it 'can be changed and written' do
-      provider.deep_freeze = false
+      described_class.deep_freeze = false
       config.development.config.baz = 'something else'
-      provider.write_config('new_config', value: config)
-      expect(provider.config(asset('new_config.yml')).development.config.baz).to eq 'something else'
+      described_class.write_config('new_config', value: config)
+      expect(described_class.config(asset('new_config.yml')).development.config.baz).to eq 'something else'
     end
   end
 
   context 'reading encrypted configurations' do
     before do
-      provider.config_dir = Pathname.new(__FILE__).dirname.dirname + 'config'
+      described_class.config_dir = Pathname.new(__FILE__).dirname.dirname + 'config'
     end
 
     let :key do
-      IO.binread(provider.config_dir + 'with-key-file.yml.key')
+      IO.binread(described_class.config_dir + 'with-key-file.yml.key')
     end
 
     it 'can read when key is set by accessor' do
-      provider.key = key
-      expect(provider.key).to eq key.chomp
-      expect(provider['without-key-file'].development.foo.bar).to eq 'baz'
+      described_class.key = key
+      expect(described_class.key).to eq key.chomp
+      expect(described_class['without-key-file'].development.foo.bar).to eq 'baz'
     end
 
     it 'can read when key is in ENV var' do
       ENV['RAILS_MASTER_KEY'] = key
-      expect(provider['without-key-file'].development.foo.bar).to eq 'baz'
+      expect(described_class['without-key-file'].development.foo.bar).to eq 'baz'
       ENV['RAILS_MASTER_KEY'] = nil
     end
 
     it 'can read when key is stored in file' do
-      expect(provider['with-key-file'].development.foo.bar).to eq 'baz'
+      expect(described_class['with-key-file'].development.foo.bar).to eq 'baz'
     end
   end
 
   context 'writing encrypted configurations' do
     before do
-      provider.config_dir = Pathname.new(__FILE__).dirname.dirname + 'config'
+      described_class.config_dir = Pathname.new(__FILE__).dirname.dirname + 'config'
       instance_eval(&reset_new_config)
     end
 
     let :config do
-      provider.config(asset('config.yml'))
+      described_class.config(asset('config.yml'))
     end
 
     it 'can be written with random key' do
-      key = provider.write_config('new_config', value: config, encrypt: :random, store_key: false)
-      provider.key = key
-      expect(provider.config(asset('new_config.yml'))).to eq config
+      key = described_class.write_config('new_config', value: config, encrypt: :random, store_key: false)
+      described_class.key = key
+      expect(described_class.config(asset('new_config.yml'))).to eq config
     end
 
     it 'can be written with random key and store key' do
-      provider.write_config('new_config', value: config, encrypt: :random, store_key: true)
-      expect(provider.config(asset('new_config.yml'))).to eq config
+      described_class.write_config('new_config', value: config, encrypt: :random, store_key: true)
+      expect(described_class.config(asset('new_config.yml'))).to eq config
     end
 
     it 'can be written with passed key' do
       key = SecureRandom.hex(16)
-      provider.write_config('new_config', value: config, encrypt: key)
-      provider.key = key
-      expect(provider.config(asset('new_config.yml'))).to eq config
+      described_class.write_config('new_config', value: config, encrypt: key)
+      described_class.key = key
+      expect(described_class.config(asset('new_config.yml'))).to eq config
     end
 
     it 'can be written with configured key' do
-      provider.write_config('new_config', value: config)
-      expect(provider.config(asset('new_config.yml'))).to eq config
+      described_class.write_config('new_config', value: config)
+      expect(described_class.config(asset('new_config.yml'))).to eq config
     end
 
     it 'can be written with COMPLEX_CONFIG_KEY key' do
       ENV['COMPLEX_CONFIG_KEY'] = SecureRandom.hex(16)
-      k = provider.write_config('new_config', value: config, encrypt: true)
+      k = described_class.write_config('new_config', value: config, encrypt: true)
       expect(k).to eq ENV['COMPLEX_CONFIG_KEY']
-      expect(provider.config(asset('new_config.yml'))).to eq config
+      expect(described_class.config(asset('new_config.yml'))).to eq config
     end
 
     it 'can be written with RAILS_MASTER_KEY key' do
       ENV['RAILS_MASTER_KEY'] = SecureRandom.hex(16)
-      k = provider.write_config('new_config', value: config, encrypt: true)
+      k = described_class.write_config('new_config', value: config, encrypt: true)
       expect(k).to eq ENV['RAILS_MASTER_KEY']
-      expect(provider.config(asset('new_config.yml'))).to eq config
+      expect(described_class.config(asset('new_config.yml'))).to eq config
     end
 
     it 'can encrypt file content with RAILS_MASTER_KEY key' do
       ENV['RAILS_MASTER_KEY'] = SecureRandom.hex(16)
-      encrypted = provider.encrypt_config(asset('new_config.yml'), 'test')
+      encrypted = described_class.encrypt_config(asset('new_config.yml'), 'test')
       expect(encrypted).not_to be_empty
       ks = ComplexConfig::KeySource.new(env_var: 'RAILS_MASTER_KEY')
       expect(
@@ -220,58 +216,58 @@ RSpec.describe ComplexConfig::Provider do
     end
 
     it 'can be changed and written' do
-      provider.deep_freeze = false
-      expect(provider.config(asset('config.yml')).development.config.baz).to eq 'something'
+      described_class.deep_freeze = false
+      expect(described_class.config(asset('config.yml')).development.config.baz).to eq 'something'
       config.development.config.baz = 'something else'
-      provider.write_config('new_config', value: config)
-      expect(provider.config(asset('new_config.yml')).development.config.baz).to eq 'something else'
+      described_class.write_config('new_config', value: config)
+      expect(described_class.config(asset('new_config.yml')).development.config.baz).to eq 'something else'
       #
-      new_config = provider.config(asset('new_config.yml'), :new_config)
+      new_config = described_class.config(asset('new_config.yml'), :new_config)
       new_config.development.config.baz = 'something else else'
-      provider.write_config new_config
-      expect(provider.config(asset('new_config.yml')).development.config.baz).to eq 'something else else'
+      described_class.write_config new_config
+      expect(described_class.config(asset('new_config.yml')).development.config.baz).to eq 'something else else'
       #
-      new_config = provider.config(asset('new_config.yml'), :new_config)
-      provider.write_config(new_config, value: { development: { config: { baz: 'even more else' } } })
-      #expect(provider.config(asset('new_config.yml')).development.config.baz).to eq 'something else else'
+      new_config = described_class.config(asset('new_config.yml'), :new_config)
+      described_class.write_config(new_config, value: { development: { config: { baz: 'even more else' } } })
+      #expect(described_class.config(asset('new_config.yml')).development.config.baz).to eq 'something else else'
     end
   end
 
   context 'handling configuration files with []' do
     before do
-      provider.config_dir = Pathname.new(__FILE__).dirname.dirname + 'config'
+      described_class.config_dir = Pathname.new(__FILE__).dirname.dirname + 'config'
     end
 
     it 'returns the correct configuration' do
-      expect(provider['config']).to be_a ComplexConfig::Settings
+      expect(described_class['config']).to be_a ComplexConfig::Settings
     end
 
     it 'caches the configuration after first use' do
       expect {
-        expect(provider['config']).to be_a ComplexConfig::Settings
+        expect(described_class['config']).to be_a ComplexConfig::Settings
       }.to change {
-        provider.instance.__send__(:__mize_cache__).instance_variable_get(:@data).size
+        described_class.instance.__send__(:__mize_cache__).instance_variable_get(:@data).size
       }.by(1)
-      expect(provider).not_to receive(:config)
-      expect(provider['config']).to be_a ComplexConfig::Settings
+      expect(described_class).not_to receive(:config)
+      expect(described_class['config']).to be_a ComplexConfig::Settings
     end
 
     it 'can flush loaded configurations' do
-      expect(provider['config']).to be_a ComplexConfig::Settings
+      expect(described_class['config']).to be_a ComplexConfig::Settings
       result = nil
       expect {
-        result = provider.flush_cache
+        result = described_class.flush_cache
       }.to change {
-        provider.instance.__send__(:__mize_cache__).instance_variable_get(:@data).size
+        described_class.instance.__send__(:__mize_cache__).instance_variable_get(:@data).size
       }.by(-1)
-      expect(result).to be_a ComplexConfig::Provider
+      expect(result).to be_a described_class
     end
   end
 
   context 'evaluating configuration files with ERB' do
     it 'evaluates a config file correctly' do
       expect(
-        provider.config(asset('config.yml')).development.config.pi
+        described_class.config(asset('config.yml')).development.config.pi
       ).to be_within(1e-6).of Math::PI
     end
   end
@@ -287,33 +283,33 @@ RSpec.describe ComplexConfig::Provider do
     end
 
     after do
-      provider.env = nil
+      described_class.env = nil
     end
 
     it 'can be set manually' do
-      provider.env = 'foobar'
-      expect(provider.env).to eq 'foobar'
+      described_class.env = 'foobar'
+      expect(described_class.env).to eq 'foobar'
     end
 
     it 'can derive environments from Rails.env if present' do
       expect(Rails).to receive(:env).and_return('foobar')
-      expect(provider.env).to eq 'foobar'
+      expect(described_class.env).to eq 'foobar'
     end
 
     it 'falls back to "development" as a default' do
-      expect(provider.env).to eq 'development'
+      expect(described_class.env).to eq 'development'
     end
 
   end
 
   context 'shared' do
     before do
-      provider.config_dir = Pathname.new(__FILE__).dirname.dirname + 'config'
+      described_class.config_dir = Pathname.new(__FILE__).dirname.dirname + 'config'
     end
 
     it 'can share values' do
-      expect(provider['config'].development.shared).to eq true
-      expect(provider['config'].test.shared).to eq true
+      expect(described_class['config'].development.shared).to eq true
+      expect(described_class['config'].test.shared).to eq true
     end
   end
 end

data/spec/complex_config/settings_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe ComplexConfig::Settings do
   end
 
   let :settings do
-    ComplexConfig::Settings[
+    described_class[
       foo: {
         bar: {
           baz: true
@@ -18,12 +18,12 @@ RSpec.describe ComplexConfig::Settings do
   end
 
   it 'can be initialized with a hash' do
-    s = ComplexConfig::Settings.new(foo: 'bar')
+    s = described_class.new(foo: 'bar')
     expect(s.foo).to eq 'bar'
   end
 
   it 'can be duped and changed' do
-    s = ComplexConfig::Settings.new(foo: 'bar')
+    s = described_class.new(foo: 'bar')
     t = s.dup
     expect(s.foo).to eq 'bar'
     t.foo = 'baz'
@@ -43,6 +43,10 @@ RSpec.describe ComplexConfig::Settings do
     expect(settings.size).to eq 1
   end
 
+  it 'can be empty' do
+    expect(described_class.new).to be_empty
+  end
+
   it 'can set its attributes via index method' do
     expect {
       settings['blub'] = 'blub'
@@ -87,8 +91,12 @@ foo/qux → "quux"
 EOT
   end
 
+  it 'responds with class name if #to_s is called on empty settigs' do
+    expect(described_class.new.to_s).to eq described_class.name
+  end
+
   it 'can be represented as a string if it has arrays' do
-    settings[:ary] = ComplexConfig::Settings[ [ 1, { nested: 2 }, 3 ] ]
+    settings[:ary] = described_class[ [ 1, { nested: 2 }, 3 ] ]
     expect(settings.to_s).to eq <<EOT
 foo.bar.baz = true
 foo.qux = "quux"
@@ -126,12 +134,12 @@ EOT
   end
 
   it 'handles arrays correctly' do
-    settings = ComplexConfig::Settings[ary: [ 1, { hsh: 2 }, 3 ]]
+    settings = described_class[ary: [ 1, { hsh: 2 }, 3 ]]
     expect(settings.to_h).to eq(ary: [ 1, { hsh: 2 }, 3 ])
   end
 
   it 'returns zip if it was set' do
-    settings = ComplexConfig::Settings[zip: 'a string']
+    settings = described_class[zip: 'a string']
     expect(settings.zip).to eq 'a string'
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: complex_config
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -161,7 +161,6 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- TODO.md
 - VERSION
 - bin/complex_config
 - complex_config.gemspec
@@ -221,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: configuration library

data/TODO.md

@@ -1,4 +0,0 @@
-# TODO
-
-- Figure out why rspec don't like my double dispatch.
-