config 5.3.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 777b7f8139564b25204ca8c3d375044d16d7ed58132d898493404f04133f7a22
-  data.tar.gz: 8ce204241f891f5cf9b2130d02c0d03c12999624dd6a12efc653462bc4e781f1
+  metadata.gz: c8c55570ed35c36e29bb0e7fd02b4aa449fb1edf17b5c43739526d33c68bc67b
+  data.tar.gz: 0cdf118110c9761a24944e2cb810123ec26242efc820e8b47545ff2cc6219f86
 SHA512:
-  metadata.gz: 143d0364fd88bfacfceb6032d82bdd7e8cf74179f4bef6b9439dc966e94692ebfd41c166a85b31dbfa052b57004cfbc91dccb6fb80646d23764ee5a9466f1902
-  data.tar.gz: a71272f604d882b05eab6958bddbb0aac72894dc62463668aaedcd3d98814d6eada6ab480cffd0679763bb0d8a125e792e7d02577b118a7771738dace0ad6af3
+  metadata.gz: f698950933d9c7830b10d6849c8b249df8ea63ef2b8ddc6111c5dfc5f47f7173ef3049744cbbf30c95660b5b3caa98ababd61f269f1bc74be7227a15be244797
+  data.tar.gz: 6078e1863615b7115af836136dc3759cc62815a85ea23a3a8f9a9ff671f2246b5059bcec0549ed61398c863ea834d861741890c55fac5e31f091d3c3ab438af5

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 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
+
+* Add configuration option `environment` to override the use of `Rails.env` ([#356](https://github.com/rubyconfig/config/pull/356))
+
 ## 5.3.0
 
 * Remove `dry-validation` from dependencies ([#333](https://github.com/rubyconfig/config/pull/333))
@@ -50,7 +67,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

data/README.md

@@ -53,6 +53,8 @@ which will generate customizable config file `config/initializers/config.rb` and
 
 You can now edit them to adjust to your needs.
 
+> Note: By default, the config environment will match the Rails environment (`Rails.env`). This can be changed by setting `config.environment`.
+
 ### Installing on Padrino
 
 Add the gem to your `Gemfile` and run `bundle install` to install it. Then edit `app.rb` and register `Config`
@@ -426,7 +428,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

data/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_url' => 'https://opencollective.com/rubyconfig/donate',
     'source_code_uri' => 'https://github.com/rubyconfig/config',
     'bug_tracker_uri' => 'https://github.com/rubyconfig/config/issues'
   }

data/lib/config/integrations/rails/railtie.rb

@@ -9,7 +9,7 @@ module Config
 
           # Parse the settings before any of the initializers
           Config.load_and_set_settings(
-            Config.setting_files(::Rails.root.join('config'), ::Rails.env)
+            Config.setting_files(::Rails.root.join('config'), Config.environment.nil? ? ::Rails.env : Config.environment.to_sym)
           )
         end
 

data/lib/config/sources/env_source.rb

@@ -6,17 +6,20 @@ module Config
       attr_reader :separator
       attr_reader :converter
       attr_reader :parse_values
+      attr_reader :parse_arrays
 
       def initialize(env,
                      prefix: Config.env_prefix || Config.const_name,
                      separator: Config.env_separator,
                      converter: Config.env_converter,
-                     parse_values: Config.env_parse_values)
+                     parse_values: Config.env_parse_values,
+                     parse_arrays: Config.env_parse_arrays)
         @env = env
         @prefix = prefix.to_s.split(separator)
         @separator = separator
         @converter = converter
         @parse_values = parse_values
+        @parse_arrays = parse_arrays
       end
 
       def load
@@ -52,10 +55,28 @@ module Config
           leaf[keys.last] = parse_values ? __value(value) : value
         end
 
-        hash
+        parse_arrays ? convert_hashes_to_arrays(hash) : hash
       end
 
       private
+      def convert_hashes_to_arrays(hash)
+        hash.each_with_object({}) do |(key, value), new_hash|
+          if value.is_a?(Hash)
+            value = convert_hashes_to_arrays(value)
+            if consecutive_numeric_keys?(value.keys)
+              new_hash[key] = value.keys.sort_by(&:to_i).map { |k| value[k] }
+            else
+              new_hash[key] = value
+            end
+          else
+            new_hash[key] = value
+          end
+        end
+      end
+
+      def consecutive_numeric_keys?(keys)
+        keys.map(&:to_i).sort == (0...keys.size).to_a && keys.all? { |k| k == k.to_i.to_s }
+      end
 
       # Try to convert string to a correct type
       def __value(v)

data/lib/config/version.rb

@@ -1,3 +1,3 @@
 module Config
-  VERSION = '5.3.0'.freeze
+  VERSION = '5.5.0'.freeze
 end

data/lib/config.rb

@@ -18,6 +18,7 @@ module Config
     env_separator: '.',
     env_converter: :downcase,
     env_parse_values: true,
+    env_parse_arrays: false,
     fail_on_missing: false,
     file_name: 'settings',
     dir_name: 'settings',
@@ -27,7 +28,8 @@ module Config
     overwrite_arrays: true,
     merge_hash_arrays: false,
     validation_contract: nil,
-    evaluate_erb_in_yaml: true
+    evaluate_erb_in_yaml: true,
+    environment: nil
   )
 
   def self.setup

data/lib/generators/config/templates/config.rb

@@ -15,6 +15,11 @@ Config.setup do |config|
   #
   # config.overwrite_arrays = true
 
+  # Defines current environment, affecting which settings file will be loaded.
+  # Default: `Rails.env`
+  #
+  # config.environment = ENV.fetch('ENVIRONMENT', :development)
+
   # Load environment variables from the `ENV` object and override any settings defined in files.
   #
   # config.use_env = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.5.0
 platform: ruby
 authors:
 - Piotr Kuczynski
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -264,10 +264,10 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/rubyconfig/config/blob/master/CHANGELOG.md
+  funding_url: https://opencollective.com/rubyconfig/donate
   source_code_uri: https://github.com/rubyconfig/config
   bug_tracker_uri: https://github.com/rubyconfig/config/issues
-post_install_message: "\n\e[33mThanks for installing Config\e[0m\nPlease consider
-  donating to our open collective to help us maintain this project.\n\n\nDonate: \e[34mhttps://opencollective.com/rubyconfig/donate\e[0m\n"
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -283,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: Effortless multi-environment settings in Rails, Sinatra, Padrino and others