s3 0.3.7 → 0.3.8

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    s3 (0.3.7)
-      proxies
+    s3 (0.3.8)
+      proxies (~> 0.2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -19,6 +19,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.0.0)
   mocha
-  proxies
   s3!
   test-unit (>= 2.0)

data/README.md

@@ -0,0 +1,78 @@
+# 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).
+
+<a href="http://pledgie.com/campaigns/14173"><img alt="Click here to lend your support to: S3 and make a donation at www.pledgie.com!" src="http://pledgie.com/campaigns/14173.png?skin_name=chrome" border="0" /></a>
+
+## Installation
+
+    gem install s3
+
+## Usage
+
+### Initialize the service
+
+    require "s3"
+    service = S3::Service.new(:access_key_id => "...",
+                              :secret_access_key => "...")
+    #=> #<S3::Service:...>
+
+### List buckets
+
+    service.buckets
+    #=> [#<S3::Bucket:first-bucket>,
+    #    #<S3::Bucket:second-bucket>]
+
+### Find bucket
+
+    first_bucket = service.buckets.find("first-bucket")
+    #=> #<S3::Bucket:first-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
+
+    object = first_bucket.objects.find("lenna.png")
+    #=> #<S3::Object:/first-bucket/lenna.png>
+
+### Access object metadata (cached from find)
+
+    object.content_type
+    #=> "image/png"
+
+### Access object content (downloads the object)
+
+    object.content
+    #=> "\x89PNG\r\n\x1A\n\x00\x00\x00\rIHDR\x00..."
+
+### Delete an object
+
+    object.destroy
+    #=> true
+
+### Create an object
+
+    new_object = bucket.objects.build("bender.png")
+    #=> #<S3::Object:/synergy-staging/bender.png>
+
+    new_object.content = open("bender.png")
+
+    new_object.save
+    #=> true
+
+## 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)
+
+## Copyright
+
+Copyright (c) 2009 Jakub Kuźma, Mirosław Boruta. See [LICENSE](http://github.com/qoobaa/s3/raw/master/LICENSE) for details.

data/extra/s3_paperclip.rb

@@ -95,7 +95,10 @@ module Paperclip
       def to_file style = default_style
         return @queued_for_write[style] if @queued_for_write[style]
         begin
-          file = Tempfile.new(path(style))
+          filename = path(style)
+          extname = File.extname(filename)
+          basename = File.basename(filename, extname)
+          file = Tempfile.new([basename, extname])
           file.binmode if file.respond_to?(:binmode)
           file.write(bucket.objects.find(path(style)).content)
           file.rewind

data/lib/s3/bucket.rb

@@ -94,6 +94,13 @@ module S3
       Proxy.new(lambda { list_bucket }, :owner => self, :extend => ObjectsExtension)
     end
 
+    # Returns the object with the given key. Does not check whether the
+    # object exists. But also does not issue any HTTP requests, so it's
+    # much faster than objects.find
+    def object(key)
+      Object.send(:new, self, :key => key)
+    end
+
     def inspect #:nodoc:
       "#<#{self.class}:#{name}>"
     end

data/lib/s3/object.rb

@@ -150,7 +150,7 @@ module S3
       headers[:content_disposition] = options[:content_disposition] if options[:content_disposition]
       headers[:cache_control] = options[:cache_control] if options[:cache_control]
       headers[:x_amz_copy_source] = full_key
-      headers[:x_amz_metadata_directive] = "REPLACE"
+      headers[:x_amz_metadata_directive] = options[:replace] == false ? "COPY" : "REPLACE"
       headers[:x_amz_copy_source_if_match] = options[:if_match] if options[:if_match]
       headers[:x_amz_copy_source_if_none_match] = options[:if_none_match] if options[:if_none_match]
       headers[:x_amz_copy_source_if_unmodified_since] = options[:if_modified_since] if options[:if_modified_since]

data/lib/s3/service.rb

@@ -39,6 +39,13 @@ module S3
       Proxy.new(lambda { list_all_my_buckets }, :owner => self, :extend => BucketsExtension)
     end
 
+    # Returns the bucket with the given name. Does not check whether the
+    # bucket exists. But also does not issue any HTTP requests, so it's
+    # much faster than buckets.find
+    def bucket(name)
+      Bucket.send(:new, self, name)
+    end
+
     # Returns "http://" or "https://", depends on <tt>:use_ssl</tt>
     # value from initializer
     def protocol

data/lib/s3/signature.rb

@@ -220,7 +220,23 @@ module S3
       # 4. If the request addresses a sub-resource, like ?location,
       # ?acl, or ?torrent, append the sub-resource including question
       # mark.
-      string << "?#{$1}" if uri.query =~ /&?(acl|torrent|logging|location)(?:&|=|\Z)/
+      sub_resources = [
+        'acl',
+        'location',
+        'logging',
+        'notification',
+        'partNumber',
+        'policy',
+        'requestPayment',
+        'torrent',
+        'uploadId',
+        'uploads',
+        'versionId',
+        'versioning',
+        'versions',
+        'website'
+      ]
+      string << "?#{$1}" if uri.query =~ /&?(#{sub_resources.join('|')})(?:&|=|\Z)/
       string
     end
   end

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/s3.gemspec

@@ -1,6 +1,9 @@
 # -*- encoding: utf-8 -*-
 
-require File.expand_path("../lib/s3/version", __FILE__)
+# Load version requiring the canonical "s3/version", otherwise Ruby will think
+# is a different file and complaint about a double declaration of S3::VERSION.
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require "s3/version"
 
 Gem::Specification.new do |s|
   s.name        = "s3"
@@ -15,7 +18,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "s3"
 
-  s.add_dependency "proxies"
+  s.add_dependency "proxies", "~> 0.2.0"
   s.add_development_dependency "test-unit", ">= 2.0"
   s.add_development_dependency "mocha"
   s.add_development_dependency "bundler", ">= 1.0.0"

data/test/object_test.rb

@@ -157,18 +157,18 @@ class ObjectTest < Test::Unit::TestCase
     actual = @object_lena.acl
     assert_equal expected, actual
   end
-  
+
   test "storage-class writer" do
     expected = nil
     actual = @object_lena.storage_class
     assert_equal expected, actual
-    
+
     assert @object_lena.storage_class = :standard
-    
+
     expected = "STANDARD"
     actual = @object_lena.storage_class
     assert_equal expected, actual
-    
+
     assert @object_lena.storage_class = :reduced_redundancy
 
     expected = "REDUCED_REDUNDANCY"
@@ -176,7 +176,7 @@ class ObjectTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
-  test "copy" do
+  test "replace" 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")
@@ -184,4 +184,13 @@ class ObjectTest < Test::Unit::TestCase
     assert_equal "Lena-copy.png", new_object.key
     assert_equal "Lena.png", @object_lena.key
   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 => "COPY" }).returns(@response_xml)
+
+    new_object = @object_lena.copy(:key => "Lena-copy.png", :replace => false)
+
+    assert_equal "Lena-copy.png", new_object.key
+    assert_equal "Lena.png", @object_lena.key
+  end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: s3
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 7
-  version: 0.3.7
+  prerelease: 
+  version: 0.3.8
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 +02:00
+date: 2011-03-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,11 +18,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -37,9 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
         version: "2.0"
   type: :development
   prerelease: false
@@ -51,8 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -64,10 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   prerelease: false
@@ -86,7 +71,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - extra/s3_attachment_fu.rb
 - extra/s3_paperclip.rb
@@ -123,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3296897330677873024
+      hash: 1379753891873581983
       segments: 
       - 0
       version: "0"
@@ -132,15 +117,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: s3
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Library for accessing S3 objects and buckets

data/README.rdoc

@@ -1,22 +0,0 @@
-= S3
-
-S3 library provides access to {Amazon's Simple Storage Service}[http://aws.amazon.com/s3/].
-It supports both: European and US buckets through {REST API}[http://docs.amazonwebservices.com/AmazonS3/latest/RESTAPI.html].
-
-* homepage[http://jah.pl/projects/s3.html]
-* gemcutter[http://gemcutter.org/gems/s3]
-* repository[http://github.com/qoobaa/s3]
-* {issue tracker}[http://github.com/qoobaa/s3/issues]
-* rdoc[http://qoobaa.github.com/s3]
-
-== Installation
-
-  gem install s3
-
-== Usage
-
-See homepage[http://jah.pl/projects/s3.html] for details.
-
-== Copyright
-
-Copyright (c) 2009 Jakub Kuźma, Mirosław Boruta. See LICENSE[http://github.com/qoobaa/s3/raw/master/LICENSE] for details.