s3 0.2.5 → 0.2.6

data/README.rdoc

@@ -11,11 +11,7 @@ It supports both: European and US buckets through {REST API}[http://docs.amazonw
 
 == Installation
 
-If you don't have the {Gemcutter sources}[http://gemcutter.org/pages/gem_docs] yet:
-  gem sources -a http://gemcutter.org
-
-To install the gem type:
-  gem install s3
+  gem install s3 --source http://gemcutter.org
 
 == Usage
 

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/s3/object.rb

@@ -151,10 +151,10 @@ module S3
       object_attributes = parse_copy_object_result(response.body)
 
       object = Object.send(:new, bucket, object_attributes.merge(:key => key, :size => size))
-      object.acl = response[:x_amz_acl]
-      object.content_type = response[:content_type]
-      object.content_encoding = response[:content_encoding]
-      object.content_disposition = response[:content_disposition]
+      object.acl = response["x-amz-acl"]
+      object.content_type = response["content-type"]
+      object.content_encoding = response["content-encoding"]
+      object.content_disposition = response["content-disposition"]
       object
     end
 

data/lib/s3/signature.rb

@@ -111,11 +111,13 @@ module S3
       # 'x-amz-meta-username: fred' and 'x-amz-meta-username: barney'
       # would be combined into the single header 'x-amz-meta-username:
       # fred,barney'.
-      groupped_headers = headers.group_by { |i| i.first }
-      #=> {"a"=>[["a", 1], ["a", 2]], "b"=>[["b", 3]], "c"=>[["c", 0]]}
-      combined_headers = groupped_headers.map do |key, value|
-        values = value.map { |e| e.last }
-        [key, values.join(",")]
+      combined_headers = headers.inject([]) do |new_headers, header|
+        existing_header = new_headers.find { |h| h.first == header.first }
+        if existing_header
+          existing_header.last << ",#{header.last}"
+        else
+          new_headers << header
+        end
       end
       #=> [["a", "1,2"], ["b", "3"], ["c", "0"]]
 

data/s3.gemspec

@@ -0,0 +1,82 @@
+# 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.2.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jakub Ku\305\272ma", "Miros\305\202aw Boruta"]
+  s.date = %q{2010-02-07}
+  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/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",
+     "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.5}
+  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_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<test-unit>, [">= 2.0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<trollop>, [">= 1.14"])
+    s.add_dependency(%q<test-unit>, [">= 2.0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+  end
+end
+

data/test/bucket_test.rb

@@ -219,7 +219,7 @@ class BucketTest < Test::Unit::TestCase
     assert @bucket.objects.reload
 
     expected = @objects_list
-    actual = @bucket.objects
+    actual = @bucket.objects(true)
     assert_equal expected, actual
   end
 

data/test/connection_test.rb

@@ -86,9 +86,12 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
   test "parse params with and without values" do
-    expected = "max-keys=100&prefix"
-    actual = S3::Connection.parse_params(:max_keys => 100, :prefix => nil)
-    assert_equal expected, actual
+    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

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")
-    @response_binary.stubs(:body).returns("test".force_encoding(Encoding::BINARY))
+    @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"

data/test/signature_test.rb

@@ -89,9 +89,9 @@ class SignatureTest < Test::Unit::TestCase
     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=="
-    # TODO:
-    # was:
+    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"

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require "rubygems"
+gem "test-unit"
 require "test/unit"
 require "mocha"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: s3
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -72,6 +72,7 @@ files:
 - lib/s3/roxy/proxy.rb
 - lib/s3/service.rb
 - lib/s3/signature.rb
+- s3.gemspec
 - test/bucket_test.rb
 - test/connection_test.rb
 - test/object_test.rb