fog 0.2.30 → 0.3.0

data/spec/aws/models/{ec2 → compute}/snapshots_spec.rb

@@ -1,9 +1,9 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'Fog::AWS::EC2::Snapshots' do
+describe 'Fog::AWS::Compute::Snapshots' do
 
   before(:all) do
-    @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+    @volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
     @volume.wait_for { ready? }
   end
 
@@ -25,11 +25,11 @@ describe 'Fog::AWS::EC2::Snapshots' do
     end
 
     it "should include persisted snapshots" do
-      AWS[:ec2].snapshots.all.map {|snapshot| snapshot.id}.should include(@snapshot.id)
+      AWS[:compute].snapshots.all.map {|snapshot| snapshot.id}.should include(@snapshot.id)
     end
 
     it "should limit snapshots by volume if present" do
-      @other_volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      @other_volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
 
       @volume.snapshots.map {|snapshot| snapshot.id}.should include(@snapshot.identity)
       @other_volume.snapshots.map {|snapshot| snapshot.id}.should_not include(@snapshot.identity)
@@ -46,38 +46,38 @@ describe 'Fog::AWS::EC2::Snapshots' do
     end
 
     it "should exist on ec2" do
-      AWS[:ec2].snapshots.get(@snapshot.id).should_not be_nil
+      AWS[:compute].snapshots.get(@snapshot.id).should_not be_nil
     end
 
   end
 
   describe "#get" do
 
-    it "should return a Fog::AWS::EC2::Snapshot if a matching snapshot exists" do
+    it "should return a Fog::AWS::Compute::Snapshot if a matching snapshot exists" do
       @snapshot = @volume.snapshots.create
       @snapshot.wait_for { ready? }
-      get = AWS[:ec2].snapshots.get(@snapshot.id)
+      get = AWS[:compute].snapshots.get(@snapshot.id)
       @snapshot.attributes.should == get.attributes
     end
 
     it "should return nil if no matching address exists" do
-      AWS[:ec2].snapshots.get('snap-00000000').should be_nil
+      AWS[:compute].snapshots.get('snap-00000000').should be_nil
     end
 
   end
 
   describe "#new" do
 
-    it "should return a Fog::AWS::EC2::Snapshot" do
-      AWS[:ec2].snapshots.new.should be_a(Fog::AWS::EC2::Snapshot)
+    it "should return a Fog::AWS::Compute::Snapshot" do
+      AWS[:compute].snapshots.new.should be_a(Fog::AWS::Compute::Snapshot)
     end
 
   end
 
   describe "#reload" do
 
-    it "should return a Fog::AWS::EC2::Snapshots" do
-      AWS[:ec2].snapshots.all.reload.should be_a(Fog::AWS::EC2::Snapshots)
+    it "should return a Fog::AWS::Compute::Snapshots" do
+      AWS[:compute].snapshots.all.reload.should be_a(Fog::AWS::Compute::Snapshots)
     end
 
   end

data/spec/aws/models/{ec2 → compute}/volume_spec.rb

@@ -1,11 +1,11 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'Fog::AWS::EC2::Volume' do
+describe 'Fog::AWS::Compute::Volume' do
 
   describe "#initialize" do
 
     it "should remap attributes from parser" do
-      volume = AWS[:ec2].volumes.new(
+      volume = AWS[:compute].volumes.new(
         'attachTime'        => 'now',
         'availabilityZone'  => 'us-east-1a',
         'createTime'        => 'recently',
@@ -25,12 +25,12 @@ describe 'Fog::AWS::EC2::Volume' do
 
   describe "#collection" do
 
-    it "should return a Fog::AWS::EC2::Volumes" do
-      AWS[:ec2].volumes.new.collection.should be_a(Fog::AWS::EC2::Volumes)
+    it "should return a Fog::AWS::Compute::Volumes" do
+      AWS[:compute].volumes.new.collection.should be_a(Fog::AWS::Compute::Volumes)
     end
 
     it "should be the volumes the volume is related to" do
-      volumes = AWS[:ec2].volumes
+      volumes = AWS[:compute].volumes
       volumes.new.collection.should == volumes
     end
 
@@ -39,14 +39,14 @@ describe 'Fog::AWS::EC2::Volume' do
   describe "#destroy" do
 
     it "should return true if the volume is deleted" do
-      volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => '/dev/sdz1')
+      volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => '/dev/sdz1')
       volume.destroy.should be_true
     end
 
     it 'should fail if the volume is attached to an instance' do
-      server = AWS[:ec2].servers.create(:image_id => GENTOO_AMI)
+      server = AWS[:compute].servers.create(:image_id => GENTOO_AMI)
       server.wait_for { ready? }
-      volume = AWS[:ec2].volumes.create(:availability_zone => server.availability_zone, :size => 1, :device => '/dev/sdz1')
+      volume = AWS[:compute].volumes.create(:availability_zone => server.availability_zone, :size => 1, :device => '/dev/sdz1')
       volume.server = server
       lambda { volume.destroy }.should raise_error
     end
@@ -55,7 +55,7 @@ describe 'Fog::AWS::EC2::Volume' do
 
   describe "#server=" do
     before(:all) do
-      @server = AWS[:ec2].servers.create(:image_id => GENTOO_AMI)
+      @server = AWS[:compute].servers.create(:image_id => GENTOO_AMI)
       @server.wait_for { ready? }
     end
 
@@ -64,7 +64,7 @@ describe 'Fog::AWS::EC2::Volume' do
     end
 
     before(:each) do
-      @volume = AWS[:ec2].volumes.new(:availability_zone => @server.availability_zone, :size => 1, :device => '/dev/sdz1')
+      @volume = AWS[:compute].volumes.new(:availability_zone => @server.availability_zone, :size => 1, :device => '/dev/sdz1')
     end
 
     after(:each) do
@@ -108,7 +108,7 @@ describe 'Fog::AWS::EC2::Volume' do
   describe "#reload" do
 
     before(:each) do
-      @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => '/dev/sdz1')
+      @volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => '/dev/sdz1')
       @reloaded = @volume.reload
     end
 
@@ -116,8 +116,8 @@ describe 'Fog::AWS::EC2::Volume' do
       @volume.destroy
     end
 
-    it "should return a Fog::AWS::EC2::Volume" do
-      @reloaded.should be_a(Fog::AWS::EC2::Volume)
+    it "should return a Fog::AWS::Compute::Volume" do
+      @reloaded.should be_a(Fog::AWS::Compute::Volume)
     end
 
     it "should reset attributes to remote state" do
@@ -129,7 +129,7 @@ describe 'Fog::AWS::EC2::Volume' do
   describe "#save" do
 
     before(:each) do
-      @volume = AWS[:ec2].volumes.new(:availability_zone => 'us-east-1a', :size => 1, :device => '/dev/sdz1')
+      @volume = AWS[:compute].volumes.new(:availability_zone => 'us-east-1a', :size => 1, :device => '/dev/sdz1')
     end
 
     it "should return true when it succeeds" do
@@ -138,12 +138,12 @@ describe 'Fog::AWS::EC2::Volume' do
     end
 
     it "should not exist in volumes before save" do
-      AWS[:ec2].volumes.get(@volume.id).should be_nil
+      AWS[:compute].volumes.get(@volume.id).should be_nil
     end
 
     it "should exist in buckets after save" do
       @volume.save
-      AWS[:ec2].volumes.get(@volume.id).should_not be_nil
+      AWS[:compute].volumes.get(@volume.id).should_not be_nil
       @volume.destroy
     end
 

data/spec/aws/models/compute/volumes_spec.rb

@@ -0,0 +1,71 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Fog::AWS::Compute::Volumes' do
+
+  describe "#all" do
+
+    it "should return a Fog::AWS::Compute::Volumes" do
+      AWS[:compute].volumes.all.should be_a(Fog::AWS::Compute::Volumes)
+    end
+
+    it "should include persisted volumes" do
+      volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      AWS[:compute].volumes.get(volume.id).should_not be_nil
+      volume.destroy
+    end
+
+  end
+
+  describe "#create" do
+
+    before(:each) do
+      @volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+    end
+
+    after(:each) do
+      @volume.destroy
+    end
+
+    it "should return a Fog::AWS::Compute::Volume" do
+      @volume.should be_a(Fog::AWS::Compute::Volume)
+    end
+
+    it "should exist on ec2" do
+      AWS[:compute].volumes.get(@volume.id).should_not be_nil
+    end
+
+  end
+
+  describe "#get" do
+
+    it "should return a Fog::AWS::Compute::Volume if a matching volume exists" do
+      volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      volume.wait_for { ready? }
+      get = AWS[:compute].volumes.get(volume.id)
+      volume.attributes.should == get.attributes
+      volume.destroy
+    end
+
+    it "should return nil if no matching address exists" do
+      AWS[:compute].volumes.get('vol-00000000').should be_nil
+    end
+
+  end
+
+  describe "#new" do
+
+    it "should return a Fog::AWS::Compute::Volume" do
+      AWS[:compute].volumes.new.should be_a(Fog::AWS::Compute::Volume)
+    end
+
+  end
+
+  describe "#reload" do
+
+    it "should return a Fog::AWS::Compute::Volumes" do
+      AWS[:compute].volumes.all.reload.should be_a(Fog::AWS::Compute::Volumes)
+    end
+
+  end
+
+end

data/spec/aws/models/storage/directories_spec.rb

@@ -0,0 +1,49 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Fog::AWS::Storage::Directories' do
+
+  describe "#all" do
+
+    it "should include persisted directories" do
+      @directory = AWS[:storage].directories.create(:key => 'fogdirectorykey')
+      AWS[:storage].directories.all.map {|directory| @directory.key}.should include('fogdirectorykey')
+      @directory.destroy
+    end
+
+  end
+
+  describe "#create" do
+
+    it "should exist on s3" do
+      directory = AWS[:storage].directories.create(:key => 'fogdirectorykey')
+      AWS[:storage].directories.get(directory.key).should_not be_nil
+      directory.destroy
+    end
+
+  end
+
+  describe "#get" do
+
+    it "should return a Fog::AWS::Storage::Directory if a matching directory exists" do
+      directory = AWS[:storage].directories.create(:key => 'fogdirectorykey')
+      get = AWS[:storage].directories.get('fogdirectorykey')
+      directory.attributes.should == get.attributes
+      directory.destroy
+    end
+
+    it "should return nil if no matching directory exists" do
+      AWS[:storage].directories.get('fognotadirectory').should be_nil
+    end
+
+  end
+
+  describe "#reload" do
+
+    it "should reload data" do
+      directories = AWS[:storage].directories
+      directories.should == directories.reload
+    end
+
+  end
+
+end

data/spec/aws/models/{s3 → storage}/directory_spec.rb

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'Fog::AWS::S3::Directory' do
+describe 'Fog::AWS::Storage::Directory' do
 
   describe "#initialize" do
 
     it "should remap attributes from parser" do
       now = Time.now
-      directory = Fog::AWS::S3::Directory.new(
+      directory = Fog::AWS::Storage::Directory.new(
         'CreationDate' => now,
         'Name'         => 'directorykey'
       )
@@ -19,7 +19,7 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#collection" do
 
     it "should be the directories the directory is related to" do
-      directories = AWS[:s3].directories
+      directories = AWS[:storage].directories
       directories.new.collection.should == directories
     end
 
@@ -28,12 +28,12 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#destroy" do
 
     it "should return true if the directory is deleted" do
-      directory = AWS[:s3].directories.create(:key => 'fogmodeldirectory')
+      directory = AWS[:storage].directories.create(:key => 'fogmodeldirectory')
       directory.destroy.should be_true
     end
 
     it "should return false if the directory does not exist" do
-      directory = AWS[:s3].directories.new(:key => 'fogmodeldirectory')
+      directory = AWS[:storage].directories.new(:key => 'fogmodeldirectory')
       directory.destroy.should be_false
     end
 
@@ -42,9 +42,9 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#location" do
 
     it "should return the location constraint" do
-      directory = AWS[:s3].directories.create(:key => 'fogmodeleudirectory', :location => 'EU')
+      directory = AWS[:storage].directories.create(:key => 'fogmodeleudirectory', :location => 'EU')
       directory.location.should == 'EU'
-      AWS[:eu_s3].directories.get('fogmodeleudirectory').destroy
+      AWS[:eu_storage].directories.get('fogmodeleudirectory').destroy
     end
 
   end
@@ -52,7 +52,7 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#payer" do
 
     it "should return the request payment value" do
-      directory = AWS[:s3].directories.create(:key => 'fogmodeldirectory')
+      directory = AWS[:storage].directories.create(:key => 'fogmodeldirectory')
       directory.payer.should == 'BucketOwner'
       directory.destroy.should be_true
     end
@@ -62,7 +62,7 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#payer=" do
 
     it "should set the request payment value" do
-      directory = AWS[:s3].directories.create(:key => 'fogmodeldirectory')
+      directory = AWS[:storage].directories.create(:key => 'fogmodeldirectory')
       (directory.payer = 'Requester').should == 'Requester'
       directory.destroy.should
     end
@@ -72,7 +72,7 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#reload" do
 
     before(:each) do
-      @directory = AWS[:s3].directories.create(:key => 'fogmodeldirectory')
+      @directory = AWS[:storage].directories.create(:key => 'fogmodeldirectory')
       @reloaded = @directory.reload
     end
 
@@ -89,11 +89,11 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#save" do
 
     before(:each) do
-      @directory = AWS[:s3].directories.new(:key => 'fogmodeldirectory')
+      @directory = AWS[:storage].directories.new(:key => 'fogmodeldirectory')
     end
 
     it "should not exist in directories before save" do
-      AWS[:s3].directories.all.map {|directory| directory.key}.include?(@directory.key).should be_false
+      AWS[:storage].directories.all.map {|directory| directory.key}.include?(@directory.key).should be_false
     end
 
     it "should return true when it succeeds" do
@@ -103,7 +103,7 @@ describe 'Fog::AWS::S3::Directory' do
 
     it "should exist in directories after save" do
       @directory.save
-      AWS[:s3].directories.all.map {|directory| directory.key}.include?(@directory.key).should be_true
+      AWS[:storage].directories.all.map {|directory| directory.key}.include?(@directory.key).should be_true
       @directory.destroy
     end
 

data/spec/aws/models/{s3 → storage}/file_spec.rb

@@ -1,9 +1,9 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'Fog::AWS::S3::File' do
+describe 'Fog::AWS::Storage::File' do
 
   before(:each) do
-    @directory = AWS[:s3].directories.create(:key => 'fogdirectoryname')
+    @directory = AWS[:storage].directories.create(:key => 'fogdirectoryname')
   end
 
   after(:each) do
@@ -14,7 +14,7 @@ describe 'Fog::AWS::S3::File' do
 
     it "should remap attributes from parser" do
       now = Time.now
-      directory = Fog::AWS::S3::File.new(
+      directory = Fog::AWS::Storage::File.new(
         'Content-Length' => 10,
         'Content-Type'   => 'contenttype',
         'Etag'           => 'etag',
@@ -31,7 +31,7 @@ describe 'Fog::AWS::S3::File' do
       directory.size.should == 10
       directory.storage_class.should == 'storageclass'
 
-      directory = Fog::AWS::S3::File.new(
+      directory = Fog::AWS::Storage::File.new(
         'ETag'          => 'etag',
         'LastModified'  => now
       )
@@ -52,8 +52,8 @@ describe 'Fog::AWS::S3::File' do
 
   describe "#copy" do
 
-    it "should return a Fog::AWS::S3::File with matching attributes" do
-      other_directory = AWS[:s3].directories.create(:key => 'fogotherdirectoryname')
+    it "should return a Fog::AWS::Storage::File with matching attributes" do
+      other_directory = AWS[:storage].directories.create(:key => 'fogotherdirectoryname')
       data = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
       file = @directory.files.create(:key => 'fogfilename', :body => data)
       other_file = file.copy('fogotherdirectoryname', 'fogotherfilename')

data/spec/aws/models/{s3 → storage}/files_spec.rb

@@ -1,9 +1,9 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'Fog::AWS::S3::Files' do
+describe 'Fog::AWS::Storage::Files' do
 
   before(:each) do
-    @directory = AWS[:s3].directories.create(:key => "fog#{Time.now.to_f}")
+    @directory = AWS[:storage].directories.create(:key => "fog#{Time.now.to_f}")
   end
 
   after(:each) do
@@ -16,7 +16,7 @@ describe 'Fog::AWS::S3::Files' do
   describe "#initialize" do
 
     it "should remap attributes from parser" do
-      files = Fog::AWS::S3::Files.new(
+      files = Fog::AWS::Storage::Files.new(
         'IsTruncated' => true,
         'Marker'      => 'marker',
         'MaxKeys'     => 1,
@@ -33,7 +33,7 @@ describe 'Fog::AWS::S3::Files' do
   describe "#all" do
 
     it "should return nil if the directory does not exist" do
-      directory = AWS[:s3].directories.new(:key => 'notadirectory')
+      directory = AWS[:storage].directories.new(:key => 'notadirectory')
       directory.files.all.should be_nil
     end
 
@@ -80,7 +80,7 @@ describe 'Fog::AWS::S3::Files' do
       @file.destroy
     end
 
-    it "should return a Fog::AWS::S3::File with metadata and data" do
+    it "should return a Fog::AWS::Storage::File with metadata and data" do
       @file.reload
       @file.body.should_not be_nil
       @file.content_length.should_not be_nil
@@ -116,7 +116,7 @@ describe 'Fog::AWS::S3::Files' do
 
   describe "#head" do
 
-    it "should return a Fog::AWS::S3::File with metadata" do
+    it "should return a Fog::AWS::Storage::File with metadata" do
       data = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
       file = @directory.files.create(:key => 'fogfilename', :body => data)
       file = @directory.files.get('fogfilename')