fog 0.0.29 → 0.0.30

data/spec/aws/requests/ec2/describe_addresses_spec.rb

@@ -31,7 +31,7 @@ describe 'EC2.describe_addresses' do
     it "should raise a BadRequest error if ip does not exist" do
       lambda {
         ec2.describe_addresses('127.0.0.1')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

data/spec/aws/requests/ec2/describe_instances_spec.rb

@@ -79,7 +79,7 @@ describe 'EC2.describe_instances' do
     it 'should raise a BadRequest error if the instance does not exist' do
       lambda {
         ec2.describe_instances('i-00000000')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

data/spec/aws/requests/ec2/describe_key_pairs_spec.rb

@@ -35,7 +35,7 @@ describe 'EC2.describe_key_pairs' do
     it "should raise a BadRequest error if the key does not exist" do
       lambda {
         ec2.describe_key_pairs('fog_not_a_key_name')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

data/spec/aws/requests/ec2/describe_security_groups_spec.rb

@@ -44,7 +44,7 @@ describe 'EC2.describe_security_groups' do
     it "should raise a BadRequest error if the security group does not exist" do
       lambda {
         ec2.describe_security_groups('not_a_security_group')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

data/spec/aws/requests/ec2/describe_snapshots_spec.rb

@@ -47,7 +47,7 @@ describe 'EC2.describe_snapshots' do
     it "should raise a BadRequest error if the snapshot does not exist" do
       lambda {
         ec2.describe_snapshots('snap-00000000')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

data/spec/aws/requests/ec2/describe_volumes_spec.rb

@@ -43,7 +43,7 @@ describe 'EC2.describe_volumes' do
     it "should raise a BadRequest error if volume does not exist" do
       lambda {
         ec2.describe_volumes('vol-00000000')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

data/spec/aws/requests/ec2/detach_volume_spec.rb

@@ -36,7 +36,7 @@ describe 'EC2.detach_volume' do
     it "should raise a BadRequest error if the volume does not exist" do
       lambda {
         ec2.detach_volume('vol-00000000')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

data/spec/aws/requests/ec2/disassociate_address_spec.rb

@@ -27,7 +27,7 @@ describe 'EC2.disassociate_address' do
     it "should raise a BadRequest error if the address does not exist" do
       lambda {
         ec2.disassociate_address('127.0.0.1')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

data/spec/aws/requests/ec2/get_console_output_spec.rb

@@ -25,7 +25,7 @@ describe 'EC2.get_console_output' do
     it "should raise a BadRequest error if the instance does not exist" do
       lambda {
         ec2.get_console_output('i-00000000')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

data/spec/aws/requests/ec2/reboot_instances_spec.rb

@@ -23,7 +23,7 @@ describe 'EC2.reboot_instances' do
     it "should raise a BadRequest error if the instance does not exist" do
       lambda {
         ec2.reboot_instances('i-00000000')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

data/spec/aws/requests/ec2/release_address_spec.rb

@@ -19,7 +19,7 @@ describe 'EC2.release_address' do
     it "should raise a BadRequest error if address does not exist" do
       lambda {
         ec2.release_address('127.0.0.1')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

data/spec/aws/requests/ec2/terminate_instances_spec.rb

@@ -28,7 +28,7 @@ describe 'EC2.terminate_instances' do
     it 'should raise a BadRequest error if the instance does not exist' do
       lambda {
         ec2.terminate_instances('i-00000000')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

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

@@ -5,8 +5,7 @@ describe 'S3.copy_object' do
 
     before(:each) do
       s3.put_bucket('fogcopyobjectsource')
-      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
-      s3.put_object('fogcopyobjectsource', 'fog_copy_object_source', file)
+      s3.put_object('fogcopyobjectsource', 'fog_copy_object_source', lorem_file)
       s3.put_bucket('fogcopyobjectdestination')
     end
 
@@ -36,7 +35,7 @@ describe 'S3.copy_object' do
           'fognotabucket', 'fog_copy_object_source',
           'fogcopyobjectdestination', 'fog_copy_object_destination'
         )
-      }.should raise_error(Fog::Errors::NotFound)
+      }.should raise_error(Excon::Errors::NotFound)
     end
 
     it 'should raise a NotFound error if the source_object does not exist' do
@@ -45,7 +44,7 @@ describe 'S3.copy_object' do
           'fogcopyobjectsource', 'fog_not_an_object',
           'fogcopyobjectdestination', 'fog_copy_object_destination'
         )
-      }.should raise_error(Fog::Errors::NotFound)
+      }.should raise_error(Excon::Errors::NotFound)
     end
 
     it 'should raise a NotFound error if the target_bucket does not exist' do
@@ -54,7 +53,7 @@ describe 'S3.copy_object' do
           'fogcopyobjectsource', 'fog_copy_object_source',
           'fognotabucket', 'fog_copy_object_destination'
         )
-      }.should raise_error(Fog::Errors::NotFound)
+      }.should raise_error(Excon::Errors::NotFound)
     end
 
   end

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

@@ -18,16 +18,15 @@ describe 'S3.delete_bucket' do
     it 'should raise a NotFound error if the bucket does not exist' do
       lambda {
         s3.delete_bucket('fognotabucket')
-      }.should raise_error(Fog::Errors::NotFound)
+      }.should raise_error(Excon::Errors::NotFound)
     end
 
     it 'should raise a Conflict error if the bucket is not empty' do
       s3.put_bucket('fogdeletebucket')
-      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
-      s3.put_object('fogdeletebucket', 'fog_delete_object', file)
+      s3.put_object('fogdeletebucket', 'fog_delete_object', lorem_file)
       lambda {
         s3.delete_bucket('fogdeletebucket')
-      }.should raise_error(Fog::Errors::Conflict)
+      }.should raise_error(Excon::Errors::Conflict)
       s3.delete_object('fogdeletebucket', 'fog_delete_object')
       s3.delete_bucket('fogdeletebucket')
     end

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

@@ -5,8 +5,7 @@ describe 'S3.delete_object' do
 
     before(:each) do
       s3.put_bucket('fogdeleteobject')
-      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
-      s3.put_object('fogdeleteobject', 'fog_delete_object', file)
+      s3.put_object('fogdeleteobject', 'fog_delete_object', lorem_file)
     end
 
     after(:each) do
@@ -24,7 +23,7 @@ describe 'S3.delete_object' do
     it 'should raise a NotFound error if the bucket does not exist' do
       lambda {
         s3.delete_object('fognotabucket', 'fog_delete_object')
-      }.should raise_error(Fog::Errors::NotFound)
+      }.should raise_error(Excon::Errors::NotFound)
     end
 
     it 'should not raise an error if the object does not exist' do

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

@@ -23,7 +23,7 @@ describe 'S3.get_bucket_location' do
     it 'should raise NotFound error if bucket does not exist' do
       lambda {
         s3.get_bucket_location('fognotabucket')
-      }.should raise_error(Fog::Errors::NotFound)
+      }.should raise_error(Excon::Errors::NotFound)
     end
 
   end

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

@@ -5,10 +5,8 @@ describe 'S3.get_bucket' do
 
     before(:each) do
       s3.put_bucket('foggetbucket')
-      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
-      s3.put_object('foggetbucket', 'fog_object', file)
-      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
-      s3.put_object('foggetbucket', 'fog_other_object', file)
+      s3.put_object('foggetbucket', 'fog_object', lorem_file)
+      s3.put_object('foggetbucket', 'fog_other_object', lorem_file)
     end
 
     after(:each) do
@@ -103,13 +101,13 @@ describe 'S3.get_bucket' do
     it 'should raise a NotFound error if the bucket does not exist' do
       lambda {
         s3.get_bucket('fognotabucket')
-      }.should raise_error(Fog::Errors::NotFound)
+      }.should raise_error(Excon::Errors::NotFound)
     end
 
     it 'should request non-subdomain buckets and raise a NotFound error' do
       lambda {
         s3.get_bucket('A-invalid--name')
-      }.should raise_error(Fog::Errors::NotFound)
+      }.should raise_error(Excon::Errors::NotFound)
     end
 
   end

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

@@ -5,8 +5,7 @@ describe 'S3.get_object' do
 
     before(:each) do
       s3.put_bucket('foggetobject')
-      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
-      s3.put_object('foggetobject', 'fog_get_object', file)
+      s3.put_object('foggetobject', 'fog_get_object', lorem_file)
     end
 
     after(:each) do
@@ -17,8 +16,7 @@ describe 'S3.get_object' do
     it 'should return proper attributes' do
       actual = s3.get_object('foggetobject', 'fog_get_object')
       actual.status.should == 200
-      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
-      data = file.read
+      data = lorem_file.read
       actual.body.should == data
       actual.headers['Content-Length'].should == data.length.to_s
       actual.headers['Content-Type'].should be_a(String)
@@ -27,19 +25,17 @@ describe 'S3.get_object' do
     end
 
     it 'should return chunks with optional block' do
-      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
       data = ''
       s3.get_object('foggetobject', 'fog_get_object') do |chunk|
         data << chunk
       end
-      data.should == file.read
+      data.should == lorem_file.read
     end
 
     it 'should return a signed expiring url' do
       url = s3.get_object_url('foggetobject', 'fog_get_object', Time.now + 60 * 10)
-      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
       unless Fog.mocking?
-        open(url).read.should == file.read
+        open(url).read.should == lorem_file.read
       end
     end
 
@@ -49,13 +45,13 @@ describe 'S3.get_object' do
     it 'should raise a NotFound error if the bucket does not exist' do
       lambda {
         s3.get_object('fognotabucket', 'fog_get_object')
-      }.should raise_error(Fog::Errors::NotFound)
+      }.should raise_error(Excon::Errors::NotFound)
     end
 
     it 'should raise a NotFound error if the object does not exist' do
       lambda {
         s3.get_object('foggetobject', 'fog_not_an_object')
-      }.should raise_error(Fog::Errors::NotFound)
+      }.should raise_error(Excon::Errors::NotFound)
     end
 
   end

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

@@ -23,7 +23,7 @@ describe 'S3.get_request_payment' do
     it 'should raise a NotFound error if the bucket does not exist' do
       lambda {
         s3.get_request_payment('fognotabucket')
-      }.should raise_error(Fog::Errors::NotFound)
+      }.should raise_error(Excon::Errors::NotFound)
     end
 
   end

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

@@ -5,8 +5,7 @@ describe 'S3.head_object' do
 
     before(:each) do
       s3.put_bucket('fogheadobject')
-      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
-      s3.put_object('fogheadobject', 'fog_head_object', file)
+      s3.put_object('fogheadobject', 'fog_head_object', lorem_file)
     end
 
     after(:each) do
@@ -17,8 +16,7 @@ describe 'S3.head_object' do
     it 'should return proper attributes' do
       actual = s3.head_object('fogheadobject', 'fog_head_object')
       actual.status.should == 200
-      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
-      data = file.read
+      data = lorem_file.read
       actual.headers['Content-Length'].should == data.length.to_s
       actual.headers['ETag'].should be_a(String)
       actual.headers['Last-Modified'].should be_a(String)

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

@@ -5,8 +5,7 @@ describe 'S3.put_object' do
 
     before(:each) do
       s3.put_bucket('fogputobject')
-      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
-      @response = s3.put_object('fogputobject', 'fog_put_object', file)
+      @response = s3.put_object('fogputobject', 'fog_put_object', lorem_file)
     end
 
     after(:each) do
@@ -19,8 +18,7 @@ describe 'S3.put_object' do
     end
 
     it 'should not raise an error if the object already exists' do
-      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
-      actual = s3.put_object('fogputobject', 'fog_put_object', file)
+      actual = s3.put_object('fogputobject', 'fog_put_object', lorem_file)
       actual.status.should == 200
     end
 
@@ -29,9 +27,8 @@ describe 'S3.put_object' do
 
     it 'should raise a NotFound error if the bucket does not exist' do
       lambda {
-        file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
-        s3.put_object('fognotabucket', 'fog_put_object', file)
-      }.should raise_error(Fog::Errors::NotFound)
+        s3.put_object('fognotabucket', 'fog_put_object', lorem_file)
+      }.should raise_error(Excon::Errors::NotFound)
     end
 
   end

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

@@ -22,7 +22,7 @@ describe 'S3.put_request_payment' do
     it 'should raise a NotFound error if bucket does not exist' do
       lambda {
         s3.put_request_payment('fognotabucket', 'Requester')
-      }.should raise_error(Fog::Errors::NotFound)
+      }.should raise_error(Excon::Errors::NotFound)
     end
 
   end

data/spec/aws/requests/simpledb/batch_put_attributes_spec.rb

@@ -24,7 +24,7 @@ describe 'SimpleDB.batch_put_attributes' do
     it 'should raise a BadRequest error if the domain does not exist' do
       lambda {
         sdb.batch_put_attributes('notadomain', { 'a' => { 'b' => 'c' }, 'x' => { 'y' => 'z' } })
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

data/spec/aws/requests/simpledb/delete_attributes_spec.rb

@@ -25,7 +25,7 @@ describe 'SimpleDB.delete_attributes' do
     it 'shouild raise a BadRequest error if the domain does not exist' do
       lambda {
         sdb.delete_attributes('notadomain', 'notanattribute')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
     it 'should not raise an error if the attribute does not exist' do

data/spec/aws/requests/simpledb/domain_metadata_spec.rb

@@ -45,7 +45,7 @@ describe 'SimpleDB.domain_metadata' do
     it 'should raise a BadRequest error if the domain does not exist' do
       lambda {
         sdb.domain_metadata('notadomain')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

data/spec/aws/requests/simpledb/get_attributes_spec.rb

@@ -33,7 +33,7 @@ describe 'SimpleDB.get_attributes' do
     it 'should raise a BadRequest error if the domain does not exist' do
       lambda {
         sdb.get_attributes('notadomain', 'notanattribute')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
     it 'should not raise an error if the attribute does not exist' do

data/spec/aws/requests/simpledb/put_attributes_spec.rb

@@ -24,7 +24,7 @@ describe 'SimpleDB.put_attributes' do
     it 'should raise a BadRequest error if the domain does not exist' do
       lambda {
         sdb.put_attributes(@domain_name, 'notadomain', { 'notanattribute' => 'value' })
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

data/spec/rackspace/requests/files/delete_container_spec.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Files.delete_container' do
+  describe 'success' do
+
+    before(:each) do
+      files.put_container('container_name')
+    end
+
+    it "should return proper attributes" do
+      files.delete_container('container_name')
+    end
+
+  end
+  describe 'failure' do
+
+    it "should raise a NotFound error if the container does not exist" do
+      lambda do
+        files.delete_container('container_name')
+      end.should raise_error(Excon::Errors::NotFound)
+    end
+
+  end
+end

data/spec/rackspace/requests/files/delete_object_spec.rb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Files.delete_object' do
+  describe 'success' do
+
+    before(:each) do
+      files.put_container('container_name')
+      files.put_object('container_name', 'object_name', lorem_file)
+    end
+    
+    after(:each) do
+      files.delete_container('container_name')
+    end
+
+    it "should return proper attributes" do
+      files.delete_object('container_name', 'object_name')
+    end
+
+  end
+  describe 'failure' do
+
+    it "should raise a NotFound error if the container does not exist" do
+      lambda do
+        files.delete_object('container_name', 'object_name')
+      end.should raise_error(Excon::Errors::NotFound)
+    end
+
+    it "should raise a NotFound error if the object does not exist" do
+      files.put_container('container_name')
+      lambda do
+        files.delete_object('container_name', 'object_name')
+      end.should raise_error(Excon::Errors::NotFound)
+      files.delete_container('container_name')
+    end
+
+  end
+end