config 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa6adc2bd8ce8b4bfbd732f11005ae7657ef8f5eb8c08b9e08d480408d344433
-  data.tar.gz: 48d8c6f90457636a2e1732df83cda5dfa2d2d4f5f8286bf7ceb8683f09831e4e
+  metadata.gz: 2212e68e8bb8e15f821b9420db10ec3111edcaa43bffe5450ae850d5228b3107
+  data.tar.gz: de9c513f5a6450a95e113071adf79c3d3b3e2f3485a018e14ab72241a2f419e0
 SHA512:
-  metadata.gz: 32228943bbf540ef716f788fd2cde8c51161cf7a92c3d17f36a109aadf895fde2240187f04e7be17a61488602521ee646c74bdf60657c21ad382b757fd22c203
-  data.tar.gz: e148e52b0f43442c9e8a36e406622d538bcdf9e2faa7eb256376d60bcf2fd8c7c0bf5890a13077a47a0d8415d908ec63567e622f948f93086181f02c653d68b8
+  metadata.gz: ae72b6c10869bbca57d7c476e5ba7b48637b6c94c083176b2c7321710bd4daebe5f41c03d3daf69157dd3f599f63f11d74e19141e98716ae3ef20c8c33469ba3
+  data.tar.gz: 07e79c9a667587218a3370c03e912c113795fa00a9f50350065834c91b9d858e03ee1447da078e6ec5af19c32faa5317f3a94b071478d4b96397317504891ac7

data/CHANGELOG.md

@@ -4,6 +4,16 @@
 
 ...
 
+## 2.2.3
+
+### Bug fixes
+
+* Revert added alias to_h for to_hash ([#277](https://github.com/railsconfig/config/issues/277))
+
+### Changes
+
+* Raise explicit error on environment variable conflicts ([#293](https://github.com/railsconfig/config/issues/293))
+
 ## 2.2.2
 
 ### Bug fixes

data/README.md

@@ -190,8 +190,9 @@ Settings.add_source!("#{Rails.root}/config/settings/local.yml")
 Settings.reload!
 ```
 
-> Note: this is an example usage, it is easier to just use the default local files `settings.local.yml,
-settings/#{Rails.env}.local.yml and environments/#{Rails.env}.local.yml` for your developer specific settings.
+> Note: this is an example usage, it is easier to just use the default local
+> files `settings.local.yml`, `settings/#{Rails.env}.local.yml` and
+> `environments/#{Rails.env}.local.yml` for your developer specific settings.
 
 You also have the option to add a raw hash as a source. One use case might be storing settings in the database or in environment variables that overwrite what is in the YML files.
 
@@ -419,6 +420,21 @@ 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.
+
+```ruby
+# Raises an error when settings are loaded
+ENV['BACKEND_DATABASE'] = 'development'
+ENV['BACKEND_DATABASE_USER'] = 'postgres'
+```
+
+Instead, specify keys of equal depth in the environment variable names:
+
+```ruby
+ENV['BACKEND_DATABASE_NAME'] = 'development'
+ENV['BACKEND_DATABASE_USER'] = 'postgres'
+```
+
 ### Working with Heroku
 
 Heroku uses ENV object to store sensitive settings. You cannot upload such files to Heroku because it's ephemeral filesystem gets recreated from the git sources on each instance refresh. To use config with Heroku just set the `use_env` var to `true` as mentioned above.

data/lib/config/options.rb

@@ -59,6 +59,11 @@ module Config
           h[key] ||= {}
         }
 
+        unless leaf.is_a?(Hash)
+          conflicting_key = (prefix + keys[0...-1]).join(separator)
+          raise "Environment variable #{variable} conflicts with variable #{conflicting_key}"
+        end
+
         leaf[keys.last] = Config.env_parse_values ? __value(value) : value
       end
 
@@ -118,8 +123,6 @@ module Config
       result
     end
 
-    alias :to_h :to_hash
-
     def each(*args, &block)
       marshal_dump.each(*args, &block)
     end

data/lib/config/version.rb

@@ -1,3 +1,3 @@
 module Config
-  VERSION = '2.2.2'.freeze
+  VERSION = '2.2.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Piotr Kuczynski
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge