fog 0.2.30 → 0.3.0

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

@@ -1,16 +1,16 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'S3.put_object' do
+describe 'Storage.put_object' do
   describe 'success' do
 
     before(:each) do
-      AWS[:s3].put_bucket('fogputobject')
-      @response = AWS[:s3].put_object('fogputobject', 'fog_put_object', lorem_file)
+      AWS[:storage].put_bucket('fogputobject')
+      @response = AWS[:storage].put_object('fogputobject', 'fog_put_object', lorem_file)
     end
 
     after(:each) do
-      AWS[:s3].delete_object('fogputobject', 'fog_put_object')
-      AWS[:s3].delete_bucket('fogputobject')
+      AWS[:storage].delete_object('fogputobject', 'fog_put_object')
+      AWS[:storage].delete_bucket('fogputobject')
     end
 
     it 'should return proper attributes' do
@@ -18,7 +18,7 @@ describe 'S3.put_object' do
     end
 
     it 'should not raise an error if the object already exists' do
-      actual = AWS[:s3].put_object('fogputobject', 'fog_put_object', lorem_file)
+      actual = AWS[:storage].put_object('fogputobject', 'fog_put_object', lorem_file)
       actual.status.should == 200
     end
 
@@ -27,16 +27,16 @@ describe 'S3.put_object' do
 
     it 'should raise a NotFound error if the bucket does not exist' do
       lambda {
-        AWS[:s3].put_object('fognotabucket', 'fog_put_object', lorem_file)
+        AWS[:storage].put_object('fognotabucket', 'fog_put_object', lorem_file)
       }.should raise_error(Excon::Errors::NotFound)
     end
 
     it 'should not raise an error if the object already exists' do
-      AWS[:s3].put_bucket('fogputobject')
-      AWS[:s3].put_object('fogputobject', 'fog_put_object', lorem_file)
-      AWS[:s3].put_object('fogputobject', 'fog_put_object', lorem_file)
-      AWS[:s3].delete_object('fogputobject', 'fog_put_object')
-      AWS[:s3].delete_bucket('fogputobject')
+      AWS[:storage].put_bucket('fogputobject')
+      AWS[:storage].put_object('fogputobject', 'fog_put_object', lorem_file)
+      AWS[:storage].put_object('fogputobject', 'fog_put_object', lorem_file)
+      AWS[:storage].delete_object('fogputobject', 'fog_put_object')
+      AWS[:storage].delete_bucket('fogputobject')
     end
 
   end

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

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

data/spec/{rackspace/models/servers → bluebox/models/compute}/flavors_spec.rb

@@ -1,14 +1,14 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 require File.dirname(__FILE__) + '/../../../shared_examples/flavors_examples'
 
-describe 'Fog::AWS::Rackspace::Flavors' do
+describe 'Fog::Bluebox::Compute::Flavors' do
 
   it_should_behave_like "Flavors"
 
   subject { @flavor = @flavors.all.first }
 
   before(:each) do
-    @flavors = Rackspace[:servers].flavors
+    @flavors = Bluebox[:compute].flavors
   end
 
-end
+end

data/spec/bluebox/models/{server_spec.rb → compute/server_spec.rb}

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../shared_examples/server_examples'
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../shared_examples/server_examples'
 
-describe 'Fog::Bluebox::Server' do
+describe 'Fog::Bluebox::Compute::Server' do
 
   it_should_behave_like "Server"
 
@@ -12,7 +12,7 @@ describe 'Fog::Bluebox::Server' do
   }
 
   before(:each) do
-    @servers = Bluebox[:blocks].servers
+    @servers = Bluebox[:compute].servers
   end
 
   after(:each) do

data/spec/bluebox/models/{servers_spec.rb → compute/servers_spec.rb}

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../shared_examples/servers_examples'
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../shared_examples/servers_examples'
 
-describe 'Fog::Bluebox::Servers' do
+describe 'Fog::Bluebox::Compute::Servers' do
 
   it_should_behave_like "Servers"
 
@@ -14,7 +14,7 @@ describe 'Fog::Bluebox::Servers' do
   }
 
   before(:each) do
-    @servers = Bluebox[:blocks].servers
+    @servers = Bluebox[:compute].servers
   end
 
   after(:each) do

data/spec/rackspace/models/compute/flavors_spec.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../shared_examples/flavors_examples'
+
+describe 'Fog::Rackspace::Compute::Flavors' do
+
+  it_should_behave_like "Flavors"
+
+  subject { @flavor = @flavors.all.first }
+
+  before(:each) do
+    @flavors = Rackspace[:compute].flavors
+  end
+
+end

data/spec/rackspace/models/{servers → compute}/server_spec.rb

@@ -1,15 +1,15 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 require File.dirname(__FILE__) + '/../../../shared_examples/server_examples'
 
-describe 'Fog::Rackspace::Servers::Server' do
+describe 'Fog::Rackspace::Compute::Server' do
 
   it_should_behave_like "Server"
 
-  # flavor 1 = 256, image 3 = gentoo 2008.0
-  subject { @server = @servers.new(:flavor_id => 1, :image_id => 3, :name => 'name') }
+  # flavor 1 = 256, image 49 = Ubuntu 10.04 LTS (lucid)
+  subject { @server = @servers.new(:flavor_id => 1, :image_id => 49, :name => "fog_#{Time.now.to_i}") }
 
   before(:each) do
-    @servers = Rackspace[:servers].servers
+    @servers = Rackspace[:compute].servers
   end
 
   after(:each) do

data/spec/rackspace/models/compute/servers_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../shared_examples/servers_examples'
+
+describe 'Fog::Rackspace::Compute::Servers' do
+
+  it_should_behave_like "Servers"
+
+  # flavor 1 = 256, image 49 = Ubuntu 10.04 LTS (lucid)
+  subject { @server = @servers.new(:flavor_id => 1, :image_id => 49, :name => "fog_#{Time.now.to_i}") }
+
+  before(:each) do
+    @servers = Rackspace[:compute].servers
+  end
+
+  after(:each) do
+    if @server && !@server.new_record?
+      @server.wait_for { ready? }
+      @server.destroy.should be_true
+    end
+  end
+
+end

data/spec/rackspace/requests/{files → storage}/delete_container_spec.rb

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

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

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Storage.delete_object' do
+  describe 'success' do
+
+    before(:each) do
+      Rackspace[:storage].put_container('container_name')
+      Rackspace[:storage].put_object('container_name', 'object_name', lorem_file)
+    end
+
+    after(:each) do
+      Rackspace[:storage].delete_container('container_name')
+    end
+
+    it "should return proper attributes" do
+      Rackspace[:storage].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
+        Rackspace[:storage].delete_object('container_name', 'object_name')
+      end.should raise_error(Fog::Rackspace::Storage::NotFound)
+    end
+
+    it "should raise a NotFound error if the object does not exist" do
+      Rackspace[:storage].put_container('container_name')
+      lambda do
+        Rackspace[:storage].delete_object('container_name', 'object_name')
+      end.should raise_error(Fog::Rackspace::Storage::NotFound)
+      Rackspace[:storage].delete_container('container_name')
+    end
+
+  end
+end

data/spec/rackspace/requests/{files → storage}/get_container_spec.rb

@@ -1,20 +1,20 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'Rackspace::Files.get_container' do
+describe 'Rackspace::Storage.get_container' do
   describe 'success' do
 
     before(:each) do
-      Rackspace[:files].put_container('container_name')
-      Rackspace[:files].put_object('container_name', 'object_name', lorem_file)
+      Rackspace[:storage].put_container('container_name')
+      Rackspace[:storage].put_object('container_name', 'object_name', lorem_file)
     end
-    
+
     after(:each) do
-      Rackspace[:files].delete_object('container_name', 'object_name')
-      Rackspace[:files].delete_container('container_name')
+      Rackspace[:storage].delete_object('container_name', 'object_name')
+      Rackspace[:storage].delete_container('container_name')
     end
 
     it "should return proper attributes" do
-      actual = Rackspace[:files].get_container('container_name').body
+      actual = Rackspace[:storage].get_container('container_name').body
       actual.first['bytes'].should be_an(Integer)
       actual.first['content_type'].should be_a(String)
       actual.first['hash'].should be_a(String)
@@ -27,8 +27,8 @@ describe 'Rackspace::Files.get_container' do
 
     it "should raise a NotFound error if the container does not exist" do
       lambda do
-        Rackspace[:files].get_container('container_name')
-      end.should raise_error(Excon::Errors::NotFound)
+        Rackspace[:storage].get_container('container_name')
+      end.should raise_error(Fog::Rackspace::Storage::NotFound)
     end
 
   end

data/spec/rackspace/requests/{files → storage}/get_containers_spec.rb

@@ -1,18 +1,18 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'Rackspace::Files.get_containers' do
+describe 'Rackspace::Storage.get_containers' do
   describe 'success' do
 
     before(:each) do
-      Rackspace[:files].put_container('container_name')
+      Rackspace[:storage].put_container('container_name')
     end
 
     after(:each) do
-      Rackspace[:files].delete_container('container_name')
+      Rackspace[:storage].delete_container('container_name')
     end
 
     it "should return proper attributes" do
-      actual = Rackspace[:files].get_containers.body
+      actual = Rackspace[:storage].get_containers.body
       actual.first['bytes'].should be_an(Integer)
       actual.first['count'].should be_an(Integer)
       actual.first['name'].should be_a(String)

data/spec/rackspace/requests/storage/get_object_spec.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Storage.get_object' do
+  describe 'success' do
+
+    before(:each) do
+      Rackspace[:storage].put_container('container_name')
+      Rackspace[:storage].put_object('container_name', 'object_name', lorem_file)
+    end
+    
+    after(:each) do
+      Rackspace[:storage].delete_object('container_name', 'object_name')
+      Rackspace[:storage].delete_container('container_name')
+    end
+
+    it "should return proper attributes" do
+      Rackspace[:storage].get_object('container_name', 'object_name')
+    end
+
+  end
+end

data/spec/rackspace/requests/storage/head_container_spec.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Storage.head_container' do
+  describe 'success' do
+
+    before(:each) do
+      Rackspace[:storage].put_container('container_name')
+      Rackspace[:storage].put_object('container_name', 'object_name', lorem_file)
+    end
+
+    after(:each) do
+      Rackspace[:storage].delete_object('container_name', 'object_name')
+      Rackspace[:storage].delete_container('container_name')
+    end
+
+    it "should return proper attributes" do
+      Rackspace[:storage].head_container('container_name')
+    end
+
+  end
+  describe 'failure' do
+
+    it "should raise a NotFound error if the container does not exist" do
+      lambda do
+        Rackspace[:storage].head_container('container_name')
+      end.should raise_error(Fog::Rackspace::Storage::NotFound)
+    end
+
+  end
+end

data/spec/rackspace/requests/storage/head_containers_spec.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Storage.head_containers' do
+  describe 'success' do
+
+    before(:each) do
+      Rackspace[:storage].put_container('container_name')
+    end
+
+    after(:each) do
+      Rackspace[:storage].delete_container('container_name')
+    end
+
+    it "should return proper attributes" do
+      Rackspace[:storage].head_containers
+    end
+
+  end
+end

data/spec/rackspace/requests/storage/head_object_spec.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Storage.head_object' do
+  describe 'success' do
+
+    before(:each) do
+      Rackspace[:storage].put_container('container_name')
+      Rackspace[:storage].put_object('container_name', 'object_name', lorem_file)
+    end
+
+    after(:each) do
+      Rackspace[:storage].delete_object('container_name', 'object_name')
+      Rackspace[:storage].delete_container('container_name')
+    end
+
+    it "should return proper attributes" do
+      Rackspace[:storage].head_object('container_name', 'object_name')
+    end
+
+  end
+end

data/spec/rackspace/requests/{files → storage}/put_container_spec.rb

@@ -1,14 +1,14 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'Rackspace::Files.put_container' do
+describe 'Rackspace::Storage.put_container' do
   describe 'success' do
 
     after(:each) do
-      Rackspace[:files].delete_container('container_name')
+      Rackspace[:storage].delete_container('container_name')
     end
 
     it "should return proper attributes" do
-      Rackspace[:files].put_container('container_name')
+      Rackspace[:storage].put_container('container_name')
     end
 
   end