fog 1.9.0 → 1.10.0

data/tests/internet_archive/requests/storage/cors_utils_tests.rb

@@ -0,0 +1,108 @@
+require 'fog/internet_archive/requests/storage/cors_utils'
+
+Shindo.tests('Fog::Storage::InternetArchive | CORS utils', ["internet_archive"]) do
+  tests(".hash_to_cors") do
+    tests(".hash_to_cors({}) at xpath //CORSConfiguration").returns("", "has an empty CORSConfiguration") do
+      xml = Fog::Storage::InternetArchive.hash_to_cors({})
+      Nokogiri::XML(xml).xpath("//CORSConfiguration").first.content.chomp
+    end
+
+    tests(".hash_to_cors({}) at xpath //CORSConfiguration/CORSRule").returns(nil, "has no CORSRules") do
+      xml = Fog::Storage::InternetArchive.hash_to_cors({})
+      Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule").first
+    end
+
+    cors = {
+      'CORSConfiguration' => [
+        {
+          'AllowedOrigin' => ['origin_123', 'origin_456'],
+          'AllowedMethod' => ['GET', 'POST'],
+          'AllowedHeader' => ['Accept', 'Content-Type'],
+          'ID' => 'blah-888',
+          'MaxAgeSeconds' => 2500,
+          'ExposeHeader' => ['x-some-header', 'x-other-header']
+        }
+      ]
+    }
+
+    tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedOrigin").returns("origin_123", "returns the CORSRule AllowedOrigin") do
+      xml = Fog::Storage::InternetArchive.hash_to_cors(cors)
+      Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedOrigin")[0].content
+    end
+
+    tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedOrigin").returns("origin_456", "returns the CORSRule AllowedOrigin") do
+      xml = Fog::Storage::InternetArchive.hash_to_cors(cors)
+      Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedOrigin")[1].content
+    end
+
+    tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedMethod").returns("GET", "returns the CORSRule AllowedMethod") do
+      xml = Fog::Storage::InternetArchive.hash_to_cors(cors)
+      Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedMethod")[0].content
+    end
+
+    tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedMethod").returns("POST", "returns the CORSRule AllowedMethod") do
+      xml = Fog::Storage::InternetArchive.hash_to_cors(cors)
+      Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedMethod")[1].content
+    end
+
+    tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedHeader").returns("Accept", "returns the CORSRule AllowedHeader") do
+      xml = Fog::Storage::InternetArchive.hash_to_cors(cors)
+      Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedHeader")[0].content
+    end
+
+    tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedHeader").returns("Content-Type", "returns the CORSRule AllowedHeader") do
+      xml = Fog::Storage::InternetArchive.hash_to_cors(cors)
+      Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedHeader")[1].content
+    end
+
+    tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/ID").returns("blah-888", "returns the CORSRule ID") do
+      xml = Fog::Storage::InternetArchive.hash_to_cors(cors)
+      Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/ID")[0].content
+    end
+
+    tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/MaxAgeSeconds").returns("2500", "returns the CORSRule MaxAgeSeconds") do
+      xml = Fog::Storage::InternetArchive.hash_to_cors(cors)
+      Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/MaxAgeSeconds")[0].content
+    end
+
+    tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/ExposeHeader").returns("x-some-header", "returns the CORSRule ExposeHeader") do
+      xml = Fog::Storage::InternetArchive.hash_to_cors(cors)
+      Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/ExposeHeader")[0].content
+    end
+
+    tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/ExposeHeader").returns("x-other-header", "returns the CORSRule ExposeHeader") do
+      xml = Fog::Storage::InternetArchive.hash_to_cors(cors)
+      Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/ExposeHeader")[1].content
+    end
+  end
+
+  tests(".cors_to_hash") do
+    cors_xml = <<-XML
+<CORSConfiguration>
+  <CORSRule>
+    <AllowedOrigin>http://www.example.com</AllowedOrigin>
+    <AllowedOrigin>http://www.example2.com</AllowedOrigin>
+    <AllowedHeader>Content-Length</AllowedHeader>
+    <AllowedHeader>X-Foobar</AllowedHeader>
+    <AllowedMethod>PUT</AllowedMethod>
+    <AllowedMethod>GET</AllowedMethod>
+    <MaxAgeSeconds>3000</MaxAgeSeconds>
+    <ExposeHeader>x-amz-server-side-encryption</ExposeHeader>
+    <ExposeHeader>x-amz-balls</ExposeHeader>
+  </CORSRule>
+</CORSConfiguration>
+XML
+
+    tests(".cors_to_hash(#{cors_xml.inspect})").returns({
+      "CORSConfiguration" => [{
+        "AllowedOrigin" => ["http://www.example.com", "http://www.example2.com"],
+        "AllowedHeader" => ["Content-Length", "X-Foobar"],
+        "AllowedMethod" => ["PUT", "GET"],
+        "MaxAgeSeconds" => 3000,
+        "ExposeHeader" => ["x-amz-server-side-encryption", "x-amz-balls"]
+      }]
+    }, 'returns hash of CORS XML') do
+      Fog::Storage::InternetArchive.cors_to_hash(cors_xml)
+    end
+  end
+end

data/tests/internet_archive/requests/storage/multipart_upload_tests.rb

@@ -0,0 +1,132 @@
+Shindo.tests('Fog::Storage[:internetarchive] | multipart upload requests', ["internet_archive"]) do
+
+  @directory = Fog::Storage[:internetarchive].directories.create(:key => 'fogmultipartuploadtests')
+
+  tests('success') do
+
+    @initiate_multipart_upload_format = {
+      'Bucket'    => String,
+      'Key'       => String,
+      'UploadId'  => String
+    }
+
+    tests("#initiate_multipart_upload('#{@directory.identity}')", 'fog_multipart_upload').formats(@initiate_multipart_upload_format) do
+      pending if Fog.mocking?
+      data = Fog::Storage[:internetarchive].initiate_multipart_upload(@directory.identity, 'fog_multipart_upload').body
+      @upload_id = data['UploadId']
+      data
+    end
+
+    @list_multipart_uploads_format = {
+      'Bucket'              => String,
+      'IsTruncated'         => Fog::Boolean,
+      'MaxUploads'          => Integer,
+      'KeyMarker'           => NilClass,
+      'NextKeyMarker'       => String,
+      'NextUploadIdMarker'  => Fog::Nullable::String,
+      'Upload' => [{
+        'Initiated'     => Time,
+        'Initiator' => {
+          'DisplayName' => String,
+          'ID'          => String
+        },
+        'Key'           => String,
+        'Owner' => {
+          'DisplayName' => String,
+          'ID'          => String
+        },
+        'StorageClass'      => String,
+        'UploadId'          => String
+      }],
+      'UploadIdMarker'      => NilClass,
+    }
+
+    tests("#list_multipart_uploads('#{@directory.identity})").formats(@list_multipart_uploads_format) do
+      pending if Fog.mocking?
+      Fog::Storage[:internetarchive].list_multipart_uploads(@directory.identity).body
+    end
+
+    @parts = []
+
+    tests("#upload_part('#{@directory.identity}', 'fog_multipart_upload', '#{@upload_id}', 1, ('x' * 6 * 1024 * 1024))").succeeds do
+      pending if Fog.mocking?
+      data = Fog::Storage[:internetarchive].upload_part(@directory.identity, 'fog_multipart_upload', @upload_id, 1, ('x' * 6 * 1024 * 1024))
+      @parts << data.headers['ETag']
+    end
+
+    @list_parts_format = {
+      'Bucket'            => String,
+      'Initiator' => {
+        'DisplayName'     => String,
+        'ID'              => String
+      },
+      'IsTruncated'       => Fog::Boolean,
+      'Key'               => String,
+      'MaxParts'          => Integer,
+      'NextPartNumberMarker' => String,
+      'Part' => [{
+        'ETag'            => String,
+        'LastModified'    => Time,
+        'PartNumber'      => Integer,
+        'Size'            => Integer
+      }],
+      'PartNumberMarker'  => String,
+      'StorageClass'      => String,
+      'UploadId'          => String
+    }
+
+    tests("#list_parts('#{@directory.identity}', 'fog_multipart_upload', '#{@upload_id}')").formats(@list_parts_format) do
+      pending if Fog.mocking?
+      Fog::Storage[:internetarchive].list_parts(@directory.identity, 'fog_multipart_upload', @upload_id).body
+    end
+
+    if !Fog.mocking?
+      @parts << Fog::Storage[:internetarchive].upload_part(@directory.identity, 'fog_multipart_upload', @upload_id, 2, ('x' * 4 * 1024 * 1024)).headers['ETag']
+    end
+
+    @complete_multipart_upload_format = {
+      'Bucket'    => String,
+      'ETag'      => String,
+      'Key'       => String,
+      'Location'  => String
+    }
+
+    tests("#complete_multipart_upload('#{@directory.identity}', 'fog_multipart_upload', '#{@upload_id}', #{@parts.inspect})").formats(@complete_multipart_upload_format) do
+      pending if Fog.mocking?
+      Fog::Storage[:internetarchive].complete_multipart_upload(@directory.identity, 'fog_multipart_upload', @upload_id, @parts).body
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_multipart_upload').body").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:internetarchive].get_object(@directory.identity, 'fog_multipart_upload').body == ('x' * 10 * 1024 * 1024)
+    end
+
+    if !Fog.mocking?
+      @directory.files.new(:key => 'fog_multipart_upload').destroy
+    end
+
+    if !Fog.mocking?
+      @upload_id = Fog::Storage[:internetarchive].initiate_multipart_upload(@directory.identity, 'fog_multipart_abort').body['UploadId']
+    end
+
+    tests("#abort_multipart_upload('#{@directory.identity}', 'fog_multipart_abort', '#{@upload_id}')").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:internetarchive].abort_multipart_upload(@directory.identity, 'fog_multipart_abort', @upload_id)
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("initiate_multipart_upload")
+    tests("list_multipart_uploads")
+    tests("upload_part")
+    tests("list_parts")
+    tests("complete_multipart_upload")
+    tests("abort_multipart_upload")
+
+  end
+
+  @directory.destroy
+
+end

data/tests/internet_archive/requests/storage/object_tests.rb

@@ -0,0 +1,166 @@
+Shindo.tests('InternetArchive::Storage | object requests', ['internet_archive']) do
+  @directory = Fog::Storage[:internetarchive].directories.create(:key => 'fogobjecttests-' + Time.now.to_i.to_s(32))
+  @ia_owner = Fog::Storage[:internetarchive].get_bucket_acl(@directory.key).body['Owner']
+
+  tests('success') do
+
+    @multiple_delete_format = {
+      'DeleteResult' => [{
+        'Deleted' => {
+          'Key' => String
+        }
+      }]
+    }
+
+    tests("#put_object('#{@directory.identity}', 'fog_object', lorem_file)").succeeds do
+      Fog::Storage[:internetarchive].put_object(@directory.identity, 'fog_object', lorem_file)
+    end
+
+    tests("#copy_object('#{@directory.identity}', 'fog_object', '#{@directory.identity}', 'fog_other_object')").succeeds do
+      Fog::Storage[:internetarchive].copy_object(@directory.identity, 'fog_object', @directory.identity, 'fog_other_object')
+    end
+
+    @directory.files.get('fog_other_object').destroy
+
+    tests("#get_object('#{@directory.identity}', 'fog_object')").returns(lorem_file.read) do
+      Fog::Storage[:internetarchive].get_object(@directory.identity, 'fog_object').body
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_object', &block)").returns(lorem_file.read) do
+      data = ''
+      Fog::Storage[:internetarchive].get_object(@directory.identity, 'fog_object') do |chunk, remaining_bytes, total_bytes|
+        data << chunk
+      end
+      data
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_object', {'Range' => 'bytes=0-20'})").returns(lorem_file.read[0..20]) do
+      Fog::Storage[:internetarchive].get_object(@directory.identity, 'fog_object', {'Range' => 'bytes=0-20'}).body
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_object', {'Range' => 'bytes=0-0'})").returns(lorem_file.read[0..0]) do
+      Fog::Storage[:internetarchive].get_object(@directory.identity, 'fog_object', {'Range' => 'bytes=0-0'}).body
+    end
+
+    tests("#head_object('#{@directory.identity}', 'fog_object')").succeeds do
+      Fog::Storage[:internetarchive].head_object(@directory.identity, 'fog_object')
+    end
+
+    tests("#put_object_acl('#{@directory.identity}', 'fog_object', 'private')").succeeds do
+      Fog::Storage[:internetarchive].put_object_acl(@directory.identity, 'fog_object', 'private')
+    end
+
+    acl = {
+      'Owner' => @ia_owner,
+      'AccessControlList' => [
+        {
+          'Grantee' => @ia_owner,
+          'Permission' => "FULL_CONTROL"
+        }
+      ]}
+    tests("#put_object_acl('#{@directory.identity}', 'fog_object', hash with id)").returns(acl) do
+      Fog::Storage[:internetarchive].put_object_acl(@directory.identity, 'fog_object', acl)
+      Fog::Storage[:internetarchive].get_object_acl(@directory.identity, 'fog_object').body
+    end
+
+    tests("#put_object_acl('#{@directory.identity}', 'fog_object', hash with email)").returns({
+        'Owner' => @ia_owner,
+        'AccessControlList' => [
+          {
+            'Grantee' => { 'ID' => 'f62f0218873cfa5d56ae9429ae75a592fec4fd22a5f24a20b1038a7db9a8f150', 'DisplayName' => 'mtd' },
+            'Permission' => "FULL_CONTROL"
+          }
+        ]}) do
+      pending if Fog.mocking?
+      Fog::Storage[:internetarchive].put_object_acl(@directory.identity, 'fog_object', {
+        'Owner' => @ia_owner,
+        'AccessControlList' => [
+          {
+            'Grantee' => { 'EmailAddress' => 'mtd@amazon.com' },
+            'Permission' => "FULL_CONTROL"
+          }
+        ]})
+      Fog::Storage[:internetarchive].get_object_acl(@directory.identity, 'fog_object').body
+    end
+
+    acl = {
+      'Owner' => @ia_owner,
+      'AccessControlList' => [
+        {
+          'Grantee' => { 'URI' => 'http://acs.amazonaws.com/groups/global/AllUsers' },
+          'Permission' => "FULL_CONTROL"
+        }
+      ]}
+    tests("#put_object_acl('#{@directory.identity}', 'fog_object', hash with uri)").returns(acl) do
+      Fog::Storage[:internetarchive].put_object_acl(@directory.identity, 'fog_object', acl)
+      Fog::Storage[:internetarchive].get_object_acl(@directory.identity, 'fog_object').body
+    end
+
+    tests("#delete_object('#{@directory.identity}', 'fog_object')").succeeds do
+      Fog::Storage[:internetarchive].delete_object(@directory.identity, 'fog_object')
+    end
+
+    tests("#get_object_http_url('#{@directory.identity}', 'fog_object', expiration timestamp)").returns(true) do
+      object_url = Fog::Storage[:internetarchive].get_object_http_url(@directory.identity, 'fog_object', (Time.now + 60))
+      puts "get_object_http_url object_url: #{object_url}"
+      (object_url =~ /http:\/\/#{Regexp.quote(@directory.identity)}\.s3\.us\.archive\.org\/fog_object/) != nil
+    end
+
+    tests("delete_multiple_objects('#{@directory.identity}', ['fog_object', 'fog_other_object'])").formats(@multiple_delete_format) do
+      Fog::Storage[:internetarchive].delete_multiple_objects(@directory.identity, ['fog_object', 'fog_other_object']).body
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#put_object('fognonbucket', 'fog_non_object', lorem_file)").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:internetarchive].put_object('fognonbucket', 'fog_non_object', lorem_file)
+    end
+
+    tests("#copy_object('fognonbucket', 'fog_object', '#{@directory.identity}', 'fog_other_object')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:internetarchive].copy_object('fognonbucket', 'fog_object', @directory.identity, 'fog_other_object')
+    end
+
+    tests("#copy_object('#{@directory.identity}', 'fog_non_object', '#{@directory.identity}', 'fog_other_object')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:internetarchive].copy_object(@directory.identity, 'fog_non_object', @directory.identity, 'fog_other_object')
+    end
+
+    tests("#copy_object('#{@directory.identity}', 'fog_object', 'fognonbucket', 'fog_other_object')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:internetarchive].copy_object(@directory.identity, 'fog_object', 'fognonbucket', 'fog_other_object')
+    end
+
+    tests("#get_object('fognonbucket', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:internetarchive].get_object('fognonbucket', 'fog_non_object')
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:internetarchive].get_object(@directory.identity, 'fog_non_object')
+    end
+
+    tests("#head_object('fognonbucket', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:internetarchive].head_object('fognonbucket', 'fog_non_object')
+    end
+
+    tests("#head_object('#{@directory.identity}', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:internetarchive].head_object(@directory.identity, 'fog_non_object')
+    end
+
+    tests("#delete_object('fognonbucket', 'fog_non_object')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:internetarchive].delete_object('fognonbucket', 'fog_non_object')
+    end
+
+    tests("#delete_multiple_objects('fognonbucket', ['fog_non_object'])").raises(Excon::Errors::NotFound) do
+      pending if Fog.mocking?
+      Fog::Storage[:internetarchive].delete_multiple_objects('fognonbucket', ['fog_non_object'])
+    end
+
+    tests("#put_object_acl('#{@directory.identity}', 'fog_object', 'invalid')").raises(Excon::Errors::BadRequest) do
+      Fog::Storage[:internetarchive].put_object_acl('#{@directory.identity}', 'fog_object', 'invalid')
+    end
+
+  end
+
+  @directory.destroy
+
+end

data/tests/internet_archive/requests/storage/versioning_tests.rb

@@ -0,0 +1,258 @@
+def clear_bucket
+  Fog::Storage[:internetarchive].get_bucket_object_versions(@ia_bucket_name).body['Versions'].each do |version|
+    object = version[version.keys.first]
+    Fog::Storage[:internetarchive].delete_object(@ia_bucket_name, object['Key'], 'versionId' => object['VersionId'])
+  end
+end
+
+def create_versioned_bucket
+  @ia_bucket_name = 'fogbuckettests-' + Fog::Mock.random_hex(16)
+  Fog::Storage[:internetarchive].put_bucket(@ia_bucket_name)
+  Fog::Storage[:internetarchive].put_bucket_versioning(@ia_bucket_name, 'Enabled')
+end
+
+def delete_bucket
+  Fog::Storage[:internetarchive].get_bucket_object_versions(@ia_bucket_name).body['Versions'].each do |version|
+    object = version[version.keys.first]
+    Fog::Storage[:internetarchive].delete_object(@ia_bucket_name, object['Key'], 'versionId' => object['VersionId'])
+  end
+
+  Fog::Storage[:internetarchive].delete_bucket(@ia_bucket_name)
+end
+
+Shindo.tests('Fog::Storage[:internetarchive] | versioning', ["internet_archive"]) do
+  tests('success') do
+    tests("#put_bucket_versioning") do
+      @ia_bucket_name = 'fogbuckettests-' + Fog::Mock.random_hex(16)
+      Fog::Storage[:internetarchive].put_bucket(@ia_bucket_name)
+
+      tests("#put_bucket_versioning('#{@ia_bucket_name}', 'Enabled')").succeeds do
+        Fog::Storage[:internetarchive].put_bucket_versioning(@ia_bucket_name, 'Enabled')
+      end
+
+      tests("#put_bucket_versioning('#{@ia_bucket_name}', 'Suspended')").succeeds do
+        Fog::Storage[:internetarchive].put_bucket_versioning(@ia_bucket_name, 'Suspended')
+      end
+
+      delete_bucket
+    end
+
+    tests("#get_bucket_versioning('#{@ia_bucket_name}')") do
+      @ia_bucket_name = 'fogbuckettests-' + Fog::Mock.random_hex(16)
+      Fog::Storage[:internetarchive].put_bucket(@ia_bucket_name)
+
+      tests("#get_bucket_versioning('#{@ia_bucket_name}') without versioning").returns({}) do
+        Fog::Storage[:internetarchive].get_bucket_versioning(@ia_bucket_name).body['VersioningConfiguration']
+      end
+
+      tests("#get_bucket_versioning('#{@ia_bucket_name}') with versioning enabled").returns('Enabled') do
+        Fog::Storage[:internetarchive].put_bucket_versioning(@ia_bucket_name, 'Enabled')
+        Fog::Storage[:internetarchive].get_bucket_versioning(@ia_bucket_name).body['VersioningConfiguration']['Status']
+      end
+
+      tests("#get_bucket_versioning('#{@ia_bucket_name}') with versioning suspended").returns('Suspended') do
+        Fog::Storage[:internetarchive].put_bucket_versioning(@ia_bucket_name, 'Suspended')
+        Fog::Storage[:internetarchive].get_bucket_versioning(@ia_bucket_name).body['VersioningConfiguration']['Status']
+      end
+
+      delete_bucket
+    end
+
+    tests("#get_bucket_object_versions('#{@ia_bucket_name}')") do
+
+      create_versioned_bucket
+
+      before do
+        @versions = Fog::Storage[:internetarchive].get_bucket_object_versions(@ia_bucket_name)
+      end
+
+      v1 = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'a',    :key => 'file')
+      v2 = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'ab',   :key => v1.key)
+      v3 = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'abc',  :key => v1.key)
+      v4 = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'abcd', :key => v1.key)
+
+      tests("versions").returns([v4.version, v3.version, v2.version, v1.version]) do
+        @versions.body['Versions'].collect {|v| v['Version']['VersionId']}
+      end
+
+      tests("version sizes").returns([4, 3, 2, 1]) do
+        @versions.body['Versions'].collect {|v| v['Version']['Size']}
+      end
+
+      tests("latest version").returns(v4.version) do
+        latest = @versions.body['Versions'].find {|v| v['Version']['IsLatest']}
+        latest['Version']['VersionId']
+      end
+    end
+
+    tests("get_object('#{@ia_bucket_name}', 'file')") do
+      clear_bucket
+
+      v1 = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'a',  :key => 'file')
+      v2 = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'ab', :key => v1.key)
+
+      tests("get_object('#{@ia_bucket_name}', '#{v2.key}') returns the latest version").returns(v2.version) do
+        res = Fog::Storage[:internetarchive].get_object(@ia_bucket_name, v2.key)
+        res.headers['x-amz-version-id']
+      end
+
+      tests("get_object('#{@ia_bucket_name}', '#{v1.key}', 'versionId' => '#{v1.version}') returns the specified version").returns(v1.version) do
+        res = Fog::Storage[:internetarchive].get_object(@ia_bucket_name, v1.key, 'versionId' => v1.version)
+        res.headers['x-amz-version-id']
+      end
+
+      v2.destroy
+
+      tests("get_object('#{@ia_bucket_name}', '#{v2.key}') raises exception if delete marker is latest version").raises(Excon::Errors::NotFound) do
+        Fog::Storage[:internetarchive].get_object(@ia_bucket_name, v2.key)
+      end
+    end
+
+    tests("delete_object('#{@ia_bucket_name}', 'file')") do
+      clear_bucket
+
+      file = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'a',  :key => 'file')
+
+      tests("deleting an object just stores a delete marker").returns(true) do
+        file.destroy
+        versions = Fog::Storage[:internetarchive].get_bucket_object_versions(@ia_bucket_name)
+        versions.body['Versions'].first.has_key?('DeleteMarker')
+      end
+
+      tests("there are two versions: the original and the delete marker").returns(2) do
+        versions = Fog::Storage[:internetarchive].get_bucket_object_versions(@ia_bucket_name)
+        versions.body['Versions'].size
+      end
+
+      tests("deleting the delete marker makes the object available again").returns(file.version) do
+        versions = Fog::Storage[:internetarchive].get_bucket_object_versions(@ia_bucket_name)
+        delete_marker = versions.body['Versions'].find { |v| v.has_key?('DeleteMarker') }
+        Fog::Storage[:internetarchive].delete_object(@ia_bucket_name, file.key, 'versionId' => delete_marker['DeleteMarker']['VersionId'])
+
+        res = Fog::Storage[:internetarchive].get_object(@ia_bucket_name, file.key)
+        res.headers['x-amz-version-id']
+      end
+    end
+
+    tests("deleting_multiple_objects('#{@ia_bucket_name}", 'file') do
+      clear_bucket
+
+      bucket = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name)
+
+      file_count = 5
+      file_names = []
+      files = {}
+      file_count.times do |id|
+        file_names << "file_#{id}"
+        files[file_names.last] = bucket.files.create(:body => 'a',
+                                                     :key => file_names.last)
+      end
+
+      tests("deleting an object just stores a delete marker").returns(true) do
+        Fog::Storage[:internetarchive].delete_multiple_objects(@ia_bucket_name,
+                                                   file_names)
+        versions = Fog::Storage[:internetarchive].get_bucket_object_versions(
+                      @ia_bucket_name)
+        all_versions = {}
+        versions.body['Versions'].each do |version|
+          object = version[version.keys.first]
+          next if file_names.index(object['Key']).nil?
+          if !all_versions.has_key?(object['Key'])
+            all_versions[object['Key']] = version.has_key?('DeleteMarker')
+          else
+            all_versions[object['Key']] |= version.has_key?('DeleteMarker')
+          end
+        end
+        all_true = true
+        all_versions.values.each do |marker|
+          all_true = false if !marker
+        end
+        all_true
+      end
+
+      tests("there are two versions: the original and the delete marker").
+          returns(file_count*2) do
+        versions = Fog::Storage[:internetarchive].get_bucket_object_versions(
+                      @ia_bucket_name)
+        versions.body['Versions'].size
+      end
+
+      tests("deleting the delete marker makes the object available again").
+          returns(true) do
+        versions = Fog::Storage[:internetarchive].get_bucket_object_versions(
+                      @ia_bucket_name)
+        delete_markers = []
+        file_versions = {}
+        versions.body['Versions'].each do |version|
+          object = version[version.keys.first]
+          next if object['VersionId'] == files[object['Key']].version
+          file_versions[object['Key']] = object['VersionId']
+        end
+
+        Fog::Storage[:internetarchive].delete_multiple_objects(@ia_bucket_name,
+                                                   file_names,
+                                                   'versionId' => file_versions)
+        all_true = true
+        file_names.each do |file|
+          res = Fog::Storage[:internetarchive].get_object(@ia_bucket_name, file)
+          all_true = false if res.headers['x-amz-version-id'] !=
+                              files[file].version
+        end
+        all_true
+      end
+
+    end
+
+    tests("get_bucket('#{@ia_bucket_name}'") do
+      clear_bucket
+
+      file = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'a',  :key => 'file')
+
+      tests("includes a non-DeleteMarker object").returns(1) do
+        Fog::Storage[:internetarchive].get_bucket(@ia_bucket_name).body['Contents'].size
+      end
+
+      file.destroy
+
+      tests("does not include a DeleteMarker object").returns(0) do
+        Fog::Storage[:internetarchive].get_bucket(@ia_bucket_name).body['Contents'].size
+      end
+    end
+
+    delete_bucket
+  end
+
+  tests('failure') do
+    create_versioned_bucket
+
+    tests("#put_bucket_versioning('#{@ia_bucket_name}', 'bad_value')").raises(Excon::Errors::BadRequest) do
+      Fog::Storage[:internetarchive].put_bucket_versioning(@ia_bucket_name, 'bad_value')
+    end
+
+    tests("#put_bucket_versioning('fognonbucket', 'Enabled')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:internetarchive].put_bucket_versioning('fognonbucket', 'Enabled')
+    end
+
+    tests("#get_bucket_versioning('fognonbucket')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:internetarchive].get_bucket_versioning('fognonbucket')
+    end
+
+    tests("#get_bucket_object_versions('fognonbucket')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:internetarchive].get_bucket_object_versions('fognonbucket')
+    end
+
+    file = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'y', :key => 'x')
+
+    tests("#get_object('#{@ia_bucket_name}', '#{file.key}', 'versionId' => 'bad_version'").raises(Excon::Errors::BadRequest) do
+      Fog::Storage[:internetarchive].get_object(@ia_bucket_name, file.key, 'versionId' => '-1')
+    end
+
+    tests("#delete_object('#{@ia_bucket_name}', '#{file.key}', 'versionId' => 'bad_version'").raises(Excon::Errors::BadRequest) do
+      Fog::Storage[:internetarchive].delete_object(@ia_bucket_name, file.key, 'versionId' => '-1')
+    end
+
+  end
+
+  # don't keep the bucket around
+  delete_bucket
+end