aws-s3 0.6.2 → 0.6.3

data/README

@@ -195,10 +195,10 @@ You can change the content type as well if you like:
   song.content_type = 'application/pdf'
   song.store
 
-(Keep in mind that due to limitiations in S3's exposed API, the only way to change things like the content_type
+(Keep in mind that due to limitations in S3's exposed API, the only way to change things like the content_type
 is to PUT the object onto S3 again. In the case of large files, this will result in fully re-uploading the file.)
 
-A bevie of information about an object can be had using the <tt>about</tt> method:
+A bevy of information about an object can be had using the <tt>about</tt> method:
 
   pp song.about
   {"last-modified"    => "Sat, 28 Oct 2006 21:29:26 GMT",
@@ -531,7 +531,7 @@ You could use this information to redisplay the error in a way you see fit, or j
 ==== Accessing the last request's response
 
 Sometimes methods that make requests to the S3 servers return some object, like a Bucket or an S3Object. 
-Othertimes they return just <tt>true</tt>. Other times they raise an exception that you may want to rescue. Despite all these 
+Other times they return just <tt>true</tt>. Other times they raise an exception that you may want to rescue. Despite all these 
 possible outcomes, every method that makes a request stores its response object for you in Service.response. You can always 
 get to the last request's response via Service.response.
 

data/lib/aws/s3/connection.rb

@@ -63,7 +63,7 @@ module AWS
         path         = self.class.prepare_path(path)
         request      = request_method(:get).new(path, {})
         query_string = query_string_authentication(request, options)
-        returning "#{protocol(options)}#{http.address}#{port_string}#{path}" do |url|
+        "#{protocol(options)}#{http.address}#{port_string}#{path}".tap do |url|
           url << "?#{query_string}" if authenticate
         end
       end

data/lib/aws/s3/extensions.rb

@@ -1,3 +1,4 @@
+#encoding: BINARY
 #:stopdoc:
 
 class Hash
@@ -38,6 +39,11 @@ class String
     end
   end
   
+  def tap
+    yield(self)
+    self
+  end unless ''.respond_to?(:tap)
+  
   def previous
     dup.previous!
   end

data/lib/aws/s3/object.rb

@@ -75,10 +75,10 @@ module AWS
     #   song.content_type = 'application/pdf'
     #   song.store
     # 
-    # (Keep in mind that due to limitiations in S3's exposed API, the only way to change things like the content_type
+    # (Keep in mind that due to limitations in S3's exposed API, the only way to change things like the content_type
     # is to PUT the object onto S3 again. In the case of large files, this will result in fully re-uploading the file.)
     # 
-    # A bevie of information about an object can be had using the <tt>about</tt> method:
+    # A bevy of information about an object can be had using the <tt>about</tt> method:
     # 
     #   pp song.about
     #   {"last-modified"    => "Sat, 28 Oct 2006 21:29:26 GMT",
@@ -184,7 +184,7 @@ module AWS
           source_key      = path!(bucket, key)
           default_options = {'x-amz-copy-source' => source_key}
           target_key      = path!(bucket, copy_key)
-          returning put(target_key, default_options) do
+          returning put(target_key, default_options.merge(options)) do
             acl(copy_key, bucket, acl(key, bucket)) if options[:copy_acl]
           end
         end

data/lib/aws/s3/service.rb

@@ -28,7 +28,7 @@ module AWS
         memoized :buckets
         
         # Sometimes methods that make requests to the S3 servers return some object, like a Bucket or an S3Object. 
-        # Othertimes they return just <tt>true</tt>. Other times they raise an exception that you may want to rescue. Despite all these 
+        # Other times they return just <tt>true</tt>. Other times they raise an exception that you may want to rescue. Despite all these 
         # possible outcomes, every method that makes a request stores its response object for you in Service.response. You can always 
         # get to the last request's response via Service.response.
         # 
@@ -48,4 +48,4 @@ module AWS
       end
     end
   end
-end
+end

data/lib/aws/s3/version.rb

@@ -3,8 +3,8 @@ module AWS
     module VERSION #:nodoc:
       MAJOR    = '0'
       MINOR    = '6'
-      TINY     = '2' 
-      BETA     = nil #Time.now.to_i.to_s
+      TINY     = '3'
+      BETA     = nil # Time.now.to_i.to_s
     end
     
     Version = [VERSION::MAJOR, VERSION::MINOR, VERSION::TINY, VERSION::BETA].compact * '.'

data/test/extensions_test.rb

@@ -74,6 +74,11 @@ class StringExtensionsTest < Test::Unit::TestCase
     assert "318597/620065/GTL_75\24300_A600_A610.zip".remove_extended.valid_utf8?
     assert "318597/620065/GTL_75£00_A600_A610.zip".remove_extended.valid_utf8?
   end
+  
+  def test_tap
+    assert_equal("http://google.com/foo/", "http://google.com".tap {|url| url << "/foo/" })
+  end
+  
 end
 
 class CoercibleStringTest < Test::Unit::TestCase  

data/test/object_test.rb

@@ -148,6 +148,21 @@ class ObjectTest < Test::Unit::TestCase
       S3Object.about('asdfasdfasdfas-this-does-not-exist', 'bucket does not matter')
     end
   end
+  def test_copy_options_are_used
+    options = {'x-amz-storage-class' => 'REDUCED_REDUNDANCY'}
+    resp = FakeResponse.new
+
+    connection = flexmock('Mock connection') do |mock|
+      mock.should_receive(:request).
+        # The storage-class key must be passed to connection.request(:put, ...)
+        with(:put, '/some-bucket/new', hsh(options), any, any).
+        and_return(resp)
+    end
+    flexmock(S3Object).should_receive(:connection).and_return(connection)
+
+    result = S3Object.copy('old', 'new', 'some-bucket', options)
+    assert_equal resp.code, result.code
+  end
 end
 
 class MetadataTest < Test::Unit::TestCase

data/test/remote/acl_test.rb

@@ -65,7 +65,7 @@ class RemoteACLTest < Test::Unit::TestCase
     new_grant                       = ACL::Grant.new
     new_grant.permission            = 'READ'
     new_grant_grantee               = ACL::Grantee.new
-    new_grant_grantee.email_address = 'marcel@vernix.org'
+    new_grant_grantee.email_address = [['amazon', 'marcelmolina'].join('@'), 'com'].join('.')
     new_grant.grantee = new_grant_grantee
     acl.grants << new_grant
     

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aws-s3
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  hash: 1
+  prerelease: 
+  segments: 
+  - 0
+  - 6
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Marcel Molina Jr.
@@ -9,39 +15,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-28 00:00:00 -07:00
+date: 2012-05-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xml-simple
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mime-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: Client library for Amazon's Simple Storage Service's REST API
 email: marcel@vernix.org
 executables: 
@@ -78,6 +96,35 @@ files:
 - support/faster-xml-simple/test/test_helper.rb
 - support/faster-xml-simple/test/xml_simple_comparison_test.rb
 - support/rdoc/code_info.rb
+- test/acl_test.rb
+- test/authentication_test.rb
+- test/base_test.rb
+- test/bucket_test.rb
+- test/connection_test.rb
+- test/error_test.rb
+- test/extensions_test.rb
+- test/fixtures/buckets.yml
+- test/fixtures/errors.yml
+- test/fixtures/headers.yml
+- test/fixtures/logging.yml
+- test/fixtures/loglines.yml
+- test/fixtures/logs.yml
+- test/fixtures/policies.yml
+- test/fixtures.rb
+- test/logging_test.rb
+- test/mocks/fake_response.rb
+- test/object_test.rb
+- test/parsing_test.rb
+- test/remote/acl_test.rb
+- test/remote/bittorrent_test.rb
+- test/remote/bucket_test.rb
+- test/remote/logging_test.rb
+- test/remote/object_test.rb
+- test/remote/test_file.data
+- test/remote/test_helper.rb
+- test/response_test.rb
+- test/service_test.rb
+- test/test_helper.rb
 - README
 - COPYING
 - INSTALL
@@ -96,21 +143,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: amazon
-rubygems_version: 1.3.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Client library for Amazon's Simple Storage Service's REST API