s33r 0.5.2 → 0.5.3

data/examples/fores33r/app/controllers/browser_controller.rb

@@ -40,8 +40,9 @@ class BrowserController < ApplicationController
   def delete
     bucket_name = params[:bucket_name]
     resource_key = params[:resource_key]
+    
     if resource_key
-      @s3.do_delete(:bucket => bucket_name, :key => resource_key)
+      @s3.do_delete(:bucket => bucket_name, :key => resource_key.to_s)
       to_url = url_for(:action => 'show_bucket', :bucket_name => bucket_name)
       notice = "Resource"
     else

data/examples/fores33r/app/views/browser/_create_bucket.rhtml

@@ -1,6 +1,6 @@
-<%= start_form_tag :action => 'create_bucket' %>
+<% form_for '', :url => {:action => 'create_bucket'} do %>
 <p>Create a new bucket: <%= text_field 'bucket', 'name' %></p>
 <p>Use your default bucket prefix (<strong><%= @default_prefix %></strong>)? 
 <%= check_box_tag 'bucket[prefix]', 1, true %></p>
 <p><%= submit_tag 'Create' %></p>
-<%= end_form_tag %>
+<% end %>

data/examples/fores33r/app/views/browser/_upload.rhtml

@@ -1,5 +1,5 @@
-<%= start_form_tag({:action => 'upload'}, :multipart => true) %>
+<% form_for '', :url => {:action => 'upload'}, :html => {:multipart => true} do %>
 <%= hidden_field 'upload', 'bucket_name', :value => @bucket_name %>
 <p>Upload a file to this bucket:<br /><%= file_field('upload', 'filename', :size => 20) %></p>
 <p><%= submit_tag 'Upload' %></p>
-<%= end_form_tag %>
+<% end %>

data/examples/fores33r/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '1.1.6'
+RAILS_GEM_VERSION = '1.2.1'
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -63,4 +63,4 @@ config, S3_OPTIONS =
 
 options = config.merge(S3_OPTIONS)
 
-S3_CLIENT = S33r::Client.new(options)
+S3_CLIENT = S33r::Client.new(options)

data/examples/fores33r/config/routes.rb

@@ -13,11 +13,17 @@ ActionController::Routing::Routes.draw do |map|
   # -- just remember to delete public/index.html.
   map.connect '', :controller => 'browser'
   
-  map.connect '/show_bucket/:bucket_name', :controller => 'browser', :action => 'show_bucket'
-  map.connect '/plain_bucket/:bucket_name/listing.txt', :controller => 'browser', :action => 'plain_bucket'
-  map.connect '/add_index/:bucket_name', :controller => 'browser', :action => 'add_index'
-  map.connect '/delete/:bucket_name', :controller => 'browser', :action => 'delete'
-  map.connect '/delete/:bucket_name/:resource_key', :controller => 'browser', :action => 'delete'
+  bucket = { :bucket_name => /.*/ }
+  map.connect '/show_bucket/:bucket_name', :controller => 'browser', :action => 'show_bucket', 
+  :requirements => bucket
+  map.connect '/plain_bucket/:bucket_name/listing.txt', :controller => 'browser', :action => 'plain_bucket',
+  :requirements => bucket
+  map.connect '/add_index/:bucket_name', :controller => 'browser', :action => 'add_index',
+  :requirements => bucket
+  map.connect '/delete/:bucket_name/key/:resource_key', :controller => 'browser', :action => 'delete',
+  :requirements => bucket.merge({:resource_key => /.*/})
+  map.connect '/delete/:bucket_name', :controller => 'browser', :action => 'delete', 
+  :requirements => bucket
   map.connect '/create_bucket', :controller => 'browser', :action => 'create_bucket'
 
   # Install the default route as the lowest priority.

data/lib/s33r.rb

@@ -10,15 +10,25 @@ require 'net/https'
 require 'stringio'
 
 require 'rubygems'
-require_gem 'builder'
+
+if respond_to? 'gem'
+  gem 'builder'
+else
+  require_gem 'builder'
+end
+
 
 begin
   require 'xml/libxml'
 rescue LoadError
-  require_gem 'libxml-ruby'
+  if respond_to? 'gem'
+    gem 'libxml-ruby'
+  else
+    require_gem 'libxml-ruby'
+  end
 end
 
-to_load = ['mimetypes', 'builder', 'libxml_extensions', 's33r_http', 'networking', 
+to_load = ['mimetypes', 'orderly_xml_markup', 'libxml_extensions', 's33r_http', 'networking', 
 's33r_exception', 'utility', 's3_acl', 's3_logging', 'bucket_listing', 'client', 'bucket', 's3_obj']
 
 base = File.join(File.dirname(__FILE__), 's33r')

data/lib/s33r/client.rb

@@ -211,10 +211,12 @@ module S33r
     # Delete a Bucket.
     # 
     # +options+:
-    # * <tt>:force => true</tt>: To clear the content of the bucket first.
+    # * <tt>:force => true</tt>: To clear the content of the bucket first. This option adds :escape => true to ensure bucket deletion.
+	# * <tt>:escape => true</tt>: CGI::escape keys when they are appended to the path.
     def delete_bucket(bucket_name, options={})
       options[:bucket] = bucket_name
       if options[:force]
+        options[:escape] = true
         listing(options).keys.each { |key| do_delete(options.merge(:key => key)) }
       end
       do_delete(options).ok?

data/lib/s33r/{builder.rb → orderly_xml_markup.rb}

@@ -1,6 +1,8 @@
+require 'builder'
+
 module S33r
   # Variant of XmlMarkup which explicitly orders attributes.
-  class OrderlyXmlMarkup < Builder::XmlMarkup
+  class OrderlyXmlMarkup < ::Builder::XmlMarkup
   
     # Override Builder _insert_attributes so attributes are ordered.
     def _insert_attributes(attrs, order=[])

data/lib/s33r/utility.rb

@@ -281,7 +281,8 @@ module S33r
     str
   end
   
-  # Returns the path for this bucket and key.
+  # Returns the path for this bucket and key. By default, keys are not CGI-escaped; if you want 
+  # escaping, use the <tt>:escape => true</tt> option.
   #
   # +options+:
   # * <tt>:bucket => 'my-bucket'</tt>: get a path which includes the bucket (unless 
@@ -293,6 +294,7 @@ module S33r
   # * <tt>:subdomain => true</tt>: don't include the bucket name in the path.
   # * <tt>:acl => true</tt>: append ?acl to the front of the querystring.
   # * <tt>:logging => true</tt>: append ?logging to the start of the querystring.
+  # * <tt>:escape => true</tt>: CGI::escape keys when they are appended to the path.
   def s3_path(options={})
     bucket = options[:bucket]
     key = options[:key]
@@ -308,7 +310,10 @@ module S33r
   
     path = '/'
     path += (bucket + '/') if bucket and !options[:subdomain]
-    path += key if key
+    if key
+      key = CGI::escape(key) if options[:escape]
+      path += key
+    end
     path += '?' + qstring unless '' == qstring
     path
   end

data/test/cases/spec_acl.rb

@@ -42,32 +42,32 @@ context 'S33r ACL functions' do
   end
   
   specify 'should represent a grant for a CanonicalUser' do
-     clean_xml(@canonical_user_grant.to_xml).should.equal @acl_grant_xml1
+     clean_xml(@canonical_user_grant.to_xml).should == @acl_grant_xml1
   end
   
   specify 'should represent a grant for an AmazonUserByEmail' do
-     clean_xml(@amazon_grant.to_xml).should.equal @acl_grant_xml2
+     clean_xml(@amazon_grant.to_xml).should == @acl_grant_xml2
   end
   
   specify 'should represent a grant for AllUsers' do
-     clean_xml(@group_grant.to_xml).should.equal @acl_grant_xml3
+     clean_xml(@group_grant.to_xml).should == @acl_grant_xml3
   end
   
   specify 'should represent a grant for AuthenticatedUsers' do
-     clean_xml(@group_grant2.to_xml).should.equal @acl_grant_xml4
+     clean_xml(@group_grant2.to_xml).should == @acl_grant_xml4
   end
   
   specify 'should generate a valid AccessControlPolicy document' do
-    clean_xml(@full_acl_doc.to_xml).should.equal @full_acl_xml
+    clean_xml(@full_acl_doc.to_xml).should == @full_acl_xml
   end
   
   specify 'should provide convenience classes for grants' do
-    clean_xml(@con_full_acl_doc.to_xml).should.equal @full_acl_xml
+    clean_xml(@con_full_acl_doc.to_xml).should == @full_acl_xml
   end
   
   specify 'needs equality method for grantees' do
     test_grantee = Group.new(:all_users)
-    test_grantee.should.equal @group_grantee
+    test_grantee.should == @group_grantee
     test_grantee.should.not.equal @amazon_grantee
   end
   
@@ -82,7 +82,7 @@ context 'S33r ACL functions' do
   	"</Grantee>"
   	doc = XML.get_xml_doc(xml)
   	grantee = Grantee.from_xml(doc)
-  	grantee.should.equal @amazon_grantee
+  	grantee.should == @amazon_grantee
   end
   
   specify 'should correctly create Group grantee from XML node' do
@@ -91,7 +91,7 @@ context 'S33r ACL functions' do
   	"</Grantee>"
   	doc = XML.get_xml_doc(xml)
   	grantee = Grantee.from_xml(doc)
-  	grantee.should.equal @group_grantee
+  	grantee.should == @group_grantee
   end
   
   specify 'should correctly create Group grantee for AuthenticatedUsers from XML node' do
@@ -100,14 +100,14 @@ context 'S33r ACL functions' do
   	"</Grantee>"
   	doc = XML.get_xml_doc(xml)
   	grantee = Grantee.from_xml(doc)
-  	grantee.should.equal @group_grantee2
+  	grantee.should == @group_grantee2
   	p grantee.group_type
   	p @group_grantee2.group_type
   end
   
   specify 'should parse AccessControlPolicy documents' do
     acl_doc_from_xml = Policy.from_xml(@full_acl_xml)
-    acl_doc_from_xml.owner.should.equal @full_acl_doc.owner
+    acl_doc_from_xml.owner.should == @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

data/test/cases/spec_bucket_listing.rb

@@ -35,22 +35,22 @@ context 'S33r bucket listing' do
   end
 
   specify 'should present bucket metadata as typed properties' do
-    @bucket_listing.name.should.equal('testingtesting')
-    @bucket_listing.prefix.should.equal('')
-    @bucket_listing.marker.should.equal('')
-    @bucket_listing.max_keys.should.equal(1000)
-    @bucket_listing.is_truncated.should.equal(false)
+    @bucket_listing.name.should ==('testingtesting')
+    @bucket_listing.prefix.should ==('')
+    @bucket_listing.marker.should ==('')
+    @bucket_listing.max_keys.should ==(1000)
+    @bucket_listing.is_truncated.should ==(false)
     @bucket_listing.delimiter.should.be nil
   end
 
   specify 'when listing XML is reset, should update all properties correctly' do
     @bucket_listing.set_listing_xml(@with_bucket_listing_xml2)
-    @bucket_listing.name.should.equal('testing2')
-    @bucket_listing.prefix.should.equal('/home/ell/')
-    @bucket_listing.marker.should.equal('')
-    @bucket_listing.max_keys.should.equal(100)
-    @bucket_listing.delimiter.should.equal('/')
-    @bucket_listing.is_truncated.should.equal(false)
+    @bucket_listing.name.should ==('testing2')
+    @bucket_listing.prefix.should ==('/home/ell/')
+    @bucket_listing.marker.should ==('')
+    @bucket_listing.max_keys.should ==(100)
+    @bucket_listing.delimiter.should ==('/')
+    @bucket_listing.is_truncated.should ==(false)
   end
 
   specify 'should provide private setters for metadata' do
@@ -59,7 +59,7 @@ context 'S33r bucket listing' do
     # names of the setters
     setters = @bucket_property_setters
     # all methods should be a superset of the private setters
-    methods.superset?(setters.to_set).should.equal true
+    methods.superset?(setters.to_set).should == true
   end
 
   specify 'should store resources (<Contents> elements) in a hash' do

data/test/cases/spec_logging.rb

@@ -21,11 +21,11 @@ context 'S33r logging' do
   end
   
   specify 'should generate BucketLoggingStatus XML document to enable logging' do
-    clean_xml(@logging_resource_to_enable.to_xml).should.equal @logging_enabled_xml
+    clean_xml(@logging_resource_to_enable.to_xml).should == @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
+    clean_xml(@logging_resource_to_disable.to_xml).should == @logging_disabled_xml
   end
   
   specify 'should represent LogDelivery grants so buckets can act as logging targets' do
@@ -42,6 +42,6 @@ context 'S33r logging' do
   
   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
+    clean_xml(@logging_acl_doc_no_grants.to_xml).should == @logging_acl_xml
   end
 end

data/test/cases/spec_s3_object.rb

@@ -23,15 +23,15 @@ context 'S3 object' do
   end
 
   specify 'can be initialised from XML fragment with correct data types' do
-    @s3obj.key.should.equal '/home/ell/dir1/four.txt'
+    @s3obj.key.should == '/home/ell/dir1/four.txt'
     d = @s3obj.last_modified
-    [d.year, d.month, d.day, d.hour, d.min, d.sec].should.equal [2006, 8, 19, 22, 53, 29]
-    @s3obj.etag.should.equal '24ce59274b89287b3960c184153ac24b'
-    @s3obj.size.should.equal 14
+    [d.year, d.month, d.day, d.hour, d.min, d.sec].should == [2006, 8, 19, 22, 53, 29]
+    @s3obj.etag.should == '24ce59274b89287b3960c184153ac24b'
+    @s3obj.size.should == 14
   end
   
   specify 'can be associated with bucket on creation' do
-    @s3obj2.bucket.name.should.equal 'quotes'
+    @s3obj2.bucket.name.should == 'quotes'
   end
   
   specify 'can be created from a file' do
@@ -39,7 +39,7 @@ context 'S3 object' do
   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 \
+    [@s3obj.owner.user_id, @s3obj.owner.display_name].should == \
     ['56efddfead5aa65da942f156fb2b294f44d78fd932d701331edc5fba19620fd4', 'elliotsmith3']
     @s3obj.owner.should_be_instance_of S3ACL::CanonicalUser
   end
@@ -57,18 +57,18 @@ context 'S3 object' do
   end
   
   specify 'should return authenticated URL' do
-    @s3obj2.url(:authenticated => true, :expires => 1141889120).should.equal @correct_authenticated_url
+    @s3obj2.url(:authenticated => true, :expires => 1141889120).should == @correct_authenticated_url
   end
   
   specify 'should return public URL' do
-    @s3obj2.url.should.equal @correct_public_url
+    @s3obj2.url.should == @correct_public_url
   end
   
   specify 'should optionally return HTTPS URL' do
-    @s3obj2.url(:use_ssl => true).should.equal @correct_public_url_with_ssl
+    @s3obj2.url(:use_ssl => true).should == @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
+    @s3obj2.url(:subdomain => true).should == @correct_public_url_with_subdomain
   end
 end

data/test/cases/spec_utility.rb

@@ -45,38 +45,40 @@ context 'S33r utility' do
     @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"
+    @url_with_escaped_key = "http://s3.amazonaws.com/quotes/some+key"
+    @url_with_unescaped_key = "http://s3.amazonaws.com/quotes/some key"
   end
   
   specify 'should load config files containing standard S33r settings' do
     config, _ = S33r.load_config(@yaml_file)
-    config[:access].should.equal Testing::ACCESS_KEY
+    config[:access].should == 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
+    config[:secret].should == 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
+    options[:email_to].should == 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
+    @for_request_headers).should == @correct_canonical_string
   end
 
   specify 'should generate correct signatures' do
     generate_signature(Testing::SECRET_ACCESS_KEY,
-    @correct_canonical_string).should.equal @correct_signature
+    @correct_canonical_string).should == @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
+    Testing::ACCESS_KEY, Testing::SECRET_ACCESS_KEY).should == @correct_auth_header
   end
 
   specify 'should not generate auth header if bad HTTP method passed' do
@@ -95,8 +97,8 @@ context 'S33r utility' do
     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'
+    fixed_headers['Date'].should == now.httpdate
+    fixed_headers['Content-Type'].should == 'text/html'
   end
   
   specify 'should generate correct x-amz-meta- headers from a hash' do
@@ -104,8 +106,8 @@ context 'S33r utility' do
     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'
+    headers['x-amz-meta-myname'].should == 'elliot'
+    headers['x-amz-meta-myage'].should == '36'
   end
 
   specify 'should not generate canned ACL header if invalid canned ACL supplied' do
@@ -117,28 +119,28 @@ context 'S33r utility' 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'
+    new_headers['x-amz-acl'].should == '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['Content-Type'].should == ''
     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')
+    guess_mime_type('hello.madeup').should ==('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-Type'].should == 'text/plain'
+    headers['Content-Disposition'].should == "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"
+    headers['Content-Type'].should == 'image/jpeg'
+    headers['Content-Transfer-Encoding'].should == 'binary'
+    headers['Content-Disposition'].should == "attachment; filename=me.jpg"
   end
 
   specify 'should recognise invalid bucket names' do
@@ -149,75 +151,75 @@ context 'S33r utility' do
   end
 
   specify 'should return empty string if generating querystring with no key/value pairs' do
-    generate_querystring({}).should_equal ''
+    generate_querystring({}).should == ''
   end
 
   specify 'should correctly format querystring key/value pairs' do
-    generate_querystring({'message' => 'Hello world', 'id' => 1, 'page' => '[2,4]'}).should_equal \
+    generate_querystring({'message' => 'Hello world', 'id' => 1, 'page' => '[2,4]'}).should == \
     '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')
+    generate_querystring({ :prefix => '/home/ell' }).should ==('prefix=%2Fhome%2Fell')
   end
 
   specify 'should convert integers to strings when generating querystrings' do
-    generate_querystring({ 'max-keys' => 400 }).should.equal('max-keys=400')
+    generate_querystring({ 'max-keys' => 400 }).should ==('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
+    :key => 'nelson', :expires => 1141889120).should == @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
+    :expires => 1141889120).should == @correct_authenticated_url
   end
   
   specify 'should generate correct public URLs' do
-    s3_public_url(:bucket => 'quotes', :key => 'nelson').should.equal @correct_public_url
+    s3_public_url(:bucket => 'quotes', :key => 'nelson').should == @correct_public_url
   end
   
   specify 'should correctly append querystring variables' do
-    s3_url(:bucket => 'quotes', :querystring => {'max-keys' => 400, 'prefix' => '/home'}).should.equal \
+    s3_url(:bucket => 'quotes', :querystring => {'max-keys' => 400, 'prefix' => '/home'}).should == \
     @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
+    s3_public_url(:bucket => 'quotes', :key => 'nelson', :use_ssl => true).should == @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 \
+    s3_public_url(:bucket => 'quotes', :key => 'nelson', :subdomain => true).should == \
     @correct_public_url_with_subdomain
-    s3_public_url(:bucket => 'quotes', :key => 'nelson', :subdomain => true, :use_ssl => true).should.equal \
+    s3_public_url(:bucket => 'quotes', :key => 'nelson', :subdomain => true, :use_ssl => true).should == \
     @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
+    s3_public_url(:bucket => 'quotes').should == @correct_public_url_without_key
   end
   
   specify 'should generate logging URLs' do
-    s3_url(:bucket => 'quotes', :logging => true).should.equal @correct_logging_url
+    s3_url(:bucket => 'quotes', :logging => true).should == @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
+    s3_url(:bucket => 'quotes', :acl => true).should == @correct_acl_url
+    s3_url(:bucket => 'quotes', :key => 'nelson', :acl => true).should == @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
+    :expires => 1141889120).should == @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
+    :subdomain => true).should == @correct_public_ssl_url
   end
   
   specify 'should produce correct default expiry time if none specified, or time 50 years \
@@ -231,14 +233,14 @@ context 'S33r utility' do
     # 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 == 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 == expected_expiry
     expires.should_be_kind_of Integer
     
     class Time
@@ -251,14 +253,19 @@ context 'S33r utility' 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 == 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})
+    symbolised.should ==({:access => Testing::ACCESS_KEY, :secret => Testing::SECRET_ACCESS_KEY})
+  end
+  
+  specify 'can optionally escape keys passed in paths' do
+    s3_url(:bucket => 'quotes', :key => 'some key', :escape => true).should == @url_with_escaped_key
+    s3_url(:bucket => 'quotes', :key => 'some key').should == @url_with_unescaped_key
   end
 
 end