configa 0.0.2 → 0.0.3

data/lib/configa/version.rb

@@ -1,3 +1,3 @@
 module Configa
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/configa.rb

@@ -52,7 +52,6 @@ module Configa
 
     # Tree traverse
     def merge_yaml(yaml, cache={})
-      cache = cache.dup
       yaml.each do |k,v|
         next  unless Hash === v
         cache[k] ||= {}
@@ -60,9 +59,9 @@ module Configa
       end
       yaml.each do |k,v|
         next  unless Hash === v
-        v.each do |key, data|
+        v.each do |key, val|
           if cache[key]
-            yaml[k][key] = cache[key].merge data  if cache[key] != data
+            yaml[k][key] = cache[key].merge yaml[k][key]  if cache[key] != val
           end
         end
         yaml[k] = merge_yaml(yaml[k], cache)

data/spec/config.yml

@@ -18,6 +18,10 @@ production:
     username: admin
     password: strongone
 
+users:
+  mysql:
+    password: password
+
 staging:
   prestaging:
     mysql:

data/spec/configa/configa_spec.rb

@@ -11,11 +11,12 @@ describe Configa do
       dev = configa.instance_variable_get(:"@yaml")["development"]
       dev["mysql"]["adapter"].must_equal mysql["adapter"]
       dev["mysql"]["database"].must_equal "mysql_dev"
-      proc{ configa.staging.prestaging.mysql.database}.must_raise Configa::UnknownKey
+      proc{ configa.staging.prestaging.mysql.port}.must_raise Configa::UnknownKey
       configa.staging.prestaging.mysql.adapter.must_equal "mysql"
       configa.staging.prestaging.users.mysql.adapter.must_equal "mysql"
       configa.staging.prestaging.users.mysql.username.must_equal "test"
       configa.staging.prestaging.users.mysql.database.must_equal "users"
+      configa.staging.prestaging.users.mysql.password.must_equal "password"
     end
 
     it "basic test for multi file config" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configa
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies: []
 description: YAML configuration file parser
 email: