config 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33b69a268cf5f3283b1d14ea01b4345fbd6433ef
-  data.tar.gz: 4ad2fb585182fd398877f53974bba1244eae8bea
+  metadata.gz: 34f4e737856626cc5203879e2d02a960d462c98a
+  data.tar.gz: 19ad725186dca0e04f6df5e3cc19233f4a9f8082
 SHA512:
-  metadata.gz: a92ef95bc9265fcd182d29cffd3f37e2bd71f3b0e3d8ca4d0f540f62389c4aaab2fbddd4ba15b45fd11c782c9ed3836eabe35927c3ceb3bd54abdf4d616cb1cc
-  data.tar.gz: 58568bb221dd00b41b8b5305510c763bf1610b63e7904a41e38ef1b5305c79e9ca0cbb49f3177bbb33c8107075314e5349d1ebd9d26e3fe1b15810c71b46057e
+  metadata.gz: 91ee75b5cda097edfc300b7c3362a327e309ae782a2840554eb265732e8061e17427e521f4ecb39c250a5d99acf2c805fb92f4a0b0f45494a04552ec59e62258
+  data.tar.gz: d4402504c6080cfb54ed9660b391a53724e924c005c70bd995e2f31b60118cd7a5cecda0edbdef5968f8b947518eb2d703021af2650d0ad42180c65fdb3ba6e8

data/CHANGELOG.md

@@ -1,9 +1,13 @@
 # Changelog
 
+## 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
+
 ## 1.2.0
 
-* Add ability to load settings from ENV variables ([#108](https://github.com/railsconfig/config/issues/108) thanks @vinceve and @spalladino)
-* Removed Rails 5 deprecation warnings for prepend_before_filter ([#141](https://github.com/railsconfig/config/pull/141)
+* Add ability to load settings from ENV variables ([#108](https://github.com/railsconfig/config/issues/108) thanks to @vinceve and @spalladino)
+* Removed Rails 5 deprecation warnings for prepend_before_filter ([#141](https://github.com/railsconfig/config/pull/141))
 
 ## 1.1.1
 
@@ -18,8 +22,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) thanks @dudo)
-* Allows loading before app configuration process ([#107](https://github.com/railsconfig/config/pull/107) thanks @Antiarchitect)
+* 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)
 * `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/lib/config/integrations/rails/engine.rb

@@ -1,5 +1,9 @@
 module Config
-  class Engine < ::Rails::Engine
-    isolate_namespace Config
+  module Integrations
+    module Rails
+      class Engine < ::Rails::Engine
+        isolate_namespace Config
+      end
+    end
   end
 end

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

@@ -1,35 +1,33 @@
 module Config
-  module Integration
+  module Integrations
     module Rails
-      if defined?(::Rails::Railtie)
-        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
+      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 }
+        config.before_configuration { preload }
 
-          def preload
-            # Manually load the custom initializer before everything else
-            initializer = ::Rails.root.join("config", "initializers", "config.rb")
-            require initializer if File.exist?(initializer)
+        def preload
+          # Manually load the custom initializer before everything else
+          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)
-            )
-          end
+          # Parse the settings before any of the initializers
+          Config.load_and_set_settings(
+            Config.setting_files(::Rails.root.join("config"), ::Rails.env)
+          )
+        end
 
-          # Rails Dev environment should reload the Settings on every request
-          if ::Rails.env.development?
-            initializer :config_reload_on_development do
-              ActionController::Base.class_eval do
-                if ::Rails::VERSION::MAJOR >= 4
-                  prepend_before_action { ::Config.reload! }
-                else
-                  prepend_before_filter { ::Config.reload! }
-                end
+        # Rails Dev environment should reload the Settings on every request
+        if ::Rails.env.development?
+          initializer :config_reload_on_development do
+            ActionController::Base.class_eval do
+              if ::Rails::VERSION::MAJOR >= 4
+                prepend_before_action { ::Config.reload! }
+              else
+                prepend_before_filter { ::Config.reload! }
               end
             end
           end

data/lib/config/options.rb

@@ -29,23 +29,33 @@ module Config
 
     def reload_env!
       return self if ENV.nil? || ENV.empty?
-      conf = Hash.new
-      ENV.each do |key, value|
-        next unless key.to_s.index(Config.env_prefix || Config.const_name) == 0
-        hash = Config.env_parse_values ? __value(value) : value
-        key.to_s.split(Config.env_separator).reverse[0...-1].each do |element|
-          element = case Config.env_converter
-          when :downcase then element.downcase
-          when nil then element
-          else raise "Invalid env converter: #{Config.env_converter}"
+
+      hash = Hash.new
+
+      ENV.each do |variable, value|
+        keys = variable.to_s.split(Config.env_separator)
+
+        next if keys.shift != (Config.env_prefix || Config.const_name)
+
+        keys.map! { |key|
+          case Config.env_converter
+            when :downcase then
+              key.downcase.to_sym
+            when nil then
+              key.to_sym
+            else
+              raise "Invalid ENV variables name converter: #{Config.env_converter}"
           end
+        }
 
-          hash = {element => hash}
-        end
-        DeepMerge.deep_merge!(hash, conf, :preserve_unmergeables => false)
+        leaf = keys[0...-1].inject(hash) { |h, key|
+          h[key] ||= {}
+        }
+
+        leaf[keys.last] = Config.env_parse_values ? __value(value) : value
       end
 
-      merge!(conf)
+      merge!(hash)
     end
 
     alias :load_env! :reload_env!
@@ -59,11 +69,10 @@ module Config
         if conf.empty?
           conf = source_conf
         else
-          # see Options Details in lib/rails_config/vendor/deep_merge.rb
           DeepMerge.deep_merge!(source_conf,
                                 conf,
                                 preserve_unmergeables: false,
-                                knockout_prefix: Config.knockout_prefix)
+                                knockout_prefix:       Config.knockout_prefix)
         end
       end
 

data/lib/config/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Piotr Kuczynski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport