lib/fakes3/file_store.rb in fakes3-0.1.4 vs lib/fakes3/file_store.rb in fakes3-0.1.5

@@ -73,29 +73,30 @@
 
     def get_object(bucket,object_name, request)
       begin
         real_obj = S3Object.new
         obj_root = File.join(@root,bucket,object_name,SHUCK_METADATA_DIR)
-        metadata = YAML.parse(File.open(File.join(obj_root,"metadata"),'rb').read)
+        metadata = YAML.load(File.open(File.join(obj_root,"metadata"),'rb'))
         real_obj.name = object_name
-        real_obj.md5 = metadata[:md5].value
-        real_obj.content_type = metadata[:content_type] ? metadata[:content_type].value : "application/octet-stream"
+        real_obj.md5 = metadata[:md5]
+        real_obj.content_type = metadata.fetch(:content_type) { "application/octet-stream" }
         #real_obj.io = File.open(File.join(obj_root,"content"),'rb')
         real_obj.io = RateLimitableFile.open(File.join(obj_root,"content"),'rb')
         return real_obj
       rescue
         puts $!
+        $!.backtrace.each { |line| puts line }
         return nil
       end
     end
 
     def object_metadata(bucket,object)
     end
 
     def copy_object(src_bucket_name,src_name,dst_bucket_name,dst_name)
       src_root = File.join(@root,src_bucket_name,src_name,SHUCK_METADATA_DIR)
       src_metadata_filename = File.join(src_root,"metadata")
-      src_metadata = YAML.parse(File.open(src_metadata_filename,'rb').read)
+      src_metadata = YAML.load(File.open(src_metadata_filename,'rb').read)
       src_content_filename = File.join(src_root,"content")
 
       dst_filename= File.join(@root,dst_bucket_name,dst_name)
       FileUtils.mkdir_p(dst_filename)