really-confy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d8b66a182e1d7c887d75d5f344831351c1735eb0
-  data.tar.gz: cf7768c87280384cd1e23ce19956420f97e3f77a
+SHA256:
+  metadata.gz: fe43d28fb270524f64d23ada64d2a054d83e37ea05e94499f5406fea12271687
+  data.tar.gz: 6d91c998d8025c14777f9a2f1adf69e7f3d47a8590f39ce7510f031ed3917de0
 SHA512:
-  metadata.gz: cb7418f5d8c25342d2e28d6f30e96212fea238692d9c8f525bcc5358986d4e19119d10d27434706299255f5b21127d6363a6be3e8d746905cf61a1fd3fa106ee
-  data.tar.gz: 6aa643bb79169707716d299dd983c31358a8d64b304f6e2bd7cae37164588a5988545482baaea65d5b9c7c2c335bcecb447a99abb591aabd2bc22d5195f310a7
+  metadata.gz: 677a176c7db12f371b9e5dbb13d532de8b5260135dae1bf10269261cf927ab5282d9d66dfccf12f555b4599a4e5d74b8918d01b0d6da21da8d8d139669fa7548
+  data.tar.gz: 16d4463184283d057fe836f861d0eb85f2a89105cdffde3e2f3cf52b96ab0c7457a390da3a985a019bff964a2367b9c800e1502f7ae9353fe24241205a123846

data/lib/really_confy.rb

@@ -86,9 +86,9 @@ class ReallyConfy
     end
 
     env_configs = multi_env_configs.map{|multi_env_config|
-        multi_env_config.fetch('DEFAULTS', {}).deep_merge multi_env_config.fetch(env, {})
+        deep_merge multi_env_config.fetch('DEFAULTS', empty_config), multi_env_config.fetch(env, empty_config)
       }
-    merged_config = env_configs.reduce{|merged_config, config| merged_config.deep_merge(config) }
+    merged_config = env_configs.reduce{|merged_config, config| deep_merge(merged_config, config) }
 
     merged_config['env'] ||= env
 
@@ -118,13 +118,17 @@ class ReallyConfy
     raise e
   end
 
+  def empty_config
+    ReallyConfy::Config.new {}
+  end
+
   def load_config_file(file)
     full_path = full_path_to_config_file(file)
 
     if File.exists? full_path
       multi_env_config = (ReallyConfy::Config.load full_path)
     else
-      multi_env_config = ReallyConfy::Config.new {}
+      multi_env_config = empty_config
     end
 
     multi_env_config
@@ -132,6 +136,25 @@ class ReallyConfy
 
   private
 
+  def deep_merge(base_hash, other_hash, &block)
+    base_hash = base_hash.dup
+    other_hash.each_pair do |current_key, other_value|
+      this_value = base_hash[current_key]
+
+      base_hash[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
+        deep_merge(this_value, other_value, &block)
+      else
+        if block_given? && base_hash.key?(current_key)
+          block.call(current_key, this_value, other_value)
+        else
+          other_value
+        end
+      end
+    end
+
+    base_hash
+  end
+
   def full_path_to_config_file(file)
     File.absolute_path(relative_path_to_config_file(file))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: really-confy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Matt Zukowski
@@ -65,10 +65,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple YAML configuration loader
 test_files: []
-has_rdoc: