config 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34f4e737856626cc5203879e2d02a960d462c98a
-  data.tar.gz: 19ad725186dca0e04f6df5e3cc19233f4a9f8082
+  metadata.gz: 596c969d80cfb2d6801d31bba080085e92a4ac6a
+  data.tar.gz: 216e0648c48e36e8500d12158c8d337146a7db1c
 SHA512:
-  metadata.gz: 91ee75b5cda097edfc300b7c3362a327e309ae782a2840554eb265732e8061e17427e521f4ecb39c250a5d99acf2c805fb92f4a0b0f45494a04552ec59e62258
-  data.tar.gz: d4402504c6080cfb54ed9660b391a53724e924c005c70bd995e2f31b60118cd7a5cecda0edbdef5968f8b947518eb2d703021af2650d0ad42180c65fdb3ba6e8
+  metadata.gz: fa84888d4bbc7c706a408c377771ffbd20bb1d2711a1eaf6aa49a068dac7e93fe5523187416c0ae5e47f891cf144ce697bfdfcab1127339bba9931a96738ba9b
+  data.tar.gz: acaff95833ee702ce60d99284284e8db0dc5682b54ce1d4afb3c4af235702370bca792ccfa395f070d1e6b45de19726ec25523f1f7621155bf0986a8ffa6b9d3

data/CHANGELOG.md

@@ -1,12 +1,19 @@
 # Changelog
 
+## 1.3.0
+
+* **WARNING:** Overwrite arrays found in previously loaded settings file ([#137](https://github.com/railsconfig/config/pull/137) thanks to [@Fryguy](https://github.com/Fryguy) and [@dtaniwaki](https://github.com/dtaniwaki)) - this is a change breaking previous behaviour. If you want to keep Config to work as before, which is merging arrays found in following loaded settings file, please add `config.overwrite_arrays = true` to your Config initializer 
+* Changed default ENV variables loading settings to downcase variable names and parse values
+* Added parsing ENV variables values to Float type
+* Change method definition order in Rails integration module to prevent undefined method `preload` error (based on [@YaroSpace](https://github.com/YaroSpace) suggestion in [#111](https://github.com/railsconfig/config/issues/111)
+
 ## 1.2.1
 
-* Fixed support for multilevel settings loaded from ENV variables (inspired by @cbeer in [#144](https://github.com/railsconfig/config/pull/144))gem
+* Fixed support for multilevel settings loaded from ENV variables (inspired by [@cbeer](https://github.com/cbeer) in [#144](https://github.com/railsconfig/config/pull/144))
 
 ## 1.2.0
 
-* Add ability to load settings from ENV variables ([#108](https://github.com/railsconfig/config/issues/108) thanks to @vinceve and @spalladino)
+* Add ability to load settings from ENV variables ([#108](https://github.com/railsconfig/config/issues/108) thanks to [@vinceve](https://github.com/vinceve) and [@spalladino](https://github.com/spalladino))
 * Removed Rails 5 deprecation warnings for prepend_before_filter ([#141](https://github.com/railsconfig/config/pull/141))
 
 ## 1.1.1
@@ -22,8 +29,8 @@
 
 * `RailsConfig` is now officially renamed to `Config`
 * Fixed array descent when converting to hash ([#89](https://github.com/railsconfig/config/pull/89))
-* Catch OpenStruct reserved keywords ([#95](https://github.com/railsconfig/config/pull/95) by @dudo)
-* Allows loading before app configuration process ([#107](https://github.com/railsconfig/config/pull/107) by @Antiarchitect)
+* Catch OpenStruct reserved keywords ([#95](https://github.com/railsconfig/config/pull/95) by [@dudo](https://github.com/dudo))
+* Allows loading before app configuration process ([#107](https://github.com/railsconfig/config/pull/107) by [@Antiarchitect](https://github.com/Antiarchitect))
 * `deep_merge` is now properly managed via gemspec ([#110](https://github.com/railsconfig/config/pull/110))
 * Added `prepend_source!` ([#102](https://github.com/railsconfig/config/pull/102))
 

data/README.md

@@ -45,26 +45,7 @@ which will generate customizable config file `config/initializers/config.rb` and
     config/settings/test.yml
 
 You can now edit them to adjust to your needs.
-
-If you want to use Settings before rails application initialization process you can load Config railtie manually:
-
-```ruby
-module Appname
-  class Application < Rails::Application
-
-    Bundler.require(*Rails.groups)
-    Config::Integration::Rails::Railtie.preload
-
-    # ...
-
-    config.time_zone = Settings.time_zone
-
-    # ...
-
-  end
-end
-```
-
+a
 ### Installing on Padrino
 
 Add the gem to your `Gemfile` and run `bundle install` to install it. Then edit `app.rb` and register `Config`
@@ -271,7 +252,8 @@ located at `config/initializers/config.rb`.
 
 ### Merge customization
 
-* `knockout_prefix` - ability to remove elements of the array set in earlier loaded settings file. Default: `nil`
+* `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`
 
 Check [Deep Merge](https://github.com/danielsdeleo/deep_merge) for more details.
 
@@ -313,14 +295,14 @@ 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` - which variables to load into config
-* `env_separator` - what string to use as level separator instead of dots - default value of `.` works well with
+* `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_converter` - how to process variables names:
+* `env_converter` (default: `:downcase`)  - how to process variables names:
   * `nil` - no change
   * `:downcase` - convert to lower case
-* `env_parse_values` - parse numeric values as integers instead of strings
+* `env_parse_values` (default: `true`) - try to parse values to a correct type (`Integer`, `Float`, `String`)
 
 For instance, given the following environment:
 

data/config.gemspec

@@ -25,24 +25,24 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.0.0'
 
   s.add_dependency 'activesupport',           '>= 3.0'
-  s.add_dependency 'deep_merge',              '~> 1.0',   '>= 1.0.1'
+  s.add_dependency 'deep_merge',              '~> 1.1.1'
 
-  s.add_development_dependency 'bundler',     '~> 1.11',  '>= 1.11.2'
-  s.add_development_dependency 'rake',        '~> 11.1',  '>= 11.1.2'
+  s.add_development_dependency 'bundler',     '~> 1.13',  '>= 1.13.1'
+  s.add_development_dependency 'rake',        '~> 11.2',  '>= 11.2.2'
 
   # Testing
   s.add_development_dependency 'appraisal',   '~> 2.1',   '>= 2.1.0'
-  s.add_development_dependency 'rails',       '~> 4.2',   '>= 4.2.6'
-  s.add_development_dependency 'rspec',       '~> 3.4',   '>= 3.4.0'
-  s.add_development_dependency 'rspec-rails', '~> 3.4',   '>= 3.4.2'
-  s.add_development_dependency 'test-unit',   '~> 3.1',   '>= 3.1.7'
+  s.add_development_dependency 'rails',       '~> 5.0',   '>= 5.0.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'
 
   # Static code analysis
-  s.add_development_dependency 'mdl',         '~> 0.3',   '>= 0.3.1'
-  s.add_development_dependency 'rubocop',     '~> 0.40',  '>= 0.40.0'
+  s.add_development_dependency 'mdl',         '~> 0.4',   '>= 0.4.0'
+  s.add_development_dependency 'rubocop',     '~> 0.42',  '>= 0.42.0'
 
   if ENV['TRAVIS']
-    s.add_development_dependency 'codeclimate-test-reporter'
+    s.add_development_dependency 'codeclimate-test-reporter', '~> 0.6.0'
   end
 end

data/lib/config.rb

@@ -16,12 +16,13 @@ module Config
   @@use_env    = false
   @@env_prefix = @@const_name
   @@env_separator = '.'
-  @@env_converter = nil
-  @@env_parse_values = false
+  @@env_converter = :downcase
+  @@env_parse_values = true
 
   # deep_merge options
-  mattr_accessor :knockout_prefix
+  mattr_accessor :knockout_prefix, :overwrite_arrays
   @@knockout_prefix = nil
+  @@overwrite_arrays = true
 
   def self.setup
     yield self if @@_ran_once == false

data/lib/config/{tasks.rb → integrations/heroku.rb}

@@ -1,7 +1,7 @@
-require "bundler"
+require 'bundler'
 
 module Config
-  module Tasks
+  module Integrations
     class Heroku < Struct.new(:app)
       def invoke
         puts 'Setting vars...'
@@ -56,4 +56,4 @@ module Config
       end
     end
   end
-end
+end

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

@@ -2,25 +2,25 @@ module Config
   module Integrations
     module Rails
       class Railtie < ::Rails::Railtie
-        # Load rake tasks (eg. Heroku)
-        rake_tasks do
-          Dir[File.join(File.dirname(__FILE__), '../tasks/*.rake')].each { |f| load f }
-        end
-
-        config.before_configuration { preload }
-
         def preload
           # Manually load the custom initializer before everything else
-          initializer = ::Rails.root.join("config", "initializers", "config.rb")
+          initializer = ::Rails.root.join('config', 'initializers', 'config.rb')
           require initializer if File.exist?(initializer)
 
           # 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'), ::Rails.env)
           )
         end
 
-        # Rails Dev environment should reload the Settings on every request
+        # Load rake tasks (eg. Heroku)
+        rake_tasks do
+          Dir[File.join(File.dirname(__FILE__), '../tasks/*.rake')].each { |f| load f }
+        end
+
+        config.before_configuration { preload }
+
+        # Development environment should reload settings on every request
         if ::Rails.env.development?
           initializer :config_reload_on_development do
             ActionController::Base.class_eval do

data/lib/config/options.rb

@@ -72,7 +72,8 @@ module Config
           DeepMerge.deep_merge!(source_conf,
                                 conf,
                                 preserve_unmergeables: false,
-                                knockout_prefix:       Config.knockout_prefix)
+                                knockout_prefix:       Config.knockout_prefix,
+                                overwrite_arrays:      Config.overwrite_arrays)
         end
       end
 
@@ -116,7 +117,10 @@ module Config
 
     def merge!(hash)
       current = to_hash
-      DeepMerge.deep_merge!(hash.dup, current)
+      DeepMerge.deep_merge!(hash.dup,
+                            current,
+                            preserve_unmergeables: false,
+                            overwrite_arrays:      Config.overwrite_arrays)
       marshal_load(__convert(current).marshal_dump)
       self
     end
@@ -174,9 +178,9 @@ module Config
       s
     end
 
-    # Return an integer if it looks like one
+    # Try to convert string to a correct type
     def __value(v)
-      Integer(v) rescue v
+      Integer(v) rescue Float(v) rescue v
     end
   end
 end

data/lib/config/tasks/heroku.rake

@@ -1,8 +1,7 @@
-# require 'config'
-require 'config/tasks'
+require 'config/integrations/heroku'
 
 namespace 'config' do
   task :heroku, [:app] => :environment do |_, args|
-    Config::Tasks::Heroku.new(args[:app]).invoke
+    Config::Integrations::Heroku.new(args[:app]).invoke
   end
-end
+end

data/lib/config/version.rb

@@ -1,3 +1,3 @@
 module Config
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

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

@@ -6,6 +6,10 @@ Config.setup do |config|
   #
   # config.knockout_prefix = nil
 
+  # Overwrite arrays found in previously loaded settings file. When set to `false`, arrays will be merged.
+  #
+  # config.overwrite_arrays = true
+
   # Load environment variables from the `ENV` object and override any settings defined in files.
   #
   # config.use_env = false
@@ -24,9 +28,9 @@ Config.setup do |config|
   #   * nil  - no change
   #   * :downcase - convert to lower case
   #
-  # config.env_converter = nil
+  # config.env_converter = :downcase
 
   # Parse numeric values as integers instead of strings.
   #
-  # config.env_parse_values = false
+  # config.env_parse_values = true
 end

data/spec/app/rails_5/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.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Piotr Kuczynski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,60 +32,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.13.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '11.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.1.2
+        version: 11.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '11.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.1.2
+        version: 11.2.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -112,80 +106,80 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 5.0.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 5.0.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.5.2
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: 3.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -212,40 +206,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.42'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.42.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.42'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.42.0
 description: 'Easiest way to manage multi-environment settings in any ruby project
   or framework: Rails, Sinatra, Pandrino and others'
 email:
@@ -265,13 +259,13 @@ files:
 - config.gemspec
 - lib/config.rb
 - lib/config/compatibility.rb
+- lib/config/integrations/heroku.rb
 - lib/config/integrations/rails/engine.rb
 - lib/config/integrations/rails/railtie.rb
 - lib/config/integrations/sinatra.rb
 - lib/config/options.rb
 - lib/config/rack/reloader.rb
 - lib/config/sources/yaml_source.rb
-- lib/config/tasks.rb
 - lib/config/tasks/heroku.rake
 - lib/config/version.rb
 - lib/generators/config/install_generator.rb
@@ -281,6 +275,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/README.md
 homepage: https://github.com/railsconfig/config
 licenses:
 - MIT
@@ -302,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Effortless multi-environment settings in Rails, Sinatra, Pandrino and others