config 1.7.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7819e4fb603d2c59c34576f17235be6467fcd3b7d50776b2c2f3956364af15db
-  data.tar.gz: 3eb676c4b9e5fdf8f87e366d694f736370d8f6959206c4b8820c4d889e329cb9
+  metadata.gz: 8a73b8d9d0d0b87e7663d494adcef7051ea4df4d6ab7a0e501ae096c870d0220
+  data.tar.gz: f97f4226c7baa682647f3098317526a45c3e8d45bbbde48e80e7b3183e090736
 SHA512:
-  metadata.gz: 0a663e08ad559ac60dffe8bed4a085da7630e4b8412db5e4300adad325dc32d82085336ffaf274e529c1d891a46dc9bcee91c1684b0c43668318882ecdc9a1f7
-  data.tar.gz: e03f1dc386dffedaadc56b6428611c4a0f2d292383b552f4240fe0b0fc5f15a10474f6538c0a1831757031782a2507f1e6c126732d633a0abd79887b799a6e0e
+  metadata.gz: 28248c7da97c294525d04d56b5e470c171231d15bcb7bbff3029adc5b2710e00e9ebf07ea0697bbb9b2444a64d8f25a1e0a3e7492cda727bf4a84b2a8f936712
+  data.tar.gz: 36462bd11b537212ee25d6d05c90297f65ccb4db4a7b80657f2b6c3647ff8ded75de3b8649672bad4a77b6947e17709efc875404c2a2f5126b5b7fb9a4cd0ab9

data/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 ## Unreleased
 
+...
+
+## 2.0.0
+
+### BREAKING CHANGES
+
+After upgrade to dry-schema 1.0 we had to drop support for Rails `< 4.2` and Ruby `< 2.4`.
+If you need older version of Ruby or Rails, please stick to 1.x version of this gem. 
+
+### New features
+
+* Add `merge_hash_arrays` as a configuration option ([#214](https://github.com/railsconfig/config/pull/214))
+
+### Changes
+
+* Upgraded dry-validation dependency to dry-schema 1.0 ([#224](https://github.com/railsconfig/config/pull/224))
+* Moved constant to be defined on `Object` instead of `Kernel` ([#227](https://github.com/railsconfig/config/issues/227))
+* Add TruffleRuby to the test matrix ([#229](https://github.com/railsconfig/config/issues/229))
+
 ## 1.7.2
 
 ### Bug fixes

data/README.md

@@ -2,7 +2,6 @@
 
 [![Build Status](https://api.travis-ci.org/railsconfig/config.svg?branch=master)](http://travis-ci.org/railsconfig/config)
 [![Gem Version](https://badge.fury.io/rb/config.svg)](http://badge.fury.io/rb/config)
-[![Dependency Status](https://gemnasium.com/railsconfig/config.svg)](https://gemnasium.com/railsconfig/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)
 
@@ -21,16 +20,19 @@ Config helps you easily manage environment specific settings in an easy and usab
 
 ## Compatibility
 
-* Ruby `2.x`
-* Rails `>= 3.1`, `4` and `5`
-* Padrino
-* Sinatra
+* Interpreters
+  * [Ruby](https://www.ruby-lang.org/en/) `>= 2.4`
+  * [TruffleRuby](https://github.com/oracle/truffleruby) `>= 19.0.0`
+* Application frameworks
+  * Rails `>= 4.2` and `5`
+  * Padrino
+  * Sinatra
 
-For older versions of Rails or Ruby use [AppConfig](http://github.com/fredwu/app_config).
+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).
 
 ## Installing
 
-### Installing on Rails 3, 4 or 5
+### Installing on Rails
 
 Add `gem 'config'` to your `Gemfile` and run `bundle install` to install it. Then run
 
@@ -270,6 +272,7 @@ located at `config/initializers/config.rb`.
 ### Merge customization
 
 * `overwrite_arrays` - overwrite arrays found in previously loaded settings file. Default: `true`
+* `merge_hash_arrays` - merge hashes inside of arrays from previously loaded settings files. Makes sense only when `overwrite_arrays = false`. Default: `false`
 * `knockout_prefix` - ability to remove elements of the array set in earlier loaded settings file. Makes sense only when `overwrite_arrays = false`, otherwise array settings would be overwritten by default. Default: `nil`
 * `merge_nil_values` - `nil` values will overwrite an existing value when merging configs. Default: `true`.
 
@@ -317,7 +320,7 @@ If you define a schema it will automatically be used to validate your config. If
 raise a `Config::Validation::Error` containing a nice message with information about all the mismatches
 between the schema and your config.
 
-Check [dry-validation](https://github.com/dry-rb/dry-validation) for more details.
+Check [dry-schema](https://github.com/dry-rb/dry-schema) for more details.
 
 ### Missing keys
 

data/config.gemspec

@@ -21,32 +21,17 @@ Gem::Specification.new do |s|
   s.files += Dir.glob('doc/**/*')
 
   s.require_paths         = ['lib']
-  s.required_ruby_version = '>= 2.0.0'
+  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'
 
-  if RUBY_VERSION >= '2.2'
-    s.add_dependency 'activesupport',  '>= 3.0'
-    s.add_dependency 'dry-validation', '~> 0.12', '>= 0.12.2', '< 1.0.0'
-
-    s.add_development_dependency 'rails', '~> 5.2',   '>= 5.2.2'
-  end
-
-  if RUBY_VERSION >= '2.1' && RUBY_VERSION < '2.2'
-    s.add_dependency 'activesupport',    '>= 3.0', '< 5.0.0'
-    s.add_dependency 'dry-configurable', '~> 0.5.0'
-    s.add_dependency 'dry-logic',        '~> 0.5.0'
-    s.add_dependency 'dry-validation',   '~> 0.10', '>= 0.10.7', '< 1.0.0'
-    s.add_dependency 'i18n',             '~> 0.9.0'
-
-    s.add_development_dependency 'rails', '< 5.0.0'
-  end
-
-  s.add_development_dependency 'bundler',     '~> 1.13',  '>= 1.13.6'
   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'
@@ -55,12 +40,8 @@ Gem::Specification.new do |s|
   # Static code analysis
   s.add_development_dependency 'mdl',         '~> 0.5',   '>= 0.5.0'
 
-  # Version 0.51 drops support for Ruby 2.0
-  s.add_development_dependency 'rubocop',     '~> 0.50',  '< 0.51' if RUBY_VERSION < '2.1'
-  # Version 0.58 drops support for Ruby 2.1
-  s.add_development_dependency 'rubocop',     '~> 0.57',  '< 0.58' if RUBY_VERSION >= '2.1' && RUBY_VERSION < '2.2'
   # Version 0.62 requires Ruby 2.2
-  s.add_development_dependency 'rubocop',     '~> 0.62'            if RUBY_VERSION >= '2.2'
+  s.add_development_dependency 'rubocop',     '~> 0.62'
 
   if ENV['TRAVIS']
     s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.9'

data/lib/config.rb

@@ -6,11 +6,11 @@ require 'config/version'
 require 'config/integrations/rails/engine' if defined?(::Rails)
 require 'config/sources/yaml_source'
 require 'config/sources/hash_source'
-require 'config/validation/schema' if RUBY_VERSION >= '2.1'
+require 'config/validation/schema'
 require 'deep_merge'
 
 module Config
-  extend Config::Validation::Schema if RUBY_VERSION >= '2.1'
+  extend Config::Validation::Schema
 
   # Ensures the setup only gets run once
   @@_ran_once = false
@@ -26,10 +26,11 @@ module Config
   @@fail_on_missing = false
 
   # deep_merge options
-  mattr_accessor :knockout_prefix, :merge_nil_values, :overwrite_arrays
+  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
 
   def self.setup
     yield self if @@_ran_once == false
@@ -53,8 +54,9 @@ module Config
 
   # Loads and sets the settings constant!
   def self.load_and_set_settings(*files)
-    Kernel.send(:remove_const, Config.const_name) if Kernel.const_defined?(Config.const_name)
-    Kernel.const_set(Config.const_name, Config.load_files(files))
+    name = Config.const_name
+    Object.send(:remove_const, name) if Object.const_defined?(name)
+    Object.const_set(name, Config.load_files(files))
   end
 
   def self.setting_files(config_root, env)
@@ -70,7 +72,7 @@ module Config
   end
 
   def self.reload!
-    Kernel.const_get(Config.const_name).reload!
+    Object.const_get(Config.const_name).reload!
   end
 end
 

data/lib/config/options.rb

@@ -1,10 +1,10 @@
 require 'ostruct'
-require 'config/validation/validate' if RUBY_VERSION >= '2.1'
+require 'config/validation/validate'
 
 module Config
   class Options < OpenStruct
     include Enumerable
-    include Validation::Validate if RUBY_VERSION >= '2.1'
+    include Validation::Validate
 
     def keys
       marshal_dump.keys
@@ -82,7 +82,8 @@ module Config
                                 preserve_unmergeables: false,
                                 knockout_prefix:       Config.knockout_prefix,
                                 overwrite_arrays:      Config.overwrite_arrays,
-                                merge_nil_values:      Config.merge_nil_values
+                                merge_nil_values:      Config.merge_nil_values,
+                                merge_hash_arrays:     Config.merge_hash_arrays
                                )
         end
       end
@@ -91,7 +92,7 @@ module Config
       marshal_load(__convert(conf).marshal_dump)
 
       reload_env! if Config.use_env
-      validate! if RUBY_VERSION >= '2.1'
+      validate!
 
       self
     end
@@ -134,7 +135,8 @@ module Config
                             preserve_unmergeables: false,
                             knockout_prefix:       Config.knockout_prefix,
                             overwrite_arrays:      Config.overwrite_arrays,
-                            merge_nil_values:      Config.merge_nil_values
+                            merge_nil_values:      Config.merge_nil_values,
+                            merge_hash_arrays:     Config.merge_hash_arrays
                            )
       marshal_load(__convert(current).marshal_dump)
       self

data/lib/config/validation/error.rb

@@ -3,22 +3,11 @@ module Config
     class Error < StandardError
 
       def self.format(v_res)
-        flatten_hash(v_res.messages).map do |field, msgs|
-          "#{' ' * 2}#{field}: #{msgs.join('; ')}"
+        v_res.errors.group_by(&:path).map do |path, messages|
+          "#{' ' * 2}#{path.join('.')}: #{messages.map(&:text).join('; ')}"
         end.join("\n")
       end
 
-      def self.flatten_hash(h, acc={}, pref=[])
-        h.inject(acc) do |a, (k, v)|
-          if v.is_a?(Hash)
-            flatten_hash(v, acc, pref + [k])
-          else
-            acc[(pref + [k]).join('.')] = v
-            acc
-          end
-        end
-      end
-
     end
   end
 end

data/lib/config/validation/schema.rb

@@ -1,4 +1,4 @@
-require 'dry-validation'
+require 'dry-schema'
 require 'config/validation/schema'
 
 module Config
@@ -10,7 +10,7 @@ module Config
 
       def schema(&block)
         if block_given?
-          @@schema = Dry::Validation.Schema(&block)
+          @@schema = Dry::Schema.define(&block)
         else
           @@schema
         end

data/lib/config/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Piotr Kuczynski
@@ -10,108 +10,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-06-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: deep_merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: dry-validation
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !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'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: dry-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.13.6
-  type: :development
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.13.6
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +100,26 @@ 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
@@ -321,14 +289,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Effortless multi-environment settings in Rails, Sinatra, Pandrino and others