lib/robut/storage/yaml_store.rb in robut-0.2.1 vs lib/robut/storage/yaml_store.rb in robut-0.3.0

@@ -1,24 +1,24 @@
 require 'yaml'
 
 # A store backed by a persistent on-disk yaml file.
 class Robut::Storage::YamlStore < Robut::Storage::Base
-    
+
   class << self
 
-    # The path to the file this store will persist to. 
+    # The path to the file this store will persist to.
     attr_reader :file
 
     # Sets the path to the file this store will persist to, and forces
     # a reload of all of the data.
     def file=(f)
       @file = f
       @internal = nil # force reload
       @file
     end
 
-    # Sets the key +k+ to the value +v+ 
+    # Sets the key +k+ to the value +v+
     def []=(k, v)
       internal[k] = v
       persist!
       v
     end
@@ -30,22 +30,28 @@
 
     private
 
     # The internal in-memory representation of the yaml file
     def internal
-      @internal ||= begin
-        YAML.load_file(file) rescue {}
-      end
+      @internal ||= load_from_file
     end
-    
+
     # Persists the data in this store to disk. Throws an exception if
     # we don't have a file set.
     def persist!
       raise "Robut::Storage::YamlStore.file must be set" unless file
-      f = File.open(file, "w")
-      f.puts internal.to_yaml
-      f.close
+      File.open(file, "w") do |f|
+        f.puts internal.to_yaml
+      end
     end
-    
+
+    def load_from_file
+      begin
+        store = YAML.load_file(file)
+      rescue Errno::ENOENT
+      end
+
+      store || Hash.new
+    end
+
   end
-    
 end