config 5.0.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63588fb0e3226125aacd3d3e8223a61b8bbe3b8dad14388fd6c4e7389a1fbebb
-  data.tar.gz: 63db33abec5829b54e5e41ee328891556ae63dfd27bdf04048592ac945ed7a8c
+  metadata.gz: e9473a6dc953514afb09fbefa950f14cf7fe20e9cf461740e682404dc06ea726
+  data.tar.gz: 2dcd6fb8e88fbc2b04c152a424ad4877804e0c7e5607fc4d1b9be6000b02bf92
 SHA512:
-  metadata.gz: 3761476e2956deb7423c360d041c622de50cf79fc763271fa2dd8754f104408579fdddafe735044f115cc39100ba21de725ce7d2c19f9d1e178aaddb74487b42
-  data.tar.gz: af8a9adfd80ce42580e18097ac108796e3c3e52ed7068348b7aff8e4050557e273a036728d4898891b118e5ae6b6909e283593a1b3630ec9f22b504592dd82d1
+  metadata.gz: '049ac670db93d0c93e7d3fe60688ae3edda405e9f28b67d2464d660ccd9a6dbbfd5d66e57d1d25b1b3fa763956d719e5fe252e7d5147e0bfc4da0f458b0f726f'
+  data.tar.gz: 20774a5e9bfcbc377cd1969a133129b1259ccd9d211651312fce5e69a98999766ccb11ca1521e661f168086bfcd310f87840c141d2acd923b5fe708bf3fd8a26

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 5.2.0
+
+### New features
+
+* Allow to use custom filename && directory name to store configs ([#341](https://github.com/rubyconfig/config/pull/341))
+
+### Bug fixes
+
+* Prevent name collision with private methods from ancestors ([#351](https://github.com/rubyconfig/config/pull/351))
+
+## 5.1.0
+
+* Fix conflicts with Rails 7 active_support methods ([#347](https://github.com/rubyconfig/config/pull/347))
+
 ## 5.0.0
 
 ### BREAKING CHANGES

data/README.md

@@ -270,6 +270,8 @@ After installing `Config` in Rails, you will find automatically generated file t
 
 * `const_name` - name of the object holing you 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/`
 
 ### Merge customization
 

data/config.gemspec

@@ -20,6 +20,11 @@ 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",
+    'source_code_uri' => 'https://github.com/rubyconfig/config',
+    'bug_tracker_uri' => 'https://github.com/rubyconfig/config/issues'
+  }
   s.files = `git ls-files`.split($/)
   s.files.select! { |file| /(^lib\/|^\w+.md$|\.gemspec$)/ =~ file }
 

data/lib/config/integrations/heroku.rb

@@ -14,8 +14,8 @@ module Config
       def vars
         # Load only local options to Heroku
         Config.load_and_set_settings(
-            Rails.root.join("config", "settings.local.yml").to_s,
-            Rails.root.join("config", "settings", "#{environment}.local.yml").to_s,
+            Rails.root.join("config", "#{Config.file_name}.local.yml").to_s,
+            Rails.root.join("config", Config.dir_name, "#{environment}.local.yml").to_s,
             Rails.root.join("config", "environments", "#{environment}.local.yml").to_s
         )
 

data/lib/config/options.rb

@@ -114,11 +114,15 @@ module Config
     # Some keywords that don't play nicely with OpenStruct
     SETTINGS_RESERVED_NAMES = %w[select collect test count zip min max exit! table].freeze
 
+    # Some keywords that don't play nicely with Rails 7.*
+    RAILS_RESERVED_NAMES = %w[maximum minimum].freeze
+
     # An alternative mechanism for property access.
     # This let's you do foo['bar'] along with foo.bar.
     def [](param)
       return super if SETTINGS_RESERVED_NAMES.include?(param)
-      send("#{param}")
+      return super if RAILS_RESERVED_NAMES.include?(param)
+      public_send("#{param}")
     end
 
     def []=(param, value)
@@ -131,6 +135,12 @@ module Config
       end
     end
 
+    RAILS_RESERVED_NAMES.each do |name|
+      define_method name do
+        self[name]
+      end
+    end
+
     def key?(key)
       @table.key?(key)
     end

data/lib/config/version.rb

@@ -1,3 +1,3 @@
 module Config
-  VERSION = '5.0.0'.freeze
+  VERSION = '5.2.0'.freeze
 end

data/lib/config.rb

@@ -19,6 +19,8 @@ module Config
     env_converter: :downcase,
     env_parse_values: true,
     fail_on_missing: false,
+    file_name: 'settings',
+    dir_name: 'settings',
     # deep_merge options
     knockout_prefix: nil,
     merge_nil_values: true,
@@ -58,8 +60,8 @@ module Config
 
   def self.setting_files(config_root, env)
     [
-      File.join(config_root, 'settings.yml').to_s,
-      File.join(config_root, 'settings', "#{env}.yml").to_s,
+      File.join(config_root, "#{Config.file_name}.yml").to_s,
+      File.join(config_root, Config.dir_name, "#{env}.yml").to_s,
       File.join(config_root, 'environments', "#{env}.yml").to_s,
       *local_setting_files(config_root, env)
     ].freeze
@@ -67,8 +69,8 @@ module Config
 
   def self.local_setting_files(config_root, env)
     [
-      (File.join(config_root, 'settings.local.yml').to_s if env != 'test'),
-      File.join(config_root, 'settings', "#{env}.local.yml").to_s,
+      (File.join(config_root, "#{Config.file_name}.local.yml").to_s if env != 'test'),
+      File.join(config_root, Config.dir_name, "#{env}.local.yml").to_s,
       File.join(config_root, 'environments', "#{env}.local.yml").to_s
     ].compact
   end

data/lib/generators/config/install_generator.rb

@@ -12,18 +12,18 @@ module Config
       end
 
       def copy_settings
-        template "settings.yml", "config/settings.yml"
-        template "settings.local.yml", "config/settings.local.yml"
-        directory "settings", "config/settings"
+        template "settings.yml", "config/#{Config.file_name}.yml"
+        template "settings.local.yml", "config/#{Config.file_name}.local.yml"
+        directory "settings", "config/#{Config.dir_name}"
       end
 
       def modify_gitignore
         create_file '.gitignore' unless File.exist? '.gitignore'
 
         append_to_file '.gitignore' do
-          "\n"                                +
-          "config/settings.local.yml\n"       +
-          "config/settings/*.local.yml\n"     +
+          "\n"                                      +
+          "config/#{Config.file_name}.local.yml\n"  +
+          "config/#{Config.dir_name}/*.local.yml\n" +
           "config/environments/*.local.yml\n"
         end
       end

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

@@ -55,4 +55,9 @@ Config.setup do |config|
   # Evaluate ERB in YAML config files at load time.
   #
   # config.evaluate_erb_in_yaml = true
+
+  # Name of directory and file to store config keys
+  #
+  # config.file_name = 'settings'
+  # config.dir_name = 'settings'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Piotr Kuczynski
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2024-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -261,7 +261,10 @@ files:
 homepage: https://github.com/rubyconfig/config
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/rubyconfig/config/blob/master/CHANGELOG.md
+  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"
 rdoc_options:
@@ -279,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Effortless multi-environment settings in Rails, Sinatra, Padrino and others