From 2c82662609fb69ced42289b6441ef89ed09cc3c5 Mon Sep 17 00:00:00 2001
From: geemus <geemus@gmail.com>
Date: Fri, 23 Sep 2011 10:53:53 -0500
Subject: [PATCH] [aws|storage] fix acl mocking

---
 lib/fog/aws/requests/storage/get_object_acl.rb | 2 +-
 lib/fog/aws/requests/storage/hash_to_acl.rb    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/fog/aws/requests/storage/get_object_acl.rb b/lib/fog/aws/requests/storage/get_object_acl.rb
index dbd81389e..f4ebe103f 100644
--- a/lib/fog/aws/requests/storage/get_object_acl.rb
+++ b/lib/fog/aws/requests/storage/get_object_acl.rb
@@ -59,7 +59,7 @@ module Fog
 
       class Mock # :nodoc:all
 
-        def get_object_acl(bucket_name, object_name)
+        def get_object_acl(bucket_name, object_name, options = {})
           response = Excon::Response.new
           if acl = self.data[:acls][:object][bucket_name] && self.data[:acls][:object][bucket_name][object_name]
             response.status = 200
diff --git a/lib/fog/aws/requests/storage/hash_to_acl.rb b/lib/fog/aws/requests/storage/hash_to_acl.rb
index 984681640..e9699bf2d 100644
--- a/lib/fog/aws/requests/storage/hash_to_acl.rb
+++ b/lib/fog/aws/requests/storage/hash_to_acl.rb
@@ -24,9 +24,8 @@ DATA
               'Group'
             end
             data << "      <Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"#{type}\">\n"
-            for key, value in grant['Grantee']
-              data << "        <#{key}>#{value}</#{key}>\n"
-            end
+            data << "        <ID>#{grant['Grantee']['ID']}</ID>\n"
+            data << "        <DisplayName>#{grant['Grantee']['DisplayName']}</DisplayName>\n"
             data << "      </Grantee>\n"
             data << "      <Permission>#{grant['Permission']}</Permission>\n"
             data << "    </Grant>\n"