fog 0.2.30 → 0.3.0

data/spec/aws/requests/{ec2 → compute}/describe_images_spec.rb

@@ -1,10 +1,10 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'EC2.describe_images' do
+describe 'Compute.describe_images' do
   describe 'success' do
 
     it "should return proper attributes with no params" do
-      actual = AWS[:ec2].describe_images
+      actual = AWS[:compute].describe_images
       actual.body['requestId'].should be_a(String)
       image = actual.body['imagesSet'].first
       image['architecture'].should be_a(String)
@@ -21,9 +21,9 @@ describe 'EC2.describe_images' do
       ["ebs","instance-store"].should include(image['rootDeviceType'])
       image['rootDeviceName'].should be_a(String) if image['rootDeviceName']
     end
-  
+
     it "should return proper attributes with params" do
-      actual = AWS[:ec2].describe_images('ImageId' => GENTOO_AMI)
+      actual = AWS[:compute].describe_images('ImageId' => GENTOO_AMI)
       actual.body['requestId'].should be_a(String)
       image = actual.body['imagesSet'].first
       image['architecture'].should be_a(String)

data/spec/aws/requests/s3/copy_object_spec.rb

@@ -1,23 +1,23 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'S3.copy_object' do
+describe 'Storage.copy_object' do
   describe 'success' do
 
     before(:each) do
-      AWS[:s3].put_bucket('fogcopyobjectsource')
-      AWS[:s3].put_object('fogcopyobjectsource', 'fog_copy_object_source', lorem_file)
-      AWS[:s3].put_bucket('fogcopyobjectdestination')
+      AWS[:storage].put_bucket('fogcopyobjectsource')
+      AWS[:storage].put_object('fogcopyobjectsource', 'fog_copy_object_source', lorem_file)
+      AWS[:storage].put_bucket('fogcopyobjectdestination')
     end
 
     after(:each) do
-      AWS[:s3].delete_object('fogcopyobjectdestination', 'fog_copy_object_destination')
-      AWS[:s3].delete_bucket('fogcopyobjectdestination')
-      AWS[:s3].delete_object('fogcopyobjectsource', 'fog_copy_object_source')
-      AWS[:s3].delete_bucket('fogcopyobjectsource')
+      AWS[:storage].delete_object('fogcopyobjectdestination', 'fog_copy_object_destination')
+      AWS[:storage].delete_bucket('fogcopyobjectdestination')
+      AWS[:storage].delete_object('fogcopyobjectsource', 'fog_copy_object_source')
+      AWS[:storage].delete_bucket('fogcopyobjectsource')
     end
 
     it 'should return proper attributes' do
-      actual = AWS[:s3].copy_object(
+      actual = AWS[:storage].copy_object(
         'fogcopyobjectsource', 'fog_copy_object_source',
         'fogcopyobjectdestination', 'fog_copy_object_destination'
       )
@@ -31,7 +31,7 @@ describe 'S3.copy_object' do
 
     it 'should raise a NotFound error if the source_bucket does not exist' do
       lambda {
-        AWS[:s3].copy_object(
+        AWS[:storage].copy_object(
           'fognotabucket', 'fog_copy_object_source',
           'fogcopyobjectdestination', 'fog_copy_object_destination'
         )
@@ -40,7 +40,7 @@ describe 'S3.copy_object' do
 
     it 'should raise a NotFound error if the source_object does not exist' do
       lambda {
-        AWS[:s3].copy_object(
+        AWS[:storage].copy_object(
           'fogcopyobjectsource', 'fog_not_an_object',
           'fogcopyobjectdestination', 'fog_copy_object_destination'
         )
@@ -49,7 +49,7 @@ describe 'S3.copy_object' do
 
     it 'should raise a NotFound error if the target_bucket does not exist' do
       lambda {
-        AWS[:s3].copy_object(
+        AWS[:storage].copy_object(
           'fogcopyobjectsource', 'fog_copy_object_source',
           'fognotabucket', 'fog_copy_object_destination'
         )

data/spec/aws/requests/s3/delete_bucket_spec.rb

@@ -1,14 +1,14 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'S3.delete_bucket' do
+describe 'Storage.delete_bucket' do
   describe 'success' do
 
     before(:each) do
-      AWS[:s3].put_bucket('fogdeletebucket')
+      AWS[:storage].put_bucket('fogdeletebucket')
     end
 
     it 'should return proper attributes' do
-      actual = AWS[:s3].delete_bucket('fogdeletebucket')
+      actual = AWS[:storage].delete_bucket('fogdeletebucket')
       actual.status.should == 204
     end
 
@@ -17,18 +17,18 @@ describe 'S3.delete_bucket' do
 
     it 'should raise a NotFound error if the bucket does not exist' do
       lambda {
-        AWS[:s3].delete_bucket('fognotabucket')
+        AWS[:storage].delete_bucket('fognotabucket')
       }.should raise_error(Excon::Errors::NotFound)
     end
 
     it 'should raise a Conflict error if the bucket is not empty' do
-      AWS[:s3].put_bucket('fogdeletebucket')
-      AWS[:s3].put_object('fogdeletebucket', 'fog_delete_object', lorem_file)
+      AWS[:storage].put_bucket('fogdeletebucket')
+      AWS[:storage].put_object('fogdeletebucket', 'fog_delete_object', lorem_file)
       lambda {
-        AWS[:s3].delete_bucket('fogdeletebucket')
+        AWS[:storage].delete_bucket('fogdeletebucket')
       }.should raise_error(Excon::Errors::Conflict)
-      AWS[:s3].delete_object('fogdeletebucket', 'fog_delete_object')
-      AWS[:s3].delete_bucket('fogdeletebucket')
+      AWS[:storage].delete_object('fogdeletebucket', 'fog_delete_object')
+      AWS[:storage].delete_bucket('fogdeletebucket')
     end
 
   end

data/spec/aws/requests/s3/delete_object_spec.rb

@@ -1,19 +1,19 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'S3.delete_object' do
+describe 'Storage.delete_object' do
   describe 'success' do
 
     before(:each) do
-      AWS[:s3].put_bucket('fogdeleteobject')
-      AWS[:s3].put_object('fogdeleteobject', 'fog_delete_object', lorem_file)
+      AWS[:storage].put_bucket('fogdeleteobject')
+      AWS[:storage].put_object('fogdeleteobject', 'fog_delete_object', lorem_file)
     end
 
     after(:each) do
-      AWS[:s3].delete_bucket('fogdeleteobject')
+      AWS[:storage].delete_bucket('fogdeleteobject')
     end
 
     it 'should return proper attributes' do
-      actual = AWS[:s3].delete_object('fogdeleteobject', 'fog_delete_object')
+      actual = AWS[:storage].delete_object('fogdeleteobject', 'fog_delete_object')
       actual.status.should == 204
     end
 
@@ -22,14 +22,14 @@ describe 'S3.delete_object' do
 
     it 'should raise a NotFound error if the bucket does not exist' do
       lambda {
-        AWS[:s3].delete_object('fognotabucket', 'fog_delete_object')
+        AWS[:storage].delete_object('fognotabucket', 'fog_delete_object')
       }.should raise_error(Excon::Errors::NotFound)
     end
 
     it 'should not raise an error if the object does not exist' do
-      AWS[:s3].put_bucket('fogdeleteobject')
-      AWS[:s3].delete_object('fogdeleteobject', 'fog_not_an_object')
-      AWS[:s3].delete_bucket('fogdeleteobject')
+      AWS[:storage].put_bucket('fogdeleteobject')
+      AWS[:storage].delete_object('fogdeleteobject', 'fog_not_an_object')
+      AWS[:storage].delete_bucket('fogdeleteobject')
     end
 
   end

data/spec/aws/requests/s3/get_bucket_location_spec.rb

@@ -1,18 +1,18 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'S3.get_bucket_location' do
+describe 'Storage.get_bucket_location' do
   describe 'success' do
 
     before(:each) do
-      AWS[:s3].put_bucket('foggetlocation', 'LocationConstraint' => 'EU')
+      AWS[:storage].put_bucket('foggetlocation', 'LocationConstraint' => 'EU')
     end
 
     after(:each) do
-      AWS[:eu_s3].delete_bucket('foggetlocation')
+      AWS[:eu_storage].delete_bucket('foggetlocation')
     end
 
     it 'should return proper attributes' do
-      actual = AWS[:s3].get_bucket_location('foggetlocation')
+      actual = AWS[:storage].get_bucket_location('foggetlocation')
       actual.status.should == 200
       actual.body['LocationConstraint'].should == 'EU'
     end
@@ -22,7 +22,7 @@ describe 'S3.get_bucket_location' do
 
     it 'should raise NotFound error if bucket does not exist' do
       lambda {
-        AWS[:s3].get_bucket_location('fognotabucket')
+        AWS[:storage].get_bucket_location('fognotabucket')
       }.should raise_error(Excon::Errors::NotFound)
     end
 

data/spec/aws/requests/s3/get_bucket_spec.rb

@@ -1,22 +1,22 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'S3.get_bucket' do
+describe 'Storage.get_bucket' do
   describe 'success' do
 
     before(:all) do
-      AWS[:s3].put_bucket('foggetbucket')
-      AWS[:s3].put_object('foggetbucket', 'fog_object', lorem_file)
-      AWS[:s3].put_object('foggetbucket', 'fog_other_object', lorem_file)
+      AWS[:storage].put_bucket('foggetbucket')
+      AWS[:storage].put_object('foggetbucket', 'fog_object', lorem_file)
+      AWS[:storage].put_object('foggetbucket', 'fog_other_object', lorem_file)
     end
 
     after(:all) do
-      AWS[:s3].delete_object('foggetbucket', 'fog_object')
-      AWS[:s3].delete_object('foggetbucket', 'fog_other_object')
-      AWS[:s3].delete_bucket('foggetbucket')
+      AWS[:storage].delete_object('foggetbucket', 'fog_object')
+      AWS[:storage].delete_object('foggetbucket', 'fog_other_object')
+      AWS[:storage].delete_bucket('foggetbucket')
     end
 
     it 'should return proper attributes' do
-      actual = AWS[:s3].get_bucket('foggetbucket')
+      actual = AWS[:storage].get_bucket('foggetbucket')
       actual.body['IsTruncated'].should == false
       actual.body['Marker'].should be_nil
       actual.body['MaxKeys'].should be_an(Integer)
@@ -36,7 +36,7 @@ describe 'S3.get_bucket' do
     end
 
     it 'should accept marker option' do
-      actual = AWS[:s3].get_bucket('foggetbucket', 'marker' => 'fog_object')
+      actual = AWS[:storage].get_bucket('foggetbucket', 'marker' => 'fog_object')
       actual.body['IsTruncated'].should == false
       actual.body['Marker'].should be_a(String)
       actual.body['MaxKeys'].should be_an(Integer)
@@ -56,7 +56,7 @@ describe 'S3.get_bucket' do
     end
 
     it 'should accept max-keys option' do
-      actual = AWS[:s3].get_bucket('foggetbucket', 'max-keys' => 1)
+      actual = AWS[:storage].get_bucket('foggetbucket', 'max-keys' => 1)
       actual.body['IsTruncated'].should == true
       actual.body['Marker'].should be_nil
       actual.body['MaxKeys'].should be_an(Integer)
@@ -76,7 +76,7 @@ describe 'S3.get_bucket' do
     end
 
     it 'should accept prefix option' do
-      actual = AWS[:s3].get_bucket('foggetbucket', 'prefix' => 'fog_ob')
+      actual = AWS[:storage].get_bucket('foggetbucket', 'prefix' => 'fog_ob')
       actual.body['IsTruncated'].should == false
       actual.body['Marker'].should be_nil
       actual.body['MaxKeys'].should be_an(Integer)
@@ -100,13 +100,13 @@ describe 'S3.get_bucket' do
 
     it 'should raise a NotFound error if the bucket does not exist' do
       lambda {
-        AWS[:s3].get_bucket('fognotabucket')
+        AWS[:storage].get_bucket('fognotabucket')
       }.should raise_error(Excon::Errors::NotFound)
     end
 
     it 'should request non-subdomain buckets and raise a NotFound error' do
       lambda {
-        AWS[:s3].get_bucket('A-invalid--name')
+        AWS[:storage].get_bucket('A-invalid--name')
       }.should raise_error(Excon::Errors::NotFound)
     end
 

data/spec/aws/requests/s3/get_object_spec.rb

@@ -1,20 +1,20 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'S3.get_object' do
+describe 'Storage.get_object' do
   describe 'success' do
 
     before(:each) do
-      AWS[:s3].put_bucket('foggetobject')
-      AWS[:s3].put_object('foggetobject', 'fog_get_object', lorem_file)
+      AWS[:storage].put_bucket('foggetobject')
+      AWS[:storage].put_object('foggetobject', 'fog_get_object', lorem_file)
     end
 
     after(:each) do
-      AWS[:s3].delete_object('foggetobject', 'fog_get_object')
-      AWS[:s3].delete_bucket('foggetobject')
+      AWS[:storage].delete_object('foggetobject', 'fog_get_object')
+      AWS[:storage].delete_bucket('foggetobject')
     end
 
     it 'should return proper attributes' do
-      actual = AWS[:s3].get_object('foggetobject', 'fog_get_object')
+      actual = AWS[:storage].get_object('foggetobject', 'fog_get_object')
       actual.status.should == 200
       data = lorem_file.read
       actual.body.should == data
@@ -26,14 +26,14 @@ describe 'S3.get_object' do
 
     it 'should return chunks with optional block' do
       data = ''
-      AWS[:s3].get_object('foggetobject', 'fog_get_object') do |chunk|
+      AWS[:storage].get_object('foggetobject', 'fog_get_object') do |chunk|
         data << chunk
       end
       data.should == lorem_file.read
     end
 
     it 'should return a signed expiring url' do
-      url = AWS[:s3].get_object_url('foggetobject', 'fog_get_object', Time.now + 60 * 10)
+      url = AWS[:storage].get_object_url('foggetobject', 'fog_get_object', Time.now + 60 * 10)
       unless Fog.mocking?
         open(url).read.should == lorem_file.read
       end
@@ -44,13 +44,13 @@ describe 'S3.get_object' do
 
     it 'should raise a NotFound error if the bucket does not exist' do
       lambda {
-        AWS[:s3].get_object('fognotabucket', 'fog_get_object')
+        AWS[:storage].get_object('fognotabucket', 'fog_get_object')
       }.should raise_error(Excon::Errors::NotFound)
     end
 
     it 'should raise a NotFound error if the object does not exist' do
       lambda {
-        AWS[:s3].get_object('foggetobject', 'fog_not_an_object')
+        AWS[:storage].get_object('foggetobject', 'fog_not_an_object')
       }.should raise_error(Excon::Errors::NotFound)
     end
 

data/spec/aws/requests/s3/get_request_payment_spec.rb

@@ -1,18 +1,18 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'S3.get_request_payment' do
+describe 'Storage.get_request_payment' do
   describe 'success' do
 
     before(:each) do
-      AWS[:s3].put_bucket('foggetrequestpayment')
+      AWS[:storage].put_bucket('foggetrequestpayment')
     end
 
     after(:each) do
-      AWS[:s3].delete_bucket('foggetrequestpayment')
+      AWS[:storage].delete_bucket('foggetrequestpayment')
     end
 
     it 'should return proper attributes' do
-      actual = AWS[:s3].get_request_payment('foggetrequestpayment')
+      actual = AWS[:storage].get_request_payment('foggetrequestpayment')
       actual.status.should == 200
       actual.body['Payer'].should == 'BucketOwner'
     end
@@ -22,7 +22,7 @@ describe 'S3.get_request_payment' do
 
     it 'should raise a NotFound error if the bucket does not exist' do
       lambda {
-        AWS[:s3].get_request_payment('fognotabucket')
+        AWS[:storage].get_request_payment('fognotabucket')
       }.should raise_error(Excon::Errors::NotFound)
     end
 

data/spec/aws/requests/s3/get_service_spec.rb

@@ -1,19 +1,19 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'S3.get_service' do
+describe 'Storage.get_service' do
   describe 'success' do
 
     before(:all) do
-      AWS[:s3].put_bucket('foggetservice')
-      Fog.wait_for { AWS[:s3].directories.get('foggetservice') }
+      AWS[:storage].put_bucket('foggetservice')
+      Fog.wait_for { AWS[:storage].directories.get('foggetservice') }
     end
 
     after(:all) do
-      AWS[:s3].delete_bucket('foggetservice')
+      AWS[:storage].delete_bucket('foggetservice')
     end
 
     it 'should return proper_attributes' do
-      actual = AWS[:s3].get_service
+      actual = AWS[:storage].get_service
       actual.body['Buckets'].should be_an(Array)
       bucket = actual.body['Buckets'].select {|bucket| bucket['Name'] == 'foggetservice'}.first
       bucket['CreationDate'].should be_a(Time)
@@ -24,7 +24,7 @@ describe 'S3.get_service' do
     end
 
     it 'should include foggetservice in get_service' do
-      actual = AWS[:s3].get_service
+      actual = AWS[:storage].get_service
       actual.body['Buckets'].collect { |bucket| bucket['Name'] }.should include('foggetservice')
     end
 

data/spec/aws/requests/s3/head_object_spec.rb

@@ -1,20 +1,20 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'S3.head_object' do
+describe 'Storage.head_object' do
   describe 'success' do
 
     before(:each) do
-      AWS[:s3].put_bucket('fogheadobject')
-      AWS[:s3].put_object('fogheadobject', 'fog_head_object', lorem_file)
+      AWS[:storage].put_bucket('fogheadobject')
+      AWS[:storage].put_object('fogheadobject', 'fog_head_object', lorem_file)
     end
 
     after(:each) do
-      AWS[:s3].delete_object('fogheadobject', 'fog_head_object')
-      AWS[:s3].delete_bucket('fogheadobject')
+      AWS[:storage].delete_object('fogheadobject', 'fog_head_object')
+      AWS[:storage].delete_bucket('fogheadobject')
     end
 
     it 'should return proper attributes' do
-      actual = AWS[:s3].head_object('fogheadobject', 'fog_head_object')
+      actual = AWS[:storage].head_object('fogheadobject', 'fog_head_object')
       actual.status.should == 200
       data = lorem_file.read
       actual.headers['Content-Length'].should == data.length.to_s

data/spec/aws/requests/s3/put_bucket_spec.rb

@@ -1,18 +1,18 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'S3.put_bucket' do
+describe 'Storage.put_bucket' do
   describe 'success' do
 
     before(:each) do
-      @response = AWS[:s3].put_bucket('fogputbucket')
+      @response = AWS[:storage].put_bucket('fogputbucket')
     end
 
     after(:each) do
-      AWS[:s3].delete_bucket('fogputbucket')
+      AWS[:storage].delete_bucket('fogputbucket')
     end
 
     it 'should not raise an error if the bucket already exists' do
-      AWS[:s3].put_bucket('fogputbucket')
+      AWS[:storage].put_bucket('fogputbucket')
     end
 
   end