SQS 0.1.4 → 0.1.5

data/CHANGELOG

@@ -1,3 +1,22 @@
+0.1.5
+2007-07-18
+* sqs_queue_test.rb is now dependent on the assert_statistically gem.  You can still
+run SQS without assert_statistically, but you will need assert_statistically to run
+the tests.
+* http://developer.amazonwebservices.com/connect/thread.jspa?threadID=15618&tstart=0
+is now resolved and tested.
+* Exceptions are now custom SQS:: classes, generated from the error code returned in
+the web service XML.  No more generic RuntimeErrors!
+* http://developer.amazonwebservices.com/connect/thread.jspa?messageID=61724&#61724
+is now resolved and tested.
+* Changed SQS.reasons_not_to_retry to SQS.reasons_to_retry and it's now being used!
+(See http://developer.amazonwebservices.com/connect/thread.jspa?messageID=56888&#56888)
+* The user can now SQS.add_reasons_to_retry and SQS.remove_reasons_to_retry
+* The user can now set the number of times to retry, when a request fails and the
+error code is included? in SQS.reasons_to_retry
+* Add a random sleep between retries
+* Ensure that retrying doesn't sleep on the final iteration of the loop
+
 0.1.4
 2007-06-12
 * Upped the API version to 2007-05-01
@@ -21,6 +40,7 @@ message as it comes.
 http://developer.amazonwebservices.com/connect/thread.jspa?threadID=15618&tstart=0
 Is unresolved
 
+
 0.1.3
 2007-04-25
 * Missed one "include REXML."

data/lib/sqs.rb

@@ -94,7 +94,7 @@ class SQS
       return queue if queue.name == params[:name]
     end
 
-    raise "Could not find the queue named '#{params[:name]}'"
+    raise SQS::UnavailableQueue, "Could not find the queue named '#{params[:name]}'"
   rescue Exception => e
     raise e
   end
@@ -147,7 +147,12 @@ class SQS
   end
 
   def self.retry_attempts
-    10
+    @@retry_attempts
+  end
+  def self.retry_attempts=( new_value )
+    @@retry_attempts = new_value.to_i
+  rescue NoMethodError
+    raise ArgumentError.new( $!.message )
   end
 
   def self.params_for_query( t=nil )
@@ -171,15 +176,70 @@ class SQS
   def self.increment_counter
     @@counter += 1
   end
+
+  def self.reasons_to_retry
+    @@reasons_to_retry.dup
+  end
+  def self.add_reasons_to_retry( *string_or_array )
+    @@reasons_to_retry += (
+                            string_or_array[0].is_a?( String ) ?
+                            string_or_array :
+                            string_or_array[0]
+                          )
+    @@reasons_to_retry.uniq!
+  rescue TypeError
+    raise ArgumentError.new( $!.message )
+  end
+  
+  def self.remove_reasons_to_retry( *string_or_array )
+    @@reasons_to_retry -= (
+                            string_or_array[0].is_a?( String ) ?
+                            string_or_array :
+                            string_or_array[0]
+                          )
+  rescue TypeError
+    raise ArgumentError.new( $!.message )
+  end
+  class <<self
+    alias :add_reason_to_retry :add_reasons_to_retry
+    alias :remove_reason_to_retry :remove_reasons_to_retry
+  end
+
   protected
+  @@retry_attempts = 10;
   @@counter = 0;
   @@secret_access_key = 'Replace this with your secret access key'
   @@access_key_id = 'Replace this with your access key id'
   @@url_for_query = 'http://queue.amazonaws.com/'
-  
+  @@exception_classes = {}
+  @@reasons_to_retry = [ 'ServiceUnavailable' ]
+
+  def self.get_exception_class( s=nil )
+    raise ArgumentError, "Please specify an error code" if s.to_s.empty?
+    class_name = s.to_s.gsub( /[^a-z0-9]/i, '' )
+    class_name = "#{$1.capitalize}#{$2}" if class_name =~ /^(.)(.*)/
+    class_name = class_name.to_sym
+    @@exception_classes[class_name] ||= eval( "class #{class_name.to_s} < RuntimeError ; end ; #{class_name.to_s}" , binding, __FILE__, __LINE__ )
+  end
+
+  def self.get_exception( params=nil )
+    raise ArgumentError, "You must pass a Hash to SQS.get_exception" unless params.is_a?( Hash )
+
+    if params[:document].respond_to?( :error_code ) && params[:document].respond_to?( :error_message )
+      doc = params[:document]
+      error_code = params[:document].error_code
+      error_message = params[:document].error_message
+    else
+      raise ArgumentError, "Cannot determine error code and message"
+    end
+    if params[:url].respond_to?( :to_s )
+      url = params[:url].to_s
+    else
+      raise ArgumentError, "Cannot determine url"
+    end
+    attempts = params[:attempts].respond_to?( :to_i ) ? attempts = params[:attempts].to_i : 0
 
-  def self.reasons_not_to_retry
-    [ 'Success', 'InvalidParameterValue' ]
+    self.get_exception_class( error_code ).new( "#{error_message} #{attempts > 0 ? "(After #{attempts} attempt#{attempts == 1 ? '' : 's'}) " : ''}(The XML returned from #{url} was #{doc})" )
   end
 
   def self.call_web_service( params )
@@ -193,6 +253,7 @@ class SQS
       retries = self.retry_attempts
     end
 
+
     if !params[:queue].nil?
       if params[:queue].respond_to?( :url )
         url = params[:queue].url
@@ -203,28 +264,41 @@ class SQS
     else
       url = "#{self.url_for_query}"
     end
-    url += "?#{self.prepare_parameters_for_query( params )}&Signature="
-
-    url_encoded_signature = url_encode( self.create_signature( params ) )
-    response = Net::HTTP.get( URI.parse( url + url_encoded_signature ) )
-    self.increment_counter
-    doc = REXML::Document.new( response )
-    status = doc.status
-
-    unless status == 'Success'
-      error_code = doc.error_code
-      error_message = doc.error_message
-      case error_code
-      when 'AuthFailure', 'InvalidParameterValue', 'AWS.SimpleQueueService.NonEmptyQueue'
-        raise( "#{error_code}: #{error_message} (#{url}#{url_encoded_signature})" )
-      else
-        raise( "Unknown Error: #{doc} (#{url}#{url_encoded_signature})" )
+    
+    remaining_attempts = retries + 1
+    while remaining_attempts > 0
+      url_to_use = url + "?#{self.prepare_parameters_for_query( params )}&Signature="
+
+      url_encoded_signature = url_encode( self.create_signature( params ) )
+
+      begin
+        response = Net::HTTP.get( URI.parse( url_to_use + url_encoded_signature ) )
+        self.increment_counter
+        doc = REXML::Document.new( response )
+      rescue
+        raise $!
       end
+
+      remaining_attempts -= 1
+
+      break if remaining_attempts == 0 || !self.reasons_to_retry.include?( doc.error_code.to_s )
+
+      sleep( rand( 500 ) / 1000.0 ) #sleep for up to half a second
     end
+      
+    raise self.get_exception(
+      :document => doc,
+      :url => ( url_to_use + url_encoded_signature ),
+      :attempts => ( retries + 1 - remaining_attempts )
+    ) unless doc.status == 'Success'
 
     doc
   rescue Exception => e
-    raise e.is_a?( SocketError ) ? "Do you have internet access? (#{e.message})" : e
+    if e.is_a?( SocketError )
+      raise SocketError, "Do you have internet access? (#{e.message})"
+    else
+      raise e
+    end
   end
 end
 
@@ -262,6 +336,9 @@ module REXML
     def node_text( xpath )
       code = REXML::XPath.first( self, xpath )
       code.to_s.empty? ? '' : code.text
+    rescue
+#      puts "XPath #{xpath} on #{self.to_s} resulted in #{$!.class.name}"
+      raise $!
     end
     
     def nodes( xpath )
@@ -287,6 +364,9 @@ module REXML
     def node_text( xpath )
       code = REXML::XPath.first( self, xpath )
       code.to_s.empty? ? '' : code.text
+    rescue
+#      puts "XPath #{xpath} on #{self.to_s} resulted in #{$!.class.name}: #{$!.message}\n#{$!.backtrace.join("\n")}"
+      raise $!
     end
     
     def nodes( xpath )

data/lib/sqs/message.rb

@@ -11,8 +11,8 @@ class SQS::Message
 
 
   def delete
-    raise "This #{self.class.to_s} cannot be deleted, because there is no associated SQS::Queue" unless self.queue.is_a?( SQS::Queue )
-    raise "Cannot delete a message with no id." if self.id.to_s.empty?
+    raise SQS::UnavailableQueue, "This #{self.class.to_s} cannot be deleted, because there is no associated SQS::Queue" unless self.queue.is_a?( SQS::Queue )
+    raise SQS::MissingId, "Cannot delete a message with no id." if self.id.to_s.empty?
 
     doc = SQS.call_web_service( :Action => 'DeleteMessage', :queue => self.queue, :MessageId => self.id )
     true
@@ -22,8 +22,8 @@ class SQS::Message
 
 
   def peek
-    raise "This #{self.class.to_s} cannot be peeked, because there is no associated SQS::Queue" unless self.queue.is_a?( SQS::Queue )
-    raise "Cannot peek a message with no id." if self.id.to_s.empty?
+    raise SQS::UnavailableQueue, "This #{self.class.to_s} cannot be peeked, because there is no associated SQS::Queue" unless self.queue.is_a?( SQS::Queue )
+    raise SQS::MissingId, "Cannot peek a message with no id." if self.id.to_s.empty?
 
     doc = SQS.call_web_service( :Action => 'PeekMessage', :queue => self.queue, :MessageId => self.id )
     self.body = doc.message_body
@@ -40,4 +40,7 @@ class SQS::Message
     self._body = b
   end
 
-end
+end
+
+class SQS::UnavailableQueue < TypeError ; end
+class SQS::MissingId < TypeError ; end

data/lib/sqs/queue.rb

@@ -19,7 +19,7 @@ class SQS::Queue
     rescue URI::InvalidURIError, NoMethodError
       bad_url = true
     end
-    raise "'#{self.url}' does not seem to be a parseable URL. (Please provide all parts of the URL.)" if bad_url
+    raise URI::InvalidURIError, "'#{self.url}' does not seem to be a parseable URL. (Please provide all parts of the URL.)" if bad_url
   end
 
   def method_missing( symbol, *args )
@@ -164,7 +164,7 @@ class SQS::Queue
     elsif !options[:email].nil?
       params['Grantee.EmailAddress'.to_sym] = options[:email].respond_to?( :email ) ? options[:email].email : options[:email]
     else
-      raise "You must specify either a grant id (:id) or a grantee email address (:email) when calling remove_grant."
+      raise ArgumentError, "You must specify either a grant id (:id) or a grantee email address (:email) when calling remove_grant."
     end
 
     doc = SQS.call_web_service( params )
@@ -173,8 +173,24 @@ class SQS::Queue
     raise e
   end
 
-  def list_grants
-    doc = SQS.call_web_service( :Action => 'ListGrants', :queue => self )
+  def list_grants( p=nil )
+    params = { :Action => 'ListGrants', :queue => self }
+
+    case p
+    when SQS::Grant
+      if p.email.to_s.empty?
+        params['Grantee.ID'.to_sym] = p.id
+      else
+        params['Grantee.EmailAddress'.to_sym] = p.email
+      end
+    when Hash
+      params['Grantee.EmailAddress'.to_sym] = p[:email] unless p[:email].to_s.empty?
+      params['Grantee.ID'.to_sym] = p[:id] unless p[:id].to_s.empty?
+      params[:Permission] = SQS.permissions[p[:permission]] unless p[:permission].to_s.empty?
+    end
+      
+    
+    doc = SQS.call_web_service( params )
     grants = Array.new
     doc.grant_lists.each do |list|
       list.grantees.each do |g|

data/test/unit/sqs_message_test.rb

@@ -5,6 +5,14 @@ require 'test/unit'
 require "#{File.expand_path( File.dirname( __FILE__ ) )}/test_setup"
 
 
+class Test::Unit::TestCase
+  def multi_assert( o={}, &b )
+    echo "I'm in multi_assert"
+    return true
+  end
+end
+
+
 class SQS_MessageTest < Test::Unit::TestCase
   def setup
     @queue_prefix = 'testMSG'
@@ -22,8 +30,22 @@ class SQS_MessageTest < Test::Unit::TestCase
       assert_equal @q, m.queue
       assert m.delete
       sleep 2
-      assert_raises RuntimeError do
+      begin
         m.peek
+      rescue
+        assert_equal 'SQS::MessageNotFound', $!.class.name
+      else
+        flunk "Was supposed to raise an SQS::MessageNotFound"
+      end
+
+      m.id = nil
+      assert_raises SQS::MissingId do
+        m.delete
+      end
+      
+      m.queue = nil
+      assert_raises SQS::UnavailableQueue do
+        m.delete
       end
     end
 
@@ -31,6 +53,17 @@ class SQS_MessageTest < Test::Unit::TestCase
       m = @q.send_message( 'This is something else special' )
       assert m.peek
       assert_equal 'This is something else special', m.body
+
+
+      m.id = nil
+      assert_raises SQS::MissingId do
+        m.delete
+      end
+      
+      m.queue = nil
+      assert_raises SQS::UnavailableQueue do
+        m.delete
+      end
     end
 
     def test_body
@@ -44,13 +77,13 @@ class SQS_MessageTest < Test::Unit::TestCase
   end
   
   def test_new
-    assert_nothing_raised RuntimeError do
+    assert_nothing_raised do
       SQS::Message.new
     end
-    assert_nothing_raised RuntimeError do
+    assert_nothing_raised do
       SQS::Message.new :a => 'b'
     end
-    assert_nothing_raised RuntimeError do
+    assert_nothing_raised do
       SQS::Message.new :a => 'b', :body => ''
     end
 
@@ -78,4 +111,12 @@ class SQS_MessageTest < Test::Unit::TestCase
     assert_equal 'Message 2', m2.id
     assert_equal 'Message 3', m3.id
   end
+  
+  
+#  def test_it_all
+#    puts methods.sort.join("\n")
+#    tenaciously_assert( :min => 1, :of => 10 ) do
+#      
+#    end
+#  end
 end

data/test/unit/sqs_queue_test.rb

@@ -4,7 +4,8 @@ dir = File.expand_path( File.dirname( __FILE__ ) )
 require 'test/unit'
 require "#{File.expand_path( File.dirname( __FILE__ ) )}/test_setup"
 
-
+require 'rubygems'
+require 'assert_statistically'
 
 
 class SQS_QueueTest < Test::Unit::TestCase
@@ -15,9 +16,26 @@ class SQS_QueueTest < Test::Unit::TestCase
   def setup
     @queue_prefix = 'test_queue_'
     @q = SQStest.skip_live_tests? ? SQS::Queue.new( 'http://nowhere.com/nothing' ) : SQS.create_queue( @queue_prefix )
+
+    unless SQStest.skip_live_tests?
+      assert_statistically( :of => 3, :min => 1, :sleep => 0.25 ) do
+        begin
+          @q = SQS.get_queue( @queue_prefix )
+        rescue
+          false
+        else
+          true
+        end
+      end
+    end
   end
   def teardown
-    SQS.list_queues( @queue_prefix ).each { |q| q.delete! } unless SQStest.skip_live_tests?
+    unless SQStest.skip_live_tests?
+      SQS.list_queues( @queue_prefix ).each do |q|
+        q.delete!
+      end
+    end
+
     print SQS.counter if SQStest.print_counter?
   end
 
@@ -30,19 +48,31 @@ class SQS_QueueTest < Test::Unit::TestCase
 
       assert @q.delete
 
-      assert_raises RuntimeError do
+      begin
         q3 = SQS.get_queue( @queue_prefix )
+      rescue
+        assert_equal 'SQS::UnavailableQueue', $!.class.name
+      else
+        flunk 'Was supposed to raise an SQS::UnavailableQueue'
       end
 
-      assert_raises RuntimeError do
+      begin
         q2.delete
+      rescue
+        assert_equal 'SQS::AWSSimpleQueueServiceNonExistentQueue', $!.class.name
+      else
+        flunk 'Was supposed to raise an SQS::AWSSimpleQueueServiceNonExistentQueue'
       end
 
       q = SQS.create_queue :name => "#{@queue_prefix}test_delete"
       q.send_message( 'A' )
       q.send_message( 'B' )
-      assert_raises RuntimeError do
+      begin
         q.delete
+      rescue
+        assert_equal 'SQS::AWSSimpleQueueServiceNonEmptyQueue', $!.class.name
+      else
+        flunk 'Was supposed to raise an SQS::AWSSimpleQueueServiceNonEmptyQueue'
       end
       assert_nothing_raised do
         q.delete( :force => true )
@@ -52,15 +82,23 @@ class SQS_QueueTest < Test::Unit::TestCase
     def test_delete!
       @q.send_message( 'A' )
       @q.send_message( 'B' )
-      assert_raises RuntimeError do
+      begin
         @q.delete
+      rescue
+        assert_equal 'SQS::AWSSimpleQueueServiceNonEmptyQueue', $!.class.name
+      else
+        asssert false, "Was supposed to raise an SQS::AWSSimpleQueueServiceNonEmptyQueue"
       end
       assert_nothing_raised do
         @q.delete!
       end
-      
-      assert_raises RuntimeError do
+
+      begin
         q = SQS.get_queue( @queue_prefix )
+      rescue
+        assert_equal 'SQS::UnavailableQueue', $!.class.name
+      else
+        flunk 'Was supposed to raise an SQS::UnavailableQueue'
       end
     end
 
@@ -71,8 +109,12 @@ class SQS_QueueTest < Test::Unit::TestCase
     
       sleep 5
     
-      assert_raises RuntimeError do
+      begin
         @q.delete
+      rescue
+        assert_equal 'SQS::AWSSimpleQueueServiceNonEmptyQueue', $!.class.name
+      else
+        flunk 'Was supposed to raise an SQS::AWSSimpleQueueServiceNonEmptyQueue'
       end
     
       assert_nothing_raised do
@@ -81,8 +123,12 @@ class SQS_QueueTest < Test::Unit::TestCase
       
       sleep 5
     
-      assert_raises RuntimeError do
+      begin
         q = SQS.get_queue( @queue_prefix )
+      rescue
+        assert_equal 'SQS::UnavailableQueue', $!.class.name
+      else
+        flunk 'Was supposed to raise an SQS::UnavailableQueue'
       end
     end
 
@@ -140,14 +186,19 @@ class SQS_QueueTest < Test::Unit::TestCase
       assert_nothing_raised do
         @q.get_queue_attributes( true )
       end
-      assert_equal 400, @q.attributes[:VisibilityTimeout]
+      assert_statistically( :of => 10, :min => 1, :sleep => 1 ) do
+        @q.get_queue_attributes( true )
+        400 == @q.attributes[:VisibilityTimeout]
+      end
       assert_equal 0, @q.attributes[:ApproximateNumberOfMessages]
 
 
-      assert_nothing_raised do
-        # This should ultimately raise an error, but does not as of 2007-06-12
-        # See http://developer.amazonwebservices.com/connect/thread.jspa?threadID=15618&tstart=0
+      begin
         @q.set_queue_attributes( :SHOULDBEANERROR => 'crazy!' )
+      rescue
+        assert_equal 'SQS::InvalidAttributeName', $!.class.name
+      else
+        flunk 'Was supposed to raise an SQS::InvalidAttributeName'
       end
     end
     
@@ -185,26 +236,30 @@ class SQS_QueueTest < Test::Unit::TestCase
       
       # Update happens in situ
       assert_equal 500, @q.visibility_timeout
-      assert_equal 500, @q.visibility_timeout( true )
+      assert_statistically( :of => 10, :min => 1, :sleep => 1 ) do
+        @q.visibility_timeout( true ) == 500
+      end
     end
 
     def test_empty?
       assert @q.empty?
       
       @q.send_message( 'no longer empty' )
-      sleep 2
+      sleep 3
       assert !@q.empty?
 
       @q.send_message( 'no longer empty again' )
 
       assert !@q.empty?
-      
-      messages = @q.receive_messages
-      messages.each do |m|
+
+      sleep 3
+      while m = @q.receive_message
         m.delete
       end
       
-      assert @q.empty?
+      assert_statistically( :min => 1, :of => 3, :sleep => 1, :message => 'Attempt %d failed' ) do
+        @q.empty?
+      end
     end
 
 
@@ -304,13 +359,23 @@ class SQS_QueueTest < Test::Unit::TestCase
     
     def test_add_grant
       assert_respond_to @q, :add_grant
+
       assert_equal 1, @q.list_grants.size
+
       assert @q.add_grant( :email => SQStest.other_aws_account[:email], :permission => :full )
-      assert_equal 2, @q.list_grants.size
+      assert_statistically( :of => 3, :min => 1, :sleep => 0.5 ) do
+        2 == @q.list_grants.size
+      end
+
       assert @q.add_grant( :email => SQStest.other_aws_account[:email], :permission => :send )
-      assert_equal 3, @q.list_grants.size
+      assert_statistically( :of => 3, :min => 1, :sleep => 0.5 ) do
+        3 == @q.list_grants.size
+      end
+
       assert @q.add_grant( :email => SQStest.other_aws_account[:email], :permission => :receive )
-      assert_equal 4, @q.list_grants.size
+      assert_statistically( :of => 3, :min => 1, :sleep => 0.5 ) do
+        4 == @q.list_grants.size
+      end
       
       assert_nothing_raised do
         #DUMMY responds to :email (is not an address itself)
@@ -318,15 +383,25 @@ class SQS_QueueTest < Test::Unit::TestCase
       end
       assert_equal 4, @q.list_grants.size
       
-      
-      assert_raises RuntimeError do
-        assert @q.add_grant( :email => 'invalid@email.address', :permission => :receive )
+      begin
+        @q.add_grant( :email => 'invalid@email.address', :permission => :receive )
+      rescue
+        assert_equal 'SQS::ServiceUnavailable', $!.class.name
+      else
+        flunk "Was supposed to raise an SQS::ServiceUnavailable"
       end
     end
     
     def test_remove_grant
       assert_respond_to @q, :remove_grant
 
+      [:full, :send, :receive].each do |perm|
+        assert_raises ArgumentError do
+          @q.remove_grant( :permission => perm )
+        end
+      end
+
+
 
       [:full, :send, :receive].each do |perm|
         assert @q.add_grant( :email => SQStest.other_aws_account[:email], :permission => perm )
@@ -377,8 +452,17 @@ class SQS_QueueTest < Test::Unit::TestCase
       assert_equal SQStest.my_aws_account[:display_name], grant.display_name
 
       @q.add_grant( :email => SQStest.other_aws_account[:email], :permission => :receive)
+
       grants = @q.list_grants
-      assert_equal 2, grants.size
+      if grants.size != 2
+        assert_statistically( :of => 4, :min => 1, :sleep => 0.5 ) do
+          grants = @q.list_grants
+          2 == grants.size
+        end
+      else
+        assert true
+      end
+
       grants.each do |grant|
         case grant.display_name
         when SQStest.my_aws_account[:display_name]
@@ -386,9 +470,24 @@ class SQS_QueueTest < Test::Unit::TestCase
         when SQStest.other_aws_account[:display_name]
           assert_equal SQS.permissions[:receive], grant.permission
         else
-          assert false, "'#{grant.display_name}' is an unknown display name"
+          flunk "'#{grant.display_name}' is an unknown display name"
         end
       end
+
+
+      grants = @q.list_grants( :email => SQStest.other_aws_account[:email] )
+      assert_equal 1, grants.size
+      grants.each do |g|
+        assert_kind_of SQS::Grant, g
+        assert_equal SQStest.other_aws_account[:display_name], g.display_name
+      end
+
+      grants = @q.list_grants( :permission => :receive )
+      assert_equal 1, grants.size
+      grants.each do |g|
+        assert_kind_of SQS::Grant, g
+        assert_equal SQStest.other_aws_account[:display_name], g.display_name
+      end
     end
 
 
@@ -416,6 +515,7 @@ class SQS_QueueTest < Test::Unit::TestCase
       end
     end
 
+
     def test_get_visiblity_timeout
       assert_equal SQS::Queue.default_visibility_timeout, @q.visibility_timeout
       assert_kind_of Integer, @q.visibility_timeout
@@ -429,31 +529,52 @@ class SQS_QueueTest < Test::Unit::TestCase
       assert( @q.visibility_timeout = 456 )
       assert_equal 456, @q.visibility_timeout
 
-      assert_raises RuntimeError do
+      begin
         @q.visibility_timeout = nil
+      rescue
+        assert_equal 'SQS::EmptyValue', $!.class.name
+      else
+        flunk 'Was supposed to raise an SQS::EmptyValue'
       end
 
       assert_nothing_raised do
         @q.visibility_timeout = 0
       end
 
-      assert_raises RuntimeError do
+      begin
         @q.visibility_timeout = -1
+      rescue
+        assert_equal 'SQS::InvalidAttributeValue', $!.class.name
+      else
+        flunk 'Was supposed to raise an SQS::InvalidAttributeValue'
       end
-      assert_raises RuntimeError do
+
+      begin
         @q.visibility_timeout = 86401
+      rescue
+        assert_equal 'SQS::InvalidAttributeValue', $!.class.name
+      else
+        flunk 'Was supposed to raise an SQS::InvalidAttributeValue'
       end
 
-      assert_raises RuntimeError do
+      begin
         @q.visibility_timeout = Object
+      rescue
+        assert_equal 'SQS::InvalidAttributeValue', $!.class.name
+      else
+        flunk 'Was supposed to raise an SQS::InvalidAttributeValue'
       end
     end
     
     
     def test_legal_names
       assert !SQS.create_queue( '' )
-      assert_raises RuntimeError do
+      begin
         SQS.create_queue( '81characterslongxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' )
+      rescue
+        assert_equal 'SQS::InvalidParameterValue', $!.class.name
+      else
+        flunk 'Was supposed to raise an SQS::InvalidParameterValue'
       end
       assert q = SQS.create_queue( '80characterslongxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' )
       q.delete
@@ -492,7 +613,7 @@ class SQS_QueueTest < Test::Unit::TestCase
       q.b
     end
 
-    assert_raises RuntimeError do
+    assert_raises URI::InvalidURIError do
       q = SQS::Queue.new :url => 'http://www.slappy.com'
       q = SQS::Queue.new :url => 'LKJSDFLKJ@#$)()'
     end

data/test/unit/sqs_test.rb

@@ -2,7 +2,6 @@
 
 require 'test/unit'
 require "#{File.expand_path( File.dirname( __FILE__ ) )}/test_setup"
-include REXML
 
 class DuckTypeParameter
   def initialize( st )
@@ -20,6 +19,10 @@ class SQSTest < Test::Unit::TestCase
   def setup
     @queue_prefix = 'testSQS'
     @q = SQS.create_queue( @queue_prefix ) unless SQStest.skip_live_tests?
+    
+    SQS.add_reasons_to_retry 'ServiceUnavailable'
+    SQS.remove_reasons_to_retry( SQS.reasons_to_retry.reject { |r| r == 'ServiceUnavailable' } )
+    SQS.retry_attempts = 10
   end
   def teardown
     SQS.list_queues( @queue_prefix ).each { |q| q.delete! } unless SQStest.skip_live_tests?
@@ -62,13 +65,17 @@ class SQSTest < Test::Unit::TestCase
       assert q1.is_a?( SQS::Queue )
       assert q2.is_a?( SQS::Queue )
       assert_equal q1, q2
+      
+      assert_raises SQS::UnavailableQueue do
+        SQS.get_queue( "SHOULD_NEVER_EXIST" )
+      end
     end
 
     def test_get_non_existent_queue
       assert_respond_to SQS, :get_queue
 
       queuename = "#{@queue_prefix}nonexist"
-      assert_raises RuntimeError do
+      assert_raises SQS::UnavailableQueue do
         q2 = SQS.get_queue( queuename )
       end
     end
@@ -84,8 +91,12 @@ class SQSTest < Test::Unit::TestCase
     end
 
     def test_call_web_service
-      assert_raises RuntimeError do
+      begin
         SQS.call_web_service( :Something => 'for nothing' )
+      rescue
+        assert_equal 'SQS::InvalidAction', $!.class.name
+      else
+        flunk "Was supposed to raise an SQS::InvalidAction"
       end
 
       x = nil
@@ -95,6 +106,61 @@ class SQSTest < Test::Unit::TestCase
       assert_equal REXML::Document, x.class
     end
   end
+  
+  
+  def test_get_exception_class
+    assert_raises ArgumentError do
+      SQS.get_exception_class
+    end
+    assert_raises ArgumentError do
+      SQS.get_exception_class( nil )
+    end
+    
+    assert_nothing_raised do
+      SQS.get_exception_class( 'Crazy' )
+    end
+    assert_equal Class, SQS.get_exception_class( 'Crazy' ).class
+    assert_equal 'SQS::Crazy', SQS.get_exception_class( 'Crazy' ).name
+
+    assert_equal Class, SQS.get_exception_class( 'good For Nothing' ).class
+    assert_equal 'SQS::GoodForNothing', SQS.get_exception_class( 'good For Nothing' ).name
+
+    assert_equal Class, SQS.get_exception_class( 'good.For.Nothing' ).class
+    assert_equal 'SQS::GoodForNothing', SQS.get_exception_class( 'good.For.Nothing' ).name
+
+    assert_equal Class, SQS.get_exception_class( '&(#Sunday)99' ).class
+    assert_equal 'SQS::Sunday99', SQS.get_exception_class( '&(#Sunday)99' ).name
+  end
+  def test_get_exception
+    assert_raises ArgumentError do
+      SQS.get_exception
+    end
+    assert_raises ArgumentError do
+      SQS.get_exception( 9 )
+    end
+    assert_raises ArgumentError do
+      SQS.get_exception( 'Thursday' )
+    end
+    assert_raises ArgumentError do
+      SQS.get_exception( {} )
+    end
+
+    e = SQS.get_exception( :url => "I'm a URL!", :document => REXML::Document.new( "<?xml version='1.0'?><Response><Errors><Error><Code>ServiceUnavailable</Code><Message>Service Queue is currently unavailable. Please try again later</Message></Error></Errors><RequestID>6847ea9e-af25-4fc7-9974-75b6bef82581</RequestID></Response>" ) )
+    assert_equal 'SQS::ServiceUnavailable', e.class.name
+    assert_match /^Service Queue is currently unavailable\. Please try again later \(The XML/, e.message
+
+    e = SQS.get_exception( :attempts => 0, :url => "I'm a URL!", :document => REXML::Document.new( "<?xml version='1.0'?><Response><Errors><Error><Code>ServiceUnavailable</Code><Message>Service Queue is currently unavailable. Please try again later</Message></Error></Errors><RequestID>6847ea9e-af25-4fc7-9974-75b6bef82581</RequestID></Response>" ) )
+    assert_equal 'SQS::ServiceUnavailable', e.class.name
+    assert_match /^Service Queue is currently unavailable\. Please try again later \(The XML/, e.message
+
+    e = SQS.get_exception( :attempts => 1, :url => "I'm a URL!", :document => REXML::Document.new( "<?xml version='1.0'?><Response><Errors><Error><Code>ServiceUnavailable</Code><Message>Service Queue is currently unavailable. Please try again later</Message></Error></Errors><RequestID>6847ea9e-af25-4fc7-9974-75b6bef82581</RequestID></Response>" ) )
+    assert_equal 'SQS::ServiceUnavailable', e.class.name
+    assert_match /^Service Queue is currently unavailable\. Please try again later \(After 1 attempt\) \(The XML/, e.message
+
+    e = SQS.get_exception( :attempts => 2, :url => "I'm a URL!", :document => REXML::Document.new( "<?xml version='1.0'?><Response><Errors><Error><Code>ServiceUnavailable</Code><Message>Service Queue is currently unavailable. Please try again later</Message></Error></Errors><RequestID>6847ea9e-af25-4fc7-9974-75b6bef82581</RequestID></Response>" ) )
+    assert_equal 'SQS::ServiceUnavailable', e.class.name
+    assert_match /^Service Queue is currently unavailable\. Please try again later \(After 2 attempts\) \(The XML/, e.message
+  end
 
   def test_counter
     initial_counter = SQS.counter
@@ -212,6 +278,109 @@ class SQSTest < Test::Unit::TestCase
     assert 1 <= SQS.retry_attempts
   end
 
+  def test_change_retry_attempts
+    assert_respond_to SQS, :retry_attempts=
+
+    assert_raises ArgumentError do
+      SQS.retry_attempts = Object
+    end
+    assert_equal 10, SQS.retry_attempts
+
+    assert_nothing_raised ArgumentError do
+      SQS.retry_attempts = nil
+    end
+    assert_equal 0, SQS.retry_attempts
+
+    assert_nothing_raised do
+      SQS.retry_attempts = 2
+    end
+    assert_equal 2, SQS.retry_attempts
+  end
+
+
+  def test_reasons_to_retry
+    assert_respond_to SQS, :reasons_to_retry
+    assert_kind_of Array, SQS.reasons_to_retry
+    assert_equal ['ServiceUnavailable'], SQS.reasons_to_retry
+  end
+
+  def test_add_reasons_to_retry
+    assert_respond_to SQS, :add_reasons_to_retry
+    assert_respond_to SQS, :add_reasons_to_retry
+
+    assert_raises ArgumentError do
+      SQS.add_reasons_to_retry
+    end
+
+    assert_raises ArgumentError do
+      SQS.add_reasons_to_retry( nil )
+    end
+    assert_equal ['ServiceUnavailable'], SQS.reasons_to_retry
+
+    assert_nothing_raised do
+      SQS.add_reasons_to_retry( 'ServiceUnavailable' )
+    end
+    assert_equal ['ServiceUnavailable'], SQS.reasons_to_retry
+
+    assert_nothing_raised do
+      SQS.add_reasons_to_retry( 'a' )
+    end
+    assert_equal ['ServiceUnavailable', 'a'], SQS.reasons_to_retry
+
+
+    assert_nothing_raised do
+      SQS.add_reasons_to_retry( 'b', 'c' )
+    end
+    assert_equal ['ServiceUnavailable', 'a', 'b', 'c' ], SQS.reasons_to_retry
+
+    assert_nothing_raised do
+      SQS.add_reasons_to_retry( ['d', 'e'] )
+    end
+    assert_equal ['ServiceUnavailable', 'a', 'b', 'c', 'd', 'e' ], SQS.reasons_to_retry
+  end
+
+  def test_remove_reasons_to_retry
+    assert_respond_to SQS, :remove_reasons_to_retry
+    assert_respond_to SQS, :remove_reason_to_retry
+
+    assert_nothing_raised do
+      SQS.add_reasons_to_retry( 'a', 'b', 'c', 'd', 'e' )
+    end
+    assert_equal ['ServiceUnavailable', 'a', 'b', 'c', 'd', 'e' ], SQS.reasons_to_retry
+      
+
+    assert_raises ArgumentError do
+      SQS.remove_reasons_to_retry
+    end
+
+    assert_raises ArgumentError do
+      SQS.remove_reasons_to_retry( nil )
+    end
+    assert_equal ['ServiceUnavailable', 'a', 'b', 'c', 'd', 'e' ], SQS.reasons_to_retry
+
+    assert_nothing_raised do
+      SQS.remove_reasons_to_retry( 'ServiceUnavailable' )
+    end
+    assert_equal ['a', 'b', 'c', 'd', 'e' ], SQS.reasons_to_retry
+
+    assert_nothing_raised do
+      SQS.remove_reasons_to_retry( 'a' )
+    end
+    assert_equal ['b', 'c', 'd', 'e' ], SQS.reasons_to_retry
+
+
+    assert_nothing_raised do
+      SQS.remove_reasons_to_retry( 'b', 'c' )
+    end
+    assert_equal ['d', 'e' ], SQS.reasons_to_retry
+
+    assert_nothing_raised do
+      SQS.remove_reasons_to_retry( ['d', 'e'] )
+    end
+    assert SQS.reasons_to_retry.empty?
+  end
+
+
   def test_iso8601
     t = Time.now
     assert_respond_to t, :to_iso8601
@@ -225,46 +394,46 @@ class SQSTest < Test::Unit::TestCase
   end
 
   def test_xpath
-    d = Document.new( "<?xml version='1.0'?><CreateQueueResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><QueueUrl>http://queue.amazonaws.com/A3ZVJ8HH1F466/nothing</QueueUrl><ResponseStatus><StatusCode>Success</StatusCode><RequestId>945de8b9-a820-4329-a56e-211053d89d0b</RequestId></ResponseStatus></CreateQueueResponse>" )
+    d = REXML::Document.new( "<?xml version='1.0'?><CreateQueueResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><QueueUrl>http://queue.amazonaws.com/A3ZVJ8HH1F466/nothing</QueueUrl><ResponseStatus><StatusCode>Success</StatusCode><RequestId>945de8b9-a820-4329-a56e-211053d89d0b</RequestId></ResponseStatus></CreateQueueResponse>" )
     assert_equal 'Success', d.status
     assert_equal 'http://queue.amazonaws.com/A3ZVJ8HH1F466/nothing', d.queue_url
 
 
-    d = Document.new( "<?xml version='1.0'?><Response><Errors><Error><Code>AuthFailure</Code><Message>AWS was not able to authenticate the request: access credentials are missing</Message></Error></Errors><RequestID>8f6707de-db6e-4bf7-909c-8dd6486bd42f</RequestID></Response>" )
+    d = REXML::Document.new( "<?xml version='1.0'?><Response><Errors><Error><Code>AuthFailure</Code><Message>AWS was not able to authenticate the request: access credentials are missing</Message></Error></Errors><RequestID>8f6707de-db6e-4bf7-909c-8dd6486bd42f</RequestID></Response>" )
     assert_equal 'AuthFailure', d.error_code
     assert_equal 'AWS was not able to authenticate the request: access credentials are missing', d.error_message
 
 
-    d = Document.new( "<?xml version='1.0'?><ListQueuesResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><QueueUrl>http://queue.amazonaws.com/A3ZVJ8HH1F466/nothing</QueueUrl><ResponseStatus><StatusCode>Success</StatusCode><RequestId>c2d4fe0b-f6f1-4874-9e6d-d081a1155b54</RequestId></ResponseStatus></ListQueuesResponse>" )
+    d = REXML::Document.new( "<?xml version='1.0'?><ListQueuesResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><QueueUrl>http://queue.amazonaws.com/A3ZVJ8HH1F466/nothing</QueueUrl><ResponseStatus><StatusCode>Success</StatusCode><RequestId>c2d4fe0b-f6f1-4874-9e6d-d081a1155b54</RequestId></ResponseStatus></ListQueuesResponse>" )
     assert_equal 'Success', d.status
 
 
-    d = Document.new( "<?xml version='1.0'?><ListQueuesResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><QueueUrl>http://queue.amazonaws.com/A3ZVJ8HH1F466/nothingAgain</QueueUrl><QueueUrl>http://queue.amazonaws.com/A3ZVJ8HH1F466/nothing</QueueUrl><ResponseStatus><StatusCode>Success</StatusCode><RequestId>e27b54da-ff38-413b-b52f-82a6342cd151</RequestId></ResponseStatus></ListQueuesResponse>" )
+    d = REXML::Document.new( "<?xml version='1.0'?><ListQueuesResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><QueueUrl>http://queue.amazonaws.com/A3ZVJ8HH1F466/nothingAgain</QueueUrl><QueueUrl>http://queue.amazonaws.com/A3ZVJ8HH1F466/nothing</QueueUrl><ResponseStatus><StatusCode>Success</StatusCode><RequestId>e27b54da-ff38-413b-b52f-82a6342cd151</RequestId></ResponseStatus></ListQueuesResponse>" )
     assert_equal 'Success', d.status
     assert_equal 'e27b54da-ff38-413b-b52f-82a6342cd151', d.request_id
 
 
-    d = Document.new( "<?xml version='1.0'?><SendMessageResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><MessageId>171Q1105D8GTGS9FR4QB|9CBMKVD6TTQX44QJ1S30|PT6DRTB278S4MNY77NJ0</MessageId><ResponseStatus><StatusCode>Success</StatusCode><RequestId>ddbab3dc-3910-4c86-a139-27e37cabeac4</RequestId></ResponseStatus></SendMessageResponse>" )
+    d = REXML::Document.new( "<?xml version='1.0'?><SendMessageResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><MessageId>171Q1105D8GTGS9FR4QB|9CBMKVD6TTQX44QJ1S30|PT6DRTB278S4MNY77NJ0</MessageId><ResponseStatus><StatusCode>Success</StatusCode><RequestId>ddbab3dc-3910-4c86-a139-27e37cabeac4</RequestId></ResponseStatus></SendMessageResponse>" )
     assert_equal '171Q1105D8GTGS9FR4QB|9CBMKVD6TTQX44QJ1S30|PT6DRTB278S4MNY77NJ0', d.message_id( :send )
     assert_equal 'Success', d.status
     assert_equal 'ddbab3dc-3910-4c86-a139-27e37cabeac4', d.request_id
 
 
-    d = Document.new( "<?xml version='1.0'?><PeekMessageResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><Message><MessageId>1WB69MM74V13FFJRTA65|3H4AA8J7EJKM0DQZR7E1|9CBMKVD6TTQX44QJ1S30</MessageId><MessageBody>what it is</MessageBody></Message><ResponseStatus><StatusCode>Success</StatusCode><RequestId>c23c96f4-6479-48d3-b1e4-158ebfe0cc17</RequestId></ResponseStatus></PeekMessageResponse>" )
+    d = REXML::Document.new( "<?xml version='1.0'?><PeekMessageResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><Message><MessageId>1WB69MM74V13FFJRTA65|3H4AA8J7EJKM0DQZR7E1|9CBMKVD6TTQX44QJ1S30</MessageId><MessageBody>what it is</MessageBody></Message><ResponseStatus><StatusCode>Success</StatusCode><RequestId>c23c96f4-6479-48d3-b1e4-158ebfe0cc17</RequestId></ResponseStatus></PeekMessageResponse>" )
     assert_equal 'what it is', d.message_body
     assert_equal '1WB69MM74V13FFJRTA65|3H4AA8J7EJKM0DQZR7E1|9CBMKVD6TTQX44QJ1S30', d.message_id( :peek )
     assert_equal 'Success', d.status
     assert_equal 'c23c96f4-6479-48d3-b1e4-158ebfe0cc17', d.request_id
 
 
-    d = Document.new( "<?xml version='1.0'?><ReceiveMessageResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><Message><MessageId>0C2GG4PAQACB5REHPA7W|3H4AA8J7EJKM0DQZR7E1|9CBMKVD6TTQX44QJ1S30</MessageId><MessageBody>you are silly person</MessageBody></Message><ResponseStatus><StatusCode>Success</StatusCode><RequestId>a901d3ec-24b6-4125-9345-36f01cd82021</RequestId></ResponseStatus></ReceiveMessageResponse>" )
+    d = REXML::Document.new( "<?xml version='1.0'?><ReceiveMessageResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><Message><MessageId>0C2GG4PAQACB5REHPA7W|3H4AA8J7EJKM0DQZR7E1|9CBMKVD6TTQX44QJ1S30</MessageId><MessageBody>you are silly person</MessageBody></Message><ResponseStatus><StatusCode>Success</StatusCode><RequestId>a901d3ec-24b6-4125-9345-36f01cd82021</RequestId></ResponseStatus></ReceiveMessageResponse>" )
     assert_equal 'you are silly person', d.message_body( :receive )
     assert_equal '0C2GG4PAQACB5REHPA7W|3H4AA8J7EJKM0DQZR7E1|9CBMKVD6TTQX44QJ1S30', d.message_id( :receive )
     assert_equal 'Success', d.status
     assert_equal 'a901d3ec-24b6-4125-9345-36f01cd82021', d.request_id
 
 
-    d = Document.new( "<?xml version='1.0'?><ReceiveMessageResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><Message><MessageId>0C2GG4PAQACB5REHPA7W|3H4AA8J7EJKM0DQZR7E1|9CBMKVD6TTQX44QJ1S30</MessageId><MessageBody>you are silly person</MessageBody></Message><Message><MessageId>12ZJQSDVXE728WJBXACC|3H4AA8J7EJKM0DQZR7E1|9CBMKVD6TTQX44QJ1S30</MessageId><MessageBody>whatever</MessageBody></Message><Message><MessageId>15YJSSXZ2R5XB0T1PXMY|3H4AA8J7EJKM0DQZR7E1|PT6DRTB278S4MNY77NJ0</MessageId><MessageBody>whatever</MessageBody></Message><Message><MessageId>0BRPBSW05BB9Z6HXWV4J|3H4AA8J7EJKM0DQZR7E1|9CBMKVD6TTQX44QJ1S30</MessageId><MessageBody>whatever</MessageBody></Message><ResponseStatus><StatusCode>Success</StatusCode><RequestId>ebf56590-665f-4077-8820-953c6663d220</RequestId></ResponseStatus></ReceiveMessageResponse>" )
+    d = REXML::Document.new( "<?xml version='1.0'?><ReceiveMessageResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><Message><MessageId>0C2GG4PAQACB5REHPA7W|3H4AA8J7EJKM0DQZR7E1|9CBMKVD6TTQX44QJ1S30</MessageId><MessageBody>you are silly person</MessageBody></Message><Message><MessageId>12ZJQSDVXE728WJBXACC|3H4AA8J7EJKM0DQZR7E1|9CBMKVD6TTQX44QJ1S30</MessageId><MessageBody>whatever</MessageBody></Message><Message><MessageId>15YJSSXZ2R5XB0T1PXMY|3H4AA8J7EJKM0DQZR7E1|PT6DRTB278S4MNY77NJ0</MessageId><MessageBody>whatever</MessageBody></Message><Message><MessageId>0BRPBSW05BB9Z6HXWV4J|3H4AA8J7EJKM0DQZR7E1|9CBMKVD6TTQX44QJ1S30</MessageId><MessageBody>whatever</MessageBody></Message><ResponseStatus><StatusCode>Success</StatusCode><RequestId>ebf56590-665f-4077-8820-953c6663d220</RequestId></ResponseStatus></ReceiveMessageResponse>" )
     assert d.messages.is_a?( Array )
     d.messages.each do |m|
       assert m.respond_to?( :message_id )
@@ -273,17 +442,17 @@ class SQSTest < Test::Unit::TestCase
     assert_equal 'Success', d.status
     assert_equal 'ebf56590-665f-4077-8820-953c6663d220', d.request_id
 
-    d = Document.new( "<?xml version='1.0'?><GetVisibilityTimeoutResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><VisibilityTimeout>30</VisibilityTimeout><ResponseStatus><StatusCode>Success</StatusCode><RequestId>410fa43f-56f8-4e48-8c37-fa2f488f84aa</RequestId></ResponseStatus></GetVisibilityTimeoutResponse>" )
+    d = REXML::Document.new( "<?xml version='1.0'?><GetVisibilityTimeoutResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><VisibilityTimeout>30</VisibilityTimeout><ResponseStatus><StatusCode>Success</StatusCode><RequestId>410fa43f-56f8-4e48-8c37-fa2f488f84aa</RequestId></ResponseStatus></GetVisibilityTimeoutResponse>" )
     assert_equal 30, d.visibility_timeout
     assert_equal 'Success', d.status
     assert_equal '410fa43f-56f8-4e48-8c37-fa2f488f84aa', d.request_id
 
-    d = Document.new( "<?xml version='1.0'?><SetVisibilityTimeoutResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><ResponseStatus><StatusCode>Success</StatusCode><RequestId>26d8f4b9-a95a-4ead-85e0-a3c6ee642d64</RequestId></ResponseStatus></SetVisibilityTimeoutResponse>" )
+    d = REXML::Document.new( "<?xml version='1.0'?><SetVisibilityTimeoutResponse xmlns='http://queue.amazonaws.com/doc/2006-04-01/'><ResponseStatus><StatusCode>Success</StatusCode><RequestId>26d8f4b9-a95a-4ead-85e0-a3c6ee642d64</RequestId></ResponseStatus></SetVisibilityTimeoutResponse>" )
     assert_equal 'Success', d.status
     assert_equal '26d8f4b9-a95a-4ead-85e0-a3c6ee642d64', d.request_id
 
 
-    d = Document.new( "<?xml version='1.0'?><ListGrantsResponse xmlns='http://access.amazonaws.com/doc/2006-01-01/'><GrantList><Grantee xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='CanonicalUser'><ID>2a3fad33685601e436445b8d283589b9d5ccd89a50da8fa91c664f2531ea5c71</ID><DisplayName>wzph</DisplayName></Grantee><Permission>FULLCONTROL</Permission></GrantList><ResponseStatus><StatusCode>Success</StatusCode></ResponseStatus></ListGrantsResponse>" )
+    d = REXML::Document.new( "<?xml version='1.0'?><ListGrantsResponse xmlns='http://access.amazonaws.com/doc/2006-01-01/'><GrantList><Grantee xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='CanonicalUser'><ID>2a3fad33685601e436445b8d283589b9d5ccd89a50da8fa91c664f2531ea5c71</ID><DisplayName>wzph</DisplayName></Grantee><Permission>FULLCONTROL</Permission></GrantList><ResponseStatus><StatusCode>Success</StatusCode></ResponseStatus></ListGrantsResponse>" )
     assert d.grant_lists.is_a?( Array )
     assert_equal 1, d.grant_lists.size
     d.grant_lists.each do |list|
@@ -297,7 +466,7 @@ class SQSTest < Test::Unit::TestCase
     end
     assert_equal 'Success', d.status
 
-    d = Document.new( "<?xml version='1.0'?><ListGrantsResponse xmlns='http://access.amazonaws.com/doc/2006-01-01/'><GrantList><Grantee xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='CanonicalUser'><ID>fde39a46472f20295511ed16510c2ff352e5d0cc0060e1aa3edfa77cbc6412bf</ID><DisplayName>lance3515</DisplayName></Grantee><Permission>RECEIVEMESSAGE</Permission></GrantList><GrantList><Grantee xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='CanonicalUser'><ID>2a3fad33685601e436445b8d283589b9d5ccd89a50da8fa91c664f2531ea5c71</ID><DisplayName>wzph</DisplayName></Grantee><Permission>FULLCONTROL</Permission></GrantList><ResponseStatus><StatusCode>Success</StatusCode></ResponseStatus></ListGrantsResponse>" )
+    d = REXML::Document.new( "<?xml version='1.0'?><ListGrantsResponse xmlns='http://access.amazonaws.com/doc/2006-01-01/'><GrantList><Grantee xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='CanonicalUser'><ID>fde39a46472f20295511ed16510c2ff352e5d0cc0060e1aa3edfa77cbc6412bf</ID><DisplayName>lance3515</DisplayName></Grantee><Permission>RECEIVEMESSAGE</Permission></GrantList><GrantList><Grantee xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='CanonicalUser'><ID>2a3fad33685601e436445b8d283589b9d5ccd89a50da8fa91c664f2531ea5c71</ID><DisplayName>wzph</DisplayName></Grantee><Permission>FULLCONTROL</Permission></GrantList><ResponseStatus><StatusCode>Success</StatusCode></ResponseStatus></ListGrantsResponse>" )
     assert d.grant_lists.is_a?( Array )
     assert_equal 2, d.grant_lists.size
     d.grant_lists.each do |list|
@@ -312,10 +481,10 @@ class SQSTest < Test::Unit::TestCase
     assert_equal 'Success', d.status
 
 
-    d = Document.new( "<?xml version='1.0'?><AddGrantResponse xmlns='http://access.amazonaws.com/doc/2006-01-01/'><ResponseStatus><StatusCode>Success</StatusCode></ResponseStatus></AddGrantResponse>" )
+    d = REXML::Document.new( "<?xml version='1.0'?><AddGrantResponse xmlns='http://access.amazonaws.com/doc/2006-01-01/'><ResponseStatus><StatusCode>Success</StatusCode></ResponseStatus></AddGrantResponse>" )
     assert_equal 'Success', d.status
 
-    d = Document.new( "<?xml version='1.0'?><GetQueueAttributesResponse xmlns='http://queue.amazonaws.com/doc/2007-05-01/'><AttributedValue><Attribute>VisibilityTimeout</Attribute><Value>30</Value></AttributedValue><AttributedValue><Attribute>ApproximateNumberOfMessages</Attribute><Value>0</Value></AttributedValue><ResponseStatus><StatusCode>Success</StatusCode><RequestId>00ae54e4-0dc9-4835-bc2e-36304ff40506</RequestId></ResponseStatus></GetQueueAttributesResponse>" )
+    d = REXML::Document.new( "<?xml version='1.0'?><GetQueueAttributesResponse xmlns='http://queue.amazonaws.com/doc/2007-05-01/'><AttributedValue><Attribute>VisibilityTimeout</Attribute><Value>30</Value></AttributedValue><AttributedValue><Attribute>ApproximateNumberOfMessages</Attribute><Value>0</Value></AttributedValue><ResponseStatus><StatusCode>Success</StatusCode><RequestId>00ae54e4-0dc9-4835-bc2e-36304ff40506</RequestId></ResponseStatus></GetQueueAttributesResponse>" )
     assert d.attributed_values.is_a?( Array )
     assert_equal 2, d.attributed_values.size
 #    d.attributed_values.each do |att|
@@ -323,6 +492,15 @@ class SQSTest < Test::Unit::TestCase
 #    end
     assert_equal 'Success', d.status
     
+    
+    
+    d = REXML::Document.new( "<?xml version='1.0'?><ListQueuesResponse xmlns='http://queue.amazonaws.com/doc/2007-05-01/'><QueueUrl>http://queue.amazonaws.com/A3ZVJ8HH1F466/testSQS</QueueUrl><ResponseStatus><StatusCode>Success</StatusCode><RequestId>fd2d47e4-2cac-4047-94f2-e220d995835b</RequestId></ResponseStatus></ListQueuesResponse>" )
+    assert_nothing_raised do
+      d.status
+    end
+    assert_equal 'Success', d.status
+    assert_equal '', d.error_code
+    
   end
 
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: SQS
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
-date: 2007-06-12 00:00:00 -07:00
+  version: 0.1.5
+date: 2007-07-18 00:00:00 -07:00
 summary: A Ruby interface to Amazon's Simple Queue Service
 require_paths: 
 - lib