configarrr 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/configarrr.rb

@@ -4,4 +4,6 @@ module Configarrr
   class OptionError < StandardError; end
 end
 
+require 'core_ext'
+
 %w( base simple yaml ).each { |lib| require "configarrr/#{lib}" }

data/lib/configarrr/yaml.rb

@@ -16,9 +16,9 @@ module Configarrr
 
     def set_yaml
       if @parent
-        @yaml.has_key?(@parent) ? set(defaults.merge(@yaml[@parent])) : raise(Configarrr::OptionError, "Please provide a valid parent value. #{@parent} does not exist.")
+        @yaml.has_key?(@parent) ? set(defaults.recursive_merge(@yaml[@parent])) : raise(Configarrr::OptionError, "Please provide a valid parent value. #{@parent} does not exist.")
       else
-        set defaults.merge(@yaml)
+        set defaults.recursive_merge(@yaml)
       end
     end
 

data/lib/core_ext.rb

@@ -0,0 +1 @@
+require 'core_ext/hash/recursive_merge'

data/lib/core_ext/hash/recursive_merge.rb

@@ -0,0 +1,24 @@
+# From https://gist.github.com/raw/6391/a9de33bb917726d4983fa07971af21fb5c664f70/hash_recursive_merge.rb
+
+module CoreExt
+  module Hash
+    module RecursiveMerge
+      def recursive_merge!(other_hash)
+        merge!(other_hash) do |key, _old, _new| 
+            _old.class == self.class ? _old.recursive_merge!(_new) : _new
+        end
+      end
+
+      def recursive_merge(other_hash)
+        r = {}
+        merge(other_hash)  do |key, _old, _new| 
+          r[key] = _old.class == self.class ? _old.recursive_merge(_new) : _new
+        end
+      end
+    end
+  end
+end
+
+class Hash
+  include CoreExt::Hash::RecursiveMerge
+end

data/spec/configarrr/yaml_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 class YAMLWithDefaults < Configarrr::YAML
   def defaults
-    { 'first_key' => 1234, 'third_key' => 1234 }
+    { 'first_key' => 1234, 'third_key' => 1234, 'parent' => { 'fourth_key' => 12345 } }
   end
 end
 
@@ -60,6 +60,10 @@ describe Configarrr::YAML do
     it "should provide setting if not provided" do
       @yaml_with_defaults.third_key.should == 1234
     end
+
+    it "should work with multidimensional hashes" do
+      @yaml_with_defaults.parent['fourth_key'].should == 12345
+    end
   end
 
   it_should_behave_like "a Configarrr implementation"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: configarrr
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Dylan Egan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-30 00:00:00 +10:00
+date: 2009-10-01 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,8 @@ files:
 - lib/configarrr/base.rb
 - lib/configarrr/simple.rb
 - lib/configarrr/yaml.rb
+- lib/core_ext.rb
+- lib/core_ext/hash/recursive_merge.rb
 - spec/configarrr/base_spec.rb
 - spec/configarrr/yaml_spec.rb
 - spec/fixtures/config.yml