s3 0.3.10 → 0.3.11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    s3 (0.3.10)
+    s3 (0.3.11)
       proxies (~> 0.2.0)
 
 GEM

data/{README.md → README.rdoc}

@@ -1,60 +1,60 @@
-# S3
+= S3
 
-S3 library provides access to [Amazon's Simple Storage Service](http://aws.amazon.com/s3/).
+S3 library provides access to {Amazon's Simple Storage Service}[http://aws.amazon.com/s3/].
 
-It supports both: European and US buckets through the [REST API](http://docs.amazonwebservices.com/AmazonS3/latest/API/APIRest.html).
+It supports both: European and US buckets through the {REST API}[http://docs.amazonwebservices.com/AmazonS3/latest/API/APIRest.html].
 
-## Installation
+== Installation
 
     gem install s3
 
-## Usage
+== Usage
 
-### Initialize the service
+=== Initialize the service
 
     require "s3"
     service = S3::Service.new(:access_key_id => "...",
                               :secret_access_key => "...")
     #=> #<S3::Service:...>
 
-### List buckets
+=== List buckets
 
     service.buckets
     #=> [#<S3::Bucket:first-bucket>,
     #    #<S3::Bucket:second-bucket>]
 
-### Find bucket
+=== Find bucket
 
     first_bucket = service.buckets.find("first-bucket")
     #=> #<S3::Bucket:first-bucket>
 
-### List objects in a bucket
+=== List objects in a bucket
 
     first_bucket.objects
     #=> [#<S3::Object:/first-bucket/lenna.png>,
     #    #<S3::Object:/first-bucket/lenna_mini.png>]
 
-### Find object in a bucket
+=== Find object in a bucket
 
     object = first_bucket.objects.find("lenna.png")
     #=> #<S3::Object:/first-bucket/lenna.png>
 
-### Access object metadata (cached from find)
+=== Access object metadata (cached from find)
 
     object.content_type
     #=> "image/png"
 
-### Access object content (downloads the object)
+=== Access object content (downloads the object)
 
     object.content
     #=> "\x89PNG\r\n\x1A\n\x00\x00\x00\rIHDR\x00..."
 
-### Delete an object
+=== Delete an object
 
     object.destroy
     #=> true
 
-### Create an object
+=== Create an object
 
     new_object = bucket.objects.build("bender.png")
     #=> #<S3::Object:/synergy-staging/bender.png>
@@ -67,13 +67,13 @@ It supports both: European and US buckets through the [REST API](http://docs.ama
 Please note that new objects are created with "public-read" ACL by
 default.
 
-## See also
+== See also
 
-* [gemcutter](http://gemcutter.org/gems/s3)
-* [repository](http://github.com/qoobaa/s3)
-* [issue tracker](http://github.com/qoobaa/s3/issues)
-* [documentation](http://qoobaa.github.com/s3)
+* rubygems[http://rubygems.org/gems/s3]
+* repository[http://github.com/qoobaa/s3]
+* {issue tracker}[http://github.com/qoobaa/s3/issues]
+* documentation[http://rubydoc.info/github/qoobaa/s3/master/frames]
 
-## Copyright
+== Copyright
 
-Copyright (c) 2009 Jakub Kuźma, Mirosław Boruta. See [LICENSE](http://github.com/qoobaa/s3/raw/master/LICENSE) for details.
+Copyright (c) 2009 Jakub Kuźma, Mirosław Boruta. See LICENSE[http://github.com/qoobaa/s3/raw/master/LICENSE] for details.

data/lib/s3/object.rb

@@ -6,7 +6,7 @@ module S3
     extend Forwardable
 
     attr_accessor :content_type, :content_disposition, :content_encoding, :cache_control
-    attr_reader :last_modified, :etag, :size, :bucket, :key, :acl, :storage_class
+    attr_reader :last_modified, :etag, :size, :bucket, :key, :acl, :storage_class, :metadata
     attr_writer :content
 
     def_instance_delegators :bucket, :name, :service, :bucket_request, :vhost?, :host, :path_prefix
@@ -235,6 +235,7 @@ module S3
     end
 
     def parse_headers(response)
+      @metadata = response.to_hash.select { |k, v| k.to_s.start_with?("x-amz-meta") }
       self.etag = response["etag"] if response.key?("etag")
       self.content_type = response["content-type"] if response.key?("content-type")
       self.content_disposition = response["content-disposition"] if response.key?("content-disposition")

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

data/test/object_test.rb

@@ -22,6 +22,7 @@ class ObjectTest < Test::Unit::TestCase
     @response_binary["content-encoding"] = nil
     @response_binary["last-modified"] = Time.now.httpdate
     @response_binary["content-length"] = 20
+    @response_binary["x-amz-meta-test"] = "metadata"
 
     @xml_body = <<-EOXML
     <?xml version="1.0" encoding="UTF-8"?>
@@ -132,6 +133,14 @@ class ObjectTest < Test::Unit::TestCase
     assert @object_lena.retrieve
   end
 
+  test "retrieve headers" do
+    @object_lena.expects(:object_request).twice.with(:head, {}).returns(@response_binary)
+    assert @object_lena.retrieve
+
+    meta = {"x-amz-meta-test" => ["metadata"]}
+    assert_equal meta, @object_lena.retrieve.metadata
+  end
+
   test "exists" do
     @object_lena.expects(:retrieve).returns(true)
     assert @object_lena.exists?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000 Z
+date: 2011-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: proxies
-  requirement: &10828500 !ruby/object:Gem::Requirement
+  requirement: &6899940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *10828500
+  version_requirements: *6899940
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &10827960 !ruby/object:Gem::Requirement
+  requirement: &6952760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *10827960
+  version_requirements: *6952760
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &10827580 !ruby/object:Gem::Requirement
+  requirement: &6952100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10827580
+  version_requirements: *6952100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10827020 !ruby/object:Gem::Requirement
+  requirement: &6950720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *10827020
+  version_requirements: *6950720
 description: ! 'S3 library provides access to Amazon''s Simple Storage Service. It
   supports both: European and US buckets through REST API.'
 email:
@@ -67,7 +67,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.md
+- README.rdoc
 - Rakefile
 - lib/s3.rb
 - lib/s3/bucket.rb
@@ -100,6 +100,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3173124590106976282
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: