asetus 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aabab562229de22b1301e26910b4a000a2086a15
-  data.tar.gz: b7fd09d5490ff4a84a3659cc653c02c4a70910ad
+  metadata.gz: 4fabf93268fce1615b09c0169c1c7b7d580ba66f
+  data.tar.gz: c83d026f4830c955396495de0c5ff9bcb752a540
 SHA512:
-  metadata.gz: cbc9b3ab70bd09b13c4d99ef328bebe75c2515b01f41c1074e5180f16878fc221db0e2bcb70f7aafa7d41fbfcbd1398383184954acf357e4932c4a38bb4684aa
-  data.tar.gz: 79c8ece12fa2d9a32bb58a1e67ff7cbc7c838aff04355d661cb2220d6f29b7afe8c416ccc76dcf8bad8628e3c19f3cff5863df72ba870b4a62a54a02f9b55644
+  metadata.gz: a345a668e8a0362fcb38d1257f4f49243253401d0b3d66c3959cbdfc0ce3e4d6a90b39436378f1b640904f89ecdccd8043e93f2cc48f47f20ee1738a68717382
+  data.tar.gz: 1856d311d47d76a8eb739601d1181bb95b89a1aa68480c7eb0e0987e6d3db6715d872722df78f92ccb1f2f49abafa4936a86e4ab3d30258caa4716828278bf34

data/asetus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'asetus'
-  s.version           = '0.0.1'
+  s.version           = '0.0.3'
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]
   s.email             = %w( saku@ytti.fi )

data/lib/asetus/configstruct.rb

@@ -48,10 +48,11 @@ class Asetus
       cfg = {}
       hash.each do |key, value|
         if value.class == Hash
-          value = _asetus_from_hash value
+          value = ConfigStruct.new value
         end
         cfg[key] = value
       end
+      cfg
     end
 
   end

data/lib/asetus.rb

@@ -73,7 +73,7 @@ class Asetus
   def merge *configs
     hash = {}
     configs.each do |config|
-      hash = hash.merge config._asetus_to_hash
+      hash = hash._asetus_deep_merge config._asetus_to_hash
     end
     ConfigStruct.new hash
   end
@@ -95,3 +95,12 @@ class Asetus
     raise NoName, "can't figure out name, specify explicitly"
   end
 end
+
+class Hash
+  def _asetus_deep_merge newhash
+    merger = proc do |key, oldval, newval|
+      Hash === oldval && Hash === newval ? oldval.merge(newval, &merger) : newval
+    end
+    merge newhash, &merger
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asetus
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop