radosgw-s3 0.1

data/test/object_test.rb

@@ -0,0 +1,223 @@
+# encoding: utf-8
+require "test_helper"
+
+class ObjectTest < Test::Unit::TestCase
+  def setup
+    @service = S3::Service.new(
+      :access_key_id => "1234",
+	:host =>  "192.168.1.248",
+      :secret_access_key => "1337"
+    )
+    @bucket_images = S3::Bucket.send(:new, @service, "images")
+    @object_lena = S3::Object.send(:new, @bucket_images, :key => "Lena.png")
+    @object_lena.content = "test"
+    @object_carmen = S3::Object.send(:new, @bucket_images, :key => "Carmen.png")
+    @object_mac = S3::Object.send(:new, @bucket_images, :key => "Mac.png", :cache_control => "max-age=315360000")
+    @object_mac.content = "test2"
+
+    @response_binary = Net::HTTPOK.new("1.1", "200", "OK")
+    @response_binary.stubs(:body).returns("test".respond_to?(:force_encoding) ? "test".force_encoding(Encoding::BINARY) : "test")
+    @response_binary["etag"] = ""
+    @response_binary["content-type"] = "image/png"
+    @response_binary["content-disposition"] = "inline"
+    @response_binary["content-encoding"] = nil
+    @response_binary["last-modified"] = Time.now.httpdate
+    @response_binary["content-length"] = 20
+    @response_binary["x-amz-meta-test"] = "metadata"
+
+    @xml_body = <<-EOXML
+    <?xml version="1.0" encoding="UTF-8"?>
+    <CopyObjectResult> <LastModified>#{Time.now.httpdate}</LastModified> <ETag>"etag"</ETag> </CopyObjectResult>
+    EOXML
+    @response_xml = Net::HTTPOK.new("1.1", "200", "OK")
+    @response_xml.stubs(:body).returns(@xml_body)
+  end
+
+  test "initializing" do
+    assert_raise ArgumentError do S3::Object.send(:new, nil, :key => "") end # should not allow empty key
+
+    assert_nothing_raised do
+      S3::Object.send(:new, nil, :key => "Lena.png")
+      S3::Object.send(:new, nil, :key => "Lena playboy.png")
+      S3::Object.send(:new, nil, :key => "Lena Söderberg.png")
+      S3::Object.send(:new, nil, :key => "/images/pictures/test images/Lena not full.png")
+    end
+  end
+
+  test "==" do
+    expected = false
+    actual = @object_lena == nil
+    assert_equal(expected, actual)
+  end
+
+  test "full key" do
+    expected = "images/Lena.png"
+    actual = @object_lena.full_key
+    assert_equal expected, actual
+  end
+
+  test "url" do
+    bucket1 = S3::Bucket.send(:new, @service, "images")
+
+    object11 = S3::Object.send(:new, bucket1, :key => "Lena.png")
+    expected = "http://images.s3.amazonaws.com/Lena.png"
+    actual = object11.url
+    assert_equal expected, actual
+
+    object12 = S3::Object.send(:new, bucket1, :key => "Lena Söderberg.png")
+    expected = "http://images.s3.amazonaws.com/Lena%20S%C3%B6derberg.png"
+    actual = object12.url
+    assert_equal expected, actual
+
+    object13 = S3::Object.send(:new, bucket1, :key => "Lena Söderberg [1].png")
+    expected = "http://images.s3.amazonaws.com/Lena%20S%C3%B6derberg%20%5B1%5D.png"
+    actual = object13.url
+    assert_equal expected, actual
+
+    bucket2 = S3::Bucket.send(:new, @service, "images_new")
+
+    object21 = S3::Object.send(:new, bucket2, :key => "Lena.png")
+    expected = "http://s3.amazonaws.com/images_new/Lena.png"
+    actual = object21.url
+    assert_equal expected, actual
+  end
+
+  test "cname url" do
+    bucket1 = S3::Bucket.send(:new, @service, "images.example.com")
+
+    object11 = S3::Object.send(:new, bucket1, :key => "Lena.png")
+    expected = "http://images.example.com/Lena.png"
+    actual = object11.cname_url
+    assert_equal expected, actual
+
+    object12 = S3::Object.send(:new, bucket1, :key => "Lena Söderberg.png")
+    expected = "http://images.example.com/Lena%20S%C3%B6derberg.png"
+    actual = object12.cname_url
+    assert_equal expected, actual
+
+    bucket2 = S3::Bucket.send(:new, @service, "images_new")
+
+    object21 = S3::Object.send(:new, bucket2, :key => "Lena.png")
+    expected = nil
+    actual = object21.cname_url
+    assert_equal expected, actual
+  end
+
+  test "destroy" do
+    @object_lena.expects(:object_request).with(:delete)
+    assert @object_lena.destroy
+  end
+
+  test "save" do
+    @object_lena.expects(:object_request).with(:put, :body=>"test", :headers=>{ :x_amz_acl=>"private", :x_amz_storage_class=>"STANDARD", :content_type=>"application/octet-stream" }).returns(@response_binary)
+    assert @object_lena.save
+  end
+
+  test "save with cache control headers" do
+    assert_equal "max-age=315360000", @object_mac.cache_control
+    @object_mac.expects(:object_request).with(:put, :body=>"test2", :headers=>{ :x_amz_acl=>"private", :x_amz_storage_class=>"STANDARD", :content_type=>"application/octet-stream", :cache_control=>"max-age=315360000" }).returns(@response_binary)
+    assert @object_mac.save
+  end
+
+  test "content and parse headers" do
+    @object_lena.expects(:object_request).with(:get, {}).returns(@response_binary)
+
+    expected = /test/n
+    actual = @object_lena.content(true)
+    assert_match expected, actual
+    assert_equal "image/png", @object_lena.content_type
+
+    assert @object_lena.content
+
+    @object_lena.expects(:object_request).with(:get, {}).returns(@response_binary)
+    assert @object_lena.content(true)
+  end
+
+  test "retrieve" do
+    @object_lena.expects(:object_request).with(:head, {}).returns(@response_binary)
+    assert @object_lena.retrieve
+  end
+
+  test "retrieve headers" do
+    @object_lena.expects(:object_request).twice.with(:head, {}).returns(@response_binary)
+    assert @object_lena.retrieve
+
+    meta = {"x-amz-meta-test" => ["metadata"]}
+    assert_equal meta, @object_lena.retrieve.metadata
+  end
+
+  test "retrieve dont set content" do
+    @object_lena.send(:remove_instance_variable, :@content)
+
+    @response_binary.stubs(:body).returns(nil)
+    @object_lena.expects(:object_request).with(:head, {}).returns(@response_binary)
+    assert @object_lena.retrieve
+
+    @object_lena.expects(:object_request).with(:get, {}).returns(@response_binary)
+    @response_binary.stubs(:body).returns("hello")
+
+    assert_equal "hello", @object_lena.content
+  end
+
+  test "exists" do
+    @object_lena.expects(:retrieve).returns(true)
+    assert @object_lena.exists?
+
+    @object_carmen.expects(:retrieve).raises(S3::Error::NoSuchKey.new(nil, nil))
+    assert ! @object_carmen.exists?
+  end
+
+  test "ACL writer" do
+    expected = nil
+    actual = @object_lena.acl
+    assert_equal expected, actual
+
+    assert @object_lena.acl = :public_read
+
+    expected = "public-read"
+    actual = @object_lena.acl
+    assert_equal expected, actual
+
+    assert @object_lena.acl = :private
+
+    expected = "private"
+    actual = @object_lena.acl
+    assert_equal expected, actual
+  end
+
+  test "storage-class writer" do
+    expected = nil
+    actual = @object_lena.storage_class
+    assert_equal expected, actual
+
+    assert @object_lena.storage_class = :standard
+
+    expected = "STANDARD"
+    actual = @object_lena.storage_class
+    assert_equal expected, actual
+
+    assert @object_lena.storage_class = :reduced_redundancy
+
+    expected = "REDUCED_REDUNDANCY"
+    actual = @object_lena.storage_class
+    assert_equal expected, actual
+  end
+
+  test "replace" do
+    @bucket_images.expects(:bucket_request).with(:put, :path => "Lena-copy.png", :headers => { :x_amz_acl => "private", :content_type => "application/octet-stream", :x_amz_copy_source => "images/Lena.png", :x_amz_metadata_directive => "REPLACE" }).returns(@response_xml)
+
+    new_object = @object_lena.copy(:key => "Lena-copy.png")
+
+    assert_equal "Lena-copy.png", new_object.key
+    assert_equal "Lena.png", @object_lena.key
+  end
+
+  test "copy" do
+    @bucket_images.expects(:bucket_request).with(:put, :path => "Lena-copy.png", :headers => { :x_amz_acl => "private", :content_type => "application/octet-stream", :x_amz_copy_source => "images/Lena.png", :x_amz_metadata_directive => "COPY" }).returns(@response_xml)
+
+    new_object = @object_lena.copy(:key => "Lena-copy.png", :replace => false)
+
+    assert_equal "Lena-copy.png", new_object.key
+    assert_equal "Lena.png", @object_lena.key
+  end
+end

data/test/service_test.rb

@@ -0,0 +1,133 @@
+require "test_helper"
+
+class ServiceTest < Test::Unit::TestCase
+  def setup
+    @buckets_list_body = <<-EOBuckets
+    <?xml version="1.0" encoding="UTF-8"?>\n<ListAllMyBucketsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> <Owner> <ID>123u1odhkhfoadf</ID> <DisplayName>JohnDoe</DisplayName> </Owner> <Buckets> <Bucket> <Name>data.example.com</Name> <CreationDate>2009-07-02T11:56:58.000Z</CreationDate> </Bucket> <Bucket> <Name>images</Name> <CreationDate>2009-06-05T12:26:33.000Z</CreationDate> </Bucket> </Buckets> </ListAllMyBucketsResult>
+    EOBuckets
+
+    @bucket_not_exists = <<-EOBucketNoexists
+    <?xml version="1.0" encoding="UTF-8"?>\n<Error> <Code>NoSuchBucket</Code> <Message>The specified bucket does not exists</Message> <BucketName>data2.example.com</BucketName> <RequestId>8D7519AAE74E9E99</RequestId> <HostId>DvKnnNSMnPHd1oXukyRaFNv8Lg/bpwhuUtY8Kj7eDLbaIrIT8JebSnHwi89AK1P+</HostId> </Error>
+    EOBucketNoexists
+
+    @bucket_exists = <<-EOBucketexists
+    <?xml version="1.0" encoding="UTF-8"?>\n<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> <Name>data.synergypeople.net</Name> <Prefix></Prefix> <Marker></Marker> <MaxKeys>1000</MaxKeys> <IsTruncated>false</IsTruncated> </ListBucketResult>
+    EOBucketexists
+
+    @service_empty_buckets_list = S3::Service.new(
+      :access_key_id =>  "12345678901234567890",
+	:host =>  "192.168.1.248",
+      :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
+    )
+    @response_empty_buckets_list = Net::HTTPOK.new("1.1", "200", "OK")
+    @service_empty_buckets_list.stubs(:service_request).returns(@response_empty_buckets_list)
+    @response_empty_buckets_list.stubs(:body).returns(@buckets_empty_list_body)
+
+    @service_buckets_list = S3::Service.new(
+      :access_key_id =>  "12345678901234567890",
+	:host =>  "192.168.1.248",
+      :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
+    )
+    @response_buckets_list = Net::HTTPOK.new("1.1", "200", "OK")
+    @service_buckets_list.stubs(:service_request).returns(@response_buckets_list)
+    @response_buckets_list.stubs(:body).returns(@buckets_list_body)
+
+    @service_bucket_exists = S3::Service.new(
+      :access_key_id =>  "12345678901234567890",
+	:host =>  "192.168.1.248",
+      :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
+    )
+    @response_bucket_exists = Net::HTTPNotFound.new("1.1", "200", "OK")
+    @service_bucket_exists.stubs(:service_request).returns(@response_bucket_exists)
+    @response_bucket_exists.stubs(:body).returns(@bucket_exists)
+
+    @service_bucket_not_exists = S3::Service.new(
+      :access_key_id =>  "12345678901234567890",
+	:host =>  "192.168.1.248",
+      :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
+    )
+    @response_bucket_not_exists = Net::HTTPNotFound.new("1.1", "404", "Not Found")
+    @service_bucket_not_exists.stubs(:service_request).raises(S3::Error::NoSuchBucket.new(404, @response_bucket_not_exists))
+    @response_bucket_not_exists.stubs(:body).returns(@bucket_not_exists)
+
+    @buckets_empty_list = []
+    @buckets_empty_list_body = <<-EOEmptyBuckets
+    <?xml version="1.0" encoding="UTF-8"?>\n<ListAllMyBucketsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> <Owner> <ID>123u1odhkhfoadf</ID> <DisplayName>JohnDoe</DisplayName> </Owner> <Buckets> </Buckets> </ListAllMyBucketsResult>
+    EOEmptyBuckets
+
+    @buckets_list = [
+      S3::Bucket.send(:new, @service_buckets_list, "data.example.com"),
+      S3::Bucket.send(:new, @service_buckets_list, "images")
+    ]
+  end
+
+  test "no :access_key_id" do
+    assert_raise ArgumentError do
+      @service_bucket_exists = S3::Service.new(
+        :access_key_id =>  nil,
+	:host =>  "192.168.1.248",
+        :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
+      )
+    end
+  end
+
+  test "no :secret_access_key" do
+    assert_raise ArgumentError do
+      @service_bucket_exists = S3::Service.new(
+        :access_key_id =>  "12345678901234567890",
+	:host =>  "192.168.1.248",
+        :secret_access_key =>  nil
+      )
+    end
+  end
+
+  test "buckets and parse buckets empty" do
+    expected = @buckets_empty_list
+    actual = @service_empty_buckets_list.buckets
+    assert_equal expected.length, actual.length
+    assert_equal expected, actual
+  end
+
+  test "buckets and parse buckets" do
+    expected = @buckets_list
+    # ugly hack
+    actual = @service_buckets_list.buckets.map { |obj| obj }
+    assert_equal expected, actual
+  end
+
+  test "buckets build" do
+    @service_empty_buckets_list.stubs(:service_request)
+
+    expected = "bucket_name"
+    actual = @service_empty_buckets_list.buckets.build("bucket_name")
+    assert_kind_of S3::Bucket, actual
+    assert_equal expected, actual.name
+  end
+
+  test "buckets find first" do
+    assert_nothing_raised do
+      actual = @service_buckets_list.buckets.find_first("data.example.com")
+      assert_equal "data.example.com", actual.name
+    end
+  end
+
+  test "buckets find first return nil" do
+    assert_equal nil, @service_bucket_not_exists.buckets.find_first("data2.example.com")
+  end
+
+  test "buckets find all on empty list" do
+    assert_nothing_raised do
+      expected = @buckets_empty_list
+      actual = @service_empty_buckets_list.buckets.find_all
+      assert_equal expected, actual
+    end
+  end
+
+  test "buckets find all" do
+    assert_nothing_raised do
+      expected = @buckets_list
+      actual = @service_buckets_list.buckets.find_all
+      assert_equal expected, actual
+    end
+  end
+end

data/test/signature_test.rb

@@ -0,0 +1,228 @@
+require "test_helper"
+
+class SignatureTest < Test::Unit::TestCase
+  # from http://docs.amazonwebservices.com/AmazonS3/latest/RESTAuthentication.html
+  test "signature for object get" do
+    request = Net::HTTP::Get.new("/photos/puppy.jpg")
+    request["host"] = "johnsmith.s3.amazonaws.com"
+    request["date"] = "Tue, 27 Mar 2007 19:36:42 +0000"
+
+    actual = S3::Signature.generate(
+      :host => request["host"],
+      :request => request,
+      :access_key_id => "0PN5J17HBGZHT7JJ3X82",
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o"
+    )
+    expected = "AWS 0PN5J17HBGZHT7JJ3X82:xXjDGYUmKxnwqr5KXNPGldn5LbA="
+    assert_equal expected, actual
+  end
+
+  test "signature for object put" do
+    request = Net::HTTP::Put.new("/photos/puppy.jpg");
+    request["content-type"] = "image/jpeg"
+    request["content-length"] = "94328"
+    request["host"] = "johnsmith.s3.amazonaws.com"
+    request["date"] = "Tue, 27 Mar 2007 21:15:45 +0000"
+
+    actual = S3::Signature.generate(
+      :host => request["host"],
+      :request => request,
+      :access_key_id => "0PN5J17HBGZHT7JJ3X82",
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o"
+    )
+    expected = "AWS 0PN5J17HBGZHT7JJ3X82:hcicpDDvL9SsO6AkvxqmIWkmOuQ="
+    assert_equal expected, actual
+  end
+
+  test "signature for list" do
+    request = Net::HTTP::Get.new("/?prefix=photos&max-keys=50&marker=puppy");
+    request["user-agent"] = "Mozilla/5.0"
+    request["host"] = "johnsmith.s3.amazonaws.com"
+    request["date"] = "Tue, 27 Mar 2007 19:42:41 +0000"
+
+    actual = S3::Signature.generate(
+      :host => request["host"],
+      :request => request,
+      :access_key_id => "0PN5J17HBGZHT7JJ3X82",
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o"
+    )
+    expected = "AWS 0PN5J17HBGZHT7JJ3X82:jsRt/rhG+Vtp88HrYL706QhE4w4="
+    assert_equal expected, actual
+  end
+
+  test "signature for fetch" do
+    request = Net::HTTP::Get.new("/?acl");
+    request["host"] = "johnsmith.s3.amazonaws.com"
+    request["date"] = "Tue, 27 Mar 2007 19:44:46 +0000"
+
+    actual = S3::Signature.generate(
+      :host => request["host"],
+      :request => request,
+      :access_key_id => "0PN5J17HBGZHT7JJ3X82",
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o"
+    )
+    expected = "AWS 0PN5J17HBGZHT7JJ3X82:thdUi9VAkzhkniLj96JIrOPGi0g="
+    assert_equal expected, actual
+  end
+
+  test "signature for delete" do
+    request = Net::HTTP::Delete.new("/johnsmith/photos/puppy.jpg");
+    request["user-agent"] = "dotnet"
+    request["host"] = "s3.amazonaws.com"
+    request["date"] = "Tue, 27 Mar 2007 21:20:27 +0000"
+    request["x-amz-date"] = "Tue, 27 Mar 2007 21:20:26 +0000"
+
+    actual = S3::Signature.generate(
+      :host => request["host"],
+      :request => request,
+      :access_key_id => "0PN5J17HBGZHT7JJ3X82",
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o"
+    )
+    expected = "AWS 0PN5J17HBGZHT7JJ3X82:k3nL7gH3+PadhTEVn5Ip83xlYzk="
+    assert_equal expected, actual
+  end
+
+  test "signature for upload" do
+    request = Net::HTTP::Put.new("/db-backup.dat.gz");
+    request["user-agent"] = "curl/7.15.5"
+    request["host"] = "static.johnsmith.net:8080"
+    request["date"] = "Tue, 27 Mar 2007 21:06:08 +0000"
+    request["x-amz-acl"] = "public-read"
+    request["content-type"] = "application/x-download"
+    request["content-md5"] = "4gJE4saaMU4BqNR0kLY+lw=="
+    # FIXME: Net::HTTP doesn't allow to have multiple headers with the same name
+    # request.add_field add additional spaces (breaks signature)
+    #request["x-amz-meta-reviewedby"] = "joe@johnsmith.net"
+    #request["x-amz-meta-reviewedby"] = "jane@johnsmith.net"
+    request["x-amz-meta-reviewedby"] = "joe@johnsmith.net,jane@johnsmith.net"
+    request["x-amz-meta-filechecksum"] = "0x02661779"
+    request["x-amz-meta-checksumalgorithm"] = "crc32"
+    request["content-disposition"] = "attachment; filename=database.dat"
+    request["content-encoding"] = "gzip"
+    request["content-length"] = "5913339"
+
+    actual = S3::Signature.generate(
+      :host => "static.johnsmith.net",
+      :request => request,
+      :access_key_id => "0PN5J17HBGZHT7JJ3X82",
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o"
+    )
+    expected = "AWS 0PN5J17HBGZHT7JJ3X82:C0FlOtU8Ylb9KDTpZqYkZPX91iI="
+    assert_equal expected, actual
+  end
+
+  test "signature for list all my buckets" do
+    request = Net::HTTP::Get.new("/");
+    request["host"] = "s3.amazonaws.com"
+    request["date"] = "Wed, 28 Mar 2007 01:29:59 +0000"
+
+    actual = S3::Signature.generate(
+      :host => request["host"],
+      :request => request,
+      :access_key_id => "0PN5J17HBGZHT7JJ3X82",
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o"
+    )
+    expected = "AWS 0PN5J17HBGZHT7JJ3X82:Db+gepJSUbZKwpx1FR0DLtEYoZA="
+    assert_equal expected, actual
+  end
+
+  test "signature for unicode keys" do
+    request = Net::HTTP::Get.new("/dictionary/fran%C3%A7ais/pr%c3%a9f%c3%a8re");
+    request["host"] = "s3.amazonaws.com"
+    request["date"] = "Wed, 28 Mar 2007 01:49:49 +0000"
+
+    actual = S3::Signature.generate(
+      :host => request["host"],
+      :request => request,
+      :access_key_id => "0PN5J17HBGZHT7JJ3X82",
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o"
+    )
+    expected = "AWS 0PN5J17HBGZHT7JJ3X82:dxhSBHoI6eVSPcXJqEghlUzZMnY="
+    assert_equal expected, actual
+  end
+
+  test "temporary signature for object get" do
+    actual = S3::Signature.generate_temporary_url_signature(
+      :bucket => "johnsmith",
+      :resource => "photos/puppy.jpg",
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o",
+      :expires_at => 1175046589
+    )
+    expected = "gs6xNznrLJ4Bd%2B1y9pcy2HOSVeg%3D"
+    assert_equal expected, actual
+  end
+  
+  test "temporary signature for object get with non-unreserved URI characters" do
+    actual = S3::Signature.generate_temporary_url_signature(
+      :bucket => "johnsmith",
+      :resource => "photos/puppy[1].jpg",
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o",
+      :expires_at => 1175046589
+    )
+    expected = "gwCM0mVb9IrEPiUf8iaml6EISPc%3D"
+    assert_equal expected, actual
+  end
+
+  test "temporary signature for object post" do
+    actual = S3::Signature.generate_temporary_url_signature(
+      :bucket => "johnsmith",
+      :resource => "photos/puppy.jpg",
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o",
+      :expires_at => 1175046589,
+      :method => :post
+    )
+    expected = "duIzwO2KTEMIlbSYbFFS86Wj0LI%3D"
+    assert_equal expected, actual
+  end
+
+  test "temporary signature for object put with headers" do
+    actual = S3::Signature.generate_temporary_url_signature(
+      :bucket => "johnsmith",
+      :resource => "photos/puppy.jpg",
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o",
+      :expires_at => 1175046589,
+      :method => :put,
+      :headers => {'x-amz-acl' => 'public-read'}
+    )
+    expected = "SDMxjIkOKIVR47nWfJ57UNPXxFM%3D"
+    assert_equal expected, actual
+  end
+
+  test "temporary signature for object delete" do
+    actual = S3::Signature.generate_temporary_url_signature(
+      :bucket => "johnsmith",
+      :resource => "photos/puppy.jpg",
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o",
+      :expires_at => 1175046589,
+      :method => :delete
+    )
+    expected = "5Vg7A4HxgS6tVCYzBx%2BkMR8sztY%3D"
+    assert_equal expected, actual
+  end
+
+  test "temporary url for object get with bucket in the hostname" do
+    actual = S3::Signature.generate_temporary_url(
+      :bucket => "johnsmith",
+      :resource => "photos/puppy.jpg",
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o",
+      :expires_at => 1175046589,
+      :add_bucket_to_host => true
+    )
+    expected = "http://johnsmith.s3.amazonaws.com/photos/puppy.jpg?AWSAccessKeyId=&Expires=1175046589&Signature=gs6xNznrLJ4Bd%2B1y9pcy2HOSVeg%3D"
+    assert_equal expected, actual
+  end
+
+  test "temporary url for object put with headers" do
+    actual = S3::Signature.generate_temporary_url(
+      :bucket => "johnsmith",
+      :resource => "photos/puppy.jpg",
+      :access_key => '0PN5J17HBGZHT7JJ3X82',
+      :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o",
+      :expires_at => 1175046589,
+      :method => :put,
+      :headers => {'x-amz-acl' => 'public-read'}
+    )
+    expected = "http://s3.amazonaws.com/johnsmith/photos/puppy.jpg?AWSAccessKeyId=0PN5J17HBGZHT7JJ3X82&Expires=1175046589&Signature=SDMxjIkOKIVR47nWfJ57UNPXxFM%3D"
+    assert_equal expected, actual
+  end
+end