From 56b3d3aa140f7ca72622ef3649ceb0fbfe211a31 Mon Sep 17 00:00:00 2001 From: binarylogic Date: Sat, 22 Aug 2009 03:41:39 -0400 Subject: [PATCH] Namespacing should only add the namespace values --- lib/settingslogic.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/settingslogic.rb b/lib/settingslogic.rb index d173a9f..685a542 100644 --- a/lib/settingslogic.rb +++ b/lib/settingslogic.rb @@ -50,8 +50,9 @@ class Settingslogic < Hash when Hash self.update hash_or_file else - self.update YAML.load(ERB.new(File.read(hash_or_file)).result).to_hash - self.update self[self.class.namespace] if self.class.namespace + hash = YAML.load(ERB.new(File.read(hash_or_file)).result).to_hash + hash = hash[self.class.namespace] if self.class.namespace + self.update hash end define_settings! -- libgit2 0.21.0