let models know about their collections

lib/fog/aws/models/s3/bucket.rb

@@ -53,6 +53,16 @@ module Fog
           true
         end
 
+        private
+
+        def buckets
+          @buckets
+        end
+
+        def buckets=(new_buckets)
+          @buckets = new_buckets
+        end
+
       end
 
     end

lib/fog/aws/models/s3/buckets.rb

@@ -14,8 +14,9 @@ module Fog
           buckets = Fog::AWS::S3::Buckets.new
           data['Buckets'].each do |bucket|
             buckets << Fog::AWS::S3::Bucket.new({
-              :connection     => connection,
+              :buckets    => self
-              :owner          => owner
+              :connection => connection,
+              :owner      => owner
             }.merge!(bucket))
           end
           buckets
@@ -28,7 +29,12 @@ module Fog
         end
 
         def new(attributes = {})
-          Fog::AWS::S3::Bucket.new(attributes.merge!(:connection => connection))
+          Fog::AWS::S3::Bucket.new(
+            attributes.merge!(
+              :connection => connection,
+              :buckets    => self
+            )
+          )
         end
 
       end

lib/fog/aws/models/s3/object.rb

@@ -5,14 +5,14 @@ module Fog
       class Object < Fog::Model
 
         attr_accessor :body,
-          :content_length,
+                      :content_length,
-          :content_type,
+                      :content_type,
-          :etag,
+                      :etag,
-          :key,
+                      :key,
-          :last_modified,
+                      :last_modified,
-          :owner,
+                      :owner,
-          :size,
+                      :size,
-          :storage_class
+                      :storage_class
 
         def initialize(attributes = {})
           remap_attributes(attributes, {
@@ -61,6 +61,14 @@ module Fog
           @bucket = new_bucket
         end
 
+        def objects
+          @objects
+        end
+
+        def objects=(new_objects)
+          @objects = new_objects
+        end
+
       end
 
     end

lib/fog/aws/models/s3/objects.rb

@@ -20,6 +20,12 @@ module Fog
         end
 
         def all(options = {})
+          remap_attributes(options, {
+            :is_truncated => 'IsTruncated',
+            :marker       => 'Marker',
+            :max_keys     => 'MaxKeys',
+            :prefix       => 'Prefix'
+          })
           data = connection.get_bucket(bucket.name, options).body
           objects_data = {}
           for key, value in data
@@ -36,6 +42,7 @@ module Fog
             objects << Fog::AWS::S3::Object.new({
               :bucket     => bucket,
               :connection => connection,
+              :objects    => self,
               :owner      => owner
             }.merge!(object))
           end
@@ -62,7 +69,8 @@ module Fog
           end
           Fog::AWS::S3::Object.new({
             :bucket     => bucket,
-            :connection => connection
+            :connection => connection,
+            :objects    => self
           }.merge!(object_data))
         end
 
@@ -76,14 +84,16 @@ module Fog
           end
           Fog::AWS::S3::Object.new({
             :bucket     => bucket,
-            :connection => connection
+            :connection => connection,
+            :objects    => self
           }.merge!(object_data))
         end
 
         def new(attributes = {})
           Fog::AWS::S3::Object.new({
             :bucket     => bucket,
-            :connection => connection
+            :connection => connection,
+            :objects    => self
           }.merge!(attributes))
         end