lib/config/options.rb in config-2.2.2 vs lib/config/options.rb in config-2.2.3

- old
+ new

@@ -57,10 +57,15 @@ leaf = keys[0...-1].inject(hash) { |h, key| h[key] ||= {} } + unless leaf.is_a?(Hash) + conflicting_key = (prefix + keys[0...-1]).join(separator) + raise "Environment variable #{variable} conflicts with variable #{conflicting_key}" + end + leaf[keys.last] = Config.env_parse_values ? __value(value) : value end merge!(hash) end @@ -115,11 +120,9 @@ result[k] = v end end result end - - alias :to_h :to_hash def each(*args, &block) marshal_dump.each(*args, &block) end