From bfb9d22ad2f1d2da32c3018492ee88882879d23f Mon Sep 17 00:00:00 2001
From: Peter Weldon <peter@lautus.net>
Date: Wed, 19 Jan 2011 18:10:47 +0000
Subject: [PATCH] [aws|storage] Normalise headers for Files#get/#head

---
 lib/fog/storage/models/aws/files.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/fog/storage/models/aws/files.rb b/lib/fog/storage/models/aws/files.rb
index c68f7f7a8..e2b125b00 100644
--- a/lib/fog/storage/models/aws/files.rb
+++ b/lib/fog/storage/models/aws/files.rb
@@ -46,9 +46,7 @@ module Fog
             :body => data.body,
             :key  => key
           })
-          file_data['Last-Modified'] = Time.parse(file_data['Last-Modified'])
-          file_data['ETag'].gsub!('"','')
-          file_data['Content-Length'] = file_data['Content-Length'].to_i
+          normalise_headers(file_data)
           new(file_data)
         rescue Excon::Errors::NotFound
           nil
@@ -65,6 +63,7 @@ module Fog
           file_data = data.headers.merge({
             :key => key
           })
+          normalise_headers(file_data)
           new(file_data)
         rescue Excon::Errors::NotFound
           nil
@@ -75,6 +74,12 @@ module Fog
           super({ :directory => directory }.merge!(attributes))
         end
 
+        def normalise_headers(headers)
+          headers['Last-Modified'] = Time.parse(headers['Last-Modified'])
+          headers['ETag'].gsub!('"','')
+          headers['Content-Length'] = headers['Content-Length'].to_i
+        end
+
       end
 
     end