From c8ef903519792c6929928c4f99c6a2e6534acbac Mon Sep 17 00:00:00 2001
From: Wesley Beary <wbeary@engineyard.com>
Date: Sat, 21 Nov 2009 10:28:18 -0800
Subject: [PATCH] remove explicit owner model from s3

---
 fog.gemspec                           |  5 +++--
 lib/fog/aws/models/s3/buckets.rb      | 14 ++++++++++----
 lib/fog/aws/models/s3/owner.rb        | 18 ------------------
 lib/fog/aws/requests/s3/put_bucket.rb |  1 +
 lib/fog/aws/requests/s3/put_object.rb |  1 -
 lib/fog/aws/s3.rb                     |  1 -
 6 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 lib/fog/aws/models/s3/owner.rb

diff --git a/fog.gemspec b/fog.gemspec
index 05a62f95a..1e8391b77 100644
--- a/fog.gemspec
+++ b/fog.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2009-11-16}
+  s.date = %q{2009-11-21}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -47,7 +47,6 @@ Gem::Specification.new do |s|
      "lib/fog/aws/models/s3/buckets.rb",
      "lib/fog/aws/models/s3/object.rb",
      "lib/fog/aws/models/s3/objects.rb",
-     "lib/fog/aws/models/s3/owner.rb",
      "lib/fog/aws/parsers/ec2/allocate_address.rb",
      "lib/fog/aws/parsers/ec2/attach_volume.rb",
      "lib/fog/aws/parsers/ec2/basic.rb",
@@ -137,6 +136,8 @@ Gem::Specification.new do |s|
      "lib/fog/rackspace/files.rb",
      "lib/fog/rackspace/models/servers/flavor.rb",
      "lib/fog/rackspace/models/servers/flavors.rb",
+     "lib/fog/rackspace/models/servers/image.rb",
+     "lib/fog/rackspace/models/servers/images.rb",
      "lib/fog/rackspace/models/servers/server.rb",
      "lib/fog/rackspace/models/servers/servers.rb",
      "lib/fog/rackspace/requests/files/delete_container.rb",
diff --git a/lib/fog/aws/models/s3/buckets.rb b/lib/fog/aws/models/s3/buckets.rb
index e87da284b..3c1451404 100644
--- a/lib/fog/aws/models/s3/buckets.rb
+++ b/lib/fog/aws/models/s3/buckets.rb
@@ -12,13 +12,16 @@ module Fog
 
         def all
           data = connection.get_service.body
-          owner = Fog::AWS::S3::Owner.new(data.delete('Owner').merge!(:connection => connection))
+          owner = Fog::AWS::S3::Owner.new(data.delete('Owner'))
           buckets = Fog::AWS::S3::Buckets.new(:connection => connection)
           data['Buckets'].each do |bucket|
             buckets << Fog::AWS::S3::Bucket.new({
               :collection => buckets,
               :connection => connection,
-              :owner      => owner
+              :owner      => {
+                :display_name => owner['DisplayName'], 
+                :id => owner['ID']
+              }
             }.merge!(bucket))
           end
           buckets
@@ -42,12 +45,15 @@ module Fog
           end
           bucket.objects.merge_attributes(options)
           data['Contents'].each do |object|
-            owner = Fog::AWS::S3::Owner.new(object.delete('Owner').merge!(:connection => connection))
+            owner = Fog::AWS::S3::Owner.new(object.delete('Owner'))
             bucket.objects << Fog::AWS::S3::Object.new({
               :bucket     => bucket,
               :connection => connection,
               :collection => bucket.objects,
-              :owner      => owner
+              :owner      => {
+                :display_name => owner['DisplayName'], 
+                :id => owner['ID']
+              }
             }.merge!(object))
           end
           bucket
diff --git a/lib/fog/aws/models/s3/owner.rb b/lib/fog/aws/models/s3/owner.rb
deleted file mode 100644
index 86eb22abd..000000000
--- a/lib/fog/aws/models/s3/owner.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module Fog
-  module AWS
-    class S3
-
-      class Owner < Fog::Model
-
-        attribute :display_name,  'DisplayName'
-        attribute :id,            'ID'
-
-        def initialize(attributes = {})
-          super
-        end
-
-      end
-
-    end
-  end
-end
diff --git a/lib/fog/aws/requests/s3/put_bucket.rb b/lib/fog/aws/requests/s3/put_bucket.rb
index 8dce5d5fa..ac72b0ff0 100644
--- a/lib/fog/aws/requests/s3/put_bucket.rb
+++ b/lib/fog/aws/requests/s3/put_bucket.rb
@@ -51,6 +51,7 @@ else
             :objects        => {},
             'Name'          => bucket_name,
             'CreationDate'  => Time.now,
+            'Owner'         => { 'DisplayName' => 'owner', 'ID' => 'some_id'},
             'Payer'         => 'BucketOwner'
           }
           if options['LocationConstraint']
diff --git a/lib/fog/aws/requests/s3/put_object.rb b/lib/fog/aws/requests/s3/put_object.rb
index 223f3e726..462e7bf4d 100644
--- a/lib/fog/aws/requests/s3/put_object.rb
+++ b/lib/fog/aws/requests/s3/put_object.rb
@@ -57,7 +57,6 @@ else
               'ETag'          => Fog::AWS::Mock.etag,
               'Key'           => object_name,
               'LastModified'  => Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S +0000"),
-              'Owner'         => { 'DisplayName' => 'owner', 'ID' => 'some_id'},
               'Size'          => data[:headers]['Content-Length'],
               'StorageClass'  => 'STANDARD'
             }
diff --git a/lib/fog/aws/s3.rb b/lib/fog/aws/s3.rb
index c9fe567ab..360c62568 100644
--- a/lib/fog/aws/s3.rb
+++ b/lib/fog/aws/s3.rb
@@ -16,7 +16,6 @@ module Fog
         load "fog/aws/models/s3/buckets.rb"
         load "fog/aws/models/s3/object.rb"
         load "fog/aws/models/s3/objects.rb"
-        load "fog/aws/models/s3/owner.rb"
 
         load "fog/aws/parsers/s3/copy_object.rb"
         load "fog/aws/parsers/s3/get_bucket.rb"