0
@@ -43,20 +43,27 @@ module Halcyon
0
       #   # parsing errors will happen if you try to use the wrong marshal
0
       #   # load method
0
       # 
0
+      # Returns a Mash if the contents parse to a Hash.
0
+      # 
0
       def to_hash(from = :from_yaml)
0
-        Mash.new case from
0
+        contents = case from
0
         when :from_yaml
0
           require 'yaml'
0
           YAML.load(self.content)
0
         when :from_json
0
           JSON.parse(self.content)
0
         end
0
+        # return mash instead of hash if result is a hash
0
+        if contents.is_a?(Hash)
0
+          contents = Mash.new contents
0
+        end
0
+        contents
0
       end
0
       
0
       # Filters the contents through ERB.
0
       # 
0
       def filter(content, filter_through_erb)
0
-        content =  ERB.new(content).result if filter_through_erb
0
+        content = ERB.new(content).result if filter_through_erb
0
         content
0
       end
0