config 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 902f4b4b5e42d70c5b1a75092e3b1150c6c22f69
-  data.tar.gz: 319118c629c0ee4f31e7f95a61fca6cc8a36b7c0
+SHA256:
+  metadata.gz: b706fa8c599dff6bd37f9faf7ef9846cdfa712f0b4bd97b2164e9b481277647b
+  data.tar.gz: 9b4345f38ef41b3c1ad466eabeb57ec506eb8f1386bef5ec50d094f4fe74006a
 SHA512:
-  metadata.gz: 8a63c569455ad70bc8b7b3562b11166306c79dbb88655b15a6f215c2909bd3ca0d97b25e8e82cdd10b5b07814fccd2027fc4f48388b776ee521a1554c85814da
-  data.tar.gz: 8e08429aaa4c9369627a7f13fb66820ebde7ca0c4d95354aa81cb0a695000501025f8afe11021954a2bebc4cb68f7f29b424cd482ed8af2e7463f111ad1f0d7b
+  metadata.gz: 0a049ea2053deecc4929019a6e1bc059f2907f222515b1e7f51063b5ab59f42e3fefa4238ba04c97cd2cafc7aeb4e26a4d7e9b25cad5f63d6cdabd33316ec011
+  data.tar.gz: 70288ae9514f87bd3ed855292a4cf6a525eff7a23ae7bb585c7b785c585683cceec79f5751516739758b05ecf5673ec615461d8a13b5cddff97ef326309616fc

data/CHANGELOG.md

@@ -4,11 +4,20 @@
 
 ...
 
+## 1.7.0
+
+**New features:**
+
+* **WARNING:** `nil` values will from now on overwrite an existing value when merging configs! This change of behavior can be reverted via `config.merge_nil_values = false` in your Config initializer ([#196](https://github.com/railsconfig/config/pull/196))
+
 ## 1.6.1
 
 **Bug fixes:**
 * Make dry-validation dependency less strict allowing to use newer versions ([#183](https://github.com/railsconfig/config/pull/183))
 * Fix `key?` and `has_key?`, which raise NoMethodError in non Rails environment, by using ActiveSupport `#delegate` implicitly ([#185](https://github.com/railsconfig/config/pull/185))
+* Update `deep_merge` dependency to latest version (v1.2.1) ([#191](https://github.com/railsconfig/config/pull/191))
+* Upgrade `rubocop` to version 0.52.1 ([#193](https://github.com/railsconfig/config/pull/193))
+* Add `zip` to the list of reserved keywords ([#197](https://github.com/railsconfig/config/pull/197))
 
 ## 1.6.0
 

data/README.md

@@ -3,9 +3,8 @@
 [![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)
-[![Code Climate](https://codeclimate.com/github/railsconfig/config/badges/gpa.svg)](https://codeclimate.com/github/railsconfig/config)
-[![Issue Count](https://codeclimate.com/github/railsconfig/config/badges/issue_count.svg)](https://codeclimate.com/github/railsconfig/config)
-[![Test Coverage](https://codeclimate.com/github/railsconfig/config/badges/coverage.svg)](https://codeclimate.com/github/railsconfig/config/coverage)
+[![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)
 
 ## Summary
 
@@ -272,6 +271,27 @@ located at `config/initializers/config.rb`.
 
 * `overwrite_arrays` - overwrite arrays found in previously loaded settings file. Default: `true`
 * `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`.
+
+```ruby
+# merge_nil_values is true by default
+c = Config.load_files("./spec/fixtures/development.yml") # => #<Config::Options size=2, ...>
+c.size # => 2
+c.merge!(size: nil) => #<Config::Options size=nil, ...>
+c.size # => nil
+```
+
+```ruby
+# To reject nil values when merging settings:
+Config.setup do |config|
+  config.merge_nil_values = false
+end
+
+c = Config.load_files("./spec/fixtures/development.yml") # => #<Config::Options size=2, ...>
+c.size # => 2
+c.merge!(size: nil) => #<Config::Options size=nil, ...>
+c.size # => 2
+```
 
 Check [Deep Merge](https://github.com/danielsdeleo/deep_merge) for more details.
 

data/config.gemspec

@@ -25,26 +25,31 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.0.0'
 
   s.add_dependency 'activesupport',           '>= 3.0'
-  s.add_dependency 'deep_merge',              '~> 1.1.1'
+  s.add_dependency 'deep_merge',              '~> 1.2.1'
   s.add_dependency 'dry-validation',          '>= 0.10.4' if RUBY_VERSION >= '2.1'
 
   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.1',   '>= 2.1.0'
-  s.add_development_dependency 'rails',       '~> 5.0',   '>= 5.0.1'
-  s.add_development_dependency 'rspec',       '~> 3.5',   '>= 3.5.0'
-  s.add_development_dependency 'rspec-rails', '~> 3.5',   '>= 3.5.2'
-  s.add_development_dependency 'test-unit',   '~> 3.2',   '>= 3.2.1'
-  s.add_development_dependency 'sqlite3',     '~> 1.3',   '>= 1.3.11'
+  s.add_development_dependency 'appraisal',   '~> 2.2',   '>= 2.2.0'
+  s.add_development_dependency 'rails',       '~> 5.1',   '>= 5.1.4'
+  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'
 
   # Static code analysis
   s.add_development_dependency 'mdl',         '~> 0.4',   '>= 0.4.0'
-  s.add_development_dependency 'rubocop',     '~> 0.46',  '>= 0.46.0'
+
+  if RUBY_VERSION < '2.1'
+    s.add_development_dependency 'rubocop',     '~> 0.50',  '>= 0.50.0'
+  else
+    s.add_development_dependency 'rubocop',     '~> 0.52',  '>= 0.52.1'
+  end
 
   if ENV['TRAVIS']
-    s.add_development_dependency 'simplecov', '~> 0.12.0'
-    s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.3'
+    s.add_development_dependency 'simplecov', '~> 0.13.0'
+    s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.8'
   end
 end

data/lib/config.rb

@@ -26,8 +26,9 @@ module Config
   @@fail_on_missing = false
 
   # deep_merge options
-  mattr_accessor :knockout_prefix, :overwrite_arrays
+  mattr_accessor :knockout_prefix, :merge_nil_values, :overwrite_arrays
   @@knockout_prefix = nil
+  @@merge_nil_values = true
   @@overwrite_arrays = true
 
   def self.setup

data/lib/config/integrations/sinatra.rb

@@ -14,8 +14,8 @@ module Config
 
       # use Padrino settings if applicable
       if defined?(Padrino)
-        env = Padrino.env
-        root = Padrino.root
+        env = Padrino.env if Padrino.respond_to?(:env)
+        root = Padrino.root if Padrino.respond_to?(:root)
       end
 
       Config.load_and_set_settings(Config.setting_files(File.join(root, 'config'), env))

data/lib/config/options.rb

@@ -76,11 +76,14 @@ module Config
         if conf.empty?
           conf = source_conf
         else
-          DeepMerge.deep_merge!(source_conf,
+          DeepMerge.deep_merge!(
+                                source_conf,
                                 conf,
                                 preserve_unmergeables: false,
                                 knockout_prefix:       Config.knockout_prefix,
-                                overwrite_arrays:      Config.overwrite_arrays)
+                                overwrite_arrays:      Config.overwrite_arrays,
+                                merge_nil_values:      Config.merge_nil_values
+                               )
         end
       end
 
@@ -125,16 +128,20 @@ module Config
 
     def merge!(hash)
       current = to_hash
-      DeepMerge.deep_merge!(hash.dup,
+      DeepMerge.deep_merge!(
+                            hash.dup,
                             current,
                             preserve_unmergeables: false,
-                            overwrite_arrays:      Config.overwrite_arrays)
+                            knockout_prefix:       Config.knockout_prefix,
+                            overwrite_arrays:      Config.overwrite_arrays,
+                            merge_nil_values:      Config.merge_nil_values
+                           )
       marshal_load(__convert(current).marshal_dump)
       self
     end
 
     # Some keywords that don't play nicely with OpenStruct
-    SETTINGS_RESERVED_NAMES = %w{select collect test count}
+    SETTINGS_RESERVED_NAMES = %w[select collect test count zip].freeze
 
     # An alternative mechanism for property access.
     # This let's you do foo['bar'] along with foo.bar.

data/lib/config/version.rb

@@ -1,3 +1,3 @@
 module Config
-  VERSION = '1.6.1'
+  VERSION = '1.7.0'
 end

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

@@ -6,6 +6,11 @@ Config.setup do |config|
   #
   # config.knockout_prefix = nil
 
+  # Overwrite an existing value when merging a `nil` value.
+  # When set to `false`, the existing value is retained after merge.
+  #
+  # config.merge_nil_values = true
+
   # Overwrite arrays found in previously loaded settings file. When set to `false`, arrays will be merged.
   #
   # config.overwrite_arrays = true

data/spec/app/rails_5.1/README.md

@@ -0,0 +1,24 @@
+# README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Piotr Kuczynski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
@@ -100,80 +100,80 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.1.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 3.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 3.7.2
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -183,7 +183,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -193,7 +193,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.7
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -213,7 +213,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.3.13
 - !ruby/object:Gem::Dependency
   name: mdl
   requirement: !ruby/object:Gem::Requirement
@@ -240,20 +240,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.52'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.52.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.52'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.52.1
 description: 'Easiest way to manage multi-environment settings in any ruby project
   or framework: Rails, Sinatra, Pandrino and others'
 email:
@@ -293,6 +293,7 @@ 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.1/README.md
 - spec/app/rails_5/README.md
 homepage: https://github.com/railsconfig/config
 licenses:
@@ -315,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Effortless multi-environment settings in Rails, Sinatra, Pandrino and others