configurate 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7ee31139c43b2f17023d605dee685f0618fcc0e56b068733cddb8e5e10cf006
-  data.tar.gz: 5ee1c764538c194795750718c6a530cbd94684d334782afc7fa47a35083547af
+  metadata.gz: c6cbde7141caa3d2c774fff3a2cc73174410582d050682b5d4804870af484b07
+  data.tar.gz: 29daacb8ee699fe7ab37d320f78f9fb5a2722c825b28dac9077cd50ce9abc383
 SHA512:
-  metadata.gz: c221bc2ed5cf3b7705a207776628621301cd73c3e891dac13ba9d2ada574fc265a5678edff29974da657daa373d712ccb6753ee2083ad6ab0d94b36cd1314225
-  data.tar.gz: 338aaf220e3ccc945a35079fb15c50c6af87132c78c97fb7fe0ff1d2d8bdd54e5a0406aa01d890eb910cfee55fb649667e67c042c54e005d0772ce654ba9be1a
+  metadata.gz: 15bc4f73d51fa365b6de1386f73d3cd92aaf72bdb9bed931c75a7046ca7a79a15beb43f0315d8db5f4d0d628c27b8e533fbadd063b1c2898f36dd0e89e23e563
+  data.tar.gz: b5e8260b309c38f58479590b07c849889c227ff51b5fd5945e689f768b0b0f69ded625c6b5fb89eabdd380c1647ce7f2c2dd3d539f9e3a45a69f31f8ca56ab27

data/Changelog.md

@@ -1,3 +1,13 @@
+# 0.6.0
+
+* Add support for Ruby 3.2
+* Drop support for Ruby below 2.7
+
+# 0.5.0
+
+* Support and prefer `toml-rb` over `tomlrb` in the shipped TOML provider.
+* Drop explicit support for Ruby < 2.4
+
 # 0.4.0
 
 * `Configurate::Proxy` returns its own singleton class if the target does not support creating one.

data/README.md

@@ -10,7 +10,7 @@ your default settings with a user configuration file and let those be overridden
 by environment variables. The query interface allows to group and nest your configuration options
 to a practically unlimited level.
 
-Configurate supports Ruby 2.0 or later.
+Configurate supports Ruby 2.7 or later.
 
 ## Installation
 
@@ -137,8 +137,8 @@ Config.stuff.param        # => "foo"
 Config.stuff.nested.param # => "bar"
 ```
 
-This provider depends on the [tomlrb](https://github.com/fbernier/tomlrb) gem. This is why it is not loaded by default and
-needs an explicit `require 'configurate/provider/toml' to be available.
+This provider depends on the [toml-rb](https://github.com/emancu/toml-rb) or the [tomlrb](https://github.com/fbernier/tomlrb) gem.
+This is why it is not loaded by default and needs an explicit `require 'configurate/provider/toml'` to be available. If both are available, toml-rb is preferred.
 
 The initializer takes a path to the configuration file a the mandatory first argument and
 the following optional parameters:

data/lib/configurate/lookup_chain.rb

@@ -12,15 +12,15 @@ module Configurate
     # they are added, so the order is important.
     #
     # @param provider [#lookup]
-    # @param *args the arguments passed to the providers constructor
+    # @param ... the arguments passed to the providers constructor
     # @raise [ArgumentError] if an invalid provider is given
     # @return [void]
-    def add_provider(provider, *args)
+    def add_provider(provider, ...)
       unless provider.respond_to?(:instance_methods) && provider.instance_methods.include?(:lookup)
         raise ArgumentError, "the given provider does not respond to lookup"
       end
 
-      @provider << provider.new(*args)
+      @provider << provider.new(...)
     end
 
     # Tries all providers in the order they were added to provide a response
@@ -31,11 +31,11 @@ module Configurate
     # @param ... further args passed to the provider
     # @return [Array,Hash,String,Boolean,nil] whatever the responding
     #   provider provides is casted to a {String}, except for some special values
-    def lookup(setting, *args)
+    def lookup(setting, ...)
       setting = SettingPath.new setting if setting.is_a? String
       @provider.each do |provider|
         begin
-          return special_value_or_string(provider.lookup(setting.clone, *args))
+          return special_value_or_string(provider.lookup(setting.clone, ...))
         rescue SettingNotFoundError; end
       end
 

data/lib/configurate/provider/toml.rb

@@ -1,13 +1,20 @@
 # frozen_string_literal: true
 
 require "configurate"
-require "tomlrb"
 
 module Configurate
   module Provider
     # This provider tries to open a TOML file and does nested lookups
     # in it.
     class TOML < StringHash
+      begin
+        require "toml-rb"
+        PARSER = TomlRB
+      rescue LoadError => e
+        require "tomlrb"
+        PARSER = Tomlrb
+      end
+
       # @param file [String] the path to the file
       # @param namespace [String] optionally set this as the root
       # @param required [Boolean] whether or not to raise an error if
@@ -17,7 +24,7 @@ module Configurate
       # @raise [ArgumentError] if the namespace isn't found in the file
       # @raise [Errno:ENOENT] if the file isn't found
       def initialize file, namespace: nil, required: true, raise_on_missing: false
-        super(Tomlrb.load_file(file),
+        super(PARSER.load_file(file),
           namespace:        namespace,
           required:         required,
           raise_on_missing: raise_on_missing,

data/spec/configurate/lookup_chain_spec.rb

@@ -27,6 +27,11 @@ describe Configurate::LookupChain do
       expect(ValidConfigurationProvider).to receive(:new).with(:extra)
       subject.add_provider ValidConfigurationProvider, :extra
     end
+
+    it "passes keyword args to the provider" do
+      expect(ValidConfigurationProvider).to receive(:new).with(required: false)
+      subject.add_provider ValidConfigurationProvider, required: false
+    end
   end
 
   describe "#lookup" do

data/spec/configurate/provider/toml_spec.rb

@@ -4,6 +4,8 @@ require "spec_helper"
 require "configurate/provider/toml"
 
 describe Configurate::Provider::TOML do
+  PARSER = Configurate::Provider::TOML::PARSER
+
   let(:settings) {
     {
       "toplevel" => "bar",
@@ -16,12 +18,12 @@ describe Configurate::Provider::TOML do
   describe "#initialize" do
     it "loads the file" do
       file = "foobar.toml"
-      expect(Tomlrb).to receive(:load_file).with(file).and_return({})
+      expect(PARSER).to receive(:load_file).with(file).and_return({})
       described_class.new file
     end
 
     it "raises if the file is not found" do
-      allow(Tomlrb).to receive(:load_file).and_raise(Errno::ENOENT)
+      allow(PARSER).to receive(:load_file).and_raise(Errno::ENOENT)
       expect {
         silence_stderr do
           described_class.new "foo"
@@ -32,13 +34,13 @@ describe Configurate::Provider::TOML do
     context "with a namespace" do
       it "looks in the file for that namespace" do
         namespace = "some.nested"
-        allow(Tomlrb).to receive(:load_file).and_return(settings)
+        allow(PARSER).to receive(:load_file).and_return(settings)
         provider = described_class.new "bla", namespace: namespace
         expect(provider.instance_variable_get(:@settings)).to eq settings["some"]["nested"]
       end
 
       it "raises if the namespace isn't found" do
-        allow(Tomlrb).to receive(:load_file).and_return({})
+        allow(PARSER).to receive(:load_file).and_return({})
         expect {
           silence_stderr do
             described_class.new "bla", namespace: "bar"
@@ -47,7 +49,7 @@ describe Configurate::Provider::TOML do
       end
 
       it "works with an empty namespace in the file" do
-        allow(Tomlrb).to receive(:load_file).and_return("foo" => {"bar" => nil})
+        allow(PARSER).to receive(:load_file).and_return("foo" => {"bar" => nil})
         expect {
           silence_stderr do
             described_class.new "bla", namespace: "foo.bar"
@@ -58,7 +60,7 @@ describe Configurate::Provider::TOML do
 
     context "with required set to false" do
       it "doesn't raise if a file isn't found" do
-        allow(Tomlrb).to receive(:load_file).and_raise(Errno::ENOENT)
+        allow(PARSER).to receive(:load_file).and_raise(Errno::ENOENT)
         expect {
           silence_stderr do
             described_class.new "not_me", required: false
@@ -67,7 +69,7 @@ describe Configurate::Provider::TOML do
       end
 
       it "doesn't raise if a namespace isn't found" do
-        allow(Tomlrb).to receive(:load_file).and_return({})
+        allow(PARSER).to receive(:load_file).and_return({})
         expect {
           silence_stderr do
             described_class.new "bla", namespace: "foo", required: false
@@ -79,7 +81,7 @@ describe Configurate::Provider::TOML do
 
   describe "#lookup_path" do
     before do
-      allow(Tomlrb).to receive(:load_file).and_return(settings)
+      allow(PARSER).to receive(:load_file).and_return(settings)
       @provider = described_class.new "dummy"
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configurate
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jonne Haß
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: tomlrb
+  name: toml-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.1
 description: Configurate is a flexible configuration system that can read settings
   from multiple sources at the same time.
 email: me@jhass.eu
@@ -87,7 +87,7 @@ homepage: http://jhass.github.io/configurate
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,26 +95,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.13
+signing_key:
 specification_version: 4
 summary: Flexbile configuration system
 test_files:
-- spec/spec_helper.rb
 - spec/configurate/lookup_chain_spec.rb
-- spec/configurate/provider/toml_spec.rb
 - spec/configurate/provider/dynamic_spec.rb
-- spec/configurate/provider/yaml_spec.rb
-- spec/configurate/provider/string_hash_spec.rb
 - spec/configurate/provider/env_spec.rb
-- spec/configurate/proxy_spec.rb
+- spec/configurate/provider/string_hash_spec.rb
+- spec/configurate/provider/toml_spec.rb
+- spec/configurate/provider/yaml_spec.rb
 - spec/configurate/provider_spec.rb
+- spec/configurate/proxy_spec.rb
 - spec/configurate/setting_path_spec.rb
 - spec/configurate_spec.rb
+- spec/spec_helper.rb