fog 0.0.39 → 0.0.40

data/spec/aws/models/s3/file_spec.rb

@@ -0,0 +1,106 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Fog::AWS::S3::File' do
+
+  before(:each) do
+    @directory = s3.directories.create(:name => 'fogdirectoryname')
+  end
+
+  after(:each) do
+    @directory.destroy
+  end
+
+  describe "#initialize" do
+
+    it "should remap attributes from parser" do
+      now = Time.now
+      directory = Fog::AWS::S3::File.new(
+        'Content-Length' => 10,
+        'Content-Type'   => 'contenttype',
+        'Etag'           => 'etag',
+        'Key'            => 'key',
+        'Last-Modified'  => now,
+        'Size'           => 10,
+        'StorageClass'   => 'storageclass'
+      )
+      directory.content_length == 10
+      directory.content_type.should == 'contenttype'
+      directory.etag.should == 'etag'
+      directory.key.should == 'key'
+      directory.last_modified.should == now
+      directory.size.should == 10
+      directory.storage_class.should == 'storageclass'
+
+      directory = Fog::AWS::S3::File.new(
+        'ETag'          => 'etag',
+        'LastModified'  => now
+      )
+      directory.etag.should == 'etag'
+      directory.last_modified.should == now
+    end
+
+  end
+
+  describe "#directory" do
+
+    it "should be the directory the file is related to" do
+      @file = @directory.files.new(:key => 'foo')
+      @file.directory.should == @directory
+    end
+
+  end
+
+  describe "#copy" do
+
+    it "should return a Fog::AWS::S3::File with matching attributes" do
+      other_directory = s3.directories.create(:name => 'fogotherdirectoryname')
+      data = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
+      file = @directory.files.create(:key => 'fogfilename', :body => data)
+      other_file = file.copy('fogotherdirectoryname', 'fogotherfilename')
+      file.reload.attributes.reject{|key,value| [:key, :last_modified].include?(key)}.should == other_file.reload.attributes.reject{|key,value| [:key, :last_modified].include?(key)}
+      other_file.destroy
+      file.destroy
+      other_directory.destroy
+    end
+
+  end
+
+  describe "#destroy" do
+
+    it "should return true if the file is deleted" do
+      data = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
+      file = @directory.files.create(:key => 'fogfilename', :body => data)
+      file.destroy.should be_true
+    end
+
+    it "should return true if the file does not exist" do
+      file = @directory.files.new(:key => 'fogfilename')
+      file.destroy.should be_true
+    end
+
+  end
+
+  describe "#reload" do
+
+    it "should reset attributes to remote state" do
+      data = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
+      file = @directory.files.create(:key => 'fogfilename', :body => data)
+      file.last_modified = Time.now
+      file.reload.attributes.should == file.attributes
+      file.destroy
+    end
+
+  end
+
+  describe "#save" do
+
+    it "should return the success value" do
+      data = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
+      file = @directory.files.new(:key => 'fogfilename', :body => data)
+      file.save.should be_true
+      file.destroy
+    end
+
+  end
+
+end

data/spec/aws/models/s3/files_spec.rb

@@ -0,0 +1,116 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Fog::AWS::S3::Files' do
+
+  before(:each) do
+    @directory = s3.directories.create(:name => 'fogdirectoryname')
+  end
+
+  after(:each) do
+    @directory.destroy
+  end
+
+  describe "#initialize" do
+
+    it "should remap attributes from parser" do
+      files = Fog::AWS::S3::Files.new(
+        'IsTruncated' => true,
+        'Marker'      => 'marker',
+        'MaxKeys'     => 1,
+        'Prefix'      => 'prefix'
+      )
+      files.is_truncated.should == true
+      files.marker.should == 'marker'
+      files.max_keys.should == 1
+      files.prefix.should == 'prefix'
+    end
+
+  end
+
+  describe "#all" do
+
+    it "should return nil if the directory does not exist" do
+      directory = s3.directories.new(:name => 'notadirectory')
+      directory.files.all.should be_nil
+    end
+
+  end
+
+  describe "#create" do
+
+    it "should exist on s3" do
+      data = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
+      file = @directory.files.create(:key => 'fogfilename', :body => data)
+      @directory.files.get('fogfilename').should_not be_nil
+      file.destroy
+    end
+
+  end
+
+  describe "#get" do
+
+    before(:each) do
+      data = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
+      @file = @directory.files.create(:key => 'fogfilename', :body => data)
+    end
+
+    after(:each) do
+      @file.destroy
+    end
+
+    it "should return a Fog::AWS::S3::File with metadata and data" do
+      @file.reload
+      @file.body.should_not be_nil
+      @file.content_length.should_not be_nil
+      @file.etag.should_not be_nil
+      @file.last_modified.should_not be_nil
+      @file.destroy
+    end
+
+    it "should return chunked data if given a block" do
+      data = ''
+      @directory.files.get('fogfilename') do |chunk|
+        data << chunk
+      end
+      data.should == File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r').read
+    end
+
+  end
+
+  describe "#get_url" do
+
+    it "should return a signed expiring url" do
+      data = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
+      file = @directory.files.create(:key => 'fogfilename', :body => data)
+      url = @directory.files.get_url('fogfilename', Time.now + 60 * 10)
+      unless Fog.mocking?
+        open(url).read.should == File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r').read
+      end
+      file.destroy
+    end
+
+  end
+
+  describe "#head" do
+
+    it "should return a Fog::AWS::S3::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')
+      file.content_length.should_not be_nil
+      file.etag.should_not be_nil
+      file.last_modified.should_not be_nil
+      file.destroy
+    end
+
+  end
+
+  describe "#reload" do
+
+    it "should reload data" do
+      @directory.files.reload.should == @directory.files
+    end
+
+  end
+
+end

data/spec/rackspace/models/servers/server_spec.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../shared_examples/server_examples'
+
+describe 'Fog::AWS::EC2::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') }
+
+  before(:each) do
+    @servers = servers.servers
+  end
+
+  after(:each) do
+    if @server && !@server.new_record?
+      @server.wait_for { ready? }
+      @server.destroy.should be_true
+    end
+  end
+
+  describe "#initialize" do
+
+    it "should remap attributes from parser" do
+      server = @servers.new({
+        'addresses'   => 'addresses',
+        'adminPass'   => 'password',
+        'flavorId'    => 'flavor_id',
+        'hostId'      => 'host_id',
+        'imageId'     => 'image_id',
+        'metadata'    => 'metadata',
+        'name'        => 'name',
+        'personality' => 'personality',
+        'progress'    => 'progress',
+        'status'      => 'status'
+      })
+      server.addresses.should == 'addresses'
+      server.password.should == 'password'
+      server.flavor_id.should == 'flavor_id'
+      server.host_id.should == 'host_id'
+      server.image_id.should == 'image_id'
+      server.metadata.should == 'metadata'
+      server.name.should == 'name'
+      server.personality.should == 'personality'
+      server.progress.should == 'progress'
+      server.status.should == 'status'
+    end
+
+  end
+
+end

data/spec/shared_examples/server_examples.rb

@@ -0,0 +1,42 @@
+shared_examples_for "Server" do
+
+  describe "#reboot" do
+
+    it "should succeed" do
+      subject.save
+      subject.wait_for { ready? }
+      subject.reboot.should be_true
+    end
+
+  end
+
+  describe "#reload" do
+
+    it "should reset attributes to remote state" do
+      subject.save
+      subject.wait_for { ready? }
+      @reloaded = subject.reload
+      subject.attributes.should == @reloaded.attributes
+    end
+
+  end
+
+  describe "#save" do
+
+    it "should return true when it succeeds" do
+      subject.save.should be_true
+    end
+
+    it "should not exist remotely before save" do
+      @servers.get(subject.id).should be_nil
+    end
+
+    it "should exist remotely after save" do
+      subject.save
+      subject.wait_for { ready? }
+      @servers.get(subject.id).should_not be_nil
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -72,7 +72,7 @@ def eventually(max_delay = 16, &block)
       sleep(delay)
       yield
       break
-    rescue Excon::Errors::Error => error
+    rescue => error
       raise error if delay >= max_delay
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  version: 0.0.39
+  version: 0.0.40
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 -08:00
+date: 2010-01-14 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.14
+        version: 0.0.18
     version: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
@@ -76,20 +76,24 @@ files:
 - lib/fog/aws/ec2.rb
 - lib/fog/aws/models/ec2/address.rb
 - lib/fog/aws/models/ec2/addresses.rb
-- lib/fog/aws/models/ec2/instance.rb
-- lib/fog/aws/models/ec2/instances.rb
+- lib/fog/aws/models/ec2/flavor.rb
+- lib/fog/aws/models/ec2/flavors.rb
+- lib/fog/aws/models/ec2/image.rb
+- lib/fog/aws/models/ec2/images.rb
 - lib/fog/aws/models/ec2/key_pair.rb
 - lib/fog/aws/models/ec2/key_pairs.rb
 - lib/fog/aws/models/ec2/security_group.rb
 - lib/fog/aws/models/ec2/security_groups.rb
+- lib/fog/aws/models/ec2/server.rb
+- lib/fog/aws/models/ec2/servers.rb
 - lib/fog/aws/models/ec2/snapshot.rb
 - lib/fog/aws/models/ec2/snapshots.rb
 - lib/fog/aws/models/ec2/volume.rb
 - lib/fog/aws/models/ec2/volumes.rb
-- lib/fog/aws/models/s3/bucket.rb
-- lib/fog/aws/models/s3/buckets.rb
-- lib/fog/aws/models/s3/object.rb
-- lib/fog/aws/models/s3/objects.rb
+- lib/fog/aws/models/s3/directories.rb
+- lib/fog/aws/models/s3/directory.rb
+- lib/fog/aws/models/s3/file.rb
+- lib/fog/aws/models/s3/files.rb
 - lib/fog/aws/parsers/ec2/allocate_address.rb
 - lib/fog/aws/parsers/ec2/attach_volume.rb
 - lib/fog/aws/parsers/ec2/basic.rb
@@ -223,20 +227,20 @@ files:
 - lib/fog/slicehost/requests/get_slices.rb
 - spec/aws/models/ec2/address_spec.rb
 - spec/aws/models/ec2/addresses_spec.rb
-- spec/aws/models/ec2/instance_spec.rb
-- spec/aws/models/ec2/instances_spec.rb
 - spec/aws/models/ec2/key_pair_spec.rb
 - spec/aws/models/ec2/key_pairs_spec.rb
 - spec/aws/models/ec2/security_group_spec.rb
 - spec/aws/models/ec2/security_groups_spec.rb
+- spec/aws/models/ec2/server_spec.rb
+- spec/aws/models/ec2/servers_spec.rb
 - spec/aws/models/ec2/snapshot_spec.rb
 - spec/aws/models/ec2/snapshots_spec.rb
 - spec/aws/models/ec2/volume_spec.rb
 - spec/aws/models/ec2/volumes_spec.rb
-- spec/aws/models/s3/bucket_spec.rb
-- spec/aws/models/s3/buckets_spec.rb
-- spec/aws/models/s3/object_spec.rb
-- spec/aws/models/s3/objects_spec.rb
+- spec/aws/models/s3/directories_spec.rb
+- spec/aws/models/s3/directory_spec.rb
+- spec/aws/models/s3/file_spec.rb
+- spec/aws/models/s3/files_spec.rb
 - spec/aws/requests/ec2/allocate_address_spec.rb
 - spec/aws/requests/ec2/associate_address_spec.rb
 - spec/aws/requests/ec2/attach_volume_spec.rb
@@ -288,6 +292,7 @@ files:
 - spec/aws/requests/simpledb/put_attributes_spec.rb
 - spec/aws/requests/simpledb/select_spec.rb
 - spec/lorem.txt
+- spec/rackspace/models/servers/server_spec.rb
 - spec/rackspace/requests/files/delete_container_spec.rb
 - spec/rackspace/requests/files/delete_object_spec.rb
 - spec/rackspace/requests/files/get_container_spec.rb
@@ -313,6 +318,7 @@ files:
 - spec/rackspace/requests/servers/list_servers_spec.rb
 - spec/rackspace/requests/servers/reboot_server_spec.rb
 - spec/rackspace/requests/servers/update_server_spec.rb
+- spec/shared_examples/server_examples.rb
 - spec/slicehost/requests/create_slice_spec.rb
 - spec/slicehost/requests/delete_slice_spec.rb
 - spec/slicehost/requests/get_backups_spec.rb
@@ -325,7 +331,28 @@ has_rdoc: true
 homepage: http://github.com/geemus/fog
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  ==================================================
+  
+    fog 0.0.40 has API changes you should know about.
+  
+    Some changes you might care about happened in the models:
+  
+      # what_it_was => what_it_is
+  
+      ec2.instances => ec2.servers
+      ec2.instance  => ec2.server
+  
+      s3.buckets  => s3.directories
+      s3.bucket   => s3.directory
+  
+      s3.objects  => s3.files
+      s3.object   => s3.file
+  
+    Sorry for the bother, but it will allow for a more consistent API as fog continues to expand.
+  
+  ==================================================
+
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -352,20 +379,20 @@ summary: fog = clouds + you
 test_files: 
 - spec/aws/models/ec2/address_spec.rb
 - spec/aws/models/ec2/addresses_spec.rb
-- spec/aws/models/ec2/instance_spec.rb
-- spec/aws/models/ec2/instances_spec.rb
 - spec/aws/models/ec2/key_pair_spec.rb
 - spec/aws/models/ec2/key_pairs_spec.rb
 - spec/aws/models/ec2/security_group_spec.rb
 - spec/aws/models/ec2/security_groups_spec.rb
+- spec/aws/models/ec2/server_spec.rb
+- spec/aws/models/ec2/servers_spec.rb
 - spec/aws/models/ec2/snapshot_spec.rb
 - spec/aws/models/ec2/snapshots_spec.rb
 - spec/aws/models/ec2/volume_spec.rb
 - spec/aws/models/ec2/volumes_spec.rb
-- spec/aws/models/s3/bucket_spec.rb
-- spec/aws/models/s3/buckets_spec.rb
-- spec/aws/models/s3/object_spec.rb
-- spec/aws/models/s3/objects_spec.rb
+- spec/aws/models/s3/directories_spec.rb
+- spec/aws/models/s3/directory_spec.rb
+- spec/aws/models/s3/file_spec.rb
+- spec/aws/models/s3/files_spec.rb
 - spec/aws/requests/ec2/allocate_address_spec.rb
 - spec/aws/requests/ec2/associate_address_spec.rb
 - spec/aws/requests/ec2/attach_volume_spec.rb
@@ -416,6 +443,7 @@ test_files:
 - spec/aws/requests/simpledb/list_domains_spec.rb
 - spec/aws/requests/simpledb/put_attributes_spec.rb
 - spec/aws/requests/simpledb/select_spec.rb
+- spec/rackspace/models/servers/server_spec.rb
 - spec/rackspace/requests/files/delete_container_spec.rb
 - spec/rackspace/requests/files/delete_object_spec.rb
 - spec/rackspace/requests/files/get_container_spec.rb
@@ -441,6 +469,7 @@ test_files:
 - spec/rackspace/requests/servers/list_servers_spec.rb
 - spec/rackspace/requests/servers/reboot_server_spec.rb
 - spec/rackspace/requests/servers/update_server_spec.rb
+- spec/shared_examples/server_examples.rb
 - spec/slicehost/requests/create_slice_spec.rb
 - spec/slicehost/requests/delete_slice_spec.rb
 - spec/slicehost/requests/get_backups_spec.rb