right_aws 1.9.0 → 3.1.0

data/lib/sqs/right_sqs_gen2_interface.rb

@@ -38,8 +38,7 @@ module RightAws
   class SqsGen2Interface < RightAwsBase
     include RightAwsBaseInterface
     
-    SIGNATURE_VERSION = "1"
-    API_VERSION       = "2008-01-01"
+    API_VERSION       = "2009-02-01"
     DEFAULT_HOST      = "queue.amazonaws.com"
     DEFAULT_PORT      = 443
     DEFAULT_PROTOCOL  = 'https'
@@ -66,14 +65,13 @@ module RightAws
     # Amazon's article "Migrating to Amazon SQS API version 2008-01-01" at:
     # http://developer.amazonwebservices.com/connect/entry.jspa?externalID=1148
     #
-    #  sqs = RightAws::SqsGen2Interface.new('1E3GDYEOGFJPIT75KDT40','hgTHt68JY07JKUY08ftHYtERkjgtfERn57DFE379', {:multi_thread => true, :logger => Logger.new('/tmp/x.log')}) 
+    #  sqs = RightAws::SqsGen2Interface.new('1E3GDYEOGFJPIT75KDT40','hgTHt68JY07JKUY08ftHYtERkjgtfERn57DFE379', {:logger => Logger.new('/tmp/x.log')}) 
     #  
     # 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)
+    #     :signature_version => '0'              # The signature version : '0', '1' or '2'(default)
     #     :logger       => Logger Object}        # Logger instance: logs to STDOUT if omitted }
     #
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
@@ -99,18 +97,15 @@ module RightAws
       # fields required in all requests, and then the headers passed in as
       # params.  We sort the header fields alphabetically and then generate the
       # signature before URL escaping the resulting query and sending it.
-      queue_uri = param[:queue_url] ? URI(param[:queue_url]).path : '/'
+      service = param[:queue_url] ? URI(param[:queue_url]).path : '/'
       param.each{ |key, value| param.delete(key) if (value.nil? || key.is_a?(Symbol)) }
-      request_hash = { "Action"           => action,
+      service_hash = { "Action"           => action,
                        "Expires"          => (Time.now + REQUEST_TTL).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
                        "AWSAccessKeyId"   => @aws_access_key_id,
-                       "Version"          => API_VERSION,
-                       "SignatureVersion" => SIGNATURE_VERSION }
-      request_hash.update(param)
-      request_data   = request_hash.sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
-      request_hash['Signature'] = AwsUtils::sign(@aws_secret_access_key, request_data)
-      request_params = request_hash.to_a.collect{|key,val| key.to_s + "=" + val.to_s }.join("&")
-      request        = Net::HTTP::Get.new(AwsUtils.URLencode("#{queue_uri}?#{request_params}"))
+                       "Version"          => API_VERSION }
+      service_hash.update(param)
+      service_params = signed_service_params(@aws_secret_access_key, service_hash, :get, @params[:server], service)
+      request        = Net::HTTP::Get.new("#{AwsUtils.URLencode(service)}?#{service_params}")
         # prepare output hash
       { :request  => request, 
         :server   => @params[:server],
@@ -119,22 +114,20 @@ module RightAws
     end
 
     def generate_post_request(action, param={})  # :nodoc:
-      queue_uri = param[:queue_url] ? URI(param[:queue_url]).path : '/'
+      service = param[:queue_url] ? URI(param[:queue_url]).path : '/'
       message   = param[:message]                # extract message body if nesessary
       param.each{ |key, value| param.delete(key) if (value.nil? || key.is_a?(Symbol)) }
-      request_hash = { "Action"           => action,
+      service_hash = { "Action"           => action,
                        "Expires"          => (Time.now + REQUEST_TTL).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
                        "AWSAccessKeyId"   => @aws_access_key_id,
                        "MessageBody"      => message,
-                       "Version"          => API_VERSION,
-                       "SignatureVersion" => SIGNATURE_VERSION }
-      request_hash.update(param)
-      request_data   = request_hash.sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
-      request_hash['Signature'] = AwsUtils::sign(@aws_secret_access_key, request_data)
-      request_body = request_hash.to_a.collect{|key,val| CGI.escape(key.to_s) + "=" + CGI.escape(val.to_s) }.join("&")
-      request        = Net::HTTP::Post.new(AwsUtils.URLencode(queue_uri))
-      request['Content-Type'] = 'application/x-www-form-urlencoded' 
-      request.body = request_body
+                       "Version"          => API_VERSION }
+      service_hash.update(param)
+      #
+      service_params = signed_service_params(@aws_secret_access_key, service_hash, :post, @params[:server], service)
+      request        = Net::HTTP::Post.new(AwsUtils::URLencode(service))
+      request['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8'
+      request.body = service_params
         # prepare output hash
       { :request  => request, 
         :server   => @params[:server],
@@ -146,15 +139,12 @@ module RightAws
       # Sends request to Amazon and parses the response
       # Raises AwsError if any banana happened
     def request_info(request, parser) # :nodoc:
-      thread = @params[:multi_thread] ? Thread.current : Thread.main
-      thread[:sqs_connection] ||= Rightscale::HttpConnection.new(:exception => AwsError, :logger => @logger)
-      request_info_impl(thread[:sqs_connection], @@bench, request, parser)
+      request_info_impl(:sqs_connection, @@bench, request, parser)
     end
 
-
       # Creates a new queue, returning its URI.
       #
-      #  sqs.create_queue('my_awesome_queue') #=> 'http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue'
+      #  sqs.create_queue('my_awesome_queue') #=> 'https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue'
       #
     def create_queue(queue_name, default_visibility_timeout=nil)
       req_hash = generate_request('CreateQueue', 'QueueName' => queue_name,
@@ -170,7 +160,7 @@ module RightAws
      #
      #  sqs.create_queue('my_awesome_queue')
      #  sqs.create_queue('my_awesome_queue_2')
-     #  sqs.list_queues('my_awesome') #=> ['http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue','http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue_2']
+     #  sqs.list_queues('my_awesome') #=> ['https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue','https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue_2']
      #
     def list_queues(queue_name_prefix=nil)
       req_hash = generate_request('ListQueues', 'QueueNamePrefix' => queue_name_prefix)
@@ -185,11 +175,10 @@ module RightAws
       # may still show the deleted queue.  It is not unusual within the 60 s window to see the deleted queue absent from 
       # one list_queues call but present in the subsequent one.  Deletion is eventual.
       #
-      #  sqs.delete_queue('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue_2') #=> true
-      # 
+      #  sqs.delete_queue('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue_2') #=> true
       # 
     def delete_queue(queue_url)
-      req_hash = generate_request('DeleteQueue', :queue_url      => queue_url)
+      req_hash = generate_request('DeleteQueue', :queue_url => queue_url)
       request_info(req_hash, SqsStatusParser.new(:logger => @logger))
     rescue
       on_exception
@@ -197,11 +186,24 @@ module RightAws
 
       # Retrieves the queue attribute(s). Returns a hash of attribute(s) or an exception.
       #
-      #  sqs.get_queue_attributes('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') 
-      #  #=> {"ApproximateNumberOfMessages"=>"0", "VisibilityTimeout"=>"30"}
+      #  sqs.get_queue_attributes('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=>
+      #    {"ApproximateNumberOfMessages" => "0",
+      #     "LastModifiedTimestamp"       => "1240946032",
+      #     "CreatedTimestamp"            => "1240816887",
+      #     "VisibilityTimeout"           => "30",
+      #     "Policy"                      => "{"Version":"2008-10-17","Id":...}"}
+      #     
+      #  queue.get_queue_attributes('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue', "LastModifiedTimestamp", "VisibilityTimeout") #=>
+      #    {"LastModifiedTimestamp" => "1240946032",
+      #     "VisibilityTimeout"     => "30"}
       #
-    def get_queue_attributes(queue_url, attribute='All')
-      req_hash = generate_request('GetQueueAttributes', 'AttributeName' => attribute, :queue_url  => queue_url)
+      # http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/index.html?Query_QueryGetQueueAttributes.html
+    def get_queue_attributes(queue_url, *attributes)
+      attributes.flatten!
+      attributes << 'All' if attributes.right_blank?
+      params = amazonize_list('AttributeName', attributes)
+      params.merge!(:queue_url  => queue_url)
+      req_hash = generate_request('GetQueueAttributes', params)
       request_info(req_hash, SqsGetQueueAttributesParser.new(:logger => @logger))
     rescue
       on_exception
@@ -209,48 +211,108 @@ module RightAws
 
       # Sets queue attribute. Returns +true+ or an exception.
       #
-      #  sqs.set_queue_attributes('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue', "VisibilityTimeout", 10) #=> true
+      #  sqs.set_queue_attributes('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue', "VisibilityTimeout", 10) #=> true
       #
       # From the SQS Dev Guide:
-      # "Currently, you can set only the 
-      # VisibilityTimeout attribute for a queue... 
-      # When you change a queue's attributes, the change can take up to 60 seconds to propagate 
+      # "When you change a queue's attributes, the change can take up to 60 seconds to propagate 
       # throughout the SQS system."
       #
       # NB: Attribute values may not be immediately available to other queries
       # for some time after an update. See the SQS documentation for
       # semantics, but in general propagation can take up to 60 s.
+      # 
+      #  see http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/index.html?Query_QuerySetQueueAttributes.html
     def set_queue_attributes(queue_url, attribute, value)
-      req_hash = generate_request('SetQueueAttributes', 'Attribute.Name'  => attribute, 'Attribute.Value' => value, :queue_url  => queue_url)
+      req_hash = generate_request('SetQueueAttributes', 
+                                  'Attribute.Name'  => attribute,
+                                  'Attribute.Value' => value,
+                                  :queue_url        => queue_url)
+      request_info(req_hash, SqsStatusParser.new(:logger => @logger))
+    rescue
+      on_exception
+    end
+
+    # Add permissions to a queue.
+    #
+    #  sqs.add_permissions('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue',
+    #                     'testLabel', ['125074342641','125074342642'],
+    #                     ['SendMessage','SendMessage','ReceiveMessage']) #=> true
+    #
+    #  +permissions+ is a hash of: AccountId => ActionName
+    #  (valid ActionNames: * | SendMessage | ReceiveMessage | DeleteMessage | ChangeMessageVisibility | GetQueueAttributes )
+    #
+    #  see http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/index.html?Query_QueryAddPermission.html
+    #      http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/index.html?acp-overview.html
+    def add_permissions(queue_url, label, grantees, actions)
+      params      = amazonize_list('AWSAccountId', Array(grantees))
+      params.merge!(amazonize_list('ActionName', Array(actions)))
+      params.merge!('Label'    => label,
+                    :queue_url => queue_url )
+      req_hash = generate_request('AddPermission', params)
+      request_info(req_hash, SqsStatusParser.new(:logger => @logger))
+    rescue
+      on_exception
+    end
+
+    # Revoke any permissions in the queue policy that matches the +label+ parameter.
+    #
+    #  sqs.remove_permissions('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue',
+    #                        'testLabel') # => true
+    #
+    #  see http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/index.html?Query_QueryRemovePermission.html
+    def remove_permissions(queue_url, label)
+      req_hash = generate_request('RemovePermission',
+                                  'Label'    => label,
+                                  :queue_url => queue_url )
       request_info(req_hash, SqsStatusParser.new(:logger => @logger))
     rescue
       on_exception
     end
 
-      # Retrieves a list of messages from queue. Returns an array of hashes in format: <tt>{:id=>'message_id', body=>'message_body'}</tt>
+      # Retrieves a list of messages from queue. Returns an array of hashes in format: <tt>{:id=>'message_id', :body=>'message_body'}</tt>
       #
-      #   sqs.receive_message('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue',10, 5) #=>
+      #   sqs.receive_message('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue',10, 5) #=>
       #    [{"ReceiptHandle"=>"Euvo62...kw==", "MD5OfBody"=>"16af2171b5b83cfa35ce254966ba81e3", 
       #      "Body"=>"Goodbyte World!", "MessageId"=>"MUM4WlAyR...pYOTA="}, ..., {}]
       #
       # Normally this call returns fewer messages than the maximum specified,
       # even if they are available.
       #
-    def receive_message(queue_url, max_number_of_messages=1, visibility_timeout=nil)
+    def receive_message(queue_url, max_number_of_messages=1, visibility_timeout=nil, attributes=nil)
       return [] if max_number_of_messages == 0
-      req_hash = generate_post_request('ReceiveMessage', 'MaxNumberOfMessages'  => max_number_of_messages, 'VisibilityTimeout' => visibility_timeout,
-                                       :queue_url          => queue_url )
+      params = {}
+      params.merge!(amazonize_list('AttributeName', Array(attributes))) unless attributes.right_blank?
+      params.merge!('MaxNumberOfMessages' => max_number_of_messages,
+                    'VisibilityTimeout'   => visibility_timeout,
+                    :queue_url            => queue_url )
+      req_hash = generate_post_request('ReceiveMessage', params)
       request_info(req_hash, SqsReceiveMessageParser.new(:logger => @logger))
     rescue
       on_exception
     end
+
+    # Change the visibility timeout of a specified message in a queue.
+    #
+    #  sqs.change_message_visibility('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue', 'Euvo62...kw==', 33) #=> true
+    #
+    #  see http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/index.html?Query_QueryChangeMessageVisibility.html
+    def change_message_visibility(queue_url, receipt_handle, visibility_timeout)
+      req_hash = generate_request('ChangeMessageVisibility',
+                                  'ReceiptHandle'     => receipt_handle,
+                                  'VisibilityTimeout' => visibility_timeout,
+                                  :queue_url          => queue_url )
+      request_info(req_hash, SqsStatusParser.new(:logger => @logger))
+    rescue
+      on_exception
+    end
     
       # Sends a new message to a queue.  Message size is limited to 8 KB.
       # If successful, this call returns a hash containing key/value pairs for
       # "MessageId" and "MD5OfMessageBody":
       #
-      #  sqs.send_message('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue', 'message_1') #=> "1234567890...0987654321"
-      #  => {"MessageId"=>"MEs4M0JKNlRCRTBBSENaMjROTk58QVFRNzNEREhDVFlFOVJDQ1JKNjF8UTdBRllCUlJUMjhKMUI1WDJSWDE=", "MD5OfMessageBody"=>"16af2171b5b83cfa35ce254966ba81e3"}
+      #  sqs.send_message('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue', 'message_1') #=> 
+      #    {"MessageId"=>"MEs4M0JKNlRCRTBBSENaMjROTk58QVFRNzNEREhDVFlFOVJDQ1JKNjF8UTdBRllCUlJUMjhKMUI1WDJSWDE=",
+      #     "MD5OfMessageBody"=>"16af2171b5b83cfa35ce254966ba81e3"}
       #
       # On failure, send_message raises an exception.
       #
@@ -277,7 +339,7 @@ module RightAws
       # you again on a subsequent receive request. You should create your system to be 
       # idempotent so that receiving a particular message more than once is not a problem. "
       #
-      #  sqs.delete_message('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue', 'Euvo62/1nlIet...ao03hd9Sa0w==') #=> true
+      #  sqs.delete_message('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue', 'Euvo62/1nlIet...ao03hd9Sa0w==') #=> true
       #
     def delete_message(queue_url, receipt_handle)
       req_hash = generate_request('DeleteMessage', 'ReceiptHandle' => receipt_handle, :queue_url  => queue_url)
@@ -287,7 +349,7 @@ module RightAws
     end
     
       # Given the queue's short name, this call returns the queue URL or +nil+ if queue is not found
-      #  sqs.queue_url_by_name('my_awesome_queue') #=> 'http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue'
+      #  sqs.queue_url_by_name('my_awesome_queue') #=> 'https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue'
       #
     def queue_url_by_name(queue_name)
       return queue_name if queue_name.include?('/')
@@ -302,7 +364,7 @@ module RightAws
 
       # Returns short queue name by url.
       #
-      #  RightSqs.queue_name_by_url('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=> 'my_awesome_queue'
+      #  RightSqs.queue_name_by_url('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=> 'my_awesome_queue'
       #
     def self.queue_name_by_url(queue_url)
       queue_url[/[^\/]*$/]
@@ -312,7 +374,7 @@ module RightAws
     
       # Returns short queue name by url.
       #
-      #  sqs.queue_name_by_url('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=> 'my_awesome_queue'
+      #  sqs.queue_name_by_url('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=> 'my_awesome_queue'
       #
     def queue_name_by_url(queue_url)
       self.class.queue_name_by_url(queue_url)
@@ -322,17 +384,19 @@ module RightAws
 
       # Returns approximate number of messages in queue.
       #
-      #  sqs.get_queue_length('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=> 3
+      #  sqs.get_queue_length('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=> 3
       #
     def get_queue_length(queue_url)
-      get_queue_attributes(queue_url)['ApproximateNumberOfMessages'].to_i
+      attrs = get_queue_attributes(queue_url)
+      attrs['ApproximateNumberOfMessages'].to_i +
+      attrs['ApproximateNumberOfMessagesNotVisible'].to_i
     rescue
       on_exception
     end
 
       # Removes all visible messages from queue. Return +true+ or an exception.
       #
-      #  sqs.clear_queue('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=> true
+      #  sqs.clear_queue('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=> true
       #
     def clear_queue(queue_url)
       while (pop_messages(queue_url, 10).length > 0) ; end   # delete all messages in queue
@@ -343,12 +407,12 @@ module RightAws
 
       # Pops (retrieves and deletes) up to 'number_of_messages' from queue. Returns an array of retrieved messages in format: <tt>[{:id=>'message_id', :body=>'message_body'}]</tt>.
       #
-      #   sqs.pop_messages('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue', 3) #=>
+      #   sqs.pop_messages('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue', 3) #=>
       #   [{"ReceiptHandle"=>"Euvo62/...+Zw==", "MD5OfBody"=>"16af2...81e3", "Body"=>"Goodbyte World!", 
       #   "MessageId"=>"MEZI...JSWDE="}, {...}, ... , {...} ]
       #
-    def pop_messages(queue_url, number_of_messages=1)
-      messages = receive_message(queue_url, number_of_messages)
+    def pop_messages(queue_url, number_of_messages=1, attributes=nil)
+      messages = receive_message(queue_url, number_of_messages, nil, attributes)
       messages.each do |message|
         delete_message(queue_url, message['ReceiptHandle'])
       end
@@ -359,12 +423,12 @@ module RightAws
 
       # Pops (retrieves and  deletes) first accessible message from queue. Returns the message in format <tt>{:id=>'message_id', :body=>'message_body'}</tt> or +nil+.
       #
-      #  sqs.pop_message('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=>
+      #  sqs.pop_message('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=>
       #    {:id=>"12345678904GEZX9746N|0N9ED344VK5Z3SV1DTM0|1RVYH4X3TJ0987654321", :body=>"message_1"}
       #
-    def pop_message(queue_url)
-      messages = pop_messages(queue_url)
-      messages.blank? ? nil : messages[0]
+    def pop_message(queue_url, attributes=nil)
+      messages = pop_messages(queue_url, 1, attributes)
+      messages.right_blank? ? nil : messages[0]
     rescue
       on_exception
     end
@@ -406,8 +470,8 @@ module RightAws
       end
       def tagend(name)
         case name 
-          when 'Name'      ; @current_attribute          = @text
-          when 'Value'     ; @result[@current_attribute] = @text
+          when 'Name'  then @current_attribute          = @text
+          when 'Value' then @result[@current_attribute] = @text
         end
       end
     end
@@ -421,14 +485,23 @@ module RightAws
         @result = []
       end
       def tagstart(name, attributes)
-        @current_message = {} if name == 'Message'
+        case name
+        when 'Message' then @current_message = { }
+        when 'Attribute' then
+          @current_message['Attributes'] ||= {}
+          @current_attribute_name  = ''
+          @current_attribute_value = ''
+        end
       end
       def tagend(name)
         case name
-          when 'MessageId'  ; @current_message['MessageId'] = @text
-          when 'ReceiptHandle' ; @current_message['ReceiptHandle'] = @text
-          when 'MD5OfBody' ; @current_message['MD5OfBody'] = @text
-          when 'Body'; @current_message['Body'] = @text; @result << @current_message
+        when 'MessageId'     then @current_message['MessageId']     = @text
+        when 'ReceiptHandle' then @current_message['ReceiptHandle'] = @text
+        when 'MD5OfBody'     then @current_message['MD5OfBody']     = @text
+        when 'Name'          then @current_attribute_name  = @text
+        when 'Value'         then @current_attribute_value = @text
+        when 'Attribute'     then @current_message['Attributes'][@current_attribute_name] = @current_attribute_value
+        when 'Body'          then @current_message['Body'] = @text; @result << @current_message
         end
       end
     end
@@ -439,8 +512,8 @@ module RightAws
       end
       def tagend(name)
         case name
-          when 'MessageId' ; @result['MessageId'] = @text
-          when 'MD5OfMessageBody' ; @result['MD5OfMessageBody'] = @text
+          when 'MessageId'        then @result['MessageId']        = @text
+          when 'MD5OfMessageBody' then @result['MD5OfMessageBody'] = @text
         end
       end
     end

data/lib/sqs/right_sqs_interface.rb

@@ -49,14 +49,13 @@ module RightAws
 
       # Creates a new SqsInterface instance.
       #
-      #  sqs = RightAws::SqsInterface.new('1E3GDYEOGFJPIT75KDT40','hgTHt68JY07JKUY08ftHYtERkjgtfERn57DFE379', {:multi_thread => true, :logger => Logger.new('/tmp/x.log')}) 
+      #  sqs = RightAws::SqsInterface.new('1E3GDYEOGFJPIT75KDT40','hgTHt68JY07JKUY08ftHYtERkjgtfERn57DFE379', {:logger => Logger.new('/tmp/x.log')}) 
       #  
       # 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)
+      #     :signature_version => '0'              # The signature version : '0', '1' or '2'(default)
       #     :logger       => Logger Object}        # Logger instance: logs to STDOUT if omitted }
       #
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
@@ -78,24 +77,17 @@ module RightAws
     def generate_request(action, params={})  # :nodoc:
         # Sometimes we need to use queue uri (delete queue etc)
         # In that case we will use Symbol key: 'param[:queue_url]'
-      queue_uri = params[:queue_url] ? URI(params[:queue_url]).path : '/'
+      service = params[:queue_url] ? URI(params[:queue_url]).path : '/'
         # remove unset(=optional) and symbolyc keys
       params.each{ |key, value| params.delete(key) if (value.nil? || key.is_a?(Symbol)) }
         # prepare output hash
       service_hash = { "Action"           => action,
                        "Expires"          => (Time.now + REQUEST_TTL).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
                        "AWSAccessKeyId"   => @aws_access_key_id,
-                       "Version"          => API_VERSION,
-                       "SignatureVersion" => signature_version }
+                       "Version"          => API_VERSION }
       service_hash.update(params)
-      # prepare string to sight
-      string_to_sign = case signature_version
-                       when '0' : service_hash["Action"] + service_hash["Expires"]
-                       when '1' : service_hash.sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
-                       end
-      service_hash['Signature'] = AwsUtils::sign(@aws_secret_access_key, string_to_sign)
-      request_params = service_hash.to_a.collect{|key,val| key.to_s + "=" + CGI::escape(val.to_s) }.join("&")
-      request        = Net::HTTP::Get.new("#{queue_uri}?#{request_params}")
+      service_params = signed_service_params(@aws_secret_access_key, service_hash, :get, @params[:server], service)
+      request        = Net::HTTP::Get.new("#{AwsUtils::URLencode(service)}?#{service_params}")
         # prepare output hash
       { :request  => request, 
         :server   => @params[:server],
@@ -111,8 +103,8 @@ module RightAws
       param.each{ |key, value| param.delete(key) if (value.nil? || key.is_a?(Symbol)) }
         # created request
       param_to_str = param.to_a.collect{|key,val| key.to_s + "=" + CGI::escape(val.to_s) }.join("&")
-      param_to_str = "?#{param_to_str}" unless param_to_str.blank?
-      request = "Net::HTTP::#{method.capitalize}".constantize.new("#{queue_uri}#{param_to_str}")
+      param_to_str = "?#{param_to_str}" unless param_to_str.right_blank?
+      request = "Net::HTTP::#{method.capitalize}".right_constantize.new("#{queue_uri}#{param_to_str}")
       request.body = message if message
         # set main headers
       request['content-md5']  = ''
@@ -135,9 +127,7 @@ module RightAws
       # Sends request to Amazon and parses the response
       # Raises AwsError if any banana happened
     def request_info(request, parser) # :nodoc:
-      thread = @params[:multi_thread] ? Thread.current : Thread.main
-      thread[:sqs_connection] ||= Rightscale::HttpConnection.new(:exception => AwsError, :logger => @logger)
-      request_info_impl(thread[:sqs_connection], @@bench, request, parser)
+      request_info_impl(:sqs_connection, @@bench, request, parser)
     end
 
 
@@ -320,7 +310,7 @@ module RightAws
     def peek_message(queue_url, message_id)
       req_hash = generate_rest_request('GET', :queue_url => "#{queue_url}/#{CGI::escape message_id}" )
       messages = request_info(req_hash, SqsReceiveMessagesParser.new(:logger => @logger))
-      messages.blank? ? nil : messages[0]
+      messages.right_blank? ? nil : messages[0]
     rescue
       on_exception
     end
@@ -461,7 +451,7 @@ module RightAws
       #
     def receive_message(queue_url, visibility_timeout=nil)
       result = receive_messages(queue_url, 1, visibility_timeout)
-      result.blank? ? nil : result[0]
+      result.right_blank? ? nil : result[0]
     rescue
       on_exception
     end
@@ -491,7 +481,7 @@ module RightAws
       #
     def pop_message(queue_url)
       messages = pop_messages(queue_url)
-      messages.blank? ? nil : messages[0]
+      messages.right_blank? ? nil : messages[0]
     rescue
       on_exception
     end