fog 0.0.31 → 0.0.32

data/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

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

@@ -20,6 +20,8 @@ module Fog
         end
 
         def copy(target_bucket_name, target_object_key)
+          requires :bucket, :key
+
           data = connection.copy_object(bucket.name, @key, target_bucket_name, target_object_key).body
           target_bucket = connection.buckets.new(:name => target_bucket_name)
           target_object = target_bucket.objects.new(attributes.merge!(:key => target_object_key))
@@ -34,11 +36,14 @@ module Fog
         end
 
         def destroy
+          requires :bucket, :key
+
           connection.delete_object(bucket.name, @key)
           true
         end
 
         def save(options = {})
+          requires :body, :bucket, :key
           data = connection.put_object(bucket.name, @key, @body, options)
           @etag = data.headers['ETag']
           true

data/lib/fog/aws/requests/ec2/allocate_address.rb

@@ -28,7 +28,7 @@ else
       class EC2
 
         def allocate_address
-          response = Fog::Response.new
+          response = Excon::Response.new
           response.status = 200
           public_ip = Fog::AWS::Mock.ip_address
           data ={

data/lib/fog/aws/requests/ec2/associate_address.rb

@@ -34,7 +34,7 @@ else
       class EC2
 
         def associate_address(instance_id, public_ip)
-          response = Fog::Response.new
+          response = Excon::Response.new
           response.status = 200
           instance = Fog::AWS::EC2.data[:instances][instance_id]
           address = Fog::AWS::EC2.data[:addresses][public_ip]
@@ -47,7 +47,7 @@ else
             }
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/attach_volume.rb

@@ -40,7 +40,7 @@ else
       class EC2
 
         def attach_volume(instance_id, volume_id, device)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if instance_id && volume_id && device
             response.status = 200
             instance = Fog::AWS::EC2.data[:instances][instance_id]
@@ -60,7 +60,7 @@ else
               }.merge!(data)
             else
               response.status = 400
-              raise(Excon::Errors.status_error(200, 400, response))
+              raise(Excon::Errors.status_error({:expects => 200}, response))
             end
           else
             response.status = 400

data/lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb

@@ -41,7 +41,7 @@ else
 
         # TODO: handle the GroupName/Source/Source case
         def authorize_security_group_ingress(options = {})
-          response = Fog::Response.new
+          response = Excon::Response.new
           group = Fog::AWS::EC2.data[:security_groups][options['GroupName']]
 
           group['ipPermissions'] ||= []

data/lib/fog/aws/requests/ec2/create_key_pair.rb

@@ -34,7 +34,7 @@ else
       class EC2
 
         def create_key_pair(key_name)
-          response = Fog::Response.new
+          response = Excon::Response.new
           unless Fog::AWS::EC2.data[:key_pairs][key_name]
             response.status = 200
             data = {
@@ -48,7 +48,7 @@ else
             }.merge!(data)
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/create_security_group.rb

@@ -34,7 +34,7 @@ else
       class EC2
 
         def create_security_group(name, description)
-          response = Fog::Response.new
+          response = Excon::Response.new
           unless Fog::AWS::EC2.data[:security_groups][name]
             data = {
               'groupDescription'  => description,
@@ -49,7 +49,7 @@ else
             }
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/create_snapshot.rb

@@ -36,7 +36,7 @@ else
       class EC2
 
         def create_snapshot(volume_id)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if Fog::AWS::EC2.data[:volumes][volume_id]
             response.status = 200
             snapshot_id = Fog::AWS::Mock.snapshot_id
@@ -53,7 +53,7 @@ else
             }.merge!(data)
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/create_volume.rb

@@ -40,7 +40,7 @@ else
       class EC2
 
         def create_volume(availability_zone, size, snapshot_id = nil)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if availability_zone && size
             response.status = 200
             volume_id = Fog::AWS::Mock.volume_id

data/lib/fog/aws/requests/ec2/delete_key_pair.rb

@@ -32,7 +32,7 @@ else
       class EC2
 
         def delete_key_pair(key_name)
-          response = Fog::Response.new
+          response = Excon::Response.new
           Fog::AWS::EC2.data[:key_pairs].delete(key_name)
           response.status = 200
           response.body = {

data/lib/fog/aws/requests/ec2/delete_security_group.rb

@@ -31,7 +31,7 @@ else
     module AWS
       class EC2
         def delete_security_group(name)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if Fog::AWS::EC2.data[:security_groups][name]
             Fog::AWS::EC2.data[:security_groups].delete(name)
             response.status = 200
@@ -41,7 +41,7 @@ else
             }
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/delete_snapshot.rb

@@ -32,7 +32,7 @@ else
       class EC2
 
         def delete_snapshot(snapshot_id)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if snapshot = Fog::AWS::EC2.data[:snapshots].delete(snapshot_id)
             response.status = true
             response.body = {
@@ -41,7 +41,7 @@ else
             }
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/delete_volume.rb

@@ -32,7 +32,7 @@ else
       class EC2
 
         def delete_volume(volume_id)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if volume = Fog::AWS::EC2.data[:volumes][volume_id]
             Fog::AWS::EC2.data[:deleted_at][volume_id] = Time.now
             volume['status'] = 'deleting'
@@ -43,7 +43,7 @@ else
             }
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/describe_addresses.rb

@@ -34,7 +34,7 @@ else
       class EC2
 
         def describe_addresses(public_ip = [])
-          response = Fog::Response.new
+          response = Excon::Response.new
           public_ip = [*public_ip]
           if public_ip != []
             addresses_set = Fog::AWS::EC2.data[:addresses].reject {|key, value| !public_ip.include?(key)}.values
@@ -49,7 +49,7 @@ else
             }
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/describe_availability_zones.rb

@@ -35,7 +35,7 @@ else
       class EC2
 
         def describe_availability_zones(zone_name = [])
-          response = Fog::Response.new
+          response = Excon::Response.new
           zone_name = [*zone_name]
           zones = {
             'us-east-1a' => {"zoneName"=>"us-east-1a", "regionName"=>"us-east-1", "zoneState"=>"available"}, 

data/lib/fog/aws/requests/ec2/describe_images.rb

@@ -49,7 +49,7 @@ else
       class EC2
 
         def describe_images(options = {})
-          response = Fog::Response.new
+          response = Excon::Response.new
           images = []
 
           (rand(101 + 100)).times do

data/lib/fog/aws/requests/ec2/describe_instances.rb

@@ -56,7 +56,7 @@ else
       class EC2
 
         def describe_instances(instance_id = {})
-          response = Fog::Response.new
+          response = Excon::Response.new
           instance_id = [*instance_id]
           if instance_id != []
             instance_set = Fog::AWS::EC2.data[:instances].reject {|key,value| !instance_id.include?(key)}.values
@@ -104,7 +104,7 @@ else
             }
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/describe_key_pairs.rb

@@ -34,7 +34,7 @@ else
       class EC2
 
         def describe_key_pairs(key_name = [])
-          response = Fog::Response.new
+          response = Excon::Response.new
           key_name = [*key_name]
           if key_name != []
             key_set = Fog::AWS::EC2.data[:key_pairs].reject {|key, value| !key_name.include?(key)}.values
@@ -51,7 +51,7 @@ else
             }
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/describe_regions.rb

@@ -34,7 +34,7 @@ else
       class EC2
 
         def describe_regions(region_name = [])
-          response = Fog::Response.new
+          response = Excon::Response.new
           region_name = [*region_name]
           regions = {
             'eu-west-1' => {"regionName"=>"eu-west-1", "regionEndpoint"=>"eu-west-1.ec2.amazonaws.com"},

data/lib/fog/aws/requests/ec2/describe_security_groups.rb

@@ -44,7 +44,7 @@ else
       class EC2
 
         def describe_security_groups(group_name = [])
-          response = Fog::Response.new
+          response = Excon::Response.new
           group_name = [*group_name]
           if group_name != []
             security_group_info = Fog::AWS::EC2.data[:security_groups].reject {|key, value| !group_name.include?(key)}.values
@@ -59,7 +59,7 @@ else
             }
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/describe_snapshots.rb

@@ -37,7 +37,7 @@ else
       class EC2
 
         def describe_snapshots(snapshot_id = [])
-          response = Fog::Response.new
+          response = Excon::Response.new
           snapshot_id = [*snapshot_id]
           if snapshot_id != []
             snapshot_set = Fog::AWS::EC2.data[:snapshots].reject {|key,value| !snapshot_id.include?(key)}.values
@@ -66,7 +66,7 @@ else
             }
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/describe_volumes.rb

@@ -43,7 +43,7 @@ else
       class EC2
 
         def describe_volumes(volume_id = [])
-          response = Fog::Response.new
+          response = Excon::Response.new
           volume_id = [*volume_id]
           if volume_id != []
             volume_set = Fog::AWS::EC2.data[:volumes].reject {|key,value| !volume_id.include?(key)}.values
@@ -73,7 +73,7 @@ else
             }
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/detach_volume.rb

@@ -40,7 +40,7 @@ else
       class EC2
 
         def detach_volume(volume_id, options = {})
-          response = Fog::Response.new
+          response = Excon::Response.new
           response.status = 200
           if volume = Fog::AWS::EC2.data[:volumes][volume_id]
             data = volume['attachmentSet'].pop
@@ -50,7 +50,7 @@ else
             }.merge!(data)
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/disassociate_address.rb

@@ -32,7 +32,7 @@ else
       class EC2
 
         def disassociate_address(public_ip)
-          response = Fog::Response.new
+          response = Excon::Response.new
           response.status = 200
           if address = Fog::AWS::EC2.data[:addresses][public_ip]
             address['instanceId'] = ''
@@ -43,7 +43,7 @@ else
             }
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/get_console_output.rb

@@ -34,7 +34,7 @@ else
       class EC2
 
         def get_console_output(instance_id)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if instance = Fog::AWS::EC2.data[:instances][instance_id]
             response.status = 200
             response.body = {
@@ -45,7 +45,7 @@ else
             }
           else
             response.status = 400
-            raise(Excon::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end