aws-sdk 1.2.0 → 1.2.1

data/lib/aws/core.rb

@@ -21,6 +21,7 @@ require 'aws/core/autoloader'
 # The currently supported services are:
 #
 # * {EC2}
+# * {ELB}
 # * {S3}
 # * {SimpleDB}
 # * {SimpleEmailService}
@@ -55,7 +56,7 @@ require 'aws/core/autoloader'
 module AWS
 
   # Current version of the AWS SDK for Ruby
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 
   register_autoloads(self) do
     autoload :Errors, 'errors'

data/lib/aws/core/configuration.rb

@@ -82,7 +82,7 @@ module AWS
     #    to send service requests through.  You can pass a URI object or a 
     #    URI string.  Defautls to +nil+.
     #
-    #      AWS.config(:proxy_uri => 'https://user:pass@my.proxy:443/path?query')
+    #      AWS.config(:proxy_uri => 'https://user:pass@my.proxy:443')
     #
     # @attr_reader [String] s3_endpoint The service endpoint for Amazon S3.
     #   Defaults to 's3.amazonaws.com'.

data/lib/aws/core/uri_escape.rb

@@ -35,7 +35,7 @@ module AWS
       protected
       def escape_path value
         escaped = ""
-        value.scan(%r{(/?)([^/]+)(/?)}) do |(leading, part, trailing)|
+        value.scan(%r{(/*)([^/]*)(/*)}) do |(leading, part, trailing)|
           escaped << leading + escape(part) + trailing
         end
         escaped

data/lib/aws/s3/client.rb

@@ -802,6 +802,7 @@ module AWS
                       :metadata_directive => 'x-amz-metadata-directive',
                       :storage_class => 'x-amz-storage-class',
                       :server_side_encryption => 'x-amz-server-side-encryption',
+                      :content_type => 'Content-Type',
                     }) do
 
         configure_request do |req, options|

data/lib/aws/s3/s3_object.rb

@@ -459,6 +459,10 @@ module AWS
       #   with the copied object.  Each name, value pair must conform
       #   to US-ASCII.  When blank, the sources metadata is copied.
       #
+      # @option options [String] :content_type The content type of
+      #   the copied object.  Defaults to the source object's content
+      #   type.
+      #
       # @option options [Boolean] :reduced_redundancy (false) If true the
       #   object is stored with reduced redundancy in S3 for a lower cost.
       #
@@ -503,11 +507,16 @@ module AWS
           end
         end
 
+        copy_opts[:metadata_directive] = 'COPY'
+
         if options[:metadata]
           copy_opts[:metadata] = options[:metadata]
           copy_opts[:metadata_directive] = 'REPLACE'
-        else
-          copy_opts[:metadata_directive] = 'COPY'
+        end
+
+        if options[:content_type]
+          copy_opts[:content_type] = options[:content_type]
+          copy_opts[:metadata_directive] = "REPLACE"
         end
 
         copy_opts[:acl] = options[:acl] if options[:acl]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aws-sdk
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Amazon Web Services
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 -07:00
+date: 2011-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency