Namespacing should only add the namespace values

binarylogic
1 parent 2f907e2b
Showing 1 changed file with 3 additions and 2 deletions Show diff stats
lib/settingslogic.rb
@@ -50,8 +50,9 @@ class Settingslogic &lt; 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!
...	...	@@ -50,8 +50,9 @@ class Settingslogic < Hash
50	50	when Hash
51	51	self.update hash_or_file
52	52	else
53		- self.update YAML.load(ERB.new(File.read(hash_or_file)).result).to_hash
54		- self.update self[self.class.namespace] if self.class.namespace
	53	+ hash = YAML.load(ERB.new(File.read(hash_or_file)).result).to_hash
	54	+ hash = hash[self.class.namespace] if self.class.namespace
	55	+ self.update hash
55	56	end
56	57
57	58	define_settings!
...	...