Merge pull request #40 from craigmarksmith/master

Handle empty yaml files.

Merge pull request #40 from craigmarksmith/master
Handle empty yaml files.
Ben Johnson
2 parents 4884d455 2e1a1cd2
Showing 5 changed files with 10 additions and 1 deletions Show diff stats
lib/settingslogic.rb
spec/settings_empty.rb
spec/settings_empty.yml
spec/settingslogic_spec.rb
spec/spec_helper.rb
@@ -111,7 +111,8 @@ class Settingslogic &lt; Hash
     when Hash
       self.replace hash_or_file
     else
-      hash = YAML.load(ERB.new(open(hash_or_file).read).result).to_hash
+      file_contents = open(hash_or_file).read
+      hash = file_contents.empty? ? {} : YAML.load(ERB.new(file_contents).result).to_hash
       if self.class.namespace
         hash = hash[self.class.namespace] or return missing_key("Missing setting '#{self.class.namespace}' in #{hash_or_file}")
       end
@@ -0,0 +1,3 @@
+class SettingsEmpty < Settingslogic
+  source "#{File.dirname(__FILE__)}/settings_empty.yml"
+end
@@ -153,6 +153,10 @@ describe &quot;Settingslogic&quot; do
     Settings.name.should == 'test'
   end
  
+  it "should handle empty file" do
+    SettingsEmpty.keys.should eql([])
+  end
+
   # Put this test last or else call to .instance will load @instance,
   # masking bugs.
   it "should be a hash" do
@@ -6,6 +6,7 @@ require &#39;settings&#39;
 require 'settings2'
 require 'settings3'
 require 'settings4'
+require 'settings_empty'
  
 # Needed to test Settings3
 Object.send :define_method, 'collides' do
...	...	@@ -111,7 +111,8 @@ class Settingslogic < Hash
111	111	when Hash
112	112	self.replace hash_or_file
113	113	else
114		- hash = YAML.load(ERB.new(open(hash_or_file).read).result).to_hash
	114	+ file_contents = open(hash_or_file).read
	115	+ hash = file_contents.empty? ? {} : YAML.load(ERB.new(file_contents).result).to_hash
115	116	if self.class.namespace
116	117	hash = hash[self.class.namespace] or return missing_key("Missing setting '#{self.class.namespace}' in #{hash_or_file}")
117	118	end
...	...
...	...	@@ -0,0 +1,3 @@
	1	+class SettingsEmpty < Settingslogic
	2	+ source "#{File.dirname(__FILE__)}/settings_empty.yml"
	3	+end
...	...
...	...	@@ -153,6 +153,10 @@ describe "Settingslogic" do
153	153	Settings.name.should == 'test'
154	154	end
155	155
	156	+ it "should handle empty file" do
	157	+ SettingsEmpty.keys.should eql([])
	158	+ end
	159	+
156	160	# Put this test last or else call to .instance will load @instance,
157	161	# masking bugs.
158	162	it "should be a hash" do
...	...
...	...	@@ -6,6 +6,7 @@ require 'settings'
6	6	require 'settings2'
7	7	require 'settings3'
8	8	require 'settings4'
	9	+require 'settings_empty'
9	10
10	11	# Needed to test Settings3
11	12	Object.send :define_method, 'collides' do
...	...