aws-sdk 1.9.2 → 1.9.3

data/lib/aws/cloud_watch.rb

@@ -35,7 +35,7 @@ module AWS
   #       :access_key_id => 'YOUR_ACCESS_KEY_ID',
   #       :secret_access_key => 'YOUR_SECRET_ACCESS_KEY')
   #
-  # Or you can set them directly on the AWS::Route53 interface:
+  # Or you can set them directly on the AWS::CloudWatch interface:
   #
   #     cw = AWS::CloudWatch.new(
   #       :access_key_id => 'YOUR_ACCESS_KEY_ID',

data/lib/aws/core.rb

@@ -708,5 +708,30 @@ module AWS
       nil
     end
 
+    # @api private
+    # @return [Hash]
+    def api_versions
+      @versions ||= begin
+        # get a list of support services/apis from disk
+        versions = {}
+        pattern = File.join(File.dirname(__FILE__), 'api_config', '*.yml')
+        Dir.glob(pattern).each do |path|
+          matches = path.match(/(\w+)-(\d{4}-\d{2}-\d{2})/)
+          svc = SERVICES[$1][:full_name]
+          versions[svc] ||= []
+          versions[svc] << $2
+        end
+
+        # s3 does not have an API configuration, so we have to add it manually
+        versions[SERVICES['S3'][:full_name]] = ['2006-03-01']
+
+        # sort the services alphabetically
+        versions.keys.sort_by(&:downcase).inject({}) do |hash,svc|
+          hash[svc] = versions[svc]
+          hash
+        end
+      end
+    end
+
   end
 end

data/lib/aws/core/client.rb

@@ -473,7 +473,9 @@ module AWS
               client = self
 
               response = new_response do
-                client.send(:build_request, name, options)
+                req = client.send(:build_request, name, options)
+                req.add_authorization!(credential_provider)
+                req
               end
 
               response.request_type = name
@@ -533,7 +535,6 @@ module AWS
 
         # configure the http request
         http_request.service_ruby_name = service_ruby_name
-        http_request.default_read_timeout = @config.http_read_timeout
         http_request.host = endpoint
         http_request.port = port
         http_request.region = config.send(:"#{service_ruby_name}_region")
@@ -554,8 +555,6 @@ module AWS
           http_request.continue_timeout = nil
         end
 
-        http_request.add_authorization!(credential_provider)
-
         http_request
 
       end

data/lib/aws/core/http/request.rb

@@ -21,21 +21,18 @@ module AWS
       # and parses the actual response.
       class Request
 
+        extend Deprecations
+
         # Returns a new empty http request object.
         def initialize
-          @default_read_timeout = 60
           @http_method = 'POST'
           @use_ssl = true
           @headers = CaseInsensitiveHash.new
           @uri = '/'
           @params = []
+          @read_timeout = 60
         end
 
-        # @return [Integer] The number of seconds the service has to respond
-        #   before a timeout error is raised on the request.  Defaults to
-        #   60 seconds.
-        attr_accessor :default_read_timeout
-
         # @return [String] hostname of the request
         attr_accessor :host
 
@@ -75,10 +72,12 @@ module AWS
         attr_accessor :service_ruby_name
 
         # @return [Integer] The number of seconds the service has to respond
-        #   before a timeout error is raised on the request.  Defaults to
-        #   60 seconds.
+        #   before a timeout error is raised on the request.
         attr_accessor :read_timeout
 
+        alias_method :default_read_timeout, :read_timeout
+        deprecated :default_read_timeout, :use => :read_timeout
+
         # @return [Boolean] Returns `true` if this request should be made
         #   with SSL enabled.
         attr_accessor :use_ssl
@@ -105,14 +104,6 @@ module AWS
           @port || (use_ssl? ? 443 : 80)
         end
 
-        # Some subclasses override this method to obseve requirements
-        # set by the services (e.q. SimpleWorlfow and SQS have special
-        # long-pulling requirements and require special read timeouts).
-        # @api private
-        def read_timeout
-          default_read_timeout
-        end
-
         # @return [String] Returns the HTTP request path.
         def path
           uri.split(/\?/)[0]

data/lib/aws/glacier/client.rb

@@ -280,6 +280,14 @@ module AWS
 
       define_client_methods('2012-06-01')
 
+      private
+
+      def build_request *args
+        request = super(*args)
+        request.headers['x-amz-glacier-version'] = API_VERSION
+        request
+      end
+
     end
   end
 end

data/lib/aws/glacier/request.rb

@@ -19,11 +19,6 @@ module AWS
 
       include Core::Signature::Version4
 
-      def initialize
-        super
-        self.headers['x-amz-glacier-version'] = Glacier::Client::API_VERSION
-      end
-
       def service
         'glacier'
       end

data/lib/aws/record.rb

@@ -24,7 +24,6 @@ module AWS
     autoload :Conversion, 'aws/record/conversion'
     autoload :DirtyTracking, 'aws/record/dirty_tracking'
     autoload :Errors, 'aws/record/errors'
-    autoload :Exceptions, 'aws/record/exceptions'
     autoload :HashModel, 'aws/record/hash_model'
     autoload :Model, 'aws/record/model'
     autoload :Naming, 'aws/record/naming'
@@ -32,6 +31,7 @@ module AWS
     autoload :Validations, 'aws/record/validations'
 
     # errors
+    autoload :RecordNotFound, 'aws/record/exceptions'
     autoload :InvalidRecordError, 'aws/record/exceptions'
     autoload :EmptyRecordError, 'aws/record/exceptions'
     autoload :UndefinedAttributeError, 'aws/record/exceptions'
@@ -50,9 +50,6 @@ module AWS
     autoload :PresenceValidator, 'aws/record/validators/presence'
     autoload :Validator, 'aws/record/validator'
 
-    # @api private
-    class RecordNotFound < StandardError; end
-
     # Sets a prefix to be applied to all SimpleDB domains associated with
     # AWS::Record::Base classes.
     #

data/lib/aws/record/exceptions.rb

@@ -14,6 +14,9 @@
 module AWS
   module Record
 
+    # @api private
+    class RecordNotFound < StandardError; end
+
     # Raised when trying to access an attribute that does not exist.
     # @api private
     class UndefinedAttributeError < StandardError

data/lib/aws/route_53/hosted_zone_collection.rb

@@ -54,7 +54,7 @@ module AWS
         end
         if options[:comment]
           options[:hosted_zone_config] ||= {}
-          options[:hosted_zone_config][:comment] = options[:comment]
+          options[:hosted_zone_config][:comment] = options.delete(:comment)
         end
 
         resp = client.create_hosted_zone(options)

data/lib/aws/simple_workflow/client.rb

@@ -1247,6 +1247,14 @@ module AWS
         end
       end
 
+      def build_request *args
+        request = super(*args)
+        if request.headers['x-amz-target'] =~ /PollFor(Decision|Activity)Task/
+          request.read_timeout = 90
+        end
+        request
+      end
+
     end
   end
 end

data/lib/aws/simple_workflow/request.rb

@@ -19,15 +19,6 @@ module AWS
 
       include Core::Signature::Version3
 
-      def read_timeout
-        # increase read timeout for long polling
-        if headers['x-amz-target'] =~ /PollFor(Decision|Activity)Task/
-          90
-        else
-          @read_timeout
-        end
-      end
-
     end
   end
 end

data/lib/aws/sqs/client.rb

@@ -253,6 +253,21 @@ module AWS
 
       define_client_methods('2012-11-05')
 
+      private
+
+      def build_request *args
+        request = super(*args)
+        if url_param = request.params.find { |p| p.name == "QueueUrl" }
+          url = URI.parse(url_param.value)
+          request.host = url.host
+          request.uri = url.request_uri
+          if matches = request.host.match(/^sqs\.(.+?)\./)
+            request.region = matches[1]
+          end
+        end
+        request
+      end
+
     end
   end
 end

data/lib/aws/sqs/request.rb

@@ -25,42 +25,6 @@ module AWS
         'sqs'
       end
 
-      def path
-        full_url.path
-      end
-
-      def host
-        full_url.host
-      end
-
-      def uri
-        path
-      end
-
-      def region
-        # sigv4 requires the region name when signing, this should come from
-        # the QueueUrl param whenever present
-        if
-          param = params.find{|p| p.name == 'QueueUrl' } and
-          host = URI.parse(param.value).host and
-          matches = host.match(/^sqs\.(.+?)\./)
-        then
-          return matches[1]
-        else
-          super
-        end
-      end
-
-      private
-
-      def full_url
-        if url_param = params.find { |p| p.name == "QueueUrl" }
-          URI.parse(url_param.value)
-        else
-          URI::HTTP.build(:host => @host, :path => '/')
-        end
-      end
-
     end
 
   end

data/lib/aws/version.rb

@@ -13,5 +13,5 @@
 
 module AWS
   # Current version of the AWS SDK for Ruby
-  VERSION = '1.9.2'
+  VERSION = '1.9.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools