s33r 0.1 → 0.2

data/test/cases/spec_sync.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../s3_test_constants'
+
+context 'S3 sync methods' do
+  setup do
+    @base_dir = File.dirname(__FILE__)
+    @text_filename =  @base_dir + '/../files/textfile.txt'
+    @graphic_filename = @base_dir + '/../files/wave.jpg'
+  end
+
+  specify 'should return MD5 checksum for text files' do
+    md5sum(@text_filename).should.equal('bbf560d44f092d22a30d3a562436ad8c')
+  end
+
+  specify 'should return MD5 checksum for graphic files' do
+    md5sum(@graphic_filename).should.equal('80b669f252257eedd8a2606cb1a0df6a')
+  end
+
+  specify 'should be able to map a directory structure to S3 bucket keys' do
+    fix
+  end
+
+  specify 'should return an array of local files to put to S3 based on differences between MD5 checksums' do
+    fix
+  end
+
+  specify 'should convert S3 bucket keys into a "virtual" directory and file structure' do
+    fix
+  end
+end

data/test/cases/spec_xml.rb

@@ -0,0 +1,22 @@
+base = File.dirname(__FILE__)
+require File.join(base, '../s3_test_constants')
+
+context 'LibXML extensions' do
+  setup do
+    @with_xml_str = File.open(File.join(base, '../files/s3_object.xml')).read
+    @doc = XML.get_xml_doc(@with_xml_str)
+  end
+
+  specify 'should make it easy to get an XML::Document from an XML string' do
+    @doc.should_be_an_instance_of XML::Document
+    clean_xml(@doc.to_s).should.equal clean_xml(@with_xml_str)
+  end
+
+  specify 'should return content of the first node matching a path' do
+    @doc.xget('//Size').should.equal '14'
+  end
+
+  specify 'should return nil if no matching path' do
+    @doc.xget('//madeup').should.equal nil
+  end
+end

data/test/cases/unit_client.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../s3_test_constants'
+require_gem 'FakeWeb'
+
+class TestClient < Test::Unit::TestCase
+  def setup
+    @client = Client.new(S3Testing::ACCESS_KEY, S3Testing::SECRET_ACCESS_KEY, :ssl => false)
+    @client2 = Client.new(S3Testing::ACCESS_KEY, S3Testing::SECRET_ACCESS_KEY)
+    @bucket = 'testingtesting'
+    @url = url_join('http://', HOST, @bucket)
+    FakeWeb.register_uri(@url, :status => 200)
+  end
+
+  def test_returns_ssl_setting_correctly
+    assert !(@client.use_ssl?)
+    assert @client2.use_ssl?
+  end
+
+  def test_catches_max_keys_too_high_in_bucket_listing_request
+    assert_raise(S3Exception::BucketListingMaxKeysError) do
+      @client.list_bucket('duff', :max_keys => (S3::BUCKET_LIST_MAX_MAX_KEYS + 1))
+    end
+  end
+
+  def test_fetches_bucket_listing_ok
+    resp = @client.list_bucket(@bucket)
+    assert resp.ok?
+  end
+
+  def test_recursively_put_files_into_bucket_with_paths_as_keys
+    flunk 'Test conversion of paths to keys'
+  end
+
+  def test_has_attached_bucket_listing_object_for_get_on_bucket
+    flunk 'Check that responses to list_bucket have an attached BucketListing instance'
+  end
+  
+  def test_keys_dont_have_leading_slashes_stripped_when_putting_resources
+    flunk 'Keys with leading slashes should not have the slash stripped'
+  end
+end

data/test/cases/unit_named_bucket.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/../s3_test_constants'
+require_gem 'FakeWeb'
+
+class TestNamedBucket < Test::Unit::TestCase
+  def test_should_wrap_bucket_listing
+    flunk 'Keep a copy of the current bucket listing inside as a property'
+  end
+
+  def test_should_enable_easy_updates_on_bucket_listing
+    flunk 'Enable prefix, marker etc. to be reset from NamedBucket and refresh wrapped bucket listing object'
+  end
+end

data/test/files/bucket_listing.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>testingtesting</Name><Prefix/><Marker/><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated><Contents><Key>/home/ell/dir1/four.txt</Key><LastModified>2006-08-19T22:53:29.000Z</LastModified><ETag>"24ce59274b89287b3960c184153ac24b"</ETag><Size>14</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/dir1/three.txt</Key><LastModified>2006-08-19T22:53:28.000Z</LastModified><ETag>"d01f8d7ad25e962f59f661126e4a5057"</ETag><Size>15</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/dir2/five.txt</Key><LastModified>2006-08-19T22:53:29.000Z</LastModified><ETag>"495f6ea4d6c70f64f767b08818c876dd"</ETag><Size>14</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/dir2/six.txt</Key><LastModified>2006-08-19T22:53:30.000Z</LastModified><ETag>"1d7407ec32f45f4ac15b121a45932059"</ETag><Size>13</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/dir2/subdir21/seven.txt</Key><LastModified>2006-08-19T22:53:31.000Z</LastModified><ETag>"b6bc8a2efb68c39c1e06469d32bc66f2"</ETag><Size>15</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/dir2/subdir22/eight.txt</Key><LastModified>2006-08-19T22:53:31.000Z</LastModified><ETag>"61fa424274f4caacbc7d4b6fd575ce1a"</ETag><Size>15</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/dir2/subdir22/subdir221/nine.txt</Key><LastModified>2006-08-19T22:53:32.000Z</LastModified><ETag>"d3dc4897b611eb4b0a2cd7bb99eb2f50"</ETag><Size>14</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/dir2/subdir22/subdir221/ten.txt</Key><LastModified>2006-08-19T22:53:32.000Z</LastModified><ETag>"5ecc5853945efc6448d17ea80d2aa4c0"</ETag><Size>13</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/one.txt</Key><LastModified>2006-08-19T22:53:27.000Z</LastModified><ETag>"420f7bf33402d3e6715d623bdac0dbcc"</ETag><Size>13</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/two.txt</Key><LastModified>2006-08-19T22:53:27.000Z</LastModified><ETag>"3be782e5229216c508fcb3be5fc8505d"</ETag><Size>13</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>

data/test/files/bucket_listing2.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>testing2</Name><Prefix>/home/ell/</Prefix><Marker></Marker><MaxKeys>100</MaxKeys><Delimiter>/</Delimiter><IsTruncated>false</IsTruncated><Contents><Key>/home/ell/one.txt</Key><LastModified>2006-08-19T22:53:27.000Z</LastModified><ETag>"420f7bf33402d3e6715d623bdac0dbcc"</ETag><Size>13</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/two.txt</Key><LastModified>2006-08-19T22:53:27.000Z</LastModified><ETag>"3be782e5229216c508fcb3be5fc8505d"</ETag><Size>13</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><CommonPrefixes><Prefix>/home/ell/dir1/</Prefix></CommonPrefixes><CommonPrefixes><Prefix>/home/ell/dir2/</Prefix></CommonPrefixes></ListBucketResult>

data/test/files/bucket_listing3.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+  <Name>testing3</Name>
+  <Prefix></Prefix>
+  <Marker></Marker>
+  <MaxKeys>100</MaxKeys>
+  <IsTruncated>false</IsTruncated>
+</ListBucketResult>

data/test/files/bucket_listing_broken.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><ListBucketResult xmlns="http:testing</Name><Prefix/><Marker/><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated><Contents><Key>/home/ell/dir1/four.txt</Key><LastModified>2006-08-19T22:53:29.000Z</LastModified><ETag>"24ce59274b89287b3960c184153ac24b"</ETag><Size>14</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/dir1/three.txt</Key><LastModified>2006-08-19T22:53:28.000Z</LastModified><ETag>"d01f8d7ad25e962f59f661126e4a5057"</ETag><Size>15</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/dir2/five.txt</Key><LastModified>2006-08-19T22:53:29.000Z</LastModified><ETag>"495f6ea4d6c70f64f767b08818c876dd"</ETag><Size>14</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/dir2/six.txt</Key><LastModified>2006-08-19T22:53:30.000Z</LastModified><ETag>"1d7407ec32f45f4ac15b121a45932059"</ETag><Size>13</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/dir2/subdir21/seven.txt</Key><LastModified>2006-08-19T22:53:31.000Z</LastModified><ETag>"b6bc8a2efb68c39c1e06469d32bc66f2"</ETag><Size>15</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/dir2/subdir22/eight.txt</Key><LastModified>2006-08-19T22:53:31.000Z</LastModified><ETag>"61fa424274f4caacbc7d4b6fd575ce1a"</ETag><Size>15</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/dir2/subdir22/subdir221/nine.txt</Key><LastModified>2006-08-19T22:53:32.000Z</LastModified><ETag>"d3dc4897b611eb4b0a2cd7bb99eb2f50"</ETag><Size>14</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/dir2/subdir22/subdir221/ten.txt</Key><LastModified>2006-08-19T22:53:32.000Z</LastModified><ETag>"5ecc5853945efc6448d17ea80d2aa4c0"</ETag><Size>13</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/one.txt</Key><LastModified>2006-08-19T22:53:27.000Z</LastModified><ETag>"420f7bf33402d3e6715d623bdac0dbcc"</ETag><Size>13</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>/home/ell/two.txt</Key><LastModified>2006-08-19T22:53:27.000Z</LastModified><ETag>"3be782e5229216c508fcb3be5fc8505d"</ETag><Size>13</Size><Owner><ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID><DisplayName>elliotsmith3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>

data/test/files/s3_object.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Contents>
+	<Key>/home/ell/dir1/four.txt</Key>
+	<LastModified>2006-08-19T22:53:29.000Z</LastModified>
+	<ETag>"24ce59274b89287b3960c184153ac24b"</ETag>
+	<Size>14</Size>
+	<Owner>
+	  <ID>56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4</ID>
+	  <DisplayName>elliotsmith3</DisplayName>
+	</Owner>
+	<StorageClass>STANDARD</StorageClass>
+</Contents>

data/test/files/textfile.txt

@@ -0,0 +1,10 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/switchtower.rake, and they will automatically be available to Rake.
+
+require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+require 'tasks/rails'

data/test/s3_test_constants.rb

@@ -0,0 +1,25 @@
+# loaded by all test classes
+require 'rubygems'
+require_gem 'rspec'
+
+require File.dirname(__FILE__) + '/../lib/s33r'
+include S3
+include S3::Sync
+
+# set up some constants
+module S3Testing
+  ACCESS_KEY = '44CF9590006BF252F707'
+  SECRET_ACCESS_KEY = 'OtxrzxIsfpFjA7SwPzILwy8Bw21TLhquhboDYROV'
+end
+
+# convenience for highlighting todos
+def fix
+  fail 'todo'
+end
+
+# clean newlines and tabs from XML to make comparisons easier
+def clean_xml(xml_str)
+  xml_str.gsub!(/\t/, '')
+  xml_str.gsub!(/\n/, '')
+  xml_str
+end

data/test/test_bucket_setup.rb

@@ -0,0 +1,41 @@
+# for setting up test bucket, so can gather responses from the real S3
+require 'yaml'
+require File.dirname(__FILE__) + '/../lib/s33r.rb'
+
+config_file = '/home/ell/.s33r'
+
+options = YAML::load_file(config_file)
+access_key = options['access_key']
+secret_key = options['secret_key']
+
+bucket = 'elliotsmith-testing'
+
+def bucketeer(client, bucket)
+  lambda do |key, text|
+    client.put_text bucket, '/home/ell/' + key, text
+  end
+end
+
+S3::Client.new(access_key, secret_key) do |client|
+
+  if !client.bucket_exists?(bucket)
+    client.create_bucket(bucket)
+
+    b = bucketeer(client, bucket)
+    b.call 'one.txt', 'one text file'
+    b.call 'two.txt', 'two text file'
+    b.call 'dir1/three.txt', 'three text file'
+    b.call 'dir1/four.txt', 'four text file'
+    b.call 'dir2/five.txt', 'five text file'
+    b.call 'dir2/six.txt', 'six text file'
+    b.call 'dir2/subdir21/seven.txt', 'seven text file'
+    b.call 'dir2/subdir22/eight.txt', 'eight text file'
+    b.call 'dir2/subdir22/subdir221/nine.txt', 'nine text file'
+    b.call 'dir2/subdir22/subdir221/ten.txt', 'ten text file'
+
+  end
+
+#  p client.list_bucket(bucket, :prefix => '/home/ell/dir1').body
+#  p client.list_bucket(bucket, :marker => '/home/ell/dir2/six.txt').body
+   p client.list_bucket(bucket).body
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: s33r
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2006-07-25 00:00:00 +01:00
+  version: "0.2"
+date: 2006-08-23 00:00:00 +01:00
 summary: A library for accessing Amazon S3
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Elliot Smith
 files: 
@@ -32,21 +33,37 @@ files:
 - bin/config.yml
 - lib/s33r
 - lib/s33r.rb
-- lib/s33r/external
+- lib/s33r/sync.rb
 - lib/s33r/client.rb
-- lib/s33r/list_bucket_result.rb
+- lib/s33r/mimetypes.rb
 - lib/s33r/net_http_overrides.rb
+- lib/s33r/bucket_listing.rb
 - lib/s33r/s3_exception.rb
 - lib/s33r/core.rb
 - lib/s33r/named_bucket.rb
-- lib/s33r/external/mimetypes.rb
-- test/spec
-- test/spec/spec_core.rb
+- lib/s33r/libxml_extensions.rb
+- test/files
+- test/test_bucket_setup.rb
+- test/s3_test_constants.rb
+- test/cases
+- test/files/wave.jpg
+- test/files/textfile.txt
+- test/files/bucket_listing.xml
+- test/files/s3_object.xml
+- test/files/bucket_listing_broken.xml
+- test/files/bucket_listing2.xml
+- test/files/bucket_listing3.xml
+- test/cases/spec_core.rb
+- test/cases/spec_sync.rb
+- test/cases/unit_client.rb
+- test/cases/spec_bucket_listing.rb
+- test/cases/unit_named_bucket.rb
+- test/cases/spec_xml.rb
 - LICENSE.txt
 - README.txt
 - MIT-LICENSE
-test_files: 
-- test/spec/spec_core.rb
+test_files: []
+
 rdoc_options: []
 
 extra_rdoc_files: []

data/lib/s33r/list_bucket_result.rb

@@ -1 +0,0 @@
-# TODO: parser to provide a tree representation of keys in a bucket

data/test/spec/spec_core.rb

@@ -1,87 +0,0 @@
-require 'rubygems'
-require_gem 'rspec'
-
-require File.dirname(__FILE__) + '/../../lib/s33r.rb'
-include S3
-
-context 'S3 module' do
-
-  setup do
-    @for_request_method = 'PUT'
-    @for_request_path = "/quotes/nelson"
-    @for_request_headers = {
-    "Content-Md5" => "c8fdb181845a4ca6b8fec737b3581d76",
-    "Content-Type" => "text/html",
-    "Date" => "Thu, 17 Nov 2005 18:49:58 GMT",
-    "X-Amz-Meta-Author" => "foo@bar.com",
-    "X-Amz-Magic" => "abracadabra"
-    }
-    @with_access_key = '44CF9590006BF252F707'
-    @with_secret_access_key = 'OtxrzxIsfpFjA7SwPzILwy8Bw21TLhquhboDYROV'
-
-    @for_incomplete_headers = @for_request_headers.clone.delete_if do |key,value|
-      'Content-Type' == key or 'Date' == key
-    end
-
-    @correct_canonical_string = "PUT\nc8fdb181845a4ca6b8fec737b3581d76\n" +
-    "text/html\nThu, 17 Nov 2005 18:49:58 GMT\nx-amz-magic:abracadabra\n" +
-    "x-amz-meta-author:foo@bar.com\n/quotes/nelson"
-    @correct_signature = "jZNOcbfWmD/A/f3hSvVzXZjM2HU="
-    @correct_auth_header = "AWS #{@with_access_key}:#{@correct_signature}"
-  end
-
-  specify 'should generate correct canonical strings' do
-    generate_canonical_string(@for_request_method, @for_request_path,
-    @for_request_headers).should.equal @correct_canonical_string
-  end
-
-  specify 'should generate correct signatures' do
-    generate_signature(@with_secret_access_key,
-    @correct_canonical_string).should.equal @correct_signature
-  end
-
-  specify 'should generate correct auth headers' do
-    generate_auth_header_value(@for_request_method, @for_request_path, @for_request_headers,
-    @with_access_key, @with_secret_access_key).should.equal @correct_auth_header
-  end
-
-  specify 'should not generate auth header if bad HTTP method passed' do
-    lambda { generate_auth_header_value('duff', nil, nil, nil, nil) }.should.raise
-    S3Exception::MethodNotAvailable
-  end
-
-  specify 'should not generate auth header if required headers missing' do
-    lambda { generate_auth_header_value('PUT', '/', @for_incomplete_headers,
-    nil, nil) }.should.raise S3Exception::MissingRequiredHeaders
-  end
-
-  specify 'when generating auth header, should allow addition of Date and Content-Type headers' do
-    now = Time.now
-
-    fixed_headers = add_default_headers(@for_incomplete_headers, :date => now,
-    :content_type => 'text/html')
-
-    fixed_headers['Date'].should.equal now.httpdate
-    fixed_headers['Content-Type'].should.equal 'text/html'
-  end
-
-  specify 'should not generate canned ACL header if invalid canned ACL supplied' do
-    lambda { canned_acl_header('duff') }.should.raise
-    S3Exception::UnsupportedCannedACL
-  end
-
-  specify 'should correctly add canned ACL headers' do
-    new_headers = canned_acl_header('private', { 'Content-Type' => 'text/html' })
-    new_headers.should.have(2).keys
-    new_headers.keys.should.include 'Content-Type'
-    new_headers.keys.should.include 'x-amz-acl'
-    new_headers['x-amz-acl'].should.equal 'private'
-  end
-
-  specify 'should set sensible defaults for missing Content-Type and Date headers' do
-    fixed_headers = add_default_headers(@for_incomplete_headers)
-    fixed_headers['Content-Type'].should.equal ''
-    fixed_headers.include?('Date').should.not.be nil
-  end
-
-end