s3 0.2.0 → 0.2.1

data/.gitignore

@@ -4,3 +4,4 @@ coverage
 rdoc
 pkg
 *.gem
+*.gemspec

data/README.rdoc

@@ -1,8 +1,8 @@
-= Stree
+= S3
 
-* repository: http://github.com/qoobaa/stree
-* issue tracker: http://github.com/qoobaa/stree/issues
-* rdoc: http://qoobaa.github.com/stree
+* repository: http://github.com/qoobaa/s3
+* issue tracker: http://github.com/qoobaa/s3/issues
+* rdoc: http://qoobaa.github.com/s3
 
 == Usage
 
@@ -11,37 +11,37 @@ Coming soon, see Rdoc documentation.
 == Command tool usage
 
 You have to pass access key id (-a) and secret access key (-s) to the
-command line tool. Stree reads ACCESS_KEY_ID and SECRET_ACCESS_KEY
+command line tool. S3 reads ACCESS_KEY_ID and SECRET_ACCESS_KEY
 environment variables and uses them by default, so if you don't want
 to pass them each time, export them (e.g. in .bashrc file).
 
 * list buckets
-    stree bucket
+    s3 bucket
 
 * create bucket
-    stree bucket add name-of-bucket
+    s3 bucket add name-of-bucket
 
 * list objects in bucket
-    stree bucket show name-of-bucket
+    s3 bucket show name-of-bucket
 
 * destroy bucket
-    stree bucket remove name-of-bucket
+    s3 bucket remove name-of-bucket
 
 * list objects (in all buckets)
-    stree object
+    s3 object
 
 * show the object information
-    stree object show bucket_name/path/to/object.extension
+    s3 object show bucket_name/path/to/object.extension
 
 * download the content of the object
-    stree object show bucket_name/path/to/object.extension filename_to_store_the_content.extension
+    s3 object show bucket_name/path/to/object.extension filename_to_store_the_content.extension
 
 * show the content of the object to STDOUT
-    stree object show bucket_name/path/to/object.extension -
+    s3 object show bucket_name/path/to/object.extension -
 
 You can also pass --help to the commmands like:
-  stree bucket add --help
-  stree object show --help
+  s3 bucket add --help
+  s3 object show --help
 
 == Copyright
 

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.name = "s3"
     gem.summary = %Q{Library for accessing S3 objects and buckets, with command line tool}
     gem.email = "qoobaa@gmail.com"
-    gem.homepage = "http://github.com/qoobaa/stree"
+    gem.homepage = "http://github.com/qoobaa/s3"
     gem.authors = ["Jakub Kuźma", "Mirosław Boruta"]
     gem.add_dependency "trollop", ">=1.14"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
@@ -51,7 +51,7 @@ Rake::RDocTask.new do |rdoc|
   end
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "stree #{version}"
+  rdoc.title = "s3 #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bin/{stree → s3}

@@ -3,11 +3,11 @@
 $: << File.expand_path(File.dirname(__FILE__) + "/../lib")
 
 require "trollop"
-require "stree"
+require "s3"
 
 # HELPER METHODS
 
-include Stree
+include S3
 
 def list_buckets(service)
   service.buckets.each do |bucket|
@@ -82,7 +82,7 @@ BUCKET_SUBCOMMANDS = %w(add remove show)
 OBJECT_SUBCOMMANDS = %w(add remove show)
 
 global_options = Trollop::options do
-  banner "stree - s3 command line tool"
+  banner "s3 command line tool"
   opt :access_key_id, "Your access key id to AWS", :type => :string, :default => ACCESS_KEY_ID
   opt :secret_access_key, "Your secret access key to AWS", :type => :string, :default => SECRET_ACCESS_KEY
   opt :debug, "Debug mode", :type => :flag, :default => false

data/extra/{stree_backend.rb → s3_backend.rb}

@@ -1,14 +1,14 @@
 require "singleton"
-require "stree"
+require "s3"
 
-# Stree Backend for attachment-fu plugin. After installing attachment-fu
+# S3 Backend for attachment-fu plugin. After installing attachment-fu
 # plugin, copy the file to:
 # +vendor/plugins/attachment-fu/lib/technoweenie/attachment_fu/backends+
 #
-# To configure StreeBackend create initializer file in your Rails
-# application, e.g. +config/initializers/stree_backend.rb+.
+# To configure S3Backend create initializer file in your Rails
+# application, e.g. +config/initializers/s3_backend.rb+.
 #
-#   Technoweenie::AttachmentFu::Backends::StreeBackend.configuration do |config|
+#   Technoweenie::AttachmentFu::Backends::S3Backend.configuration do |config|
 #     config.access_key_id = "..." # your access key id
 #     config.secret_access_key = "..." # your secret access key
 #     config.bucket_name = "..." # default bucket name to store attachments
@@ -18,9 +18,9 @@ require "stree"
 module Technoweenie
   module AttachmentFu
     module Backends
-      module StreeBackend
+      module S3Backend
 
-        # StreeBackend configuration class
+        # S3Backend configuration class
         class Configuration
           include Singleton
 
@@ -29,7 +29,7 @@ module Technoweenie
           attr_accessor *ATTRIBUTES
         end
 
-        # Method used to configure StreeBackend, see the example above
+        # Method used to configure S3Backend, see the example above
         def self.configuration
           if block_given?
             yield Configuration.instance
@@ -39,7 +39,7 @@ module Technoweenie
 
         # :nodoc:
         def self.included(base)
-          include Stree
+          include S3
 
           service = Service.new(:access_key_id => configuration.access_key_id,
                                 :secret_access_key => configuration.secret_access_key,

data/lib/s3.rb

@@ -0,0 +1,24 @@
+require "base64"
+require "digest/md5"
+require "forwardable"
+require "net/http"
+require "net/https"
+require "openssl"
+require "rexml/document"
+require "time"
+
+require "s3/roxy/moxie"
+require "s3/roxy/proxy"
+
+require "s3/parser"
+require "s3/bucket"
+require "s3/connection"
+require "s3/exceptions"
+require "s3/object"
+require "s3/service"
+require "s3/signature"
+
+module S3
+  # Default (and only) host serving S3 stuff
+  HOST = "s3.amazonaws.com"
+end

data/lib/{stree → s3}/bucket.rb

@@ -1,4 +1,4 @@
-module Stree
+module S3
   class Bucket
     include Parser
     extend Roxy::Moxie
@@ -10,7 +10,7 @@ module Stree
     private_class_method :new
 
     # Retrieves the bucket information from the server. Raises an
-    # Stree::Error exception if the bucket doesn't exist or you don't
+    # S3::Error exception if the bucket doesn't exist or you don't
     # have access to it, etc.
     def retrieve
       list_bucket(:max_keys => 0)

data/lib/{stree → s3}/connection.rb

@@ -1,4 +1,4 @@
-module Stree
+module S3
 
   # Class responsible for handling connections to amazon hosts
   class Connection

data/lib/{stree → s3}/exceptions.rb

@@ -1,4 +1,4 @@
-module Stree
+module S3
   module Error
 
     # All responses with a code between 300 and 599 that contain an
@@ -30,7 +30,7 @@ module Stree
       # Descendant of ResponseError suitable for that exception code or ResponseError class
       # if no class found
       def self.exception(code)
-        Stree::Error.const_get(code)
+        S3::Error.const_get(code)
       rescue NameError
         ResponseError
       end

data/lib/{stree → s3}/object.rb

@@ -1,4 +1,4 @@
-module Stree
+module S3
 
   # Class responsible for handling objects stored in S3 buckets
   class Object
@@ -77,7 +77,7 @@ module Stree
     # Copies the file to another key and/or bucket.
     # ==== Options:
     # +key+:: new key to store object in
-    # +bucket+:: new bucket to store object in (instance of Stree::Bucket)
+    # +bucket+:: new bucket to store object in (instance of S3::Bucket)
     # +acl+:: acl of the copied object (default: "public-read")
     # +content_type+:: content type of the copied object (default: "application/octet-stream")
     def copy(options = {})

data/lib/{stree → s3}/parser.rb

@@ -1,4 +1,4 @@
-module Stree
+module S3
   module Parser
     include REXML
 

data/lib/{stree → s3}/roxy/moxie.rb

@@ -20,7 +20,7 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-module Stree
+module S3
   module Roxy # :nodoc:all
     module Moxie
       # Set up this class to proxy on the given name

data/lib/{stree → s3}/roxy/proxy.rb

@@ -20,7 +20,7 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-module Stree
+module S3
   module Roxy # :nodoc:all
     # The very simple proxy class that provides a basic pass-through
     # mechanism between the proxy owner and the proxy target.

data/lib/{stree → s3}/service.rb

@@ -1,4 +1,4 @@
-module Stree
+module S3
   class Service
     include Parser
     extend Roxy::Moxie

data/lib/{stree → s3}/signature.rb

@@ -1,4 +1,4 @@
-module Stree
+module S3
 
   # Class responsible for generating signatures to requests.
   #

data/test/bucket_test.rb

@@ -2,8 +2,8 @@ require 'test_helper'
 
 class BucketTest < Test::Unit::TestCase
   def setup
-    @bucket_vhost = Stree::Bucket.new(nil, "data-bucket")
-    @bucket_path = Stree::Bucket.new(nil, "data_bucket")
+    @bucket_vhost = S3::Bucket.send(:new, nil, "data-bucket")
+    @bucket_path = S3::Bucket.send(:new, nil, "data_bucket")
     @bucket = @bucket_vhost
 
     @response_location = Net::HTTPOK.new("1.1", "200", "OK")
@@ -27,8 +27,8 @@ class BucketTest < Test::Unit::TestCase
 
     @objects_list_empty = []
     @objects_list = [
-      Stree::Object.new(@bucket, "obj1"),
-      Stree::Object.new(@bucket, "obj2")
+      S3::Object.send(:new, @bucket, :key => "obj1"),
+      S3::Object.send(:new, @bucket, :key => "obj2")
     ]
 
     @response_objects_list_empty = Net::HTTPOK.new("1.1", "200", "OK")
@@ -45,18 +45,18 @@ class BucketTest < Test::Unit::TestCase
   end
 
   def test_name_valid
-    assert_raise ArgumentError do Stree::Bucket.new(nil, "") end # should not be valid with empty name
-    assert_raise ArgumentError do Stree::Bucket.new(nil, "10.0.0.1") end # should not be valid with IP as name
-    assert_raise ArgumentError do Stree::Bucket.new(nil, "as") end # should not be valid with name shorter than 3 characters
-    assert_raise ArgumentError do Stree::Bucket.new(nil, "a"*256) end # should not be valid with name longer than 255 characters
-    assert_raise ArgumentError do Stree::Bucket.new(nil, ".asdf") end # should not allow special characters as first character
-    assert_raise ArgumentError do Stree::Bucket.new(nil, "-asdf") end # should not allow special characters as first character
-    assert_raise ArgumentError do Stree::Bucket.new(nil, "_asdf") end # should not allow special characters as first character
+    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
-      Stree::Bucket.new(nil, "a-a-")
-      Stree::Bucket.new(nil, "a.a.")
-      Stree::Bucket.new(nil, "a_a_")
+      S3::Bucket.send(:new, nil, "a-a-")
+      S3::Bucket.send(:new, nil, "a.a.")
+      S3::Bucket.send(:new, nil, "a_a_")
     end
   end
 
@@ -89,7 +89,7 @@ class BucketTest < Test::Unit::TestCase
     mock(@bucket).retrieve { @bucket_vhost }
     assert @bucket.exists?
 
-    mock(@bucket).retrieve { raise Stree::Error::NoSuchBucket.new(nil, nil) }
+    mock(@bucket).retrieve { raise S3::Error::NoSuchBucket.new(nil, nil) }
     assert ! @bucket.exists?
   end
 
@@ -112,41 +112,41 @@ class BucketTest < Test::Unit::TestCase
   end
 
   def test_save_failure_owned_by_you
-    mock(@bucket).bucket_request(:put, {:headers=>{}}) { raise Stree::Error::BucketAlreadyOwnedByYou.new(409, @response_owned_by_you) }
-    assert_raise Stree::Error::BucketAlreadyOwnedByYou do
+    mock(@bucket).bucket_request(:put, {:headers=>{}}) { raise S3::Error::BucketAlreadyOwnedByYou.new(409, @response_owned_by_you) }
+    assert_raise S3::Error::BucketAlreadyOwnedByYou do
       @bucket.save
     end
 
-    mock(@bucket).bucket_request(:put, {:headers=>{}}) { raise Stree::Error::BucketAlreadyExists.new(409, @response_already_exists) }
-    assert_raise Stree::Error::BucketAlreadyExists do
+    mock(@bucket).bucket_request(:put, {:headers=>{}}) { raise S3::Error::BucketAlreadyExists.new(409, @response_already_exists) }
+    assert_raise S3::Error::BucketAlreadyExists do
       @bucket.save
     end
   end
 
   def test_objects
-    mock(@bucket).fetch_objects { @objects_list_empty }
+    mock(@bucket).list_bucket { @objects_list_empty }
     expected = @objects_list_empty
     actual = @bucket.objects
     assert_equal expected, actual
 
-    stub(@bucket).fetch_objects { flunk "should load objects from cache" }
+    stub(@bucket).list_bucket { flunk "should load objects from cache" }
     actual = @bucket.objects
     assert_equal expected, actual
 
-    stub(@bucket).fetch_objects { @objects_list }
+    stub(@bucket).list_bucket { @objects_list }
 
     expected = @objects_list
     actual = @bucket.objects(true)
     assert_equal expected, actual
   end
 
-  def test_fetch_objects_and_parse_objects
-    mock(@bucket).bucket_request(:get, :test=>true) { @response_objects_list_empty }
+  def test_list_bucket_and_parse_objects
+    mock(@bucket).bucket_request(:get, :params => { :test=>true }) { @response_objects_list_empty }
     expected = @objects_list_empty
     actual = @bucket.objects.find_all(:test => true)
     assert_equal expected, actual
 
-    mock(@bucket).bucket_request(:get, :test=>true) { @response_objects_list }
+    mock(@bucket).bucket_request(:get, :params => { :test=>true }) { @response_objects_list }
     expected = @objects_list
     actual = @bucket.objects.find_all(:test => true)
     assert_equal expected, actual
@@ -162,13 +162,13 @@ class BucketTest < Test::Unit::TestCase
 
     expected = "object_name"
     actual = @bucket.objects.build("object_name")
-    assert_kind_of Stree::Object, actual
+    assert_kind_of S3::Object, actual
     assert_equal expected, actual.key
   end
 
   def test_objects_find_first
     assert_nothing_raised do
-      stub.instance_of(Stree::Object).retrieve { Stree::Object.new(nil, "obj2") }
+      stub.instance_of(S3::Object).retrieve { S3::Object.send(:new, nil, :key => "obj2") }
       expected = "obj2"
       actual = @bucket.objects.find_first("obj2")
       assert_equal "obj2", actual.key
@@ -176,14 +176,14 @@ class BucketTest < Test::Unit::TestCase
   end
 
   def test_objects_find_first_fail
-    assert_raise Stree::Error::NoSuchKey do
-      stub.instance_of(Stree::Object).retrieve { raise Stree::Error::NoSuchKey.new(404, nil) }
+    assert_raise S3::Error::NoSuchKey do
+      stub.instance_of(S3::Object).retrieve { raise S3::Error::NoSuchKey.new(404, nil) }
       @bucket.objects.find_first("obj3")
     end
   end
 
   def test_objects_find_all_on_empty_list
-    stub(@bucket).fetch_objects { @objects_list_empty }
+    stub(@bucket).list_bucket { @objects_list_empty }
     assert_nothing_raised do
       expected = @objects_list_empty
       actual = @bucket.objects.find_all
@@ -192,7 +192,7 @@ class BucketTest < Test::Unit::TestCase
   end
 
   def test_objects_find_all
-    stub(@bucket).fetch_objects { @objects_list }
+    stub(@bucket).list_bucket { @objects_list }
     assert_nothing_raised do
       expected = @objects_list
       actual = @bucket.objects.find_all
@@ -201,12 +201,12 @@ class BucketTest < Test::Unit::TestCase
   end
 
   def test_objects_reload
-    stub(@bucket).fetch_objects { @objects_list_empty }
+    stub(@bucket).list_bucket { @objects_list_empty }
     expected = @objects_list_empty
     actual = @bucket.objects
     assert_equal expected, actual
 
-    stub(@bucket).fetch_objects { @objects_list }
+    stub(@bucket).list_bucket { @objects_list }
     expected = @objects_list_empty
     actual = @bucket.objects
     assert_equal expected, actual
@@ -220,7 +220,7 @@ class BucketTest < Test::Unit::TestCase
 
   def test_objects_destroy_all
     @counter = 0
-    stub(@bucket).fetch_objects { @objects_list }
+    stub(@bucket).list_bucket { @objects_list }
     @bucket.objects.each do |obj|
       mock(obj).destroy { @counter += 1 }
     end

data/test/connection_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class ConnectionTest < Test::Unit::TestCase
   def setup
-    @connection = Stree::Connection.new(
+    @connection = S3::Connection.new(
       :access_key_id =>  "12345678901234567890",
       :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
     )
@@ -27,15 +27,16 @@ class ConnectionTest < Test::Unit::TestCase
   def test_handle_response_throws_exception_when_not_ok
     response_body = <<-EOFakeBody
     <?xml version=\"1.0\" encoding=\"UTF-8\"?>
-    <SomeResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">
+    <Error>
       <Code>NoSuchBucket</Code>
       <Message>The specified bucket does not exist</Message>
-    </SomeResult>
+    </Error>
     EOFakeBody
+
     stub(@http_request).start { @response_not_found }
     stub(@response_not_found).body { response_body }
 
-    assert_raise Stree::Error::NoSuchBucket do
+    assert_raise S3::Error::NoSuchBucket do
       response = @connection.request(
         :get,
         :host => "data.example.com.s3.amazonaws.com",
@@ -47,7 +48,7 @@ class ConnectionTest < Test::Unit::TestCase
   def test_handle_response_throws_standard_exception_when_not_ok
     stub(@http_request).start { @response_not_found }
     stub(@response_not_found).body { nil }
-    assert_raise Stree::Error::ResponseError do
+    assert_raise S3::Error::ResponseError do
       response = @connection.request(
         :get,
         :host => "data.example.com.s3.amazonaws.com",
@@ -56,7 +57,7 @@ class ConnectionTest < Test::Unit::TestCase
     end
 
     stub(@response_not_found).body { "" }
-    assert_raise Stree::Error::ResponseError do
+    assert_raise S3::Error::ResponseError do
       response = @connection.request(
         :get,
         :host => "data.example.com.s3.amazonaws.com",
@@ -67,37 +68,37 @@ class ConnectionTest < Test::Unit::TestCase
 
   def test_parse_params_empty
     expected = ""
-    actual = Stree::Connection.parse_params({})
+    actual = S3::Connection.parse_params({})
     assert_equal expected, actual
   end
 
   def test_parse_params_only_interesting_params
     expected = ""
-    actual = Stree::Connection.parse_params(:param1 => "1", :maxkeys => "2")
+    actual = S3::Connection.parse_params(:param1 => "1", :maxkeys => "2")
     assert_equal expected, actual
   end
 
   def test_parse_params_remove_underscore
     expected = "max-keys=100"
-    actual = Stree::Connection.parse_params(:max_keys => 100)
+    actual = S3::Connection.parse_params(:max_keys => 100)
     assert_equal expected, actual
   end
 
   def test_parse_params_with_and_without_values
     expected = "max-keys=100&prefix"
-    actual = Stree::Connection.parse_params(:max_keys => 100, :prefix => nil)
+    actual = S3::Connection.parse_params(:max_keys => 100, :prefix => nil)
     assert_equal expected, actual
   end
 
   def test_headers_headers_empty
     expected = {}
-    actual = Stree::Connection.parse_headers({})
+    actual = S3::Connection.parse_headers({})
     assert_equal expected, actual
   end
 
   def test_parse_headers_only_interesting_headers
     expected = {}
-    actual = Stree::Connection.parse_headers(
+    actual = S3::Connection.parse_headers(
       :accept => "text/*, text/html, text/html;level=1, */*",
       :accept_charset => "iso-8859-2, unicode-1-1;q=0.8"
     )
@@ -115,7 +116,7 @@ class ConnectionTest < Test::Unit::TestCase
       "content-disposition" => nil,
       "content-encoding" => nil
     }
-    actual = Stree::Connection.parse_headers(
+    actual = S3::Connection.parse_headers(
       :content_type => nil,
       :x_amz_acl => nil,
       :if_modified_since => nil,
@@ -139,7 +140,7 @@ class ConnectionTest < Test::Unit::TestCase
       "content-disposition" => "inline",
       "content-encoding" => "gzip"
     }
-    actual = Stree::Connection.parse_headers(
+    actual = S3::Connection.parse_headers(
       :content_type => "text/html",
       :x_amz_acl => "public-read",
       :if_modified_since => "today",
@@ -156,7 +157,7 @@ class ConnectionTest < Test::Unit::TestCase
     expected = {
       "range" => "bytes=0-100"
     }
-    actual = Stree::Connection.parse_headers(
+    actual = S3::Connection.parse_headers(
       :range => 0..100
     )
     assert_equal expected, actual

data/test/object_test.rb

@@ -3,14 +3,14 @@ require 'test_helper'
 
 class ObjectTest < Test::Unit::TestCase
   def setup
-    @service = Stree::Service.new(
+    @service = S3::Service.new(
       :access_key_id => "1234",
       :secret_access_key => "1337"
     )
-    @bucket_images = Stree::Bucket.new(@service, "images")
-    @object_lena = Stree::Object.new(@bucket_images, "Lena.png")
+    @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 = Stree::Object.new(@bucket_images, "Carmen.png")
+    @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) }
@@ -30,14 +30,14 @@ class ObjectTest < Test::Unit::TestCase
   end
 
   def test_initilalize
-    assert_raise ArgumentError do Stree::Object.new(nil, "") end # should not allow empty key
-    assert_raise ArgumentError do Stree::Object.new(nil, "//") end # should not allow key with double slash
+    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
-      Stree::Object.new(nil, "Lena.png")
-      Stree::Object.new(nil, "Lena playboy.png")
-      Stree::Object.new(nil, "Lena Söderberg.png")
-      Stree::Object.new(nil, "/images/pictures/test images/Lena not full.png")
+      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
 
@@ -48,42 +48,42 @@ class ObjectTest < Test::Unit::TestCase
   end
 
   def test_url
-    bucket1 = Stree::Bucket.new(@service, "images")
+    bucket1 = S3::Bucket.send(:new, @service, "images")
 
-    object11 = Stree::Object.new(bucket1, "Lena.png")
+    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 = Stree::Object.new(bucket1, "Lena Söderberg.png")
+    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 = Stree::Bucket.new(@service, "images_new")
+    bucket2 = S3::Bucket.send(:new, @service, "images_new")
 
-    object21 = Stree::Object.new(bucket2, "Lena.png")
+    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
 
   def test_cname_url
-    bucket1 = Stree::Bucket.new(@service, "images.example.com")
+    bucket1 = S3::Bucket.send(:new, @service, "images.example.com")
 
-    object11 = Stree::Object.new(bucket1, "Lena.png")
+    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 = Stree::Object.new(bucket1, "Lena Söderberg.png")
+    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 = Stree::Bucket.new(@service, "images_new")
+    bucket2 = S3::Bucket.send(:new, @service, "images_new")
 
-    object21 = Stree::Object.new(bucket2, "Lena.png")
+    object21 = S3::Object.send(:new, bucket2, :key => "Lena.png")
     expected = nil
     actual = object21.cname_url
     assert_equal expected, actual
@@ -95,16 +95,13 @@ class ObjectTest < Test::Unit::TestCase
   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 }
+    mock(@object_lena).object_request(:put, :body=>"test", :headers=>{ :x_amz_acl=>"public-read", :content_type=>"application/octet-stream" }) { @response_binary }
 
     assert @object_lena.save
   end
 
   def test_content_and_parse_headers
-    mock(@object_lena).object_request(:get) { @response_binary }
+    mock(@object_lena).object_request(:get, {}).times(2) { @response_binary }
 
     expected = /test/n
     actual = @object_lena.content(true) # wtf? don't work with false, maybe is not fully cleaned
@@ -114,8 +111,6 @@ class ObjectTest < Test::Unit::TestCase
     stub(@object_lena).object_request(:get) { flunk "should not use connection" }
 
     assert @object_lena.content
-
-    mock(@object_lena).object_request(:get) { @response_binary }
     assert @object_lena.content(true)
   end
 
@@ -128,7 +123,7 @@ class ObjectTest < Test::Unit::TestCase
     mock(@object_lena).retrieve { true }
     assert @object_lena.exists?
 
-    mock(@object_carmen).retrieve { raise Stree::Error::NoSuchKey.new(nil, nil) }
+    mock(@object_carmen).retrieve { raise S3::Error::NoSuchKey.new(nil, nil) }
     assert ! @object_carmen.exists?
   end
 
@@ -151,14 +146,11 @@ class ObjectTest < Test::Unit::TestCase
   end
 
   def test_copy
-    mock(@bucket_images).bucket_request(
-      :put, :path=>"Lena.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 }
+    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 }
 
-    new_object = @object_lena.copy
+    new_object = @object_lena.copy(:key => "Lena-copy.png")
 
-    assert_equal @object_lena, new_object
-    assert ! @object_lena.eql?(new_object)
+    assert_equal "Lena-copy.png", new_object.key
+    assert_equal "Lena.png", @object_lena.key
   end
 end

data/test/service_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class ServiceTest < Test::Unit::TestCase
   def setup
-    @service_empty_buckets_list = Stree::Service.new(
+    @service_empty_buckets_list = S3::Service.new(
       :access_key_id =>  "12345678901234567890",
       :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
     )
@@ -10,7 +10,7 @@ class ServiceTest < Test::Unit::TestCase
     stub(@service_empty_buckets_list).service_request { @response_empty_buckets_list }
     stub(@response_empty_buckets_list).body { @buckets_empty_list_body }
 
-    @service_buckets_list = Stree::Service.new(
+    @service_buckets_list = S3::Service.new(
       :access_key_id =>  "12345678901234567890",
       :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
     )
@@ -18,7 +18,7 @@ class ServiceTest < Test::Unit::TestCase
     stub(@service_buckets_list).service_request { @response_buckets_list }
     stub(@response_buckets_list).body { @buckets_list_body }
 
-    @service_bucket_exists = Stree::Service.new(
+    @service_bucket_exists = S3::Service.new(
       :access_key_id =>  "12345678901234567890",
       :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
     )
@@ -26,12 +26,12 @@ class ServiceTest < Test::Unit::TestCase
     stub(@service_bucket_exists).service_request { @response_bucket_exists }
     stub(@response_bucket_exists).body { @bucket_exists }
 
-    @service_bucket_not_exists = Stree::Service.new(
+    @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 Stree::Error::NoSuchBucket.new(404, @response_bucket_not_exists) }
+    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 }
 
     @buckets_empty_list = []
@@ -40,8 +40,8 @@ class ServiceTest < Test::Unit::TestCase
     EOEmptyBuckets
 
     @buckets_list = [
-      Stree::Bucket.new(@service_buckets_list, "data.example.com"),
-      Stree::Bucket.new(@service_buckets_list, "images")
+      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>
@@ -93,7 +93,7 @@ class ServiceTest < Test::Unit::TestCase
 
     expected = "bucket_name"
     actual = @service_empty_buckets_list.buckets.build("bucket_name")
-    assert_kind_of Stree::Bucket, actual
+    assert_kind_of S3::Bucket, actual
     assert_equal expected, actual.name
   end
 
@@ -105,7 +105,7 @@ class ServiceTest < Test::Unit::TestCase
   end
 
   def test_buckets_find_first_fail
-    assert_raise Stree::Error::NoSuchBucket do
+    assert_raise S3::Error::NoSuchBucket do
       @service_bucket_not_exists.buckets.find_first("data2.example.com")
     end
   end

data/test/signature_test.rb

@@ -7,7 +7,7 @@ class SignatureTest < Test::Unit::TestCase
     request["host"] = "johnsmith.s3.amazonaws.com"
     request["date"] = "Tue, 27 Mar 2007 19:36:42 +0000"
 
-    actual = Stree::Signature.generate(
+    actual = S3::Signature.generate(
       :host => request["host"],
       :request => request,
       :access_key_id => "0PN5J17HBGZHT7JJ3X82",
@@ -24,7 +24,7 @@ class SignatureTest < Test::Unit::TestCase
     request["host"] = "johnsmith.s3.amazonaws.com"
     request["date"] = "Tue, 27 Mar 2007 21:15:45 +0000"
 
-    actual = Stree::Signature.generate(
+    actual = S3::Signature.generate(
       :host => request["host"],
       :request => request,
       :access_key_id => "0PN5J17HBGZHT7JJ3X82",
@@ -40,7 +40,7 @@ class SignatureTest < Test::Unit::TestCase
     request["host"] = "johnsmith.s3.amazonaws.com"
     request["date"] = "Tue, 27 Mar 2007 19:42:41 +0000"
 
-    actual = Stree::Signature.generate(
+    actual = S3::Signature.generate(
       :host => request["host"],
       :request => request,
       :access_key_id => "0PN5J17HBGZHT7JJ3X82",
@@ -55,7 +55,7 @@ class SignatureTest < Test::Unit::TestCase
     request["host"] = "johnsmith.s3.amazonaws.com"
     request["date"] = "Tue, 27 Mar 2007 19:44:46 +0000"
 
-    actual = Stree::Signature.generate(
+    actual = S3::Signature.generate(
       :host => request["host"],
       :request => request,
       :access_key_id => "0PN5J17HBGZHT7JJ3X82",
@@ -72,7 +72,7 @@ class SignatureTest < Test::Unit::TestCase
     request["date"] = "Tue, 27 Mar 2007 21:20:27 +0000"
     request["x-amz-date"] = "Tue, 27 Mar 2007 21:20:26 +0000"
 
-    actual = Stree::Signature.generate(
+    actual = S3::Signature.generate(
       :host => request["host"],
       :request => request,
       :access_key_id => "0PN5J17HBGZHT7JJ3X82",
@@ -101,7 +101,7 @@ class SignatureTest < Test::Unit::TestCase
     request["content-encoding"] = "gzip"
     request["content-length"] = "5913339"
 
-    actual = Stree::Signature.generate(
+    actual = S3::Signature.generate(
       :host => "static.johnsmith.net",
       :request => request,
       :access_key_id => "0PN5J17HBGZHT7JJ3X82",
@@ -116,7 +116,7 @@ class SignatureTest < Test::Unit::TestCase
     request["host"] = "s3.amazonaws.com"
     request["date"] = "Wed, 28 Mar 2007 01:29:59 +0000"
 
-    actual = Stree::Signature.generate(
+    actual = S3::Signature.generate(
       :host => request["host"],
       :request => request,
       :access_key_id => "0PN5J17HBGZHT7JJ3X82",
@@ -131,7 +131,7 @@ class SignatureTest < Test::Unit::TestCase
     request["host"] = "s3.amazonaws.com"
     request["date"] = "Wed, 28 Mar 2007 01:49:49 +0000"
 
-    actual = Stree::Signature.generate(
+    actual = S3::Signature.generate(
       :host => request["host"],
       :request => request,
       :access_key_id => "0PN5J17HBGZHT7JJ3X82",

data/test/test_helper.rb

@@ -4,7 +4,7 @@ require 'rr'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'stree'
+require 's3'
 
 class Test::Unit::TestCase
   include RR::Adapters::TestUnit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: s3
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -11,7 +11,7 @@ bindir: bin
 cert_chain: []
 
 date: 2009-10-09 00:00:00 +02:00
-default_executable: stree
+default_executable: s3
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: trollop
@@ -26,7 +26,7 @@ dependencies:
 description: 
 email: qoobaa@gmail.com
 executables: 
-- stree
+- s3
 extensions: []
 
 extra_rdoc_files: 
@@ -39,18 +39,18 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- bin/stree
-- extra/stree_backend.rb
-- lib/stree.rb
-- lib/stree/bucket.rb
-- lib/stree/connection.rb
-- lib/stree/exceptions.rb
-- lib/stree/object.rb
-- lib/stree/parser.rb
-- lib/stree/roxy/moxie.rb
-- lib/stree/roxy/proxy.rb
-- lib/stree/service.rb
-- lib/stree/signature.rb
+- bin/s3
+- extra/s3_backend.rb
+- lib/s3.rb
+- lib/s3/bucket.rb
+- lib/s3/connection.rb
+- lib/s3/exceptions.rb
+- lib/s3/object.rb
+- lib/s3/parser.rb
+- lib/s3/roxy/moxie.rb
+- lib/s3/roxy/proxy.rb
+- lib/s3/service.rb
+- lib/s3/signature.rb
 - test/bucket_test.rb
 - test/connection_test.rb
 - test/object_test.rb
@@ -58,7 +58,7 @@ files:
 - test/signature_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/qoobaa/stree
+homepage: http://github.com/qoobaa/s3
 licenses: []
 
 post_install_message: 

data/lib/stree.rb

@@ -1,24 +0,0 @@
-require "base64"
-require "digest/md5"
-require "forwardable"
-require "net/http"
-require "net/https"
-require "openssl"
-require "rexml/document"
-require "time"
-
-require "stree/roxy/moxie"
-require "stree/roxy/proxy"
-
-require "stree/parser"
-require "stree/bucket"
-require "stree/connection"
-require "stree/exceptions"
-require "stree/object"
-require "stree/service"
-require "stree/signature"
-
-module Stree
-  # Default (and only) host serving S3 stuff
-  HOST = "s3.amazonaws.com"
-end