s3 0.3.0.beta → 0.3.0.beta2

data/extra/s3_paperclip.rb

@@ -17,11 +17,10 @@
 #                     },
 #                     :bucket => "bucket.domain.tld",
 #                     :path => ":attachment/:id/:style.:extension"
-
 module Paperclip
   module Storage
     module S3
-      def self.extended(base)
+      def self.extended base
         begin
           require "s3"
         rescue LoadError => e
@@ -39,9 +38,11 @@ module Paperclip
           @s3_headers     = @options[:s3_headers]     || {}
           @s3_host_alias  = @options[:s3_host_alias]
           @url            = ":s3_path_url" unless @url.to_s.match(/^:s3.*url$/)
-          @service = ::S3::Service.new(@s3_options.merge(:access_key_id => @s3_credentials[:access_key_id],
-                                                         :secret_access_key => @s3_credentials[:secret_access_key],
-                                                         :use_ssl => @s3_protocol == "https"))
+          @service = ::S3::Service.new(@s3_options.merge(
+            :access_key_id => @s3_credentials[:access_key_id],
+            :secret_access_key => @s3_credentials[:secret_access_key],
+            :use_ssl => @s3_protocol == "https"
+          ))
           @bucket = @service.buckets.build(@bucket_name)
         end
         Paperclip.interpolates(:s3_alias_url) do |attachment, style|
@@ -55,19 +56,23 @@ module Paperclip
         end
       end
 
-      def bucket
-        @bucket
+      def expiring_url(style_name = default_style, time = 3600)
+        bucket.objects.build(path(style_name)).temporary_url(Time.now + time)
       end
 
       def bucket_name
-        @bucket.name
+        @bucket_name
+      end
+
+      def bucket
+        @bucket
       end
 
       def s3_host_alias
         @s3_host_alias
       end
 
-      def parse_credentials(creds)
+      def parse_credentials creds
         creds = find_credentials(creds).stringify_keys
         (creds[RAILS_ENV] || creds).symbolize_keys
       end
@@ -86,12 +91,18 @@ module Paperclip
 
       # Returns representation of the data of the file assigned to the given
       # style, in the format most representative of the current storage.
-      def to_file(style = default_style)
+      def to_file style = default_style
         return @queued_for_write[style] if @queued_for_write[style]
-        file = Tempfile.new(path(style))
-        file.write(bucket.objects.find(path(style)).content)
-        file.rewind
-        return file
+        begin
+          file = Tempfile.new(path(style))
+          file.binmode if file.respond_to?(:binmode)
+          file.write(bucket.objects.find(path(style)).content)
+          file.rewind
+        rescue ::S3::Error::NoSuchKey
+          file.close if file.respond_to?(:close)
+          file = nil
+        end
+        file
       end
 
       def flush_writes #:nodoc:
@@ -100,7 +111,7 @@ module Paperclip
             log("saving #{path(style)}")
             object = bucket.objects.build(path(style))
             object.content = file.read
-            object.acl = @s3_permisions
+            object.acl = @s3_permissions
             object.content_type = instance_read(:content_type)
             object.content_disposition = @s3_headers[:content_disposition]
             object.content_encoding = @s3_headers[:content_encoding]
@@ -124,7 +135,7 @@ module Paperclip
         @queued_for_delete = []
       end
 
-      def find_credentials(creds)
+      def find_credentials creds
         case creds
         when File
           YAML::load(ERB.new(File.read(creds.path)).result)
@@ -137,6 +148,7 @@ module Paperclip
         end
       end
       private :find_credentials
+
     end
   end
 end

data/lib/s3.rb

@@ -20,6 +20,7 @@ require "s3/service"
 require "s3/signature"
 
 module S3
+  VERSION = "0.3.0.beta2"
   # Default (and only) host serving S3 stuff
   HOST = "s3.amazonaws.com"
 end

metadata

@@ -6,18 +6,17 @@ version: !ruby/object:Gem::Version
   - 0
   - 3
   - 0
-  - beta
-  version: 0.3.0.beta
+  - beta2
+  version: 0.3.0.beta2
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
-- "Miros\xC5\x82aw Boruta"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 +02:00
-default_executable: s3
+date: 2010-04-20 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: trollop
@@ -27,9 +26,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 14
-        version: "1.14"
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -75,43 +73,31 @@ executables:
 - s3
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .document
-- .gitignore
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
 - bin/s3
 - extra/s3_attachment_fu.rb
 - extra/s3_paperclip.rb
-- lib/s3.rb
-- lib/s3/bucket.rb
+- lib/s3/parser.rb
 - lib/s3/buckets_extension.rb
 - lib/s3/connection.rb
 - lib/s3/exceptions.rb
-- lib/s3/object.rb
+- lib/s3/bucket.rb
 - lib/s3/objects_extension.rb
-- lib/s3/parser.rb
+- lib/s3/object.rb
 - lib/s3/service.rb
 - lib/s3/signature.rb
-- s3.gemspec
-- test/bucket_test.rb
-- test/connection_test.rb
-- test/object_test.rb
-- test/service_test.rb
-- test/signature_test.rb
-- test/test_helper.rb
+- lib/s3.rb
+- LICENSE
+- README.rdoc
 has_rdoc: true
 homepage: http://jah.pl/projects/s3.html
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -123,13 +109,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
       - 1
       - 3
-      - 1
-      version: 1.3.1
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
@@ -137,10 +123,5 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Library for accessing S3 objects and buckets, with command line tool
-test_files: 
-- test/object_test.rb
-- test/test_helper.rb
-- test/bucket_test.rb
-- test/connection_test.rb
-- test/service_test.rb
-- test/signature_test.rb
+test_files: []
+

data/.document

@@ -1,6 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-extra/*
-LICENSE

data/.gitignore

@@ -1,6 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg
-*.gem

data/Rakefile

@@ -1,62 +0,0 @@
-# encoding: UTF-8
-
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "s3"
-    gem.summary = %Q{Library for accessing S3 objects and buckets, with command line tool}
-    gem.description = %Q{S3 library provides access to Amazon's Simple Storage Service. It supports both: European and US buckets through REST API.}
-    gem.email = "qoobaa@gmail.com"
-    gem.homepage = "http://jah.pl/projects/s3.html"
-    gem.authors = ["Jakub Kuźma", "Mirosław Boruta"]
-    gem.add_dependency "trollop", ">=1.14"
-    gem.add_dependency "proxies"
-    gem.add_development_dependency "test-unit", ">= 2.0"
-    gem.add_development_dependency "mocha"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "s3 #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-

data/VERSION

@@ -1 +0,0 @@
-0.3.0.beta

data/s3.gemspec

@@ -1,85 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{s3}
-  s.version = "0.3.0.beta"
-
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jakub Kuźma", "Mirosław Boruta"]
-  s.date = %q{2010-04-01}
-  s.default_executable = %q{s3}
-  s.description = %q{S3 library provides access to Amazon's Simple Storage Service. It supports both: European and US buckets through REST API.}
-  s.email = %q{qoobaa@gmail.com}
-  s.executables = ["s3"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/s3",
-     "extra/s3_attachment_fu.rb",
-     "extra/s3_paperclip.rb",
-     "lib/s3.rb",
-     "lib/s3/bucket.rb",
-     "lib/s3/buckets_extension.rb",
-     "lib/s3/connection.rb",
-     "lib/s3/exceptions.rb",
-     "lib/s3/object.rb",
-     "lib/s3/objects_extension.rb",
-     "lib/s3/parser.rb",
-     "lib/s3/service.rb",
-     "lib/s3/signature.rb",
-     "s3.gemspec",
-     "test/bucket_test.rb",
-     "test/connection_test.rb",
-     "test/object_test.rb",
-     "test/service_test.rb",
-     "test/signature_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://jah.pl/projects/s3.html}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Library for accessing S3 objects and buckets, with command line tool}
-  s.test_files = [
-    "test/object_test.rb",
-     "test/test_helper.rb",
-     "test/bucket_test.rb",
-     "test/connection_test.rb",
-     "test/service_test.rb",
-     "test/signature_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<trollop>, [">= 1.14"])
-      s.add_runtime_dependency(%q<proxies>, [">= 0"])
-      s.add_development_dependency(%q<test-unit>, [">= 2.0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-    else
-      s.add_dependency(%q<trollop>, [">= 1.14"])
-      s.add_dependency(%q<proxies>, [">= 0"])
-      s.add_dependency(%q<test-unit>, [">= 2.0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<trollop>, [">= 1.14"])
-    s.add_dependency(%q<proxies>, [">= 0"])
-    s.add_dependency(%q<test-unit>, [">= 2.0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-  end
-end
-

data/test/bucket_test.rb

@@ -1,215 +0,0 @@
-require "test_helper"
-
-class BucketTest < Test::Unit::TestCase
-  def setup
-    @bucket_vhost = S3::Bucket.send(:new, nil, "Data-Bucket")
-    @bucket_path = S3::Bucket.send(:new, nil, "Data_Bucket")
-    @bucket = @bucket_vhost
-
-    @bucket_location = "EU"
-    @bucket_location_body = <<-EOLocation
-    <?xml version="1.0" encoding="UTF-8"?>\n<LocationConstraint xmlns="http://s3.amazonaws.com/doc/2006-03-01/">EU</LocationConstraint>
-    EOLocation
-
-    @response_location = Net::HTTPOK.new("1.1", "200", "OK")
-    @response_location.stubs(:body).returns(@bucket_location_body)
-
-    @bucket_owned_by_you_body = <<-EOOwnedByYou
-    <?xml version="1.0" encoding="UTF-8"?>\n<Error> <Code>BucketAlreadyOwnedByYou</Code> <Message>Your previous request to create the named bucket succeeded and you already own it.</Message> <BucketName>bucket</BucketName> <RequestId>117D08EA0EC6E860</RequestId> <HostId>4VpMSvmJ+G5+DLtVox6O5cZNgdPlYcjCu3l0n4HjDe01vPxxuk5eTAtcAkUynRyV</HostId> </Error>
-    EOOwnedByYou
-
-    @reponse_owned_by_you = Net::HTTPConflict.new("1.1", "409", "Conflict")
-    @reponse_owned_by_you.stubs(:body).returns(@bucket_owned_by_you_body)
-
-    @bucket_already_exists_body = <<-EOAlreadyExists
-    <?xml version="1.0" encoding="UTF-8"?>\n<Error> <Code>BucketAlreadyExists</Code> <Message>The requested bucket name is not available. The bucket namespace is shared by all users of the system. Please select a different name and try again.</Message> <BucketName>bucket</BucketName> <RequestId>4C154D32807C92BD</RequestId> <HostId>/xyHQgXcUXTZQhoO+NUBzbaxbFrIhKlyuaRHFnmcId0bMePvY9Zwg+dyk2LYE4g5</HostId> </Error>
-    EOAlreadyExists
-
-    @reponse_already_exists = Net::HTTPConflict.new("1.1", "409", "Conflict")
-    @response_already_exists.stubs(:body).returns(@bucket_already_exists_body)
-
-    @objects_list_empty = []
-    @objects_list = [
-      S3::Object.send(:new, @bucket, :key => "obj1"),
-      S3::Object.send(:new, @bucket, :key => "obj2")
-    ]
-
-    @response_objects_list_empty_body = <<-EOEmpty
-    <?xml version="1.0" encoding="UTF-8"?>\n<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> <Name>bucket</Name> <Prefix></Prefix> <Marker></Marker> <MaxKeys>1000</MaxKeys> <IsTruncated>false</IsTruncated> </ListBucketResult>
-    EOEmpty
-
-    @response_objects_list_empty = Net::HTTPOK.new("1.1", "200", "OK")
-    @response_objects_list_empty.stubs(:body).returns(@response_objects_list_empty_body)
-
-    @response_objects_list_body = <<-EOObjects
-    <?xml version="1.0" encoding="UTF-8"?>\n<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> <Name>bucket</Name> <Prefix></Prefix> <Marker></Marker> <MaxKeys>1000</MaxKeys> <IsTruncated>false</IsTruncated> <Contents> <Key>obj1</Key> <LastModified>2009-07-03T10:17:33.000Z</LastModified> <ETag>&quot;99519cdf14c255e580e1b7bca85a458c&quot;</ETag> <Size>1729</Size> <Owner> <ID>df864aeb6f42be43f1d9e60aaabe3f15e245b035a4b79d1cfe36c4deaec67205</ID> <DisplayName>owner</DisplayName> </Owner> <StorageClass>STANDARD</StorageClass> </Contents> <Contents> <Key>obj2</Key> <LastModified>2009-07-03T11:17:33.000Z</LastModified> <ETag>&quot;99519cdf14c255e586e1b12bca85a458c&quot;</ETag> <Size>179</Size> <Owner> <ID>df864aeb6f42be43f1d9e60aaabe3f17e247b037a4b79d1cfe36c4deaec67205</ID> <DisplayName>owner</DisplayName> </Owner> <StorageClass>STANDARD</StorageClass> </Contents> </ListBucketResult>
-    EOObjects
-
-    @response_objects_list = Net::HTTPOK.new("1.1", "200", "OK")
-    @response_objects_list.stubs(:body).returns(@response_objects_list_body)
-  end
-
-  test "name valid" do
-    assert_raise ArgumentError do S3::Bucket.send(:new, nil, "") end # should not be valid with empty name
-    assert_raise ArgumentError do S3::Bucket.send(:new, nil, "10.0.0.1") end # should not be valid with IP as name
-    assert_raise ArgumentError do S3::Bucket.send(:new, nil, "as") end # should not be valid with name shorter than 3 characters
-    assert_raise ArgumentError do S3::Bucket.send(:new, nil, "a" * 256) end # should not be valid with name longer than 255 characters
-    assert_raise ArgumentError do S3::Bucket.send(:new, nil, ".asdf") end # should not allow special characters as first character
-    assert_raise ArgumentError do S3::Bucket.send(:new, nil, "-asdf") end # should not allow special characters as first character
-    assert_raise ArgumentError do S3::Bucket.send(:new, nil, "_asdf") end # should not allow special characters as first character
-
-    assert_nothing_raised do
-      S3::Bucket.send(:new, nil, "a-a-")
-      S3::Bucket.send(:new, nil, "a.a.")
-      S3::Bucket.send(:new, nil, "a_a_")
-    end
-  end
-
-  test "path prefix" do
-    expected = ""
-    actual = @bucket_vhost.path_prefix
-    assert_equal expected, actual
-
-    expected = "Data_Bucket/"
-    actual = @bucket_path.path_prefix
-    assert_equal expected, actual
-  end
-
-  test "host" do
-    expected = "Data-Bucket.s3.amazonaws.com"
-    actual = @bucket_vhost.host
-    assert_equal expected, actual
-
-    expected = "s3.amazonaws.com"
-    actual = @bucket_path.host
-    assert_equal expected, actual
-  end
-
-  test "vhost" do
-    assert @bucket_vhost.vhost?
-    assert ! @bucket_path.vhost?
-  end
-
-  test "exists" do
-    @bucket.expects(:retrieve).returns(@bucket_vhost)
-    assert @bucket.exists?
-
-    @bucket.expects(:retrieve).raises(S3::Error::NoSuchBucket.new(nil, nil))
-    assert ! @bucket.exists?
-  end
-
-  test "location and parse location" do
-    @bucket.expects(:bucket_request).with(:get, { :params => { :location => nil } }).returns(@response_location)
-
-    expected = @bucket_location
-    actual = @bucket.location
-    assert_equal expected, actual
-
-    @bucket.stubs(:bucket_request).with(:get, { :params => { :location => nil } })
-    actual = @bucket.location
-    assert_equal expected, actual
-  end
-
-  test "save" do
-    @bucket.expects(:bucket_request).with(:put, { :headers => {} })
-    assert @bucket.save
-    # mock ensures that bucket_request was called
-  end
-
-  test "save failure owned by you" do
-    @bucket.expects(:bucket_request).with(:put, { :headers => {} }).raises(S3::Error::BucketAlreadyOwnedByYou.new(409, @response_owned_by_you))
-    assert_raise S3::Error::BucketAlreadyOwnedByYou do
-      @bucket.save
-    end
-
-    @bucket.expects(:bucket_request).with(:put, { :headers => {} }).raises(S3::Error::BucketAlreadyExists.new(409, @response_already_exists))
-    assert_raise S3::Error::BucketAlreadyExists do
-      @bucket.save
-    end
-  end
-
-  test "objects" do
-    @bucket.expects(:list_bucket).returns(@objects_list_empty)
-    expected = @objects_list_empty
-    actual = @bucket.objects
-    assert_equal expected, actual
-
-    @bucket.stubs(:list_bucket).returns(@objects_list_empty)
-    actual = @bucket.objects
-    assert_equal expected, actual
-
-    @bucket.stubs(:list_bucket).returns(@objects_list)
-
-    expected = @objects_list
-    actual = @bucket.objects
-    assert_equal expected, actual
-  end
-
-  test "list bucket and parse objects" do
-    @bucket.expects(:bucket_request).with(:get, :params => { :test=>true }).returns(@response_objects_list_empty)
-    expected = @objects_list_empty
-    actual = @bucket.objects.find_all(:test => true)
-    assert_equal expected, actual
-
-    @bucket.expects(:bucket_request).with(:get, :params => { :test => true }).returns(@response_objects_list)
-    expected = @objects_list
-    actual = @bucket.objects.find_all(:test => true)
-    assert_equal expected, actual
-  end
-
-  test "destroy" do
-    @bucket.expects(:bucket_request).with(:delete)
-    assert @bucket.destroy
-  end
-
-  test "objects build" do
-    @bucket.stubs(:bucket_request)
-
-    expected = "object_name"
-    actual = @bucket.objects.build("object_name")
-    assert_kind_of S3::Object, actual
-    assert_equal expected, actual.key
-  end
-
-  test "objects find first" do
-    assert_nothing_raised do
-      S3::Object.any_instance.stubs(:retrieve).returns(S3::Object.send(:new, nil, :key => "obj2"))
-      expected = "obj2"
-      actual = @bucket.objects.find_first("obj2")
-      assert_equal "obj2", actual.key
-    end
-  end
-
-  test "objects find first fail" do
-    assert_raise S3::Error::NoSuchKey do
-      S3::Object.any_instance.stubs(:retrieve).raises(S3::Error::NoSuchKey.new(404, nil))
-      @bucket.objects.find_first("obj3")
-    end
-  end
-
-  test "objects find all on empty list" do
-    @bucket.stubs(:list_bucket).returns(@objects_list_empty)
-    assert_nothing_raised do
-      expected = @objects_list_empty
-      actual = @bucket.objects.find_all
-      assert_equal expected, actual
-    end
-  end
-
-  test "objects find all" do
-    @bucket.stubs(:list_bucket).returns(@objects_list)
-    assert_nothing_raised do
-      expected = @objects_list
-      actual = @bucket.objects.find_all
-      assert_equal expected, actual
-    end
-  end
-
-  test "objects destroy all" do
-    @bucket.stubs(:list_bucket).returns(@objects_list)
-    @bucket.objects.each do |obj|
-      obj.expects(:destroy)
-    end
-    @bucket.objects.destroy_all
-  end
-end

data/test/connection_test.rb

@@ -1,170 +0,0 @@
-require "test_helper"
-
-class ConnectionTest < Test::Unit::TestCase
-  def setup
-    @connection = S3::Connection.new(
-      :access_key_id =>  "12345678901234567890",
-      :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
-    )
-    @http_request = Net::HTTP.new("")
-    @response_ok = Net::HTTPOK.new("1.1", "200", "OK")
-    @response_not_found = Net::HTTPNotFound.new("1.1", "404", "Not Found")
-    @response_error = Net::HTTPInternalServerError.new("1.1", "500", "Internal Server Error")
-    @connection.stubs(:http).returns(@http_request)
-
-    @http_request.stubs(:start).returns(@response_ok)
-  end
-
-  test "handle response not modify response when ok" do
-    assert_nothing_raised do
-      response = @connection.request(
-        :get,
-        :host => "s3.amazonaws.com",
-        :path => "/"
-      )
-      assert_equal @response_ok, response
-    end
-  end
-
-  test "handle response throws exception when error" do
-    response_body = <<-EOFakeBody
-    <?xml version=\"1.0\" encoding=\"UTF-8\"?>
-    <Error>
-      <Code>NoSuchBucket</Code>
-      <Message>The specified bucket does not exist</Message>
-    </Error>
-    EOFakeBody
-
-    @http_request.stubs(:start).returns(@response_not_found)
-    @response_not_found.stubs(:body).returns(response_body)
-
-    assert_raise S3::Error::NoSuchBucket do
-      response = @connection.request(
-        :get,
-        :host => "data.example.com.s3.amazonaws.com",
-        :path => "/"
-      )
-    end
-  end
-
-  test "handle response throws standard exception when error" do
-    @http_request.stubs(:start).returns(@response_error)
-    @response_error.stubs(:body)
-    assert_raise S3::Error::ResponseError do
-      response = @connection.request(
-        :get,
-        :host => "data.example.com.s3.amazonaws.com",
-        :path => "/"
-      )
-    end
-
-    @response_error.stubs(:body).returns("")
-    assert_raise S3::Error::ResponseError do
-      response = @connection.request(
-        :get,
-        :host => "data.example.com.s3.amazonaws.com",
-        :path => "/"
-      )
-    end
-  end
-
-  test "parse params empty" do
-    expected = ""
-    actual = S3::Connection.parse_params({})
-    assert_equal expected, actual
-  end
-
-  test "parse params only interesting params" do
-    expected = ""
-    actual = S3::Connection.parse_params(:param1 => "1", :maxkeys => "2")
-    assert_equal expected, actual
-  end
-
-  test "parse params remove underscore" do
-    expected = "max-keys=100"
-    actual = S3::Connection.parse_params(:max_keys => 100)
-    assert_equal expected, actual
-  end
-
-  test "parse params with and without values" do
-    params = S3::Connection.parse_params(:max_keys => 100, :prefix => nil)
-
-    splitted_params = params.split("&")
-    assert_equal 2, splitted_params.length
-    assert splitted_params.include?("max-keys=100")
-    assert splitted_params.include?("prefix")
-  end
-
-  test "headers empty" do
-    expected = {}
-    actual = S3::Connection.parse_headers({})
-    assert_equal expected, actual
-  end
-
-  test "parse only interesting headers" do
-    expected = {}
-    actual = S3::Connection.parse_headers(
-      :accept => "text/*, text/html, text/html;level=1, */*",
-      :accept_charset => "iso-8859-2, unicode-1-1;q=0.8"
-    )
-    assert_equal expected, actual
-  end
-
-  test "parse headers remove underscore" do
-    expected = {
-      "content-type" => nil,
-      "x-amz-acl" => nil,
-      "if-modified-since" => nil,
-      "if-unmodified-since" => nil,
-      "if-match" => nil,
-      "if-none-match" => nil,
-      "content-disposition" => nil,
-      "content-encoding" => nil
-    }
-    actual = S3::Connection.parse_headers(
-      :content_type => nil,
-      :x_amz_acl => nil,
-      :if_modified_since => nil,
-      :if_unmodified_since => nil,
-      :if_match => nil,
-      :if_none_match => nil,
-      :content_disposition => nil,
-      :content_encoding => nil
-    )
-    assert_equal expected, actual
-  end
-
-  test "parse headers with values" do
-    expected = {
-      "content-type" => "text/html",
-      "x-amz-acl" => "public-read",
-      "if-modified-since" => "today",
-      "if-unmodified-since" => "tomorrow",
-      "if-match" => "1234",
-      "if-none-match" => "1243",
-      "content-disposition" => "inline",
-      "content-encoding" => "gzip"
-    }
-    actual = S3::Connection.parse_headers(
-      :content_type => "text/html",
-      :x_amz_acl => "public-read",
-      :if_modified_since => "today",
-      :if_unmodified_since => "tomorrow",
-      :if_match => "1234",
-      :if_none_match => "1243",
-      :content_disposition => "inline",
-      :content_encoding => "gzip"
-    )
-    assert_equal expected, actual
-  end
-
-  test "parse headers with range" do
-    expected = {
-      "range" => "bytes=0-100"
-    }
-    actual = S3::Connection.parse_headers(
-      :range => 0..100
-    )
-    assert_equal expected, actual
-  end
-end

data/test/object_test.rb

@@ -1,155 +0,0 @@
-# encoding: utf-8
-require "test_helper"
-
-class ObjectTest < Test::Unit::TestCase
-  def setup
-    @service = S3::Service.new(
-      :access_key_id => "1234",
-      :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")
-
-    @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
-
-    @xml_body = <<-EOXML
-    <?xml version="1.0" encoding="UTF-8"?>
-    <CopyObjectResult> <LastModified>timestamp</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_raise ArgumentError do S3::Object.send(:new, nil, :key => "//") end # should not allow key with double slash
-
-    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 "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
-
-    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=>"public-read", :content_type=>"application/octet-stream" }).returns(@response_binary)
-    assert @object_lena.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 "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 "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")
-
-    assert_equal "Lena-copy.png", new_object.key
-    assert_equal "Lena.png", @object_lena.key
-  end
-end

data/test/service_test.rb

@@ -1,111 +0,0 @@
-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")
-    @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")
-    @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")
-    @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")
-    @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 "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 fail" do
-    assert_raise S3::Error::NoSuchBucket do
-      @service_bucket_not_exists.buckets.find_first("data2.example.com")
-    end
-  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

@@ -1,143 +0,0 @@
-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
-end

data/test/test_helper.rb

@@ -1,8 +0,0 @@
-require "rubygems"
-gem "test-unit"
-require "test/unit"
-require "mocha"
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-require "s3"