aws 2.4.4 → 2.4.5

data/lib/awsbase/awsbase.rb

@@ -323,14 +323,14 @@ module Aws
     #  - :pull_out_array => an array of levels to dig into when generating return value (see rds.rb for example)
     def request_info_xml_simple(connection_name, lib_params, request, logger, params = {})
 
-      @connection = get_conn(connection_name, lib_params, logger)
+      connection = get_conn(connection_name, lib_params, logger)
       begin
         @last_request  = request[:request]
         @last_response = nil
 
-        response       = @connection.request(request)
+        response       = connection.request(request)
         #       puts "response=" + response.body
-#            benchblock.service.add!{ response = @connection.request(request) }
+#            benchblock.service.add!{ response = connection.request(request) }
         # check response for errors...
         @last_response = response
         if response.is_a?(Net::HTTPSuccess)
@@ -395,7 +395,7 @@ module Aws
           raise AwsError2.new(@last_response.code, @last_request_id, request_text_data, @last_response.body)
         end
       ensure
-        @connection.finish if @connection && lib_params[:connection_mode] == :per_request
+        connection.finish if connection && lib_params[:connection_mode] == :per_request
       end
 
     end
@@ -472,7 +472,7 @@ module Aws
 
 
     def request_info_impl(connection, benchblock, request, parser, options={}, &block) #:nodoc:
-      @connection    = connection
+      connection    = connection
       @last_request  = request[:request]
       @last_response = nil
       response       =nil
@@ -489,7 +489,7 @@ module Aws
         # Exceptions can originate from code directly in the block, or from user
         # code called in the other block which is passed to response.read_body.
         benchblock.service.add! do
-          responsehdr = @connection.request(request) do |response|
+          responsehdr = connection.request(request) do |response|
             #########
             begin
               @last_response = response
@@ -522,7 +522,7 @@ module Aws
           return parser.result
         end
       else
-        benchblock.service.add! { response = @connection.request(request) }
+        benchblock.service.add! { response = connection.request(request) }
         # check response for errors...
         @last_response = response
         if response.is_a?(Net::HTTPSuccess)

data/lib/awsbase/errors.rb

@@ -1,288 +1,292 @@
-module Aws
-
-# Exception class to signal any Amazon errors. All errors occuring during calls to Amazon's
-# web services raise this type of error.
-# Attribute inherited by RuntimeError:
-#  message    - the text of the error, generally as returned by AWS in its XML response.
-  class AwsError < RuntimeError
-
-    # either an array of errors where each item is itself an array of [code, message]),
-    # or an error string if the error was raised manually, as in <tt>AwsError.new('err_text')</tt>
-    attr_reader :errors
-
-    # Request id (if exists)
-    attr_reader :request_id
-
-    # Response HTTP error code
-    attr_reader :http_code
-
-    # Raw request text data to AWS
-    attr_reader :request_data
-
-    attr_reader :response
-
-    def initialize(errors=nil, http_code=nil, request_id=nil, request_data=nil, response=nil)
-      @errors       = errors
-      @request_id   = request_id
-      @http_code    = http_code
-      @request_data = request_data
-      @response     = response
-      msg           = @errors.is_a?(Array) ? @errors.map { |code, msg| "#{code}: #{msg}" }.join("; ") : @errors.to_s
-      msg += "\nREQUEST=#{@request_data} " unless @request_data.nil?
-      msg += "\nREQUEST ID=#{@request_id} " unless @request_id.nil?
-      super(msg)
-    end
-
-    # Does any of the error messages include the regexp +pattern+?
-    # Used to determine whether to retry request.
-    def include?(pattern)
-      if @errors.is_a?(Array)
-        @errors.each { |code, msg| return true if code =~ pattern }
-      else
-        return true if @errors_str =~ pattern
-      end
-      false
-    end
-
-    # Generic handler for AwsErrors. +aws+ is the Aws::S3, Aws::EC2, or Aws::SQS
-    # object that caused the exception (it must provide last_request and last_response). Supported
-    # boolean options are:
-    # * <tt>:log</tt> print a message into the log using aws.logger to access the Logger
-    # * <tt>:puts</tt> do a "puts" of the error
-    # * <tt>:raise</tt> re-raise the error after logging
-    def self.on_aws_exception(aws, options={:raise=>true, :log=>true})
-      # Only log & notify if not user error
-      if !options[:raise] || system_error?($!)
-        error_text = "#{$!.inspect}\n#{$@}.join('\n')}"
-        puts error_text if options[:puts]
-        # Log the error
-        if options[:log]
-          request   = aws.last_request ? aws.last_request.path : '-none-'
-          response  = aws.last_response ? "#{aws.last_response.code} -- #{aws.last_response.message} -- #{aws.last_response.body}" : '-none-'
-          @response = response
-          aws.logger.error error_text
-          aws.logger.error "Request was:  #{request}"
-          aws.logger.error "Response was: #{response}"
-        end
-      end
-      raise if options[:raise] # re-raise an exception
-      return nil
-    end
-
-    # True if e is an AWS system error, i.e. something that is for sure not the caller's fault.
-    # Used to force logging.
-    def self.system_error?(e)
-      !e.is_a?(self) || e.message =~ /InternalError|InsufficientInstanceCapacity|Unavailable/
-    end
-
-  end
-
-# Simplified version
-  class AwsError2 < RuntimeError
-    # Request id (if exists)
-    attr_reader :request_id
-
-    # Response HTTP error code
-    attr_reader :http_code
-
-    # Raw request text data to AWS
-    attr_reader :request_data
-
-    attr_reader :response
-
-    attr_reader :errors
-
-    def initialize(http_code=nil, request_id=nil, request_data=nil, response=nil)
-
-      @request_id   = request_id
-      @http_code    = http_code
-      @request_data = request_data
-      @response     = response
-#            puts '@response=' + @response.inspect
-
-      if @response
-        ref = XmlSimple.xml_in(@response, {"ForceArray"=>false})
-#                puts "refxml=" + ref.inspect
-        msg = "#{ref['Error']['Code']}: #{ref['Error']['Message']}"
-      else
-        msg = "#{@http_code}: REQUEST(#{@request_data})"
-      end
-      msg += "\nREQUEST ID=#{@request_id} " unless @request_id.nil?
-      super(msg)
-    end
-
-
-  end
-
-
-  class AWSErrorHandler
-    # 0-100 (%)
-    DEFAULT_CLOSE_ON_4XX_PROBABILITY = 10
-
-    @@reiteration_start_delay        = 0.2
-
-    def self.reiteration_start_delay
-      @@reiteration_start_delay
-    end
-
-    def self.reiteration_start_delay=(reiteration_start_delay)
-      @@reiteration_start_delay = reiteration_start_delay
-    end
-
-    @@reiteration_time = 5
-
-    def self.reiteration_time
-      @@reiteration_time
-    end
-
-    def self.reiteration_time=(reiteration_time)
-      @@reiteration_time = reiteration_time
-    end
-
-    @@close_on_error = true
-
-    def self.close_on_error
-      @@close_on_error
-    end
-
-    def self.close_on_error=(close_on_error)
-      @@close_on_error = close_on_error
-    end
-
-    @@close_on_4xx_probability = DEFAULT_CLOSE_ON_4XX_PROBABILITY
-
-    def self.close_on_4xx_probability
-      @@close_on_4xx_probability
-    end
-
-    def self.close_on_4xx_probability=(close_on_4xx_probability)
-      @@close_on_4xx_probability = close_on_4xx_probability
-    end
-
-    # params:
-    #  :reiteration_time
-    #  :errors_list
-    #  :close_on_error           = true | false
-    #  :close_on_4xx_probability = 1-100
-    def initialize(aws, parser, params={}) #:nodoc:
-      @aws                      = aws # Link to RightEc2 | RightSqs | RightS3 instance
-      @parser                   = parser # parser to parse Amazon response
-      @started_at               = Time.now
-      @stop_at                  = @started_at + (params[:reiteration_time] || @@reiteration_time)
-      @errors_list              = params[:errors_list] || []
-      @reiteration_delay        = @@reiteration_start_delay
-      @retries                  = 0
-      # close current HTTP(S) connection on 5xx, errors from list and 4xx errors
-      @close_on_error           = params[:close_on_error].nil? ? @@close_on_error : params[:close_on_error]
-      @close_on_4xx_probability = params[:close_on_4xx_probability] || @@close_on_4xx_probability
-    end
-
-    # Returns false if
-    def check(request, options={}) #:nodoc:
-      result            = false
-      error_found       = false
-      redirect_detected = false
-      error_match       = nil
-      last_errors_text  = ''
-      response          = @aws.last_response
-      # log error
-      request_text_data = "#{request[:server]}:#{request[:port]}#{request[:request].path}"
-      # is this a redirect?
-      # yes!
-      if response.is_a?(Net::HTTPRedirection)
-        redirect_detected = true
-      else
-        # no, it's an error ...
-        @aws.logger.warn("##### #{@aws.class.name} returned an error: #{response.code} #{response.message}\n#{response.body} #####")
-        @aws.logger.warn("##### #{@aws.class.name} request: #{request_text_data} ####")
-      end
-      # Check response body: if it is an Amazon XML document or not:
-      if redirect_detected || (response.body && response.body[/<\?xml/]) # ... it is a xml document
-        @aws.class.bench_xml.add! do
-          error_parser = RightErrorResponseParser.new
-          error_parser.parse(response)
-          @aws.last_errors     = error_parser.errors
-          @aws.last_request_id = error_parser.requestID
-          last_errors_text     = @aws.last_errors.flatten.join("\n")
-          # on redirect :
-          if redirect_detected
-            location = response['location']
-            # ... log information and ...
-            @aws.logger.info("##### #{@aws.class.name} redirect requested: #{response.code} #{response.message} #####")
-            @aws.logger.info("##### New location: #{location} #####")
-            # ... fix the connection data
-            request[:server]   = URI.parse(location).host
-            request[:protocol] = URI.parse(location).scheme
-            request[:port]     = URI.parse(location).port
-          end
-        end
-      else # ... it is not a xml document(probably just a html page?)
-        @aws.last_errors     = [[response.code, "#{response.message} (#{request_text_data})"]]
-        @aws.last_request_id = '-undefined-'
-        last_errors_text     = response.message
-      end
-      # now - check the error
-      unless redirect_detected
-        @errors_list.each do |error_to_find|
-          if last_errors_text[/#{error_to_find}/i]
-            error_found = true
-            error_match = error_to_find
-            @aws.logger.warn("##### Retry is needed, error pattern match: #{error_to_find} #####")
-            break
-          end
-        end
-      end
-      # check the time has gone from the first error come
-      if redirect_detected || error_found
-        # Close the connection to the server and recreate a new one.
-        # It may have a chance that one server is a semi-down and reconnection
-        # will help us to connect to the other server
-        if !redirect_detected && @close_on_error
-          @aws.connection.finish "#{self.class.name}: error match to pattern '#{error_match}'"
-        end
-# puts 'OPTIONS3=' + options.inspect
-        if options[:retries].nil? || @retries < options[:retries]
-          if (Time.now < @stop_at)
-            @retries += 1
-            unless redirect_detected
-              @aws.logger.warn("##### Retry ##{@retries} is being performed. Sleeping for #{@reiteration_delay} sec. Whole time: #{Time.now-@started_at} sec ####")
-              sleep @reiteration_delay
-              @reiteration_delay *= 2
-
-              # Always make sure that the fp is set to point to the beginning(?)
-              # of the File/IO. TODO: it assumes that offset is 0, which is bad.
-              if (request[:request].body_stream && request[:request].body_stream.respond_to?(:pos))
-                begin
-                  request[:request].body_stream.pos = 0
-                rescue Exception => e
-                  @logger.warn("Retry may fail due to unable to reset the file pointer" +
-                                   " -- #{self.class.name} : #{e.inspect}")
-                end
-              end
-            else
-              @aws.logger.info("##### Retry ##{@retries} is being performed due to a redirect.  ####")
-            end
-            result = @aws.request_info(request, @parser, options)
-          else
-            @aws.logger.warn("##### Ooops, time is over... ####")
-          end
-        else
-          @aws.logger.info("##### Stopped retrying because retries=#{@retries} and max=#{options[:retries]}  ####")
-        end
-        # aha, this is unhandled error:
-      elsif @close_on_error
-        # Is this a 5xx error ?
-        if @aws.last_response.code.to_s[/^5\d\d$/]
-          @aws.connection.finish "#{self.class.name}: code: #{@aws.last_response.code}: '#{@aws.last_response.message}'"
-          # Is this a 4xx error ?
-        elsif @aws.last_response.code.to_s[/^4\d\d$/] && @close_on_4xx_probability > rand(100)
-          @aws.connection.finish "#{self.class.name}: code: #{@aws.last_response.code}: '#{@aws.last_response.message}', " +
-                                     "probability: #{@close_on_4xx_probability}%"
-        end
-      end
-      result
-    end
-
-  end
-
+module Aws
+
+  class ResourceNotFoundError < StandardError
+
+  end
+
+# Exception class to signal any Amazon errors. All errors occuring during calls to Amazon's
+# web services raise this type of error.
+# Attribute inherited by RuntimeError:
+#  message    - the text of the error, generally as returned by AWS in its XML response.
+  class AwsError < RuntimeError
+
+    # either an array of errors where each item is itself an array of [code, message]),
+    # or an error string if the error was raised manually, as in <tt>AwsError.new('err_text')</tt>
+    attr_reader :errors
+
+    # Request id (if exists)
+    attr_reader :request_id
+
+    # Response HTTP error code
+    attr_reader :http_code
+
+    # Raw request text data to AWS
+    attr_reader :request_data
+
+    attr_reader :response
+
+    def initialize(errors=nil, http_code=nil, request_id=nil, request_data=nil, response=nil)
+      @errors       = errors
+      @request_id   = request_id
+      @http_code    = http_code
+      @request_data = request_data
+      @response     = response
+      msg           = @errors.is_a?(Array) ? @errors.map { |code, msg| "#{code}: #{msg}" }.join("; ") : @errors.to_s
+      msg += "\nREQUEST=#{@request_data} " unless @request_data.nil?
+      msg += "\nREQUEST ID=#{@request_id} " unless @request_id.nil?
+      super(msg)
+    end
+
+    # Does any of the error messages include the regexp +pattern+?
+    # Used to determine whether to retry request.
+    def include?(pattern)
+      if @errors.is_a?(Array)
+        @errors.each { |code, msg| return true if code =~ pattern }
+      else
+        return true if @errors_str =~ pattern
+      end
+      false
+    end
+
+    # Generic handler for AwsErrors. +aws+ is the Aws::S3, Aws::EC2, or Aws::SQS
+    # object that caused the exception (it must provide last_request and last_response). Supported
+    # boolean options are:
+    # * <tt>:log</tt> print a message into the log using aws.logger to access the Logger
+    # * <tt>:puts</tt> do a "puts" of the error
+    # * <tt>:raise</tt> re-raise the error after logging
+    def self.on_aws_exception(aws, options={:raise=>true, :log=>true})
+      # Only log & notify if not user error
+      if !options[:raise] || system_error?($!)
+        error_text = "#{$!.inspect}\n#{$@}.join('\n')}"
+        puts error_text if options[:puts]
+        # Log the error
+        if options[:log]
+          request   = aws.last_request ? aws.last_request.path : '-none-'
+          response  = aws.last_response ? "#{aws.last_response.code} -- #{aws.last_response.message} -- #{aws.last_response.body}" : '-none-'
+          @response = response
+          aws.logger.error error_text
+          aws.logger.error "Request was:  #{request}"
+          aws.logger.error "Response was: #{response}"
+        end
+      end
+      raise if options[:raise] # re-raise an exception
+      return nil
+    end
+
+    # True if e is an AWS system error, i.e. something that is for sure not the caller's fault.
+    # Used to force logging.
+    def self.system_error?(e)
+      !e.is_a?(self) || e.message =~ /InternalError|InsufficientInstanceCapacity|Unavailable/
+    end
+
+  end
+
+# Simplified version
+  class AwsError2 < RuntimeError
+    # Request id (if exists)
+    attr_reader :request_id
+
+    # Response HTTP error code
+    attr_reader :http_code
+
+    # Raw request text data to AWS
+    attr_reader :request_data
+
+    attr_reader :response
+
+    attr_reader :errors
+
+    def initialize(http_code=nil, request_id=nil, request_data=nil, response=nil)
+
+      @request_id   = request_id
+      @http_code    = http_code
+      @request_data = request_data
+      @response     = response
+#            puts '@response=' + @response.inspect
+
+      if @response
+        ref = XmlSimple.xml_in(@response, {"ForceArray"=>false})
+#                puts "refxml=" + ref.inspect
+        msg = "#{ref['Error']['Code']}: #{ref['Error']['Message']}"
+      else
+        msg = "#{@http_code}: REQUEST(#{@request_data})"
+      end
+      msg += "\nREQUEST ID=#{@request_id} " unless @request_id.nil?
+      super(msg)
+    end
+
+
+  end
+
+
+  class AWSErrorHandler
+    # 0-100 (%)
+    DEFAULT_CLOSE_ON_4XX_PROBABILITY = 10
+
+    @@reiteration_start_delay        = 0.2
+
+    def self.reiteration_start_delay
+      @@reiteration_start_delay
+    end
+
+    def self.reiteration_start_delay=(reiteration_start_delay)
+      @@reiteration_start_delay = reiteration_start_delay
+    end
+
+    @@reiteration_time = 5
+
+    def self.reiteration_time
+      @@reiteration_time
+    end
+
+    def self.reiteration_time=(reiteration_time)
+      @@reiteration_time = reiteration_time
+    end
+
+    @@close_on_error = true
+
+    def self.close_on_error
+      @@close_on_error
+    end
+
+    def self.close_on_error=(close_on_error)
+      @@close_on_error = close_on_error
+    end
+
+    @@close_on_4xx_probability = DEFAULT_CLOSE_ON_4XX_PROBABILITY
+
+    def self.close_on_4xx_probability
+      @@close_on_4xx_probability
+    end
+
+    def self.close_on_4xx_probability=(close_on_4xx_probability)
+      @@close_on_4xx_probability = close_on_4xx_probability
+    end
+
+    # params:
+    #  :reiteration_time
+    #  :errors_list
+    #  :close_on_error           = true | false
+    #  :close_on_4xx_probability = 1-100
+    def initialize(aws, parser, params={}) #:nodoc:
+      @aws                      = aws # Link to RightEc2 | RightSqs | RightS3 instance
+      @parser                   = parser # parser to parse Amazon response
+      @started_at               = Time.now
+      @stop_at                  = @started_at + (params[:reiteration_time] || @@reiteration_time)
+      @errors_list              = params[:errors_list] || []
+      @reiteration_delay        = @@reiteration_start_delay
+      @retries                  = 0
+      # close current HTTP(S) connection on 5xx, errors from list and 4xx errors
+      @close_on_error           = params[:close_on_error].nil? ? @@close_on_error : params[:close_on_error]
+      @close_on_4xx_probability = params[:close_on_4xx_probability] || @@close_on_4xx_probability
+    end
+
+    # Returns false if
+    def check(request, options={}) #:nodoc:
+      result            = false
+      error_found       = false
+      redirect_detected = false
+      error_match       = nil
+      last_errors_text  = ''
+      response          = @aws.last_response
+      # log error
+      request_text_data = "#{request[:server]}:#{request[:port]}#{request[:request].path}"
+      # is this a redirect?
+      # yes!
+      if response.is_a?(Net::HTTPRedirection)
+        redirect_detected = true
+      else
+        # no, it's an error ...
+        @aws.logger.warn("##### #{@aws.class.name} returned an error: #{response.code} #{response.message}\n#{response.body} #####")
+        @aws.logger.warn("##### #{@aws.class.name} request: #{request_text_data} ####")
+      end
+      # Check response body: if it is an Amazon XML document or not:
+      if redirect_detected || (response.body && response.body[/<\?xml/]) # ... it is a xml document
+        @aws.class.bench_xml.add! do
+          error_parser = RightErrorResponseParser.new
+          error_parser.parse(response)
+          @aws.last_errors     = error_parser.errors
+          @aws.last_request_id = error_parser.requestID
+          last_errors_text     = @aws.last_errors.flatten.join("\n")
+          # on redirect :
+          if redirect_detected
+            location = response['location']
+            # ... log information and ...
+            @aws.logger.info("##### #{@aws.class.name} redirect requested: #{response.code} #{response.message} #####")
+            @aws.logger.info("##### New location: #{location} #####")
+            # ... fix the connection data
+            request[:server]   = URI.parse(location).host
+            request[:protocol] = URI.parse(location).scheme
+            request[:port]     = URI.parse(location).port
+          end
+        end
+      else # ... it is not a xml document(probably just a html page?)
+        @aws.last_errors     = [[response.code, "#{response.message} (#{request_text_data})"]]
+        @aws.last_request_id = '-undefined-'
+        last_errors_text     = response.message
+      end
+      # now - check the error
+      unless redirect_detected
+        @errors_list.each do |error_to_find|
+          if last_errors_text[/#{error_to_find}/i]
+            error_found = true
+            error_match = error_to_find
+            @aws.logger.warn("##### Retry is needed, error pattern match: #{error_to_find} #####")
+            break
+          end
+        end
+      end
+      # check the time has gone from the first error come
+      if redirect_detected || error_found
+        # Close the connection to the server and recreate a new one.
+        # It may have a chance that one server is a semi-down and reconnection
+        # will help us to connect to the other server
+        if !redirect_detected && @close_on_error
+          @aws.connection.finish "#{self.class.name}: error match to pattern '#{error_match}'"
+        end
+# puts 'OPTIONS3=' + options.inspect
+        if options[:retries].nil? || @retries < options[:retries]
+          if (Time.now < @stop_at)
+            @retries += 1
+            unless redirect_detected
+              @aws.logger.warn("##### Retry ##{@retries} is being performed. Sleeping for #{@reiteration_delay} sec. Whole time: #{Time.now-@started_at} sec ####")
+              sleep @reiteration_delay
+              @reiteration_delay *= 2
+
+              # Always make sure that the fp is set to point to the beginning(?)
+              # of the File/IO. TODO: it assumes that offset is 0, which is bad.
+              if (request[:request].body_stream && request[:request].body_stream.respond_to?(:pos))
+                begin
+                  request[:request].body_stream.pos = 0
+                rescue Exception => e
+                  @logger.warn("Retry may fail due to unable to reset the file pointer" +
+                                   " -- #{self.class.name} : #{e.inspect}")
+                end
+              end
+            else
+              @aws.logger.info("##### Retry ##{@retries} is being performed due to a redirect.  ####")
+            end
+            result = @aws.request_info(request, @parser, options)
+          else
+            @aws.logger.warn("##### Ooops, time is over... ####")
+          end
+        else
+          @aws.logger.info("##### Stopped retrying because retries=#{@retries} and max=#{options[:retries]}  ####")
+        end
+        # aha, this is unhandled error:
+      elsif @close_on_error
+        # Is this a 5xx error ?
+        if @aws.last_response.code.to_s[/^5\d\d$/]
+          @aws.connection.finish "#{self.class.name}: code: #{@aws.last_response.code}: '#{@aws.last_response.message}'"
+          # Is this a 4xx error ?
+        elsif @aws.last_response.code.to_s[/^4\d\d$/] && @close_on_4xx_probability > rand(100)
+          @aws.connection.finish "#{self.class.name}: code: #{@aws.last_response.code}: '#{@aws.last_response.message}', " +
+                                     "probability: #{@close_on_4xx_probability}%"
+        end
+      end
+      result
+    end
+
+  end
+
 end

data/lib/sqs/sqs.rb

@@ -23,46 +23,46 @@
 
 module Aws
 
-    #
-    # Aws::Sqs -- RightScale's Amazon SQS interface, API version
-    # 2008-01-01 and later.
-    # The Aws::Sqs class provides a complete interface to the second generation of Amazon's Simple
-    # Queue Service.
-    # For explanations of the semantics
-    # of each call, please refer to Amazon's documentation at
-    # http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=31
-    #
-    #
-    # Aws::Sqs is built atop Aws::SqsInterface, a lower-level
-    # procedural API that may be appropriate for certain programs.
-    #
-    # Error handling: all operations raise an Aws::AwsError in case
-    # of problems. Note that transient errors are automatically retried.
-    #
-    #  sqs    = Aws::Sqs.new(aws_access_key_id, aws_secret_access_key)
-    #  queue1 = sqs.queue('my_awesome_queue')
-    #   ...
-    #  queue2 = Aws::Sqs::Queue.create(sqs, 'my_cool_queue', true)
-    #  puts queue2.size
-    #   ...
-    #  message1 = queue2.receive
-    #  message1.visibility = 0
-    #  puts message1
-    #   ...
-    #  queue2.clear(true)
-    #  queue2.send_message('Ola-la!')
-    #  message2 = queue2.pop
-    #   ...
-    #
-    # NB: Second-generation SQS has eliminated the entire access grant mechanism present in Gen 1.
-    #
-    # Params is a hash:
-    #
-    #    {:server       => 'queue.amazonaws.com' # Amazon service host: 'queue.amazonaws.com' (default)
-    #     :port         => 443                   # Amazon service port: 80 or 443 (default)
-    #     :multi_thread => true|false            # Multi-threaded (connection per each thread): true or false (default)
-    #     :signature_version => '0'              # The signature version : '0' or '1'(default)
-    #     :logger       => Logger Object}        # Logger instance: logs to STDOUT if omitted }
+  #
+  # Aws::Sqs -- RightScale's Amazon SQS interface, API version
+  # 2008-01-01 and later.
+  # The Aws::Sqs class provides a complete interface to the second generation of Amazon's Simple
+  # Queue Service.
+  # For explanations of the semantics
+  # of each call, please refer to Amazon's documentation at
+  # http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=31
+  #
+  #
+  # Aws::Sqs is built atop Aws::SqsInterface, a lower-level
+  # procedural API that may be appropriate for certain programs.
+  #
+  # Error handling: all operations raise an Aws::AwsError in case
+  # of problems. Note that transient errors are automatically retried.
+  #
+  #  sqs    = Aws::Sqs.new(aws_access_key_id, aws_secret_access_key)
+  #  queue1 = sqs.queue('my_awesome_queue')
+  #   ...
+  #  queue2 = Aws::Sqs::Queue.create(sqs, 'my_cool_queue', true)
+  #  puts queue2.size
+  #   ...
+  #  message1 = queue2.receive
+  #  message1.visibility = 0
+  #  puts message1
+  #   ...
+  #  queue2.clear(true)
+  #  queue2.send_message('Ola-la!')
+  #  message2 = queue2.pop
+  #   ...
+  #
+  # NB: Second-generation SQS has eliminated the entire access grant mechanism present in Gen 1.
+  #
+  # Params is a hash:
+  #
+  #    {:server       => 'queue.amazonaws.com' # Amazon service host: 'queue.amazonaws.com' (default)
+  #     :port         => 443                   # Amazon service port: 80 or 443 (default)
+  #     :multi_thread => true|false            # Multi-threaded (connection per each thread): true or false (default)
+  #     :signature_version => '0'              # The signature version : '0' or '1'(default)
+  #     :logger       => Logger Object}        # Logger instance: logs to STDOUT if omitted }
   class Sqs
     attr_reader :interface
 
@@ -70,26 +70,29 @@ module Aws
       @interface = SqsInterface.new(aws_access_key_id, aws_secret_access_key, params)
     end
 
-      # Retrieves a list of queues.
-      # Returns an +array+ of +Queue+ instances.
-      #
-      #  Aws::Sqs.queues #=> array of queues
-      #
+    # Retrieves a list of queues.
+    # Returns an +array+ of +Queue+ instances.
+    #
+    #  Aws::Sqs.queues #=> array of queues
+    #
     def queues(prefix=nil)
       @interface.list_queues(prefix).map do |url|
         Queue.new(self, url)
       end
     end
 
-      # Returns Queue instance by queue name.
-      # If the queue does not exist at Amazon SQS and +create+ is true, the method creates it.
-      #
-      #  Aws::Sqs.queue('my_awesome_queue') #=> #<Aws::Sqs::Queue:0xb7b626e4 ... >
-      #
+    # Returns Queue instance by queue name.
+    # If the queue does not exist at Amazon SQS and +create+ is true, the method creates it.
+    #
+    #  Aws::Sqs.queue('my_awesome_queue') #=> #<Aws::Sqs::Queue:0xb7b626e4 ... >
+    #
     def queue(queue_name, create=true, visibility=nil)
-#      url = @interface.queue_url_by_name(queue_name)
-#      url = (create ? @interface.create_queue(queue_name, visibility) : nil) unless url
-      url = @interface.create_queue(queue_name, visibility) # this returns the url even if it exists
+      if create
+        url = @interface.create_queue(queue_name, visibility) # this returns the url even if it exists
+      else
+        url = @interface.queue_url_by_name(queue_name)
+      end
+
       url ? Queue.new(self, url) : nil
     end
 
@@ -97,62 +100,63 @@ module Aws
     class Queue
       attr_reader :name, :url, :sqs
 
-        # Returns Queue instance by queue name.
-        # If the queue does not exist at Amazon SQS and +create+ is true, the method creates it.
-        #
-        #  Aws::Sqs::Queue.create(sqs, 'my_awesome_queue') #=> #<Aws::Sqs::Queue:0xb7b626e4 ... >
-        #
+      # Returns Queue instance by queue name.
+      # If the queue does not exist at Amazon SQS and +create+ is true, the method creates it.
+      #
+      #  Aws::Sqs::Queue.create(sqs, 'my_awesome_queue') #=> #<Aws::Sqs::Queue:0xb7b626e4 ... >
+      #
       def self.create(sqs, url_or_name, create=true, visibility=nil)
         sqs.queue(url_or_name, create, visibility)
       end
 
-        # Creates new Queue instance.
-        # Does not create a queue at Amazon.
-        #
-        #  queue = Aws::Sqs::Queue.new(sqs, 'my_awesome_queue')
-        #
+      # Creates new Queue instance.
+      # Does not create a queue at Amazon.
+      #
+      #  queue = Aws::Sqs::Queue.new(sqs, 'my_awesome_queue')
+      #
       def initialize(sqs, url_or_name)
-        @sqs  = sqs
-        @url  = @sqs.interface.queue_url_by_name(url_or_name)
+        @sqs = sqs
+        @url = @sqs.interface.queue_url_by_name(url_or_name)
+        raise ResourceNotFoundError, "Queue '#{url_or_name}' not found." unless @url
         @name = @sqs.interface.queue_name_by_url(@url)
       end
 
-        # Retrieves queue size.
-        #
-        #  queue.size #=> 1
-        #
+      # Retrieves queue size.
+      #
+      #  queue.size #=> 1
+      #
       def size
         @sqs.interface.get_queue_length(@url)
       end
 
-        # Clears queue, deleting only the visible messages.  Any message within its visibility
-        # timeout will not be deleted, and will re-appear in the queue in the
-        # future when the timeout expires.
-        #
-        # To delete all messages in a queue and eliminate the chance of any
-        # messages re-appearing in the future, it's best to delete the queue and
-        # re-create it as a new queue.  Note that doing this will take at least 60
-        # s since SQS does not allow re-creation of a queue within this interval.
-        #
-        #  queue.clear() #=> true
-        #
+      # Clears queue, deleting only the visible messages.  Any message within its visibility
+      # timeout will not be deleted, and will re-appear in the queue in the
+      # future when the timeout expires.
+      #
+      # To delete all messages in a queue and eliminate the chance of any
+      # messages re-appearing in the future, it's best to delete the queue and
+      # re-create it as a new queue.  Note that doing this will take at least 60
+      # s since SQS does not allow re-creation of a queue within this interval.
+      #
+      #  queue.clear() #=> true
+      #
       def clear()
-          @sqs.interface.clear_queue(@url)
+        @sqs.interface.clear_queue(@url)
       end
 
-        # Deletes queue.  Any messages in the queue will be permanently lost.
-        # Returns +true+.
-        #
-        # NB: Use with caution; severe data loss is possible!
-        #
-        # queue.delete(true) #=> true
-        #
+      # Deletes queue.  Any messages in the queue will be permanently lost.
+      # Returns +true+.
+      #
+      # NB: Use with caution; severe data loss is possible!
+      #
+      # queue.delete(true) #=> true
+      #
       def delete(force=false)
         @sqs.interface.delete_queue(@url)
       end
 
-        # Sends new message to queue.
-        # Returns new Message instance that has been sent to queue.
+      # Sends new message to queue.
+      # Returns new Message instance that has been sent to queue.
       def send_message(message)
         message = message.to_s
         res = @sqs.interface.send_message(@url, message)
@@ -161,13 +165,14 @@ module Aws
         msg.sent_at = Time.now
         msg
       end
+
       alias_method :push, :send_message
 
-        # Retrieves several messages from queue.
-        # Returns an array of Message instances.
-        #
-        #  queue.receive_messages(2,10) #=> array of messages
-        #
+      # Retrieves several messages from queue.
+      # Returns an array of Message instances.
+      #
+      #  queue.receive_messages(2,10) #=> array of messages
+      #
       def receive_messages(number_of_messages=1, visibility=nil)
         list = @sqs.interface.receive_message(@url, number_of_messages, visibility)
         list.map! do |entry|
@@ -179,74 +184,74 @@ module Aws
         end
       end
 
-        # Retrieves first accessible message from queue.
-        # Returns Message instance or +nil+ it the queue is empty.
-        #
-        #  queue.receive #=> #<Aws::Sqs::Message:0xb7bf0884 ... >
-        #
+      # Retrieves first accessible message from queue.
+      # Returns Message instance or +nil+ it the queue is empty.
+      #
+      #  queue.receive #=> #<Aws::Sqs::Message:0xb7bf0884 ... >
+      #
       def receive(visibility=nil)
         list = receive_messages(1, visibility)
         list.empty? ? nil : list[0]
       end
 
-        # Pops (and deletes) first accessible message from queue.
-        # Returns Message instance or +nil+ if the queue is empty.
-        #
-        #  queue.pop #=> #<Aws::Sqs::Message:0xb7bf0884 ... >
-        #
+      # Pops (and deletes) first accessible message from queue.
+      # Returns Message instance or +nil+ if the queue is empty.
+      #
+      #  queue.pop #=> #<Aws::Sqs::Message:0xb7bf0884 ... >
+      #
       def pop
         list = @sqs.interface.pop_messages(@url, 1)
         return nil if list.empty?
         entry = list[0]
         msg = Message.new(self, entry['MessageId'], entry['ReceiptHandle'],
-                            entry['Body'], visibility)
+                          entry['Body'], visibility)
         msg.received_at = Time.now
         msg.receive_checksum = entry['MD5OfBody']
         msg
       end
 
-        # Retrieves +VisibilityTimeout+ value for the queue.
-        # Returns new timeout value.
-        #
-        #  queue.visibility #=> 30
-        #
+      # Retrieves +VisibilityTimeout+ value for the queue.
+      # Returns new timeout value.
+      #
+      #  queue.visibility #=> 30
+      #
       def visibility
         @sqs.interface.get_queue_attributes(@url, 'VisibilityTimeout')['VisibilityTimeout']
       end
 
-        # Sets new +VisibilityTimeout+ for the queue.
-        # Returns new timeout value.
-        #
-        #  queue.visibility #=> 30
-        #  queue.visibility = 33
-        #  queue.visibility #=> 33
-        #
+      # Sets new +VisibilityTimeout+ for the queue.
+      # Returns new timeout value.
+      #
+      #  queue.visibility #=> 30
+      #  queue.visibility = 33
+      #  queue.visibility #=> 33
+      #
       def visibility=(visibility_timeout)
         @sqs.interface.set_queue_attributes(@url, 'VisibilityTimeout', visibility_timeout)
         visibility_timeout
       end
 
-        # Sets new queue attribute value.
-        # Not all attributes may be changed: +ApproximateNumberOfMessages+ (for example) is a read only attribute.
-        # Returns a value to be assigned to attribute.
-        # Currently, 'VisibilityTimeout' is the only settable queue attribute.
-        # Attempting to set non-existent attributes generates an indignant
-        # exception.
-        #
-        # queue.set_attribute('VisibilityTimeout', '100')  #=> '100'
-        # queue.get_attribute('VisibilityTimeout')         #=> '100'
-        #
+      # Sets new queue attribute value.
+      # Not all attributes may be changed: +ApproximateNumberOfMessages+ (for example) is a read only attribute.
+      # Returns a value to be assigned to attribute.
+      # Currently, 'VisibilityTimeout' is the only settable queue attribute.
+      # Attempting to set non-existent attributes generates an indignant
+      # exception.
+      #
+      # queue.set_attribute('VisibilityTimeout', '100')  #=> '100'
+      # queue.get_attribute('VisibilityTimeout')         #=> '100'
+      #
       def set_attribute(attribute, value)
         @sqs.interface.set_queue_attributes(@url, attribute, value)
         value
       end
 
-        # Retrieves queue attributes.
-        # At this moment Amazon supports +VisibilityTimeout+ and +ApproximateNumberOfMessages+ only.
-        # If the name of attribute is set, returns its value. Otherwise, returns a hash of attributes.
-        #
-        # queue.get_attribute('VisibilityTimeout')  #=> {"VisibilityTimeout"=>"45"}
-        #
+      # Retrieves queue attributes.
+      # At this moment Amazon supports +VisibilityTimeout+ and +ApproximateNumberOfMessages+ only.
+      # If the name of attribute is set, returns its value. Otherwise, returns a hash of attributes.
+      #
+      # queue.get_attribute('VisibilityTimeout')  #=> {"VisibilityTimeout"=>"45"}
+      #
       def get_attribute(attribute='All')
         attributes = @sqs.interface.get_queue_attributes(@url, attribute)
         attribute=='All' ? attributes : attributes[attribute]
@@ -254,37 +259,37 @@ module Aws
     end
 
     class Message
-      attr_reader   :queue, :id, :body, :visibility, :receipt_handle
+      attr_reader :queue, :id, :body, :visibility, :receipt_handle
       attr_accessor :sent_at, :received_at, :send_checksum, :receive_checksum
 
       def initialize(queue, id=nil, rh = nil, body=nil, visibility=nil)
-        @queue       = queue
-        @id          = id
+        @queue = queue
+        @id = id
         @receipt_handle = rh
-        @body        = body
-        @visibility  = visibility
-        @sent_at     = nil
+        @body = body
+        @visibility = visibility
+        @sent_at = nil
         @received_at = nil
         @send_checksum = nil
         @receive_checksum = nil
       end
 
-        # Returns +Message+ instance body.
+      # Returns +Message+ instance body.
       def to_s
         @body
       end
 
-        # Removes message from queue.
-        # Returns +true+.
+      # Removes message from queue.
+      # Returns +true+.
       def delete
         @queue.sqs.interface.delete_message(@queue.url, @receipt_handle) if @receipt_handle
       end
-      
+
       # Updates visibility timeout.
       def visibility=(visibility_timeout)
         if @receipt_handle
           @queue.sqs.interface.change_message_visibility(
-            @queue.url, @receipt_handle, visibility_timeout
+              @queue.url, @receipt_handle, visibility_timeout
           )
           @visibility = visibility_timeout
         end

data/lib/sqs/sqs_interface.rb

@@ -325,8 +325,8 @@ module Aws
     #
     def self.queue_name_by_url(queue_url)
       queue_url[/[^\/]*$/]
-    rescue
-      on_exception
+#    rescue
+#      on_exception
     end
 
     # Returns short queue name by url.

data/test/sqs/test_sqs.rb

@@ -33,6 +33,13 @@ class TestSqs < Test::Unit::TestCase
         queue_url
     end
 
+    def test_on_exception_no_method_error
+      assert_raise Aws::ResourceNotFoundError do
+        Aws::Sqs::Queue.new(@s, "some_nonexistant_queue")
+      end
+    end
+    
+
 
     #---------------------------
     # Rightscale::SqsInterface

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-25 00:00:00.000000000 -08:00
+date: 2011-03-10 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &28505268 !ruby/object:Gem::Requirement
+  requirement: &27101172 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28505268
+  version_requirements: *27101172
 - !ruby/object:Gem::Dependency
   name: http_connection
-  requirement: &28504980 !ruby/object:Gem::Requirement
+  requirement: &27100884 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28504980
+  version_requirements: *27100884
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &28504692 !ruby/object:Gem::Requirement
+  requirement: &27100596 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28504692
+  version_requirements: *27100596
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &28504404 !ruby/object:Gem::Requirement
+  requirement: &27100308 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,7 +57,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28504404
+  version_requirements: *27100308
 description: AWS Ruby Library for interfacing with Amazon Web Services including EC2,
   S3, SQS, SimpleDB and most of their other services as well. By http://www.appoxy.com
 email: travis@appoxy.com
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: AWS Ruby Library for interfacing with Amazon Web Services. By http://www.appoxy.com