aws-sdk 1.0.2 → 1.0.3

data/lib/aws/base_client.rb

@@ -350,6 +350,7 @@ module AWS
     protected
     def xml_error_response? response
       response.http_response.status >= 300 and
+        response.http_response.body and
         xml_error_grammar.parse(response.http_response.body).respond_to?(:code)
 
     end

data/lib/aws/ec2/client/xml.rb

@@ -11,6 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+require 'aws/base_client'
 require 'aws/configured_xml_grammars'
 
 module AWS

data/lib/aws/http/request_param.rb

@@ -11,7 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'cgi'
+require 'aws/uri_escape'
 
 module AWS
   module Http
@@ -24,6 +24,8 @@ module AWS
       # @private
       class Param
 
+        include UriEscape
+
         attr_accessor :name, :value
 
         def initialize name, value = nil
@@ -56,14 +58,6 @@ module AWS
           end
         end
 
-        # @private
-        protected
-        def escape value
-          value = value.encode("UTF-8") if
-            value.respond_to?(:encode)
-          CGI::escape(value.to_s).gsub('+', '%20')
-        end
-        
       end
     end
   end

data/lib/aws/rails.rb

@@ -32,8 +32,8 @@ module AWS
   # A handful of useful Rails integration methods.
   #
   # If you require this gem inside a Rails application (via config.gem
-  # for rails 2 and bundler for rails 3) then AWS::Rails.setup
-  # is called automatically.
+  # for rails 2 and bundler for rails 3) then {setup} is called
+  # automatically.
   module Rails
     
     # Adds extra functionality to Rails.
@@ -43,33 +43,12 @@ module AWS
     #
     # Rails 3+ (RAILS_ROOT/Gemfile)
     #
-    #   gem 'aws-sdk-rails'
+    #   gem 'aws-sdk'
     #
     # Rails 2.1 - 2.3 (RAILS_ROOT/config/environment.rb)
     #
-    #   config.gem 'aws-sdk-rails'
+    #   config.gem 'aws-sdk'
     #
-    # === Selective Rails Features
-    #
-    # If you would prefer to cherry pick a few of the features added by this
-    # gem you can change your gem requirement to load 'aws/rails' instead:
-    #
-    # Rails 3+ (RAILS_ROOT/Gemfile)
-    #
-    #   gem 'aws-sdk-rails', :require => 'aws/rails'
-    #
-    # Rails 2.1 - 2.3 (RAILS_ROOT/config/environment.rb)
-    #
-    #   config.gem 'aws-sdk-rails', :lib => 'aws/rails'
-    #
-    # In both of the examples above you can now configure AWS and call the setup
-    # methods of choice inside a config initializer (e.g. 
-    # RAILS_ROOT/config/initializers/aws.rb):
-    #
-    #   AWS.config(...)
-    #   AWS.log_to_rails_logger
-    #   AWS.add_action_mailer_delivery_method 
-    #   
     # @return [nil]
     def self.setup
       load_yaml_config
@@ -135,7 +114,8 @@ module AWS
   
     end
   
-    # Adds a delivery method to ActionMailer that uses {AWS::SimplEmailService}.
+    # Adds a delivery method to ActionMailer that uses
+    # {AWS::SimpleEmailService}.
     #
     # Once you have an SES delivery method you can configure Rails to
     # use this for ActionMailer in your environment configuration

data/lib/aws/response.rb

@@ -58,6 +58,7 @@ module AWS
     #   by AWS.
     def throttled?
       !successful? and
+        http_response.body and
         parsed_body = XmlGrammar.parse(http_response.body) and
         parsed_body.respond_to?(:code) and
         parsed_body.code == "Throttling"

data/lib/aws/s3/client.rb

@@ -78,6 +78,11 @@ module AWS
 
       XMLNS = "http://s3.amazonaws.com/doc/#{API_VERSION}/"
 
+      EMPTY_BODY_ERRORS = {
+        304 => Errors::NotModified,
+        404 => Errors::NoSuchKey
+      }
+
       include DataOptions
 
       configure_client
@@ -471,6 +476,9 @@ module AWS
           MetaUtils.extend_method(response, :etag) do
             response.http_response.header('ETag')
           end
+          MetaUtils.extend_method(response, :last_modified) do
+            Time.parse(response.http_response.header('Last-Modified'))
+          end
         end
 
         simulate_response do |response|
@@ -610,6 +618,10 @@ module AWS
             end
           end
 
+          MetaUtils.extend_method(resp, :last_modified) do
+            Time.parse(resp.http_response.header('Last-Modified'))
+          end
+
           MetaUtils.extend_method(resp, :content_length) do
             http_response.header('content-length').to_i
           end
@@ -695,6 +707,9 @@ module AWS
           MetaUtils.extend_method(response, :etag) do
             response.http_response.header('ETag')
           end
+          MetaUtils.extend_method(response, :last_modified) do
+            Time.parse(response.http_response.header('Last-Modified'))
+          end
         end
 
         simulate_response do |response|
@@ -791,6 +806,9 @@ module AWS
           MetaUtils.extend_method(response, :etag) do
             response.http_response.header('ETag')
           end
+          MetaUtils.extend_method(response, :last_modified) do
+            Time.parse(response.http_response.header('Last-Modified'))
+          end
         end
 
       end
@@ -799,9 +817,23 @@ module AWS
       def xml_error_response? response
         (response.http_response.status >= 300 ||
          response.request_type == :complete_multipart_upload) and
+          response.http_response.body and
           XmlGrammar.parse(response.http_response.body).respond_to?(:code)
       end
 
+      protected
+      def populate_error response
+        code = response.http_response.status
+        if EMPTY_BODY_ERRORS.include?(code) and
+            response.http_response.body.nil?
+          response.error =
+            EMPTY_BODY_ERRORS[code].new(response.http_request,
+                                        response.http_response)
+        else
+          super
+        end
+      end
+
       protected
       def should_retry? response
         super or

data/lib/aws/s3/errors.rb

@@ -38,6 +38,34 @@ module AWS
 
       include LazyErrorClasses
 
+      # This error is special, because S3 does not (and must not
+      # according to RFC 2616) return a body with the HTTP response.
+      # The interface is the same as for any other client error.
+      class NotModified < AWS::Errors::Base
+        include AWS::Errors::ClientError
+
+        def code; "NotModified"; end
+
+        def initialize(req, resp)
+          super(req, resp, "Not Modified")
+        end
+
+      end
+
+      # This error is special, because S3 does not return a body with
+      # the HTTP response.  The interface is the same as for any other
+      # client error.
+      class NoSuchKey < AWS::Errors::Base
+        include AWS::Errors::ClientError
+
+        def code; "NoSuchKey"; end
+
+        def initialize(req, resp)
+          super(req, resp, "No Such Key")
+        end
+
+      end
+
     end
   end
 end

data/lib/aws/s3/request.rb

@@ -13,6 +13,7 @@
 
 require 'aws/http/request'
 require 'aws/base_client'
+require 'aws/uri_escape'
 require 'uri'
 require 'time'
 
@@ -22,6 +23,8 @@ module AWS
     # @private
     class Request < AWS::Http::Request
 
+      include UriEscape
+
       # @param [bucket] S3 bucket name
       attr_accessor :bucket
 
@@ -59,7 +62,7 @@ module AWS
       def path
         parts = []
         parts << bucket if bucket and Client.path_style_bucket_name?(bucket)
-        parts << key if key
+        parts << escape_path(key) if key
         "/#{parts.join('/')}"
       end
 

data/lib/aws/s3/s3_object.rb

@@ -74,6 +74,14 @@ module AWS
 
       alias_method :eql?, :==
 
+      def exists?
+        head
+      rescue Errors::NoSuchKey => e
+        false
+      else
+        true
+      end
+
       # Performs a HEAD request against this object and returns an object
       # with useful information about the object, including:
       #
@@ -103,6 +111,13 @@ module AWS
         head.etag
       end
 
+      # Returns the object's last modified time.
+      #
+      # @return [Time] Returns the object's last modified time.
+      def last_modified
+        head.last_modified
+      end
+
       # @return [Integer] Size of the object in bytes.
       def content_length
         head.content_length
@@ -488,14 +503,24 @@ module AWS
       # @param [Hash] options
       # @option options [String] :version_id Reads data from a
       #   specific version of this object.
-      # @option options [Time] :if_unmodified_since Causes #read 
-      #   to return nil if the object was modified since the 
-      #   given time.
-      # @option options [Time] :if_modified_since Causes #read 
-      #   to return nil unless the object was modified since the 
-      #   given time.
-      # @option options [String] :if_match If specified, the method 
-      #   will return nil (and not fetch any data) unless the object ETag
+      #
+      # @option options [Time] :if_unmodified_since If specified, the
+      #   method will raise
+      #   <tt>AWS::S3::Errors::PreconditionFailed</tt> unless the
+      #   object has not been modified since the given time.
+      #
+      # @option options [Time] :if_modified_since If specified, the
+      #   method will raise <tt>AWS::S3::Errors::NotModified</tt> if
+      #   the object has not been modified since the given time.
+      #
+      # @option options [String] :if_match If specified, the method
+      #   will raise <tt>AWS::S3::Errors::PreconditionFailed</tt>
+      #   unless the object ETag matches the provided value.
+      #
+      # @option options [String] :if_none_match If specified, the
+      #   method will raise <tt>AWS::S3::Errors::NotModified</tt> if
+      #   the object ETag matches the provided value.
+      #
       # @option options [Range] :range A byte range to read data from
       def read(options = {}, &blk)
         options[:bucket_name] = bucket.name

data/lib/aws/uri_escape.rb

@@ -0,0 +1,40 @@
+# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+require 'cgi'
+
+module AWS
+
+  # @private
+  module UriEscape
+
+    # Does URI escaping the way AWS expects it to be done.
+    #
+    # @private
+    protected
+    def escape value
+      value = value.encode("UTF-8") if
+        value.respond_to?(:encode)
+      CGI::escape(value.to_s).gsub('+', '%20')
+    end
+
+    # URI-escapes a path without escaping the separators
+    #
+    # @private
+    protected
+    def escape_path value
+      value.split("/").map { |part| escape(part) }.join("/")
+    end
+
+  end
+end

data/lib/aws/xml_grammar.rb

@@ -66,14 +66,16 @@ module AWS
     class CustomizationContext < Hash
 
       def initialize(element_name = nil)
-        self[:children] = {}
+        original_store(:children, {})
 
         if element_name
-          self[:name] = element_name
+          original_store(:name, element_name)
           recompute_accessors
         end
       end
 
+      alias_method :original_store, :[]=
+
       def []=(name, value)
         super
         if respond_to?("changed_#{name}")
@@ -90,16 +92,16 @@ module AWS
       end
 
       def deep_copy(hash = self)
-        hash.inject(hash.class.new) do |copy,(key,value)|
+        fields = hash.inject({}) do |copy,(key,value)|
           if value.is_a?(CustomizationContext)
-            copy[key] = value.deep_copy
+            value = value.deep_copy
           elsif value.is_a?(Hash)
-            copy[key] = deep_copy(value)
-          else
-            copy[key] = value
+            value = deep_copy(value)
           end
+          copy[key] = value
           copy
         end
+        hash.merge(fields)
       end
 
       private

metadata

@@ -1,67 +1,93 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: aws-sdk
-version: !ruby/object:Gem::Version
-  version: 1.0.2
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 3
+  version: 1.0.3
 platform: ruby
-authors:
+authors: 
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-21 00:00:00.000000000 -07:00
+
+date: 2011-07-29 00:00:00 -07:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: &2155405840 !ruby/object:Gem::Requirement
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
   type: :runtime
+  name: uuidtools
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2155405840
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: &2155405080 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        version: "0.7"
   type: :runtime
+  name: httparty
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2155405080
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &2155394520 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 4
+        - 4
         version: 1.4.4
   type: :runtime
+  name: nokogiri
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2155394520
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &2155393900 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
   type: :runtime
-  prerelease: false
-  version_requirements: *2155393900
+  name: json
+  version_requirements: *id004
 description: AWS SDK for Ruby
 email: 
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - ca-bundle.crt
 - rails/init.rb
 - lib/aws/api_config.rb
@@ -255,6 +281,7 @@ files:
 - lib/aws/sqs/received_sns_message.rb
 - lib/aws/sqs/request.rb
 - lib/aws/sqs.rb
+- lib/aws/uri_escape.rb
 - lib/aws/xml_grammar.rb
 - lib/aws-sdk.rb
 - lib/aws.rb
@@ -270,31 +297,37 @@ files:
 - LICENSE.txt
 has_rdoc: true
 homepage: http://aws.amazon.com/sdkforruby
-licenses:
+licenses: 
 - Apache 2.0
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 437793363847079671
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: AWS SDK for Ruby
 test_files: []
+