s3 0.2.4 → 0.2.5

data/test/object_test.rb

@@ -13,7 +13,7 @@ class ObjectTest < Test::Unit::TestCase
     @object_carmen = S3::Object.send(:new, @bucket_images, :key => "Carmen.png")
 
     @response_binary = Net::HTTPOK.new("1.1", "200", "OK")
-    stub(@response_binary).body { "test".force_encoding(Encoding::BINARY) }
+    @response_binary.stubs(:body).returns("test".force_encoding(Encoding::BINARY))
     @response_binary["etag"] = ""
     @response_binary["content-type"] = "image/png"
     @response_binary["content-disposition"] = "inline"
@@ -26,10 +26,10 @@ class ObjectTest < Test::Unit::TestCase
     <CopyObjectResult> <LastModified>timestamp</LastModified> <ETag>"etag"</ETag> </CopyObjectResult>
     EOXML
     @response_xml = Net::HTTPOK.new("1.1", "200", "OK")
-    stub(@response_xml).body { @xml_body }
+    @response_xml.stubs(:body).returns(@xml_body)
   end
 
-  def test_initilalize
+  test "initializing" do
     assert_raise ArgumentError do S3::Object.send(:new, nil, :key => "") end # should not allow empty key
     assert_raise ArgumentError do S3::Object.send(:new, nil, :key => "//") end # should not allow key with double slash
 
@@ -41,13 +41,13 @@ class ObjectTest < Test::Unit::TestCase
     end
   end
 
-  def test_full_key
+  test "full key" do
     expected = "images/Lena.png"
     actual = @object_lena.full_key
     assert_equal expected, actual
   end
 
-  def test_url
+  test "url" do
     bucket1 = S3::Bucket.send(:new, @service, "images")
 
     object11 = S3::Object.send(:new, bucket1, :key => "Lena.png")
@@ -68,7 +68,7 @@ class ObjectTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
-  def test_cname_url
+  test "cname url" do
     bucket1 = S3::Bucket.send(:new, @service, "images.example.com")
 
     object11 = S3::Object.send(:new, bucket1, :key => "Lena.png")
@@ -89,45 +89,44 @@ class ObjectTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
-  def test_destroy
-    mock(@object_lena).object_request(:delete) {}
+  test "destroy" do
+    @object_lena.expects(:object_request).with(:delete)
     assert @object_lena.destroy
   end
 
-  def test_save
-    mock(@object_lena).object_request(:put, :body=>"test", :headers=>{ :x_amz_acl=>"public-read", :content_type=>"application/octet-stream" }) { @response_binary }
-
+  test "save" do
+    @object_lena.expects(:object_request).with(:put, :body=>"test", :headers=>{ :x_amz_acl=>"public-read", :content_type=>"application/octet-stream" }).returns(@response_binary)
     assert @object_lena.save
   end
 
-  def test_content_and_parse_headers
-    mock(@object_lena).object_request(:get, {}).times(2) { @response_binary }
+  test "content and parse headers" do
+    @object_lena.expects(:object_request).with(:get, {}).returns(@response_binary)
 
     expected = /test/n
-    actual = @object_lena.content(true) # wtf? don't work with false, maybe is not fully cleaned
+    actual = @object_lena.content(true)
     assert_match expected, actual
     assert_equal "image/png", @object_lena.content_type
 
-    stub(@object_lena).object_request(:get) { flunk "should not use connection" }
-
     assert @object_lena.content
+
+    @object_lena.expects(:object_request).with(:get, {}).returns(@response_binary)
     assert @object_lena.content(true)
   end
 
-  def test_retrieve
-    mock(@object_lena).object_request(:get, :headers=>{:range=>0..0}) { @response_binary }
+  test "retrieve" do
+    @object_lena.expects(:object_request).with(:get, :headers=>{:range=>0..0}).returns(@response_binary)
     assert @object_lena.retrieve
   end
 
-  def test_exists
-    mock(@object_lena).retrieve { true }
+  test "exists" do
+    @object_lena.expects(:retrieve).returns(true)
     assert @object_lena.exists?
 
-    mock(@object_carmen).retrieve { raise S3::Error::NoSuchKey.new(nil, nil) }
+    @object_carmen.expects(:retrieve).raises(S3::Error::NoSuchKey.new(nil, nil))
     assert ! @object_carmen.exists?
   end
 
-  def test_acl_writer
+  test "ACL writer" do
     expected = nil
     actual = @object_lena.acl
     assert_equal expected, actual
@@ -145,8 +144,8 @@ class ObjectTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
-  def test_copy
-    mock(@bucket_images).bucket_request(:put, :path => "Lena-copy.png", :headers => { :x_amz_acl => "public-read", :content_type => "application/octet-stream", :x_amz_copy_source => "images/Lena.png", :x_amz_metadata_directive => "REPLACE" }) { @response_xml }
+  test "copy" do
+    @bucket_images.expects(:bucket_request).with(:put, :path => "Lena-copy.png", :headers => { :x_amz_acl => "public-read", :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")
 

data/test/service_test.rb

@@ -2,37 +2,49 @@ 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",
       :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
     )
     @response_empty_buckets_list = Net::HTTPOK.new("1.1", "200", "OK")
-    stub(@service_empty_buckets_list).service_request { @response_empty_buckets_list }
-    stub(@response_empty_buckets_list).body { @buckets_empty_list_body }
+    @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",
       :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
     )
     @response_buckets_list = Net::HTTPOK.new("1.1", "200", "OK")
-    stub(@service_buckets_list).service_request { @response_buckets_list }
-    stub(@response_buckets_list).body { @buckets_list_body }
+    @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",
       :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
     )
     @response_bucket_exists = Net::HTTPNotFound.new("1.1", "200", "OK")
-    stub(@service_bucket_exists).service_request { @response_bucket_exists }
-    stub(@response_bucket_exists).body { @bucket_exists }
+    @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",
       :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
     )
     @response_bucket_not_exists = Net::HTTPNotFound.new("1.1", "404", "Not Found")
-    stub(@service_bucket_not_exists).service_request { raise S3::Error::NoSuchBucket.new(404, @response_bucket_not_exists) }
-    stub(@response_bucket_not_exists).body { @bucket_not_exists }
+    @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
@@ -43,34 +55,23 @@ class ServiceTest < Test::Unit::TestCase
       S3::Bucket.send(:new, @service_buckets_list, "data.example.com"),
       S3::Bucket.send(:new, @service_buckets_list, "images")
     ]
-    @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
   end
 
-  def test_buckets_and_parse_buckets_empty
+  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
 
-  def test_buckets_and_parse_buckets
+  test "buckets and parse buckets" do
     expected = @buckets_list
     # ugly hack
     actual = @service_buckets_list.buckets(true).map { |obj| obj }
     assert_equal expected, actual
   end
 
-  def test_buckets_reload
+  test "buckets reload" do
     @service = @service_empty_buckets_list
 
     expected = @buckets_empty_list
@@ -78,7 +79,7 @@ class ServiceTest < Test::Unit::TestCase
     actual = @service.buckets
     assert_equal expected.length, actual.length, "deliver from cache"
 
-    stub(@service).service_request { @response_buckets_list }
+    @service.stubs(:service_request).returns(@response_buckets_list)
     expected = @buckets_empty_list
     actual = @service.buckets
     assert_equal expected.length, actual.length, "deliver from cache"
@@ -88,8 +89,8 @@ class ServiceTest < Test::Unit::TestCase
     assert_equal expected.length, actual.length
   end
 
-  def test_buckets_build
-    stub(@service_empty_buckets_list).service_request { flunk "should not connect to server" }
+  test "buckets build" do
+    @service_empty_buckets_list.stubs(:service_request)
 
     expected = "bucket_name"
     actual = @service_empty_buckets_list.buckets.build("bucket_name")
@@ -97,20 +98,20 @@ class ServiceTest < Test::Unit::TestCase
     assert_equal expected, actual.name
   end
 
-  def test_buckets_find_first
+  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
 
-  def test_buckets_find_first_fail
+  test "buckets find first fail" do
     assert_raise S3::Error::NoSuchBucket do
       @service_bucket_not_exists.buckets.find_first("data2.example.com")
     end
   end
 
-  def test_buckets_find_all_on_empty_list
+  test "buckets find all on empty list" do
     assert_nothing_raised do
       expected = @buckets_empty_list
       actual = @service_empty_buckets_list.buckets.find_all
@@ -118,7 +119,7 @@ class ServiceTest < Test::Unit::TestCase
     end
   end
 
-  def test_buckets_find_all
+  test "buckets find all" do
     assert_nothing_raised do
       expected = @buckets_list
       actual = @service_buckets_list.buckets.find_all

data/test/signature_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class SignatureTest < Test::Unit::TestCase
   # from http://docs.amazonwebservices.com/AmazonS3/latest/RESTAuthentication.html
-  def test_signature_for_object_get
+  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"
@@ -17,7 +17,7 @@ class SignatureTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
-  def test_signature_for_object_put
+  test "signature for object put" do
     request = Net::HTTP::Put.new("/photos/puppy.jpg");
     request["content-type"] = "image/jpeg"
     request["content-length"] = "94328"
@@ -34,7 +34,7 @@ class SignatureTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
-  def test_signature_for_list
+  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"
@@ -50,7 +50,7 @@ class SignatureTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
-  def test_signature_for_fetch
+  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"
@@ -65,7 +65,7 @@ class SignatureTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
-  def test_signature_for_delete
+  test "signature for delete" do
     request = Net::HTTP::Delete.new("/johnsmith/photos/puppy.jpg");
     request["user-agent"] = "dotnet"
     request["host"] = "s3.amazonaws.com"
@@ -82,7 +82,7 @@ class SignatureTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
-  def test_signature_for_upload
+  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"
@@ -111,7 +111,7 @@ class SignatureTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
-  def test_signature_for_list_all_my_buckets
+  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"
@@ -126,7 +126,7 @@ class SignatureTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
-  def test_signature_for_unicode_keys
+  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"

data/test/test_helper.rb

@@ -1,11 +1,7 @@
-require 'rubygems'
-require 'test/unit'
-require 'rr'
+require "rubygems"
+require "test/unit"
+require "mocha"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 's3'
-
-class Test::Unit::TestCase
-  include RR::Adapters::TestUnit
-end
+require "s3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: s3
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 +01:00
+date: 2010-02-07 00:00:00 +01:00
 default_executable: s3
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,16 +34,16 @@ dependencies:
         version: "2.0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rr
+  name: mocha
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.2
+        version: "0"
     version: 
-description: 
+description: "S3 library provides access to Amazon's Simple Storage Service. It supports both: European and US buckets through REST API."
 email: qoobaa@gmail.com
 executables: 
 - s3
@@ -107,9 +107,9 @@ signing_key:
 specification_version: 3
 summary: Library for accessing S3 objects and buckets, with command line tool
 test_files: 
-- test/bucket_test.rb
 - test/object_test.rb
-- test/signature_test.rb
-- test/service_test.rb
 - test/test_helper.rb
+- test/bucket_test.rb
 - test/connection_test.rb
+- test/service_test.rb
+- test/signature_test.rb