config 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a73b8d9d0d0b87e7663d494adcef7051ea4df4d6ab7a0e501ae096c870d0220
-  data.tar.gz: f97f4226c7baa682647f3098317526a45c3e8d45bbbde48e80e7b3183e090736
+  metadata.gz: 9e61b3780ec9c2a5586d1e50691a655761542740ed0ae370b5c1ad769e4d6349
+  data.tar.gz: 9a3d32e7943894f2f44546ab8c161d8b97ffe3a6df620856cbb037c337d83db6
 SHA512:
-  metadata.gz: 28248c7da97c294525d04d56b5e470c171231d15bcb7bbff3029adc5b2710e00e9ebf07ea0697bbb9b2444a64d8f25a1e0a3e7492cda727bf4a84b2a8f936712
-  data.tar.gz: 36462bd11b537212ee25d6d05c90297f65ccb4db4a7b80657f2b6c3647ff8ded75de3b8649672bad4a77b6947e17709efc875404c2a2f5126b5b7fb9a4cd0ab9
+  metadata.gz: 58015736b2f1bd3394102de9dcf09c64ee9f56c51abac9673a1a38dd867ab26b12abccda26c0b81d04c052a9e6c8cff48fd015004734dc4f9a0abb1dec1a1dea
+  data.tar.gz: cfea04abd4b76cd40913dea8544df5a049ecaf50faa475fe3662f6b3389bdf9aac35c26d9614dbaaf35df06ee7033ae4ee6a3943bc28373583cd930c9569b186

data/CHANGELOG.md

@@ -2,7 +2,23 @@
 
 ## Unreleased
 
-...
+## 2.1.0
+
+### New features
+
+* Add dry-validation contract support ([#238](https://github.com/railsconfig/config/pull/238))
+
+### Changes
+
+* Get rid of activesupport dependency ([#230](https://github.com/railsconfig/config/pull/230))
+* Ignore .local files in test environment ([#135](https://github.com/railsconfig/config/issues/135), [#233](https://github.com/railsconfig/config/pull/233))
+* Execute default rspec against latest Rails app and load appropriate development dependencies dynamically ([#241](https://github.com/railsconfig/config/pull/241))
+* Fix inconsistent documentation for ENV prefix and default value in generator ([#246](https://github.com/railsconfig/config/pull/246))
+
+### Bug fixes
+
+* Fix warnings when running tests in Rails 5 scope ([#240](https://github.com/railsconfig/config/issues/240)
+* Do not run incompatible code coverage on truffleruby ([#242](https://github.com/railsconfig/config/issues/242)
 
 ## 2.0.0
 

data/CONTRIBUTING.md

@@ -0,0 +1,32 @@
+# Contributing
+
+Install appraisal
+
+```bash
+gem install bundler -v 1.17.3
+gem install appraisal
+```
+
+Bundle
+
+```bash
+bundle install
+```
+
+Bootstrap
+
+```bash
+appraisal install
+```
+
+Run the test suite:
+
+```bash
+appraisal rspec
+```
+
+If you modified any of the documentation files verify their format:
+
+```bash
+mdl --style .mdlstyle.rb *.md
+```

data/README.md

@@ -4,6 +4,7 @@
 [![Gem Version](https://badge.fury.io/rb/config.svg)](http://badge.fury.io/rb/config)
 [![Maintainability](https://api.codeclimate.com/v1/badges/85c206c13dce7de090af/maintainability)](https://codeclimate.com/github/railsconfig/config/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/85c206c13dce7de090af/test_coverage)](https://codeclimate.com/github/railsconfig/config/test_coverage)
+[![Financial Contributors on Open Collective](https://opencollective.com/rubyconfig/all/badge.svg?label=financial+contributors)](https://opencollective.com/rubyconfig)
 
 ## Summary
 
@@ -57,8 +58,7 @@ register Config
 
 ### Installing on Sinatra
 
-Add the gem to your `Gemfile` and run `bundle install` to install it. Afterwards in need to register `Config` in your
-app and give it a root so it can find the config files.
+Add the gem to your `Gemfile` and run `bundle install` to install it. Afterwards in need to register `Config` in your app and give it a root so it can find the config files.
 
 ```ruby
 set :root, File.dirname(__FILE__)
@@ -67,15 +67,13 @@ register Config
 
 ### Installing on other ruby projects
 
-Add the gem to your `Gemfile` and run `bundle install` to install it.
-Then initialize `Config` manually within your configure block.
+Add the gem to your `Gemfile` and run `bundle install` to install it. Then initialize `Config` manually within your configure block.
 
 ```ruby
 Config.load_and_set_settings(Config.setting_files("/path/to/config_root", "your_project_environment"))
 ```
 
-It's also possible to initialize `Config` manually within your configure block if you want to just give it some yml
-paths to load from.
+It's also possible to initialize `Config` manually within your configure block if you want to just give it some yml paths to load from.
 
 ```ruby
 Config.load_and_set_settings("/path/to/yaml1", "/path/to/yaml2", ...)
@@ -83,8 +81,7 @@ Config.load_and_set_settings("/path/to/yaml1", "/path/to/yaml2", ...)
 
 ## Accessing the Settings object
 
-After installing the gem, `Settings` object will become available globally and by default will be compiled from the
-files listed below. Settings defined in files that are lower in the list override settings higher.
+After installing the gem, `Settings` object will become available globally and by default will be compiled from the files listed below. Settings defined in files that are lower in the list override settings higher.
 
     config/settings.yml
     config/settings/#{environment}.yml
@@ -136,8 +133,7 @@ Settings.reload_from_files(
 
 ### Environment specific config files
 
-You can have environment specific config files. Environment specific config entries take precedence over common config
-entries.
+You can have environment specific config files. Environment specific config entries take precedence over common config entries.
 
 Example development environment config file:
 
@@ -153,8 +149,7 @@ Example production environment config file:
 
 ### Developer specific config files
 
-If you want to have local settings, specific to your machine or development environment,
-you can use the following files, which are automatically `.gitignore` :
+If you want to have local settings, specific to your machine or development environment, you can use the following files, which are automatically `.gitignore` :
 
 ```ruby
 Rails.root.join("config", "settings.local.yml").to_s,
@@ -162,6 +157,8 @@ Rails.root.join("config", "settings", "#{Rails.env}.local.yml").to_s,
 Rails.root.join("config", "environments", "#{Rails.env}.local.yml").to_s
 ```
 
+**NOTE:** The file `settings.local.yml` will not be loaded in tests to prevent local configuration from causing flaky or non-deterministic tests. Environment-specific files (e.g. `settings/test.local.yml`) will still be loaded to allow test-specific credentials.
+
 ### Adding sources at runtime
 
 You can add new YAML config files at runtime. Just use:
@@ -180,11 +177,9 @@ Settings.prepend_source!("/path/to/source.yml")
 Settings.reload!
 ```
 
-This will do the same as `add_source`, but the given YML file will be loaded first (instead of last) and its settings
-will be overwritten by any other configuration file. This is especially useful if you want to define defaults.
+This will do the same as `add_source`, but the given YML file will be loaded first (instead of last) and its settings will be overwritten by any other configuration file. This is especially useful if you want to define defaults.
 
-One thing I like to do for my Rails projects is provide a local.yml config file that is .gitignored (so its independent
-per developer). Then I create a new initializer in `config/initializers/add_local_config.rb` with the contents
+One thing I like to do for my Rails projects is provide a local.yml config file that is .gitignored (so its independent per developer). Then I create a new initializer in `config/initializers/add_local_config.rb` with the contents
 
 ```ruby
 Settings.add_source!("#{Rails.root}/config/settings/local.yml")
@@ -252,18 +247,16 @@ Settings.section.servers[1].name # => amazon.com
 
 ## Configuration
 
-There are multiple configuration options available, however you can customize `Config` only once, preferably during
-application initialization phase:
+There are multiple configuration options available, however you can customize `Config` only once, preferably during application initialization phase:
 
 ```ruby
 Config.setup do |config|
   config.const_name = 'Settings'
-  ...
+  # ...
 end
 ```
 
-After installing `Config` in Rails, you will find automatically generated file that contains default configuration
-located at `config/initializers/config.rb`.
+After installing `Config` in Rails, you will find automatically generated file that contains default configuration located at `config/initializers/config.rb`.
 
 ### General
 
@@ -300,12 +293,52 @@ Check [Deep Merge](https://github.com/danielsdeleo/deep_merge) for more details.
 
 ### Validation
 
-With Ruby 2.1 or newer, you can optionally define a schema to validate presence (and type) of specific config values:
+With Ruby 2.1 or newer, you can optionally define a [schema](https://github.com/dry-rb/dry-schema) or [contract](https://github.com/dry-rb/dry-validation) (added in `config-2.1`) using [dry-rb](https://github.com/dry-rb) to validate presence (and type) of specific config values. Generally speaking contracts allow to describe more complex validations with depencecies between fields.
+
+If you provide either validation option (or both) it will automatically be used to validate your config. If validation fails it will raise a `Config::Validation::Error` containing information about all the mismatches between the schema and your config.
+
+Both examples below demonstrates how to ensure that the configuration has an optional `email` and the `youtube` structure with the `api_key` field filled. The contract adds an additional rule.
+
+#### Contract
+
+Leverage dry-validation, you can create a contract with a params schema and rules:
+
+```ruby
+class ConfigContract < Dry::Validation::Contract
+  params do
+    optional(:email).maybe(:str?)
+
+    required(:youtube).schema do
+      required(:api_key).filled
+    end
+  end
+
+  rule(:email) do
+    unless /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z\d\-]+)*\.[a-z]+\z/i.match?(value)
+      key.failure('has invalid format')
+    end
+  end
+end
+
+Config.setup do |config|
+  config.validation_contract = ConfigContract
+end
+```
+
+The above example adds a rule to ensure the `email` is valid by matching it against the provided regular expression.
+
+Check [dry-validation](https://github.com/dry-rb/dry-validation) for more details.
+
+#### Schema
+
+You may also specify a schema using [dry-schema](https://github.com/dry-rb/dry-schema):
 
 ```ruby
 Config.setup do |config|
   # ...
   config.schema do
+    optional(:email).maybe(:str?)
+
     required(:youtube).schema do
       required(:api_key).filled
     end
@@ -313,13 +346,6 @@ Config.setup do |config|
 end
 ```
 
-The above example demonstrates how to ensure that the configuration has the `youtube` structure
-with the `api_key` field filled.
-
-If you define a schema it will automatically be used to validate your config. If validation fails it will
-raise a `Config::Validation::Error` containing a nice message with information about all the mismatches
-between the schema and your config.
-
 Check [dry-schema](https://github.com/dry-rb/dry-schema) for more details.
 
 ### Missing keys
@@ -371,8 +397,7 @@ See section below for more details.
 
 ## Working with environment variables
 
-To load environment variables from the `ENV` object, that will override any settings defined in files, set the `use_env`
-to true in your `config/initializers/config.rb` file:
+To load environment variables from the `ENV` object, that will override any settings defined in files, set the `use_env` to true in your `config/initializers/config.rb` file:
 
 ```ruby
 Config.setup do |config|
@@ -381,8 +406,7 @@ Config.setup do |config|
 end
 ```
 
-Now config would read values from the ENV object to the settings. For the example above it would look for keys starting
-with `Settings`:
+Now config would read values from the ENV object to the settings. For the example above it would look for keys starting with `Settings`:
 
 ```ruby
 ENV['Settings.section.size'] = 1
@@ -393,9 +417,7 @@ It won't work with arrays, though.
 
 ### 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.
+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.
 
 To upload your local values to Heroku you could ran `bundle exec rake config:heroku`.
 
@@ -403,10 +425,8 @@ To upload your local values to Heroku you could ran `bundle exec rake config:her
 
 You can customize how environment variables are processed:
 
-* `env_prefix` (default: `SETTINGS`) - which ENV variables to load into config
-* `env_separator` (default: `.`)  - what string to use as level separator - default value of `.` works well with
-  Heroku, but you might want to change it for example for `__` to easy override settings from command line, where using
-  dots in variable names might not be allowed (eg. Bash)
+* `env_prefix` (default: `const_name`) - load only ENV variables starting with this prefix (case-sensitive)
+* `env_separator` (default: `'.'`)  - what string to use as level separator - default value of `.` works well with   Heroku, but you might want to change it for example for `__` to easy override settings from command line, where using   dots in variable names might not be allowed (eg. Bash)
 * `env_converter` (default: `:downcase`)  - how to process variables names:
   * `nil` - no change
   * `:downcase` - convert to lower case
@@ -442,30 +462,11 @@ Settings.section.ssl_enabled # => false
 
 ## Contributing
 
-Install appraisal
+You are very warmly welcome to help. Please follow our [contribution guidelines](CONTRIBUTING.md)
 
-```bash
-gem install bundler -v 1.17.3
-gem install appraisal
-```
+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.
 
-Bootstrap
 
-```bash
-appraisal install
-```
-
-Run the test suite:
-
-```bash
-appraisal rspec
-```
-
-If you modified any of the documentation files verify their format:
-
-```bash
-mdl --style .mdlstyle.rb *.md
-```
 
 ## Authors
 
@@ -474,6 +475,36 @@ mdl --style .mdlstyle.rb *.md
 * [Jacques Crocker](http://github.com/railsjedi)
 * Inherited from [AppConfig](http://github.com/cjbottaro/app_config) by [Christopher J. Bottaro](http://github.com/cjbottaro)
 
+## Contributors
+
+### Code Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
+<a href="https://github.com/railsconfig/config/graphs/contributors"><img src="https://opencollective.com/rubyconfig/contributors.svg?width=890&button=false" /></a>
+
+### Financial Contributors
+
+[[Become a financial contributor](https://opencollective.com/rubyconfig/contribute)] and and support us with a small donation to help us continue our activities. Thank you if you already one! 🙏 
+
+#### Individuals
+
+<a href="https://opencollective.com/rubyconfig"><img src="https://opencollective.com/rubyconfig/individuals.svg?width=890"></a>
+
+#### Organizations
+
+Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/rubyconfig/contribute)]
+
+<a href="https://opencollective.com/rubyconfig/organization/0/website"><img src="https://opencollective.com/rubyconfig/organization/0/avatar.svg"></a>
+<a href="https://opencollective.com/rubyconfig/organization/1/website"><img src="https://opencollective.com/rubyconfig/organization/1/avatar.svg"></a>
+<a href="https://opencollective.com/rubyconfig/organization/2/website"><img src="https://opencollective.com/rubyconfig/organization/2/avatar.svg"></a>
+<a href="https://opencollective.com/rubyconfig/organization/3/website"><img src="https://opencollective.com/rubyconfig/organization/3/avatar.svg"></a>
+<a href="https://opencollective.com/rubyconfig/organization/4/website"><img src="https://opencollective.com/rubyconfig/organization/4/avatar.svg"></a>
+<a href="https://opencollective.com/rubyconfig/organization/5/website"><img src="https://opencollective.com/rubyconfig/organization/5/avatar.svg"></a>
+<a href="https://opencollective.com/rubyconfig/organization/6/website"><img src="https://opencollective.com/rubyconfig/organization/6/avatar.svg"></a>
+<a href="https://opencollective.com/rubyconfig/organization/7/website"><img src="https://opencollective.com/rubyconfig/organization/7/avatar.svg"></a>
+<a href="https://opencollective.com/rubyconfig/organization/8/website"><img src="https://opencollective.com/rubyconfig/organization/8/avatar.svg"></a>
+<a href="https://opencollective.com/rubyconfig/organization/9/website"><img src="https://opencollective.com/rubyconfig/organization/9/avatar.svg"></a>
+
 ## License
 
 Config is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/config.gemspec

@@ -7,14 +7,18 @@ Gem::Specification.new do |s|
   s.version          = Config::VERSION
   s.date             = Time.now.strftime '%F'
   s.authors          = ['Piotr Kuczynski', 'Fred Wu', 'Jacques Crocker']
-  s.email            = %w(piotr.kuczynski@gmail.com ifredwu@gmail.com railsjedi@gmail.com)
+  s.email            = %w[piotr.kuczynski@gmail.com ifredwu@gmail.com railsjedi@gmail.com]
   s.summary          = 'Effortless multi-environment settings in Rails, Sinatra, Pandrino and others'
   s.description      = 'Easiest way to manage multi-environment settings in any ruby project or framework: ' +
                        'Rails, Sinatra, Pandrino and others'
   s.homepage         = 'https://github.com/railsconfig/config'
   s.license          = 'MIT'
-  s.extra_rdoc_files = %w(README.md CHANGELOG.md LICENSE.md)
+  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.files = `git ls-files`.split($/)
   s.files.select! { |file| /(^lib\/|\.md$|\.gemspec$)/ =~ file }
@@ -23,27 +27,29 @@ Gem::Specification.new do |s|
   s.require_paths         = ['lib']
   s.required_ruby_version = '>= 2.4.0'
 
-  s.add_dependency 'activesupport', '>= 4.2'
   s.add_dependency 'deep_merge', '~> 1.2', '>= 1.2.1'
-  s.add_dependency 'dry-schema', '~> 1.0'
+  s.add_dependency 'dry-validation', '~> 1.0'
 
-  s.add_development_dependency 'rake',        '~> 12.0',  '>= 12.0.0'
+  s.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'
 
   # Testing
-  s.add_development_dependency 'appraisal',   '~> 2.2',   '>= 2.2.0'
-  s.add_development_dependency 'rails',       '~> 5.2',   '>= 5.2.2'
-  s.add_development_dependency 'rspec',       '~> 3.7',   '>= 3.7.0'
-  s.add_development_dependency 'rspec-rails', '~> 3.7',   '>= 3.7.2'
-  s.add_development_dependency 'test-unit',   '~> 3.2',   '>= 3.2.7'
-  s.add_development_dependency 'sqlite3',     '~> 1.3',   '>= 1.3.13'
+  s.add_development_dependency 'appraisal', '~> 2.2', '>= 2.2.0'
+  s.add_development_dependency 'rspec', '~> 3.7', '>= 3.7.0'
+
+  # Default RSpec run will test against latest Rails app
+  unless ENV['APPRAISAL_INITIALIZED']
+    File.read(Dir['gemfiles/rails*.gemfile'].sort.last).scan(/gem "(.*?)", "(.*?)"/m) do |name, version|
+      s.add_development_dependency name, version
+    end
+  end
 
   # Static code analysis
-  s.add_development_dependency 'mdl',         '~> 0.5',   '>= 0.5.0'
+  s.add_development_dependency 'mdl', '~> 0.5', '>= 0.5.0'
 
   # Version 0.62 requires Ruby 2.2
-  s.add_development_dependency 'rubocop',     '~> 0.62'
+  s.add_development_dependency 'rubocop', '~> 0.62'
 
-  if ENV['TRAVIS']
+  if ENV['TRAVIS'] && ENV['TRAVIS_RUBY_VERSION'] != 'truffleruby'
     s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.9'
     s.add_development_dependency 'simplecov', '~> 0.13.0'
   end

data/lib/config.rb

@@ -1,7 +1,7 @@
-require 'active_support/core_ext/module/attribute_accessors'
-
+require 'dry-validation'
 require 'config/compatibility'
 require 'config/options'
+require 'config/configuration'
 require 'config/version'
 require 'config/integrations/rails/engine' if defined?(::Rails)
 require 'config/sources/yaml_source'
@@ -11,30 +11,26 @@ require 'deep_merge'
 
 module Config
   extend Config::Validation::Schema
-
-  # Ensures the setup only gets run once
-  @@_ran_once = false
-
-  mattr_accessor :const_name, :use_env, :env_prefix, :env_separator,
-                 :env_converter, :env_parse_values, :fail_on_missing
-  @@const_name = 'Settings'
-  @@use_env    = false
-  @@env_prefix = @@const_name
-  @@env_separator = '.'
-  @@env_converter = :downcase
-  @@env_parse_values = true
-  @@fail_on_missing = false
-
-  # deep_merge options
-  mattr_accessor :knockout_prefix, :merge_nil_values, :overwrite_arrays, :merge_hash_arrays
-  @@knockout_prefix = nil
-  @@merge_nil_values = true
-  @@overwrite_arrays = true
-  @@merge_hash_arrays = false
+  extend Config::Configuration.new(
+    # general options
+    const_name: 'Settings',
+    use_env: false,
+    env_prefix: 'Settings',
+    env_separator: '.',
+    env_converter: :downcase,
+    env_parse_values: true,
+    fail_on_missing: false,
+    # deep_merge options
+    knockout_prefix: nil,
+    merge_nil_values: true,
+    overwrite_arrays: true,
+    merge_hash_arrays: false,
+    validation_contract: nil
+  )
 
   def self.setup
-    yield self if @@_ran_once == false
-    @@_ran_once = true
+    yield self unless @_ran_once
+    @_ran_once = true
   end
 
   # Create a populated Options instance from a settings file. If a second file is given, then the sections of that
@@ -48,7 +44,7 @@ module Config
     end
 
     config.load!
-    config.load_env! if @@use_env
+    config.load_env! if use_env
     config
   end
 
@@ -61,16 +57,21 @@ 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, "environments", "#{env}.yml").to_s,
-
-      File.join(config_root, "settings.local.yml").to_s,
-      File.join(config_root, "settings", "#{env}.local.yml").to_s,
-      File.join(config_root, "environments", "#{env}.local.yml").to_s
+      File.join(config_root, 'settings.yml').to_s,
+      File.join(config_root, 'settings', "#{env}.yml").to_s,
+      File.join(config_root, 'environments', "#{env}.yml").to_s,
+      *local_setting_files(config_root, env)
     ].freeze
   end
 
+  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, 'environments', "#{env}.local.yml").to_s
+    ].compact
+  end
+
   def self.reload!
     Object.const_get(Config.const_name).reload!
   end

data/lib/config/configuration.rb

@@ -0,0 +1,36 @@
+module Config
+  # The main configuration backbone
+  class Configuration < Module
+    # Accepts configuration options,
+    # initializing a module that can be used to extend
+    # the necessary class with the provided config methods
+    def initialize(**attributes)
+      attributes.each do |name, default|
+        define_reader(name, default)
+        define_writer(name)
+      end
+    end
+
+    private
+
+    def define_reader(name, default)
+      variable = :"@#{name}"
+
+      define_method(name) do
+        if instance_variable_defined?(variable)
+          instance_variable_get(variable)
+        else
+          default
+        end
+      end
+    end
+
+    def define_writer(name)
+      variable = :"@#{name}"
+
+      define_method("#{name}=") do |value|
+        instance_variable_set(variable, value)
+      end
+    end
+  end
+end

data/lib/config/options.rb

@@ -143,7 +143,7 @@ module Config
     end
 
     # Some keywords that don't play nicely with OpenStruct
-    SETTINGS_RESERVED_NAMES = %w[select collect test count zip].freeze
+    SETTINGS_RESERVED_NAMES = %w[select collect test count zip min max].freeze
 
     # An alternative mechanism for property access.
     # This let's you do foo['bar'] along with foo.bar.

data/lib/config/validation/schema.rb

@@ -1,21 +1,18 @@
-require 'dry-schema'
-require 'config/validation/schema'
-
 module Config
   module Validation
     module Schema
-
-      mattr_writer :schema
-      @@schema = nil
+      # Assigns schema configuration option
+      def schema=(value)
+        @schema = value
+      end
 
       def schema(&block)
         if block_given?
-          @@schema = Dry::Schema.define(&block)
+          @schema = Dry::Schema.define(&block)
         else
-          @@schema
+          @schema
         end
       end
-
     end
   end
 end

data/lib/config/validation/validate.rb

@@ -3,18 +3,23 @@ require 'config/validation/error'
 module Config
   module Validation
     module Validate
-
       def validate!
-        if Config.schema
-          v_res = Config.schema.(self.to_hash)
+        validate_using!(Config.validation_contract)
+        validate_using!(Config.schema)
+      end
+
+      private
 
-          unless v_res.success?
-            error = Config::Validation::Error.format(v_res)
-            raise Config::Validation::Error.new("Config validation failed:\n\n#{error}")
-          end
+      def validate_using!(validator)
+        if validator
+          result = validator.call(to_hash)
+
+          return if result.success?
+
+          error = Config::Validation::Error.format(result)
+          raise Config::Validation::Error, "Config validation failed:\n\n#{error}"
         end
       end
-
     end
   end
 end

data/lib/config/version.rb

@@ -1,3 +1,3 @@
 module Config
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

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

@@ -21,7 +21,12 @@ Config.setup do |config|
 
   # Define ENV variable prefix deciding which variables to load into config.
   #
-  # config.env_prefix = 'Settings'
+  # Reading variables from ENV is case-sensitive. If you define lowercase value below, ensure your ENV variables are
+  # prefixed in the same way.
+  #
+  # When not set it defaults to `config.const_name`.
+  #
+  config.env_prefix = 'SETTINGS'
 
   # What string to use as level separator for settings loaded from ENV variables. Default value of '.' works well
   # with Heroku, but you might want to change it for example for '__' to easy override settings from command line, where

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Piotr Kuczynski
@@ -10,22 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-22 00:00:00.000000000 Z
+date: 2020-01-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -47,7 +33,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
-  name: dry-schema
+  name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -100,26 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -141,65 +107,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: bootsnap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.2
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
-    - - ">="
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.2
+        version: 5.2.2
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: mdl
   requirement: !ruby/object:Gem::Requirement
@@ -245,14 +207,17 @@ extensions: []
 extra_rdoc_files:
 - README.md
 - CHANGELOG.md
+- CONTRIBUTING.md
 - LICENSE.md
 files:
 - CHANGELOG.md
+- CONTRIBUTING.md
 - LICENSE.md
 - README.md
 - config.gemspec
 - lib/config.rb
 - lib/config/compatibility.rb
+- lib/config/configuration.rb
 - lib/config/integrations/heroku.rb
 - lib/config/integrations/rails/engine.rb
 - lib/config/integrations/rails/railtie.rb
@@ -273,14 +238,16 @@ files:
 - lib/generators/config/templates/settings/development.yml
 - lib/generators/config/templates/settings/production.yml
 - lib/generators/config/templates/settings/test.yml
+- spec/app/rails_5.0/README.md
 - spec/app/rails_5.1/README.md
 - spec/app/rails_5.2/README.md
-- spec/app/rails_5/README.md
 homepage: https://github.com/railsconfig/config
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: "\n\e[33mThanks for installing Config\e[0m \U0001F64F\nPlease
+  consider donating to our open collective to help us maintain this project.\n\n\n\U0001F449
+  \ Donate: \e[34mhttps://opencollective.com/rubyconfig/donate\e[0m\n"
 rdoc_options:
 - "--charset=UTF-8"
 require_paths: