fog 0.0.31 → 0.0.32

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

@@ -32,7 +32,7 @@ else
       class EC2
 
         def reboot_instances(instance_id = [])
-          response = Fog::Response.new
+          response = Excon::Response.new
           instance_id = [*instance_id]
           if (Fog::AWS::EC2.data[:instances].keys & instance_id).length == instance_id.length
             for instance_id in instance_id
@@ -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

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

@@ -29,7 +29,7 @@ else
       class EC2
 
         def release_address(public_ip)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if (address = Fog::AWS::EC2.data[:addresses].delete(public_ip))
             response.status = 200
             response.body = {
@@ -38,7 +38,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/revoke_security_group_ingress.rb

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

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

@@ -86,7 +86,7 @@ else
       class EC2
 
         def run_instances(image_id, min_count, max_count, options = {})
-          response = Fog::Response.new
+          response = Excon::Response.new
           response.status = 200
 
           group_set = [ (options['GroupId'] || 'default') ]

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

@@ -39,7 +39,7 @@ else
       class EC2
 
         def terminate_instances(instance_id)
-          response = Fog::Response.new
+          response = Excon::Response.new
           instance_id = [*instance_id]
           if (Fog::AWS::EC2.data[:instances].keys & instance_id).length == instance_id.length
             for instance_id in instance_id
@@ -72,7 +72,7 @@ else
             end
           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/s3/copy_object.rb

@@ -48,7 +48,7 @@ else
       class S3
 
         def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {})
-          response = Fog::Response.new
+          response = Excon::Response.new
           source_bucket = Fog::AWS::S3.data[:buckets][source_bucket_name]
           source_object = source_bucket && source_bucket[:objects][source_object_name]
           target_bucket = Fog::AWS::S3.data[:buckets][target_bucket_name]
@@ -66,7 +66,7 @@ else
             }
           else
             response.status = 404
-            raise(Excon::Errors.status_error(200, 404, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
 
           response

data/lib/fog/aws/requests/s3/delete_bucket.rb

@@ -32,13 +32,13 @@ else
       class S3
 
         def delete_bucket(bucket_name)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if Fog::AWS::S3.data[:buckets][bucket_name].nil?
             response.status = 404
-            raise(Excon::Errors.status_error(204, 404, response))
+            raise(Excon::Errors.status_error({:expects => 204}, response))
           elsif Fog::AWS::S3.data[:buckets][bucket_name] && !Fog::AWS::S3.data[:buckets][bucket_name][:objects].empty?
             response.status = 409
-            raise(Excon::Errors.status_error(204, 409, response))
+            raise(Excon::Errors.status_error({:expects => 204}, response))
           else
             Fog::AWS::S3.data[:buckets].delete(bucket_name)
             response.status = 204

data/lib/fog/aws/requests/s3/delete_object.rb

@@ -15,11 +15,12 @@ unless Fog.mocking?
         #   * status<~Integer> - 204
         def delete_object(bucket_name, object_name)
           request({
-            :expects  => 204,
-            :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
-            :method   => 'DELETE',
-            :path     => CGI.escape(object_name)
+            :expects    => 204,
+            :headers    => {},
+            :host       => "#{bucket_name}.#{@host}",
+            :idempotent => true,
+            :method     => 'DELETE',
+            :path       => CGI.escape(object_name)
           })
         end
 
@@ -34,13 +35,13 @@ else
       class S3
 
         def delete_object(bucket_name, object_name)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if bucket = Fog::AWS::S3.data[:buckets][bucket_name]
             response.status = 204
             bucket[:objects].delete(object_name)
           else
             response.status = 404
-            raise(Excon::Errors.status_error(204, 404, response))
+            raise(Excon::Errors.status_error({:expects => 204}, response))
           end
           response
         end

data/lib/fog/aws/requests/s3/get_bucket.rb

@@ -67,7 +67,7 @@ else
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
-          response = Fog::Response.new
+          response = Excon::Response.new
           if bucket = Fog::AWS::S3.data[:buckets][bucket_name]
             response.status = 200
             response.body = {
@@ -94,7 +94,7 @@ else
             end
           else
             response.status = 404
-            raise(Excon::Errors.status_error(200, 404, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/s3/get_bucket_location.rb

@@ -35,13 +35,13 @@ else
       class S3
 
         def get_bucket_location(bucket_name)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if bucket = Fog::AWS::S3.data[:buckets][bucket_name]
             response.status = 200
             response.body = {'LocationConstraint' => bucket['LocationConstraint'] }
           else
             response.status = 404
-            raise(Excon::Errors.status_error(200, 404, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/s3/get_object.rb

@@ -76,7 +76,7 @@ else
           unless object_name
             raise ArgumentError.new('object_name is required')
           end
-          response = Fog::Response.new
+          response = Excon::Response.new
           if (bucket = Fog::AWS::S3.data[:buckets][bucket_name]) && (object = bucket[:objects][object_name])
             if options['If-Match'] && options['If-Match'] != object['ETag']
               response.status = 412
@@ -108,7 +108,7 @@ else
             end
           else
             response.status = 404
-            raise(Excon::Errors.status_error(200, 404, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/s3/get_request_payment.rb

@@ -35,13 +35,13 @@ else
       class S3
 
         def get_request_payment(bucket_name)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if bucket = Fog::AWS::S3.data[:buckets][bucket_name]
             response.status = 200
             response.body = { 'Payer' => bucket['Payer'] }
           else
             response.status = 404
-            raise(Excon::Errors.status_error(200, 404, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/s3/get_service.rb

@@ -37,7 +37,7 @@ else
       class S3
 
         def get_service
-          response = Fog::Response.new
+          response = Excon::Response.new
           response.headers['Status'] = 200
           buckets = Fog::AWS::S3.data[:buckets].values.map do |bucket|
             bucket.reject do |key, value|

data/lib/fog/aws/requests/s3/put_bucket.rb

@@ -26,11 +26,12 @@ unless Fog.mocking?
             data = nil
           end
           request({
-            :expects  => 200,
-            :body     => data,
-            :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
-            :method   => 'PUT'
+            :expects    => 200,
+            :body       => data,
+            :headers    => {},
+            :idempotent => true,
+            :host       => "#{bucket_name}.#{@host}",
+            :method     => 'PUT'
           })
         end
 
@@ -45,12 +46,13 @@ else
       class S3
 
         def put_bucket(bucket_name, options = {})
-          response = Fog::Response.new
+          response = Excon::Response.new
           response.status = 200
           bucket = {
             :objects        => {},
             'Name'          => bucket_name,
             'CreationDate'  => Time.now,
+            'Owner'         => { 'DisplayName' => 'owner', 'ID' => 'some_id'},
             'Payer'         => 'BucketOwner'
           }
           if options['LocationConstraint']

data/lib/fog/aws/requests/s3/put_object.rb

@@ -28,12 +28,13 @@ unless Fog.mocking?
           data = parse_data(data)
           headers = data[:headers].merge!(options)
           request({
-            :body     => data[:body],
-            :expects  => 200,
-            :headers  => headers,
-            :host     => "#{bucket_name}.#{@host}",
-            :method   => 'PUT',
-            :path     => CGI.escape(object_name)
+            :body       => data[:body],
+            :expects    => 200,
+            :headers    => headers,
+            :host       => "#{bucket_name}.#{@host}",
+            :idempotent => true,
+            :method     => 'PUT',
+            :path       => CGI.escape(object_name)
           })
         end
 
@@ -49,7 +50,7 @@ else
 
         def put_object(bucket_name, object_name, data, options = {})
           data = parse_data(data)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if (bucket = Fog::AWS::S3.data[:buckets][bucket_name])
             response.status = 200
             bucket[:objects][object_name] = {
@@ -57,14 +58,13 @@ 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'
             }
             bucket[:objects][object_name]['Content-Type'] = data[:headers]['Content-Type']
           else
             response.status = 404
-            raise(Excon::Errors.status_error(200, 404, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/s3/put_request_payment.rb

@@ -37,13 +37,13 @@ else
       class S3
 
         def put_request_payment(bucket_name, payer)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if bucket = Fog::AWS::S3.data[:buckets][bucket_name]
             response.status = 200
             bucket['Payer'] = payer
           else
             response.status = 404
-            raise(Excon::Errors.status_error(200, 404, response))
+            raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response
         end

data/lib/fog/aws/requests/simpledb/batch_put_attributes.rb

@@ -39,7 +39,7 @@ else
       class SimpleDB
 
         def batch_put_attributes(domain_name, items, replace_attributes = Hash.new([]))
-          response = Fog::Response.new
+          response = Excon::Response.new
           if Fog::AWS::SimpleDB.data[:domains][domain_name]
             for item_name, attributes in items do
               for key, value in attributes do
@@ -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/simpledb/create_domain.rb

@@ -33,7 +33,7 @@ else
       class SimpleDB
 
         def create_domain(domain_name)
-          response = Fog::Response.new
+          response = Excon::Response.new
           Fog::AWS::SimpleDB.data[:domains][domain_name] = {}
           response.status = 200
           response.body = {

data/lib/fog/aws/requests/simpledb/delete_attributes.rb

@@ -42,7 +42,7 @@ else
       class SimpleDB
 
         def delete_attributes(domain_name, item_name, attributes = nil)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if Fog::AWS::SimpleDB.data[:domains][domain_name]
             if attributes
               for key, value in attributes
@@ -60,7 +60,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/simpledb/delete_domain.rb

@@ -33,7 +33,7 @@ else
       class SimpleDB
 
         def delete_domain(domain_name)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if Fog::AWS::SimpleDB.data[:domains].delete(domain_name)
             response.status = 200
             response.body = {

data/lib/fog/aws/requests/simpledb/domain_metadata.rb

@@ -40,7 +40,7 @@ else
       class SimpleDB
 
         def domain_metadata(domain_name)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if domain = Fog::AWS::SimpleDB.data[:domains][domain_name]
             response.status = 200
             
@@ -68,7 +68,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/simpledb/get_attributes.rb

@@ -43,7 +43,7 @@ else
       class SimpleDB
 
         def get_attributes(domain_name, item_name, attributes = nil)
-          response = Fog::Response.new
+          response = Excon::Response.new
           if Fog::AWS::SimpleDB.data[:domains][domain_name]
             object = {}
             if attributes
@@ -63,7 +63,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/simpledb/list_domains.rb

@@ -36,7 +36,7 @@ else
       class SimpleDB
 
         def list_domains(options = {})
-          response = Fog::Response.new
+          response = Excon::Response.new
           keys = Fog::AWS::SimpleDB.data[:domains].keys
           max = options['MaxNumberOfDomains'] || keys.size
           offset = options['NextToken'] || 0

data/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"
@@ -96,17 +95,7 @@ module Fog
         params[:headers]['Date'] = Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S +0000")
         params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
 
-        response = @connection.request({
-          :block    => params[:block],
-          :body     => params[:body],
-          :expects  => params[:expects],
-          :headers  => params[:headers],
-          :host     => params[:host],
-          :method   => params[:method],
-          :parser   => params[:parser],
-          :path     => params[:path],
-          :query    => params[:query]
-        })
+        response = @connection.request(params)
 
         response
       end