s33r 0.4.2 → 0.5

data/test/cases/spec_acl.rb

@@ -3,7 +3,7 @@ require base + '/../test_setup'
 
 context 'S33r ACL functions' do
   setup do
-    @acl_grant_xml1 = clean_xml(File.open(File.join(File.dirname(__FILE__), '../files/acl_grant1.xml')).read)
+    @acl_grant_xml1 = load_test_xml('acl_grant1.xml')
     @canonical_user = CanonicalUser.new('a9a7b886d6fd24a52fe8ca5bef65f89a64e0193f23000e241bf9b1c61be666e9',
     'chriscustomer')
     @canonical_user_grant = Grant.new(@canonical_user, :all)
@@ -11,24 +11,22 @@ context 'S33r ACL functions' do
     'mimbo')
     @canonical_user_grant2 = Grant.new(@canonical_user2, :read)
     
-    @acl_grant_xml2 = clean_xml(File.open(File.join(File.dirname(__FILE__), '../files/acl_grant2.xml')).read)
+    @acl_grant_xml2 = load_test_xml('acl_grant2.xml')
     @amazon_grantee = AmazonCustomer.new('elliot@test.org')
     @amazon_grant = Grant.new(@amazon_grantee, :read)
-    @amazon_grantee2 = AmazonCustomer.new('bingo@blinky.com')
-    @amazon_grant2 = Grant.new(@amazon_grantee2, :write)
     
-    @acl_grant_xml3 = clean_xml(File.open(File.join(File.dirname(__FILE__), '../files/acl_grant3.xml')).read)
+    @acl_grant_xml3 = load_test_xml('acl_grant3.xml')
     @group_grantee = Group.new(:all_users)
     @group_grant = Grant.new(@group_grantee, :write)
     
-    @acl_grant_xml4 = clean_xml(File.open(File.join(File.dirname(__FILE__), '../files/acl_grant4.xml')).read)
+    @acl_grant_xml4 = load_test_xml('acl_grant4.xml')
     @group_grantee2 = Group.new(:authenticated_users)
     @group_grant2 = Grant.new(@group_grantee2, :read_acl)
     
-    @full_acl_xml = clean_xml(File.open(File.join(File.dirname(__FILE__), '../files/acl.xml')).read)
-    @full_acl_doc = ACLDoc.new(@canonical_user)
+    @full_acl_xml = load_test_xml('acl.xml')
+    @full_acl_doc = Policy.new(@canonical_user)
     @full_acl_doc.grants = [@canonical_user_grant, @canonical_user_grant2, @amazon_grant,
-    @amazon_grant2, @group_grant, @group_grant2]
+    @group_grant, @group_grant2]
     
     # Grants created using convenience methods
     @con_canonical_user_grant = Grant.for_canonical_user('a9a7b886d6fd24a52fe8ca5bef65f89a64e0193f23000e241bf9b1c61be666e9',
@@ -36,22 +34,11 @@ context 'S33r ACL functions' do
     @con_canonical_user_grant2 = Grant.for_canonical_user('baa7b886d6fd24a52fe8ca5bef65f89a64e0193f23000e241bf9b1c61be666e9',
     'mimbo', :read)
     @con_amazon_grant = Grant.for_amazon_customer('elliot@test.org', :read)
-    @con_amazon_grant2 = Grant.for_amazon_customer('bingo@blinky.com', :write)
     @con_group_grant1 = Grant.for_group(:all_users, :write)
     @con_group_grant2 = Grant.for_group(:authenticated_users, :read_acl)
-    @con_full_acl_doc = ACLDoc.new(@canonical_user)
+    @con_full_acl_doc = Policy.new(@canonical_user)
     @con_full_acl_doc.grants = [@con_canonical_user_grant, @con_canonical_user_grant2, 
-    @con_amazon_grant, @con_amazon_grant2, @con_group_grant1, @con_group_grant2]
-    
-    # Tests for logging ACLs
-    @logging_acl_xml = clean_xml(File.open(File.join(File.dirname(__FILE__), '../files/logging_acl.xml')).read)
-    @logging_acl_doc = ACLDoc.from_xml(@logging_acl_xml)
-    @log_delivery_write = Grant.for_group(:log_delivery, :write)
-    @log_delivery_read_acl = Grant.for_group(:log_delivery, :read_acl)
-    
-    # clone without the logging grants
-    @logging_acl_doc_no_grants = ACLDoc.from_xml(@logging_acl_xml)
-    @logging_acl_doc_no_grants.grants.delete_if { |g| @log_delivery_write == g or @log_delivery_read_acl == g }
+    @con_amazon_grant, @con_group_grant1, @con_group_grant2]
   end
   
   specify 'should represent a grant for a CanonicalUser' do
@@ -119,28 +106,11 @@ context 'S33r ACL functions' do
   end
   
   specify 'should parse AccessControlPolicy documents' do
-    acl_doc_from_xml = ACLDoc.from_xml(@full_acl_xml)
+    acl_doc_from_xml = Policy.from_xml(@full_acl_xml)
     acl_doc_from_xml.owner.should.equal @full_acl_doc.owner
     @full_acl_doc.grants.each do |g|
       acl_doc_from_xml.grants = acl_doc_from_xml.grants.delete_if { |i| i == g }
     end
     acl_doc_from_xml.grants.should.be.empty
   end
-  
-  specify 'should represent LogDelivery grants so buckets can act as logging targets' do
-    @logging_acl_doc.grants.should.include @log_delivery_write
-    @logging_acl_doc.grants.should.include @log_delivery_read_acl
-  end
-  
-  specify 'should be able to report whether an ACL indicates bucket is a logging target' do
-    @logging_acl_doc.log_targetable?.should.be true
-    
-    # check the variant where the grants have been removed
-    @logging_acl_doc_no_grants.log_targetable?.should.be false
-  end
-  
-  specify 'should be able to simply add logging target grants to an ACL' do
-    @logging_acl_doc_no_grants.add_log_target_grants
-    clean_xml(@logging_acl_doc_no_grants.to_xml).should.equal @logging_acl_xml
-  end
 end

data/test/cases/spec_bucket_listing.rb

@@ -1,19 +1,13 @@
-base = File.dirname(__FILE__)
-require base + '/../test_setup'
+require File.dirname(__FILE__) + '/../test_setup'
 require 'set'
 
 context 'S33r bucket listing' do
   setup do
-    xml_file = File.join(base, '../files/bucket_listing.xml')
-    @with_bucket_listing_xml = File.open(xml_file) { |f| f.read }
-    xml_file2 = File.join(base, '../files/bucket_listing2.xml')
-    @with_bucket_listing_xml2 = File.open(xml_file2) { |f| f.read }
-    xml_file3 = File.join(base, '../files/bucket_listing3.xml')
-    @with_empty_bucket_listing_xml = File.open(xml_file3) { |f| f.read }
-    xml_file4 = File.join(base, '../files/bucket_listing_broken.xml')
-    @with_broken_bucket_listing_xml = File.open(xml_file4) { |f| f.read }
-    xml_file5 = File.join(base, '../files/suspect_bucket_listing.xml')
-    @with_suspect_bl_xml = File.open(xml_file5) { |f| f.read }
+    @with_bucket_listing_xml = load_test_xml('bucket_listing.xml')
+    @with_bucket_listing_xml2 = load_test_xml('bucket_listing2.xml')
+    @with_empty_bucket_listing_xml = load_test_xml('bucket_listing3.xml')
+    @with_broken_bucket_listing_xml = load_test_xml('bucket_listing_broken.xml')
+    @with_suspect_bl_xml = load_test_xml('suspect_bucket_listing.xml')
     
     @bucket_listing = BucketListing.new(@with_bucket_listing_xml)
     @bucket_properties = %w(name prefix marker max_keys is_truncated)
@@ -25,11 +19,11 @@ context 'S33r bucket listing' do
   end
 
   specify 'cannot be created from invalid XML' do
-    lambda { BucketListing.new(nil) }.should.raise S33rException::InvalidBucketListing
+    lambda { BucketListing.new(nil) }.should.raise S3Exception::InvalidBucketListing
   end
 
   specify 'should recover gracefully from broken bucket listing XML' do
-    lambda { BucketListing.new(@with_broken_bucket_listing_xml) }.should.raise S33rException::InvalidBucketListing
+    lambda { BucketListing.new(@with_broken_bucket_listing_xml) }.should.raise S3Exception::InvalidBucketListing
   end
 
   specify 'should cope if bucket is empty (i.e. no <Contents> elements)' do
@@ -69,30 +63,16 @@ context 'S33r bucket listing' do
   end
 
   specify 'should store resources (<Contents> elements) in a hash' do
-    @bucket_listing.contents.size.should_be 10
-    first_obj = @bucket_listing.contents['/home/ell/dir1/four.txt']
+    @bucket_listing.size.should_be 10
+    first_obj = @bucket_listing['/home/ell/dir1/four.txt']
     first_obj.should_be_instance_of S3Object
   end
-
-  specify 'should enable access to metadata for a resource by its key' do
-    obj = @bucket_listing['/home/ell/dir1/four.txt']
-    obj.should_be_instance_of S3Object
-    obj.etag.should_equal '24ce59274b89287b3960c184153ac24b'
-  end
-  
-  specify 'should build a full S3Object representation when given XML from a GET on a resource key' do
-    todo
-  end
-
-  specify 'should provide easy access to <CommonPrefixes> elements as a hash' do
-    todo
-  end
   
   # attempting to fix ListBucketResult errors reported by Alex Payne
   specify 'should handle suspect bucket listing' do
     puts @with_suspect_bl_xml
     bl = BucketListing.new(@with_suspect_bl_xml)
-    bl.contents.size.should_be 1
-    bl.contents.keys.should.include 'orly.jpg'
+    bl.size.should_be 1
+    bl.keys.should.include 'orly.jpg'
   end
 end

data/test/cases/spec_logging.rb

@@ -0,0 +1,47 @@
+base = File.dirname(__FILE__)
+require base + '/../test_setup'
+
+context 'S33r logging' do
+  setup do
+    # Tests for BucketLoggingStatus generator
+    @logging_enabled_xml = load_test_xml('logging_status_enabled.xml')
+    @logging_disabled_xml = load_test_xml('logging_status_disabled.xml')
+    @logging_resource_to_enable = LoggingResource.new('mylogs', 'mybucket-access_log-')
+    @logging_resource_to_disable = LoggingResource.new
+    
+    # Tests for logging ACLs
+    @logging_acl_xml = load_test_xml('logging_acl.xml')
+    @logging_acl_doc = Policy.from_xml(@logging_acl_xml)
+    @log_delivery_write = Grant.for_group(:log_delivery, :write)
+    @log_delivery_read_acl = Grant.for_group(:log_delivery, :read_acl)
+    
+    # clone without the logging grants
+    @logging_acl_doc_no_grants = Policy.from_xml(@logging_acl_xml)
+    @logging_acl_doc_no_grants.grants.delete_if { |g| @log_delivery_write == g or @log_delivery_read_acl == g }
+  end
+  
+  specify 'should generate BucketLoggingStatus XML document to enable logging' do
+    clean_xml(@logging_resource_to_enable.to_xml).should.equal @logging_enabled_xml
+  end
+  
+  specify 'should generate BucketLoggingStatus XML document to disable logging' do
+    clean_xml(@logging_resource_to_disable.to_xml).should.equal @logging_disabled_xml
+  end
+  
+  specify 'should represent LogDelivery grants so buckets can act as logging targets' do
+    @logging_acl_doc.grants.should.include @log_delivery_write
+    @logging_acl_doc.grants.should.include @log_delivery_read_acl
+  end
+  
+  specify 'should be able to report whether an ACL indicates bucket is a logging target' do
+    @logging_acl_doc.log_targetable?.should.be true
+    
+    # check the variant where the grants have been removed
+    @logging_acl_doc_no_grants.log_targetable?.should.be false
+  end
+  
+  specify 'should be able to simply add logging target grants to an ACL' do
+    @logging_acl_doc_no_grants.add_log_target_grants
+    clean_xml(@logging_acl_doc_no_grants.to_xml).should.equal @logging_acl_xml
+  end
+end

data/test/cases/spec_networking.rb

@@ -0,0 +1,11 @@
+base = File.dirname(__FILE__)
+require File.join(base, '../test_setup')
+
+context 'S33r networking' do
+  setup do
+    
+  end
+
+  specify 'spec' do
+  end
+end

data/test/cases/spec_s3_object.rb

@@ -5,6 +5,21 @@ context 'S3 object' do
   setup do
     @s3_object_xml = File.open(File.join(base, '../files/s3_object.xml')).read
     @s3obj = S3Object.from_xml_string(@s3_object_xml)
+    @s3obj.bucket = Bucket.new('test-bucket', :access => Testing::ACCESS_KEY, \
+    :secret => Testing::SECRET_ACCESS_KEY)
+    
+    # Orphan s3obj (not attached to a bucket).
+    @orphan_obj = S3Object.new('my-key')
+    
+    bucket = Bucket.new('quotes', :access => Testing::ACCESS_KEY, \
+    :secret => Testing::SECRET_ACCESS_KEY, :use_ssl => false)
+    @s3obj2 = S3Object.new('nelson', nil, :bucket => bucket)
+    authenticated_url_end = "s3.amazonaws.com/quotes/nelson?Signature=vjbyPxybdZaNmGa%2ByT272YEAiv4%3D&"+
+    "AWSAccessKeyId=44CF9590006BF252F707&Expires=1141889120"
+    @correct_authenticated_url = "http://" + authenticated_url_end
+    @correct_public_url = "http://s3.amazonaws.com/quotes/nelson"
+    @correct_public_url_with_ssl = "https://s3.amazonaws.com/quotes/nelson"
+    @correct_public_url_with_subdomain = "http://quotes.s3.amazonaws.com/nelson"
   end
 
   specify 'can be initialised from XML fragment with correct data types' do
@@ -14,6 +29,14 @@ context 'S3 object' do
     @s3obj.etag.should.equal '24ce59274b89287b3960c184153ac24b'
     @s3obj.size.should.equal 14
   end
+  
+  specify 'can be associated with bucket on creation' do
+    @s3obj2.bucket.name.should.equal 'quotes'
+  end
+  
+  specify 'can be created from a file' do
+    todo
+  end
 
   specify 'should treat the owner as an object in his/her own right' do
     [@s3obj.owner.user_id, @s3obj.owner.display_name].should.equal \
@@ -21,15 +44,31 @@ context 'S3 object' do
     @s3obj.owner.should_be_instance_of S3ACL::CanonicalUser
   end
 
-  specify 'can be associated with a NamedBucket' do
+  specify 'can be saved' do
     todo
   end
-
-  specify 'can be saved by proxing through the NamedBucket it is associated with' do
+  
+  specify 'can be renamed' do
     todo
   end
-
-  specify 'cannot be saved unless associated with a NamedBucket' do
+  
+  specify 'can be deleted' do
     todo
   end
+  
+  specify 'should return authenticated URL' do
+    @s3obj2.url(:authenticated => true, :expires => 1141889120).should.equal @correct_authenticated_url
+  end
+  
+  specify 'should return public URL' do
+    @s3obj2.url.should.equal @correct_public_url
+  end
+  
+  specify 'should optionally return HTTPS URL' do
+    @s3obj2.url(:use_ssl => true).should.equal @correct_public_url_with_ssl
+  end
+  
+  specify 'should optionally return URL with domain name set to bucket name' do
+    @s3obj2.url(:subdomain => true).should.equal @correct_public_url_with_subdomain
+  end
 end

data/test/cases/spec_utility.rb

@@ -0,0 +1,264 @@
+base = File.dirname(__FILE__)
+require File.join(base, '../test_setup')
+require 'time'
+
+context 'S33r utility' do
+
+  setup do
+    @yaml_file = File.join(base, '../files/config.yaml')
+  
+    @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"
+    }
+
+    # create broken request header hash
+    @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 #{Testing::ACCESS_KEY}:#{@correct_signature}"
+
+    @with_invalid_bucket_name = '/badbucket'
+    @with_invalid_bucket_name2 = 'badbucket/'
+    
+    authenticated_url_end = "s3.amazonaws.com/quotes/nelson?Signature=vjbyPxybdZaNmGa%2ByT272YEAiv4%3D&"+
+    "AWSAccessKeyId=44CF9590006BF252F707&Expires=1141889120"
+    @correct_authenticated_url = "http://" + authenticated_url_end
+    @correct_authenticated_url_with_ssl = "https://" + authenticated_url_end
+    
+    @correct_public_url = "http://s3.amazonaws.com/quotes/nelson"
+    @correct_public_ssl_url = "https://s3.amazonaws.com/quotes/nelson"
+    @correct_public_url_with_subdomain = "http://quotes.s3.amazonaws.com/nelson"
+    @correct_public_url_with_ssl_and_subdomain = "https://quotes.s3.amazonaws.com/nelson"
+    @correct_public_url_without_key = "http://s3.amazonaws.com/quotes/"
+    @correct_logging_url = "http://s3.amazonaws.com/quotes/?logging"
+    @correct_acl_url = "http://s3.amazonaws.com/quotes/?acl"
+    @correct_acl_url_with_key = "http://s3.amazonaws.com/quotes/nelson?acl"
+    @correct_public_url_with_qstring = "http://s3.amazonaws.com/quotes/?prefix=%2Fhome&max-keys=400"
+  end
+  
+  specify 'should load config files containing standard S33r settings' do
+    config, _ = S33r.load_config(@yaml_file)
+    config[:access].should.equal Testing::ACCESS_KEY
+  end
+  
+  specify 'can parse ERb embedded in config. file' do
+    config, _ = S33r.load_config(@yaml_file)
+    config[:secret].should.equal Testing::SECRET_ACCESS_KEY
+  end
+  
+  specify 'can parse extra application-specific settings in config. file' do
+    config, options = S33r.load_config(@yaml_file)
+    options[:email_to].should.equal Testing::EMAIL
+    # Make sure the 'options' section has not been included in the general config..
+    config.keys.should.not.include :options
+  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(Testing::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,
+    Testing::ACCESS_KEY, Testing::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 \
+    MethodNotAllowed
+  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 MissingRequiredHeaders
+  end
+
+  specify 'when generating auth header, should allow addition of Date and Content-Type headers' do
+    now = Time.now
+
+    fixed_headers = 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 generate correct x-amz-meta- headers from a hash' do
+    meta = {'myname' => 'elliot', 'myage' => 36}
+    headers = metadata_headers(meta)
+    headers.should.include 'x-amz-meta-myname'
+    headers.should.include 'x-amz-meta-myage'
+    headers['x-amz-meta-myname'].should.equal 'elliot'
+    headers['x-amz-meta-myage'].should.equal '36'
+  end
+
+  specify 'should not generate canned ACL header if invalid canned ACL supplied' do
+    lambda { canned_acl_header('duff') }.should.raise \
+    UnsupportedCannedACL
+  end
+
+  specify 'should correctly add canned ACL headers' do
+    new_headers = canned_acl_header('private')
+    new_headers.should.have(1).keys
+    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 = default_headers(@for_incomplete_headers)
+    fixed_headers['Content-Type'].should.equal ''
+    fixed_headers.include?('Date').should.not.be nil
+  end
+
+  specify 'should default to text/plain mimetype for unknown file types' do
+    guess_mime_type('hello.madeup').should.equal('text/plain')
+  end
+  
+  specify 'should generate correct Content-Disposition, Content-Type and Content-Transfer-Encoding headers' do
+    headers = content_headers('text/plain', 'download.jpg', true)
+    headers['Content-Type'].should.equal 'text/plain'
+    headers['Content-Disposition'].should.equal "attachment; filename=download.jpg"
+    
+    headers = content_headers('image/jpeg', '/home/you/me.jpg', true)
+    headers['Content-Type'].should.equal 'image/jpeg'
+    headers['Content-Transfer-Encoding'].should.equal 'binary'
+    headers['Content-Disposition'].should.equal "attachment; filename=me.jpg"
+  end
+
+  specify 'should recognise invalid bucket names' do
+    lambda { bucket_name_valid?(@with_invalid_bucket_name) }.should.raise \
+    MalformedBucketName
+    lambda { bucket_name_valid?(@with_invalid_bucket_name2) }.should.raise \
+    MalformedBucketName
+  end
+
+  specify 'should return empty string if generating querystring with no key/value pairs' do
+    generate_querystring({}).should_equal ''
+  end
+
+  specify 'should correctly format querystring key/value pairs' do
+    generate_querystring({'message' => 'Hello world', 'id' => 1, 'page' => '[2,4]'}).should_equal \
+    'message=Hello+world&id=1&page=%5B2%2C4%5D'
+  end
+
+  specify 'should allow symbols as names for querystring variables when generating querystrings' do
+    generate_querystring({ :prefix => '/home/ell' }).should.equal('prefix=%2Fhome%2Fell')
+  end
+
+  specify 'should convert integers to strings when generating querystrings' do
+    generate_querystring({ 'max-keys' => 400 }).should.equal('max-keys=400')
+  end
+  
+  specify 'should generate URLs with authentication parameters' do
+    s3_authenticated_url(Testing::ACCESS_KEY, Testing::SECRET_ACCESS_KEY, :bucket => 'quotes', \
+    :key => 'nelson', :expires => 1141889120).should.equal @correct_authenticated_url
+  end
+  
+  specify 'should be able to pass credentials as an option to the basic URL generator' do
+    s3_url(:access => Testing::ACCESS_KEY, :secret => Testing::SECRET_ACCESS_KEY, \
+    :authenticated => true, :bucket => 'quotes', :key => 'nelson', \
+    :expires => 1141889120).should.equal @correct_authenticated_url
+  end
+  
+  specify 'should generate correct public URLs' do
+    s3_public_url(:bucket => 'quotes', :key => 'nelson').should.equal @correct_public_url
+  end
+  
+  specify 'should correctly append querystring variables' do
+    s3_url(:bucket => 'quotes', :querystring => {'max-keys' => 400, 'prefix' => '/home'}).should.equal \
+    @correct_public_url_with_qstring
+  end
+  
+  specify 'should generate HTTPS URLs' do
+    s3_public_url(:bucket => 'quotes', :key => 'nelson', :use_ssl => true).should.equal @correct_public_ssl_url
+  end
+  
+  specify 'should generate public URLs with bucket name as subdomain' do
+    s3_public_url(:bucket => 'quotes', :key => 'nelson', :subdomain => true).should.equal \
+    @correct_public_url_with_subdomain
+    s3_public_url(:bucket => 'quotes', :key => 'nelson', :subdomain => true, :use_ssl => true).should.equal \
+    @correct_public_url_with_ssl_and_subdomain
+  end
+  
+  specify 'should generate URLs for buckets without keys' do
+    s3_public_url(:bucket => 'quotes').should.equal @correct_public_url_without_key
+  end
+  
+  specify 'should generate logging URLs' do
+    s3_url(:bucket => 'quotes', :logging => true).should.equal @correct_logging_url
+  end
+  
+  specify 'should generate ACL URLs' do
+    s3_url(:bucket => 'quotes', :acl => true).should.equal @correct_acl_url
+    s3_url(:bucket => 'quotes', :key => 'nelson', :acl => true).should.equal @correct_acl_url_with_key
+  end
+  
+  specify 'should turn off subdomain if authenticated URL' do
+    s3_url(:access => Testing::ACCESS_KEY, :secret => Testing::SECRET_ACCESS_KEY, \
+    :authenticated => true, :bucket => 'quotes', :key => 'nelson', :subdomain => true, \
+    :expires => 1141889120).should.equal @correct_authenticated_url
+  end
+  
+  specify 'should turn off subdomain if generating SSL URL' do
+    s3_url(:bucket => 'quotes', :key => 'nelson', :use_ssl => true, \
+    :subdomain => true).should.equal @correct_public_ssl_url
+  end
+  
+  specify 'should produce correct default expiry time if none specified, or time 50 years \
+  from now for :far_flung_future' do
+    class Time
+      alias :old_to_i :to_i
+      # N.B. the number below is the seconds since the epoch of now, defined above
+      def to_i ; 1168349580 ; end
+    end
+    
+    # Default to DEFAULT_EXPIRY_SECS from now
+    expected_expiry = Time.now.to_i + DEFAULT_EXPIRY_SECS
+    expires = S33r.parse_expiry
+    expires.should.equal expected_expiry
+    expires.should_be_kind_of Integer
+    
+    # If :far_flung_future is passed, default to 20 years from now.
+    expected_expiry = Time.now.to_i + 
+    (60 * 60 * 24 * 365.25 * 20).to_i
+    expires = S33r.parse_expiry(:far_flung_future)
+    expires.should.equal expected_expiry
+    expires.should_be_kind_of Integer
+    
+    class Time
+      remove_method(:to_i)
+      alias :to_i :old_to_i
+    end
+  end
+  
+  specify 'should correctly set expiry from a datetime string' do
+    datetime_str = '9th January 2007 13:33'
+    expected_expiry = Time.parse(datetime_str).to_i
+    expires = S33r.parse_expiry(datetime_str)
+    expires.should.equal expected_expiry
+    expires.should_be_kind_of Integer
+  end
+  
+  specify 'should provide a method for converting string keys of a hash into symbols' do
+    h = {'access' => Testing::ACCESS_KEY, 'secret' => Testing::SECRET_ACCESS_KEY}
+    symbolised = S33r.keys_to_symbols(h)
+    symbolised.should.equal({:access => Testing::ACCESS_KEY, :secret => Testing::SECRET_ACCESS_KEY})
+  end
+
+end