config 3.1.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df10a2302fd2bd1f1199e97150b44d3f58a28915533dd7579bf58ed6fb77d7dd
-  data.tar.gz: 3fe17720f82d92766fd81b6f4dfcdeea1824ca7aa8a71302d4430496cf5921a1
+  metadata.gz: b3cac0bdae533f9149702c94c130eb5ff67615fe379cfa6327f5ca35cd70158d
+  data.tar.gz: 8b6f02dc57a929b9b6f577b006b6fd93691ab2fe2ed03924b96ca4d68ec26d1e
 SHA512:
-  metadata.gz: b9818ca58226256e90282c8dd1e92d1cac9ad77331e31a8073e811a5be36ada096914030da47ac8df2e57a8dcfcaa0d4d20b5a58ffd934602ac9b02356b53f51
-  data.tar.gz: 680d6f2b9002d1ede073b391ff747c47fe5bf13f87689dbed1e59b3f8a3abb031449069593e8de01086b62631a43936e3f461008340ed88d23b39a35ab29a2d2
+  metadata.gz: d65e0cfebb1a8340128aaf3bd38e177aca37f9e45eca1e2c131a388570e5141b1ac7f6ec4acd266dbfc9ac8abaade6dc3385f4abe2bd8432b641927c2df0e9ee
+  data.tar.gz: 6fca6f8a1bdfd9fd6f11253238a557ada04b37ec949a9f9433bc61c4732150f0397248ec236211dabbc71ea8cc1286f1f74d31e0f643363b7b020733cc94ae8a

data/CHANGELOG.md

@@ -1,8 +1,21 @@
 # Changelog
 
-## Unreleased
+## 4.1.0
 
-...
+### Bug fixes
+
+* Only load `Railtie` integration if `Rails::Railtie` is defined ([#319](https://github.com/rubyconfig/config/pull/319))
+* Fix indentation warning in Ruby 3.1 ([#322](https://github.com/rubyconfig/config/pull/322))
+
+## 4.0.0
+
+### BREAKING CHANGES
+
+* 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`.
+  * 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
 

data/README.md

@@ -24,16 +24,18 @@ Config helps you easily manage environment specific settings in an easy and usab
 Current version supports and is [tested](.github/workflows/tests.yml#L19) for the following interpreters and frameworks:
 
 * Interpreters
-  * [Ruby](https://www.ruby-lang.org) `>= 2.4`
+  * [Ruby](https://www.ruby-lang.org) `>= 2.6`
   * [JRuby](https://www.jruby.org) `>= 9.2`
   * [TruffleRuby](https://github.com/oracle/truffleruby) `>= 19.3`
 * Application frameworks
-  * Rails `>= 4.2`, `5` and `6`
+  * Rails `>= 5.2`
   * Padrino
   * Sinatra
 
 For Ruby `2.0` to `2.3` or Rails `3` to `4.1` use version `1.x` of this gem. For older versions of Rails or Ruby use [AppConfig](http://github.com/fredwu/app_config).
 
+For Ruby `2.4` or `2.5` or Rails `4.2`, `5.0`, or `5.1` use version `3.x` of this gem.
+
 ## Installing
 
 ### Installing on Rails
@@ -533,6 +535,33 @@ You are very warmly welcome to help. Please follow our [contribution guidelines]
 
 Any and all contributions offered in any form, past present or future are understood to be in complete agreement and acceptance with [MIT](LICENSE) license.
 
+### Running specs
+
+Setup
+
+```sh
+bundle install
+bundle exec appraisal install
+```
+
+List defined appraisals:
+
+```sh
+bundle exec appraisal list
+```
+
+Run specs for specific appraisal:
+
+```sh
+bundle exec appraisal rails-6.1 rspec
+```
+
+Run specs for all appraisals:
+
+```sh
+bundle exec appraisal rspec
+```
+
 ## Authors
 
 * [Piotr Kuczynski](http://github.com/pkuczynski)

data/config.gemspec

@@ -24,7 +24,7 @@ Donate: \e[34mhttps://opencollective.com/rubyconfig/donate\e[0m\n"
   s.files.select! { |file| /(^lib\/|^\w+.md$|\.gemspec$)/ =~ file }
 
   s.require_paths         = ['lib']
-  s.required_ruby_version = '>= 2.4.0'
+  s.required_ruby_version = '>= 2.6.0'
 
   s.add_dependency 'deep_merge', '~> 1.2', '>= 1.2.1'
   s.add_dependency 'dry-validation', '~> 1.0', '>= 1.0.0'

data/lib/config/options.rb

@@ -16,7 +16,7 @@ module Config
 
     def add_source!(source)
       # handle yaml file paths
-      source = (Sources::YAMLSource.new(source)) if source.is_a?(String)
+      source = (Sources::YAMLSource.new(source)) if source.is_a?(String) || source.is_a?(Pathname)
       source = (Sources::HashSource.new(source)) if source.is_a?(Hash)
 
       @config_sources ||= []
@@ -24,7 +24,7 @@ module Config
     end
 
     def prepend_source!(source)
-      source = (Sources::YAMLSource.new(source)) if source.is_a?(String)
+      source = (Sources::YAMLSource.new(source)) if source.is_a?(String) || source.is_a?(Pathname)
       source = (Sources::HashSource.new(source)) if source.is_a?(Hash)
 
       @config_sources ||= []

data/lib/config/sources/yaml_source.rb

@@ -22,10 +22,10 @@ module Config
 
         result || {}
 
-        rescue Psych::SyntaxError => e
-          raise "YAML syntax error occurred while parsing #{@path}. " \
-                "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
-                "Error: #{e.message}"
+      rescue Psych::SyntaxError => e
+        raise "YAML syntax error occurred while parsing #{@path}. " \
+              "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
+              "Error: #{e.message}"
       end
     end
   end

data/lib/config/version.rb

@@ -1,3 +1,3 @@
 module Config
-  VERSION = '3.1.1'.freeze
+  VERSION = '4.1.0'.freeze
 end

data/lib/config.rb

@@ -35,12 +35,12 @@ module Config
 
   # Create a populated Options instance from a settings file. If a second file is given, then the sections of that
   # file will overwrite existing sections of the first file.
-  def self.load_files(*files)
+  def self.load_files(*sources)
     config = Options.new
 
     # add settings sources
-    [files].flatten.compact.uniq.each do |file|
-      config.add_source!(file.to_s)
+    [sources].flatten.compact.each do |source|
+      config.add_source!(source)
     end
 
     config.add_source!(Sources::EnvSource.new(ENV)) if Config.use_env
@@ -50,10 +50,10 @@ module Config
   end
 
   # Loads and sets the settings constant!
-  def self.load_and_set_settings(*files)
+  def self.load_and_set_settings(*sources)
     name = Config.const_name
     Object.send(:remove_const, name) if Object.const_defined?(name)
-    Object.const_set(name, Config.load_files(files))
+    Object.const_set(name, Config.load_files(sources))
   end
 
   def self.setting_files(config_root, env)
@@ -79,7 +79,7 @@ module Config
 end
 
 # Rails integration
-require('config/integrations/rails/railtie') if defined?(::Rails)
+require('config/integrations/rails/railtie') if defined?(::Rails::Railtie)
 
 # Sinatra integration
 require('config/integrations/sinatra') if defined?(::Sinatra)

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: config
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Piotr Kuczynski
 - Fred Wu
 - Jacques Crocker
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2022-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -258,15 +258,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.26
+signing_key:
 specification_version: 4
 summary: Effortless multi-environment settings in Rails, Sinatra, Pandrino and others
 test_files: []