Merge branch 'master' into block-reload-config

Author: pkuczynski

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## 5.5.2
+
+* Fix warning: ostruct was loaded from the standard library with Ruby 3.3.5 and 3.4+ ([#363](https://github.com/rubyconfig/config/pull/363))
+
+## 5.5.1
+
+### Documentation
+
+* Fix funding_url to funding_uri in gemspec ([#361](https://github.com/rubyconfig/config/pull/361))
+
+## 5.5.0
+
+### New features
+
+* Allow arrays to be passed through env variables ([#354](https://github.com/rubyconfig/config/pull/354))
+
+### Documentation
+
+* Use funding_url rather than post_install_message ([#360](https://github.com/rubyconfig/config/pull/360))
+* Fix typos in the tests and documentation ([#359](https://github.com/rubyconfig/config/pull/359))
+
 ## 5.4.0
 
 ### New features
@@ -56,7 +77,7 @@
 * Rails versions `< 5.2` are no longer supported ([#316](https://github.com/rubyconfig/config/pull/316))
 * Ruby versions `< 2.6` are no longer supported ([#316](https://github.com/rubyconfig/config/pull/316))
 * Support `HashSource` and `EnvSource` instances in `Config.load_files` and `Config.load_and_set_settings`. ([#315](https://github.com/rubyconfig/config/pull/315)). There are a few subtle breaking changes:
-  * Previously, `Config.load_files` (called from `Config.load_and_set_settings`) would call `.to_s` on each of its arguments. Now, this responsibility is defered to YAMLSource. In effect, if your application passes String or Pathname objects to `Config.load_files`, no changes are necessary, but if you were somehow relying on the `.to_s` call for some other type of object, you'll now need to call `.to_s` on that object before passing it to `Config`.
+  * Previously, `Config.load_files` (called from `Config.load_and_set_settings`) would call `.to_s` on each of its arguments. Now, this responsibility is deferred to YAMLSource. In effect, if your application passes String or Pathname objects to `Config.load_files`, no changes are necessary, but if you were somehow relying on the `.to_s` call for some other type of object, you'll now need to call `.to_s` on that object before passing it to `Config`.
   * Before this change, `Config.load_files` would call `uniq` on its argument array. This call has been removed, so duplicate file paths are not removed before further processing. In some cases, this can cause differences in behavior since later config files override the values in earlier ones. In most cases, it's best to ensure that duplicate paths are not passed to `Config.load_files`.
 
 ## 3.1.1

README.md

@@ -278,7 +278,7 @@ After installing `Config` in Rails, you will find automatically generated file t
 
 ### General
 
-* `const_name` - name of the object holing you settings. Default: `'Settings'`
+* `const_name` - name of the object holding your settings. Default: `'Settings'`
 * `evaluate_erb_in_yaml` - evaluate ERB in YAML config files. Set to false if the config file contains ERB that should not be evaluated at load time. Default: `true`
 * `file_name` - name of the file to store general keys accessible in all environments. Default: `'settings'` - located at `config/settings.yml`
 * `dir_name` - name of the directory to store environment-specific files. Default: `'settings'` - located at `config/settings/`
@@ -436,7 +436,7 @@ ENV['Settings.section.server'] = 'google.com'
 
 It won't work with arrays, though.
 
-It is considered an error to use environment variables to simutaneously assign a "flat" value and a multi-level value to a key.
+It is considered an error to use environment variables to simultaneously assign a "flat" value and a multi-level value to a key.
 
 ```ruby
 # Raises an error when settings are loaded

config.gemspec

@@ -14,13 +14,10 @@ Gem::Specification.new do |s|
   s.license          = 'MIT'
   s.extra_rdoc_files = %w[README.md CHANGELOG.md CONTRIBUTING.md LICENSE.md]
   s.rdoc_options     = ['--charset=UTF-8']
-  s.post_install_message = "\n\e[33mThanks for installing Config\e[0m
-Please consider donating to our open collective to help us maintain this project.
-\n
-Donate: \e[34mhttps://opencollective.com/rubyconfig/donate\e[0m\n"
 
   s.metadata = {
     'changelog_uri' => "https://github.com/rubyconfig/config/blob/master/CHANGELOG.md",
+    'funding_uri' => 'https://opencollective.com/rubyconfig/donate',
     'source_code_uri' => 'https://github.com/rubyconfig/config',
     'bug_tracker_uri' => 'https://github.com/rubyconfig/config/issues'
   }
@@ -31,6 +28,7 @@ Donate: \e[34mhttps://opencollective.com/rubyconfig/donate\e[0m\n"
   s.required_ruby_version = '>= 2.6.0'
 
   s.add_dependency 'deep_merge', '~> 1.2', '>= 1.2.1'
+  s.add_dependency 'ostruct'
 
   s.add_development_dependency 'dry-validation', *Config::DryValidationRequirements::VERSIONS
   s.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'

lib/config/version.rb

@@ -1,3 +1,3 @@
 module Config
-  VERSION = '5.4.0'.freeze
+  VERSION = '5.5.2'.freeze
 end

spec/config_env_spec.rb

@@ -172,7 +172,7 @@
         expect(config.world.countries.europe).to eq(0)
       end
 
-      it 'should ignore variables wit default separator' do
+      it 'should ignore variables with default separator' do
         ENV['Settings.new_var'] = 'value'
 
         expect(config.new_var).to eq(nil)

spec/fixtures/unsafe_load.yml

@@ -7,6 +7,6 @@ test:
   database: myapp_test
   pool: *pool           # Psych::BadAlias: Unknown alias
 others:
-  regex: !ruby/regexp '/https?:\/\/.*exmaple\.com/' # Tried to load unspecified class: Regexp (Psych::DisallowedClass)
+  regex: !ruby/regexp '/https?:\/\/.*example\.com/' # Tried to load unspecified class: Regexp (Psych::DisallowedClass)
   date: 2021-08-03                                  # Tried to load unspecified class: Date (Psych::DisallowedClass)
   time: 2001-12-14T21:59:43.10-05:00                # Tried to load unspecified class: Time (Psych::DisallowedClass)

spec/options_spec.rb

@@ -70,7 +70,7 @@
       it 'should allow to access them via object member notation' do
         expect(config.select).to be_nil
         expect(config.table).to be_nil
-        expect(config.exit!).to be_nil        
+        expect(config.exit!).to be_nil
       end
 
       it 'should allow to access them using [] operator' do
@@ -167,7 +167,7 @@
         config.reload!
       end
 
-      it 'should be overwriten by the following values' do
+      it 'should be overwritten by the following values' do
         expect(config['tvrage']['service_url']).to eq('http://services.tvrage.com')
       end