aws 1.11.38 → 2.1.0

data/lib/s3/right_s3_interface.rb

@@ -21,13 +21,13 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-module RightAws
+module Aws
 
-  class S3Interface < RightAwsBase
+  class S3Interface < AwsBase
     
     USE_100_CONTINUE_PUT_SIZE = 1_000_000
     
-    include RightAwsBaseInterface
+    include AwsBaseInterface
     
     DEFAULT_HOST           = 's3.amazonaws.com'
     DEFAULT_PORT           = 80
@@ -50,7 +50,7 @@ module RightAws
 
       # Creates new RightS3 instance.
       #
-      #  s3 = RightAws::S3Interface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX', {:multi_thread => true, :logger => Logger.new('/tmp/x.log')}) #=> #<RightAws::S3Interface:0xb7b3c27c>
+      #  s3 = Aws::S3Interface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX', {:multi_thread => true, :logger => Logger.new('/tmp/x.log')}) #=> #<Aws::S3Interface:0xb7b3c27c>
       #  
       # Params is a hash:
       #
@@ -165,7 +165,7 @@ module RightAws
       # Raises AwsError if any banana happened.
     def request_info(request, parser, &block) # :nodoc:
       thread = @params[:multi_thread] ? Thread.current : Thread.main
-      thread[:s3_connection] ||= Rightscale::HttpConnection.new(:exception => RightAws::AwsError, :logger => @logger)
+      thread[:s3_connection] ||= Rightscale::HttpConnection.new(:exception => Aws::AwsError, :logger => @logger)
       request_info_impl(thread[:s3_connection], @@bench, request, parser, &block)
     end
 
@@ -201,7 +201,7 @@ module RightAws
       request_info(req_hash, RightHttp2xxParser.new)
     rescue Exception => e
         # if the bucket exists AWS returns an error for the location constraint interface. Drop it
-      e.is_a?(RightAws::AwsError) && e.message.include?('BucketAlreadyOwnedByYou') ? true  : on_exception
+      e.is_a?(Aws::AwsError) && e.message.include?('BucketAlreadyOwnedByYou') ? true  : on_exception
     end
     
       # Retrieve bucket location
@@ -407,7 +407,7 @@ module RightAws
    
    
     
-    # New experimental API for uploading objects, introduced in RightAws 1.8.1.
+    # New experimental API for uploading objects, introduced in Aws 1.8.1.
     # store_object is similar in function to the older function put, but returns the full response metadata.  It also allows for optional verification
     # of object md5 checksums on upload.  Parameters are passed as hash entries and are checked for completeness as well as for spurious arguments.
     # The hash of the response headers contains useful information like the Amazon request ID and the object ETag (MD5 checksum).
@@ -472,7 +472,7 @@ module RightAws
       #       "content-length"=>"0"}
       #
       # s3.store_object_and_verify(:bucket => "foobucket", :key => "foo", :md5 => "a507841b1bc8115094b00bbe8c1b2953", :data => "polemonium" )
-      #   RightAws::AwsError: Uploaded object failed MD5 checksum verification: {"x-amz-id-2"=>"HTxVtd2bf7UHHDn+WzEH43MkEjFZ26xuYvUzbstkV6nrWvECRWQWFSx91z/bl03n", 
+      #   Aws::AwsError: Uploaded object failed MD5 checksum verification: {"x-amz-id-2"=>"HTxVtd2bf7UHHDn+WzEH43MkEjFZ26xuYvUzbstkV6nrWvECRWQWFSx91z/bl03n",
       #                                                                          "etag"=>"\"a507841b1bc8115094b00bbe8c1b2954\"", 
       #                                                                          "date"=>"Mon, 29 Sep 2008 18:38:41 GMT", 
       #                                                                          :verified_md5=>false, 
@@ -519,7 +519,7 @@ module RightAws
       on_exception
     end
     
-    # New experimental API for retrieving objects, introduced in RightAws 1.8.1.
+    # New experimental API for retrieving objects, introduced in Aws 1.8.1.
     # retrieve_object is similar in function to the older function get.  It allows for optional verification
     # of object md5 checksums on retrieval.  Parameters are passed as hash entries and are checked for completeness as well as for spurious arguments.
     #
@@ -724,7 +724,7 @@ module RightAws
         else
           result[:grantees][key] = 
             { :display_name => grantee[:display_name] || grantee[:uri].to_s[/[^\/]*$/],
-              :permissions  => grantee[:permissions].to_a,
+              :permissions  => grantee[:permissions].lines.to_a,
               :attributes   => grantee[:attributes] }
         end
       end
@@ -968,7 +968,7 @@ module RightAws
     #      PARSERS:
     #-----------------------------------------------------------------
 
-    class S3ListAllMyBucketsParser < RightAWSParser # :nodoc:
+    class S3ListAllMyBucketsParser < AwsParser # :nodoc:
       def reset
         @result = []
         @owner  = {}
@@ -987,7 +987,7 @@ module RightAws
       end
     end
 
-    class S3ListBucketParser < RightAWSParser  # :nodoc:
+    class S3ListBucketParser < AwsParser  # :nodoc:
       def reset
         @result      = []
         @service     = {}
@@ -1018,7 +1018,7 @@ module RightAws
       end
     end
 
-    class S3ImprovedListBucketParser < RightAWSParser  # :nodoc:
+    class S3ImprovedListBucketParser < AwsParser  # :nodoc:
       def reset
         @result      = {}
         @result[:contents] = []
@@ -1060,7 +1060,7 @@ module RightAws
       end
     end
 
-    class S3BucketLocationParser < RightAWSParser # :nodoc:
+    class S3BucketLocationParser < AwsParser # :nodoc:
       def reset
         @result = ''
       end
@@ -1069,7 +1069,7 @@ module RightAws
       end
     end
 
-    class S3AclParser < RightAWSParser  # :nodoc:
+    class S3AclParser < AwsParser  # :nodoc:
       def reset
         @result          = {:grantees=>[], :owner=>{}}
         @current_grantee = {}
@@ -1102,7 +1102,7 @@ module RightAws
       end
     end
     
-    class S3LoggingParser < RightAWSParser  # :nodoc:
+    class S3LoggingParser < AwsParser  # :nodoc:
       def reset
         @result          = {:enabled => false, :targetbucket => '', :targetprefix => ''}
         @current_grantee = {}
@@ -1124,7 +1124,7 @@ module RightAws
       end
     end
 
-    class S3CopyParser < RightAWSParser  # :nodoc:
+    class S3CopyParser < AwsParser  # :nodoc:
       def reset
         @result = {}
       end
@@ -1148,7 +1148,7 @@ module RightAws
       def headers_to_string(headers)
         result = {}
         headers.each do |key, value|
-          value       = value.to_s if value.is_a?(Array) && value.size<2
+          value       = value[0] if value.is_a?(Array) && value.size<2
           result[key] = value
         end
         result

data/lib/sdb/active_sdb.rb

@@ -28,27 +28,27 @@ rescue LoadError => e
     exit
 end
 
-module RightAws
+module Aws
 
-    # = RightAws::ActiveSdb -- RightScale SDB interface (alpha release)
-    # The RightAws::ActiveSdb class provides a complete interface to Amazon's Simple
+    # = Aws::ActiveSdb -- RightScale SDB interface (alpha release)
+    # The Aws::ActiveSdb class provides a complete interface to Amazon's Simple
     # Database Service.
     #
-    # ActiveSdb is in alpha and does not load by default with the rest of RightAws.  You must use an additional require statement to load the ActiveSdb class.  For example:
+    # ActiveSdb is in alpha and does not load by default with the rest of Aws.  You must use an additional require statement to load the ActiveSdb class.  For example:
     #
     #   require 'right_aws'
     #   require 'sdb/active_sdb'
     #
-    # Additionally, the ActiveSdb class requires the 'uuidtools' gem; this gem is not normally required by RightAws and is not installed as a
-    # dependency of RightAws.
+    # Additionally, the ActiveSdb class requires the 'uuidtools' gem; this gem is not normally required by Aws and is not installed as a
+    # dependency of Aws.
     #
     # Simple ActiveSdb usage example:
     #
-    #  class Client < RightAws::ActiveSdb::Base
+    #  class Client < Aws::ActiveSdb::Base
     #  end
     #
     #  # connect to SDB
-    #  RightAws::ActiveSdb.establish_connection
+    #  Aws::ActiveSdb.establish_connection
     #
     #  # create domain
     #  Client.create_domain
@@ -101,7 +101,7 @@ module RightAws
 
             # Create a new handle to an Sdb account. All handles share the same per process or per thread
             # HTTP connection to Amazon Sdb. Each handle is for a specific account.
-            # The +params+ are passed through as-is to RightAws::SdbInterface.new
+            # The +params+ are passed through as-is to Aws::SdbInterface.new
             # Params:
             #    { :server       => 'sdb.amazonaws.com'  # Amazon service host: 'sdb.amazonaws.com'(default)
             #      :port         => 443                  # Amazon service port: 80 or 443(default)
@@ -118,7 +118,7 @@ module RightAws
             #      :service_endpoint	=> '/'		 # Set this to /mdb/request.mgwsi for usage with M/DB
 
             def establish_connection(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
-                @connection = RightAws::SdbInterface.new(aws_access_key_id, aws_secret_access_key, params)
+                @connection = Aws::SdbInterface.new(aws_access_key_id, aws_secret_access_key, params)
             end
 
             def close_connection
@@ -134,7 +134,7 @@ module RightAws
 
             # Retreive a list of domains.
             #
-            #  put RightAws::ActiveSdb.domains #=> ['co-workers','family','friends','clients']
+            #  put Aws::ActiveSdb.domains #=> ['co-workers','family','friends','clients']
             #
             def domains
                 connection.list_domains[:domains]
@@ -143,7 +143,7 @@ module RightAws
             # Create new domain.
             # Raises no errors if the domain already exists.
             #
-            #  RightAws::ActiveSdb.create_domain('alpha')  #=> {:request_id=>"6fc652a0-0000-41d5-91f4-3ed390a3d3b2", :box_usage=>"0.0055590278"}
+            #  Aws::ActiveSdb.create_domain('alpha')  #=> {:request_id=>"6fc652a0-0000-41d5-91f4-3ed390a3d3b2", :box_usage=>"0.0055590278"}
             #
             def create_domain(domain_name)
                 connection.create_domain(domain_name)
@@ -152,7 +152,7 @@ module RightAws
             # Remove domain from SDB.
             # Raises no errors if the domain does not exist.
             #
-            #  RightAws::ActiveSdb.create_domain('alpha')  #=> {:request_id=>"6fc652a0-0000-41c6-91f4-3ed390a3d3b2", :box_usage=>"0.0055590001"}
+            #  Aws::ActiveSdb.create_domain('alpha')  #=> {:request_id=>"6fc652a0-0000-41c6-91f4-3ed390a3d3b2", :box_usage=>"0.0055590001"}
             #
             def delete_domain(domain_name)
                 connection.delete_domain(domain_name)
@@ -167,25 +167,25 @@ module RightAws
                 # next_token value returned by last find: is useful to continue finding
                 attr_accessor :next_token
 
-                # Returns a RightAws::SdbInterface object
+                # Returns a Aws::SdbInterface object
                 #
-                #  class A < RightAws::ActiveSdb::Base
+                #  class A < Aws::ActiveSdb::Base
                 #  end
                 #
-                #  class B < RightAws::ActiveSdb::Base
+                #  class B < Aws::ActiveSdb::Base
                 #  end
                 #
-                #  class C < RightAws::ActiveSdb::Base
+                #  class C < Aws::ActiveSdb::Base
                 #  end
                 #
-                #  RightAws::ActiveSdb.establish_connection 'key_id_1', 'secret_key_1'
+                #  Aws::ActiveSdb.establish_connection 'key_id_1', 'secret_key_1'
                 #
                 #  C.establish_connection 'key_id_2', 'secret_key_2'
                 #
                 #  # A and B uses the default connection, C - uses its own
-                #  puts A.connection  #=> #<RightAws::SdbInterface:0xb76d6d7c>
-                #  puts B.connection  #=> #<RightAws::SdbInterface:0xb76d6d7c>
-                #  puts C.connection  #=> #<RightAws::SdbInterface:0xb76d6ca0>
+                #  puts A.connection  #=> #<Aws::SdbInterface:0xb76d6d7c>
+                #  puts B.connection  #=> #<Aws::SdbInterface:0xb76d6d7c>
+                #  puts C.connection  #=> #<Aws::SdbInterface:0xb76d6ca0>
                 #
                 def connection
                     @connection || ActiveSdb::connection
@@ -196,18 +196,18 @@ module RightAws
                 # Current domain name.
                 #
                 #  # if 'ActiveSupport' is not loaded then class name converted to downcase
-                #  class Client < RightAws::ActiveSdb::Base
+                #  class Client < Aws::ActiveSdb::Base
                 #  end
                 #  puts Client.domain  #=> 'client'
                 #
                 #  # if 'ActiveSupport' is loaded then class name being tableized
                 #  require 'activesupport'
-                #  class Client < RightAws::ActiveSdb::Base
+                #  class Client < Aws::ActiveSdb::Base
                 #  end
                 #  puts Client.domain  #=> 'clients'
                 #
                 #  # Explicit domain name definition
-                #  class Client < RightAws::ActiveSdb::Base
+                #  class Client < Aws::ActiveSdb::Base
                 #    set_domain_name :foreign_clients
                 #  end
                 #  puts Client.domain  #=> 'foreign_clients'
@@ -225,7 +225,7 @@ module RightAws
 
                 # Change the default domain name to user defined.
                 #
-                #  class Client < RightAws::ActiveSdb::Base
+                #  class Client < Aws::ActiveSdb::Base
                 #    set_domain_name :foreign_clients
                 #  end
                 #
@@ -236,7 +236,7 @@ module RightAws
                 # Create domain at SDB.
                 # Raises no errors if the domain already exists.
                 #
-                #  class Client < RightAws::ActiveSdb::Base
+                #  class Client < Aws::ActiveSdb::Base
                 #  end
                 #  Client.create_domain  #=> {:request_id=>"6fc652a0-0000-41d5-91f4-3ed390a3d3b2", :box_usage=>"0.0055590278"}
                 #
@@ -247,7 +247,7 @@ module RightAws
                 # Remove domain from SDB.
                 # Raises no errors if the domain does not exist.
                 #
-                #  class Client < RightAws::ActiveSdb::Base
+                #  class Client < Aws::ActiveSdb::Base
                 #  end
                 #  Client.delete_domain  #=> {:request_id=>"e14d90d3-0000-4898-9995-0de28cdda270", :box_usage=>"0.0055590278"}
                 #
@@ -297,7 +297,7 @@ module RightAws
                 #  Client.select('1234987b4583475347523948')
                 #  Client.select('1','2','3','4', :conditions=> ["toys=?", "beer"])
                 #
-                # Find helpers: RightAws::ActiveSdb::Base.select_by_... and RightAws::ActiveSdb::Base.select_all_by_...
+                # Find helpers: Aws::ActiveSdb::Base.select_by_... and Aws::ActiveSdb::Base.select_all_by_...
                 #
                 #  Client.select_by_name('Matias Rust')
                 #  Client.select_by_name_and_city('Putin','Moscow')

data/lib/sdb/right_sdb_interface.rb

@@ -21,13 +21,13 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-require "right_aws"
+require "aws"
 
-module RightAws
+module Aws
 
-  class SdbInterface < RightAwsBase
+  class SdbInterface < AwsBase
 
-    include RightAwsBaseInterface
+    include AwsBaseInterface
 
     DEFAULT_HOST      = 'sdb.amazonaws.com'
     DEFAULT_PORT      = 443
@@ -61,7 +61,7 @@ module RightAws
     #
     # Example:
     #
-    #  sdb = RightAws::SdbInterface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX', {:connection_mode => :per_request, :logger => Logger.new('/tmp/x.log')}) #=> #<RightSdb:0xa6b8c27c>
+    #  sdb = Aws::SdbInterface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX', {:connection_mode => :per_request, :logger => Logger.new('/tmp/x.log')}) #=> #<RightSdb:0xa6b8c27c>
     #
     # see: http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/
     #
@@ -243,7 +243,7 @@ module RightAws
     #
     # Example:
     #
-    #  sdb = RightAws::SdbInterface.new
+    #  sdb = Aws::SdbInterface.new
     #  sdb.list_domains  #=> { :box_usage  => "0.0000071759",
     #                          :request_id => "976709f9-0111-2345-92cb-9ce90acd0982",
     #                          :domains    => ["toys", "dolls"]}
@@ -288,7 +288,7 @@ module RightAws
     #
     # Example:
     #
-    #  sdb = RightAws::SdbInterface.new
+    #  sdb = Aws::SdbInterface.new
     #  sdb.list_domains  #=> { :box_usage  => "0.0000071759",
     #                          :request_id => "976709f9-0111-2345-92cb-9ce90acd0982",
     #                          :domains    => ["toys", "dolls"]}
@@ -320,7 +320,7 @@ module RightAws
     #
     # Example:
     #
-    #  sdb = RightAws::SdbInterface.new
+    #  sdb = Aws::SdbInterface.new
     #  sdb.create_domain('toys') # => { :box_usage  => "0.0000071759",
     #                                   :request_id => "976709f9-0111-2345-92cb-9ce90acd0982" }
     #
@@ -340,7 +340,7 @@ module RightAws
     #
     # Example:
     #
-    #  sdb = RightAws::SdbInterface.new
+    #  sdb = Aws::SdbInterface.new
     #  sdb.delete_domain('toys') # => { :box_usage  => "0.0000071759",
     #                                   :request_id => "976709f9-0111-2345-92cb-9ce90acd0982" }
     #
@@ -371,7 +371,7 @@ module RightAws
     #
     # Example:
     #
-    #  sdb = RightAws::SdbInterface.new
+    #  sdb = Aws::SdbInterface.new
     #  sdb.create_domain 'family'
     #
     #  attributes = {}
@@ -405,7 +405,7 @@ module RightAws
     end
 
     #
-    # items is an array of RightAws::SdbInterface::Item.new(o.id, o.attributes, true)
+    # items is an array of Aws::SdbInterface::Item.new(o.id, o.attributes, true)
     def batch_put_attributes(domain_name, items)
       params = { 'DomainName' => domain_name }
       i = 0
@@ -688,7 +688,7 @@ module RightAws
     #-----------------------------------------------------------------
     #      PARSERS:
     #-----------------------------------------------------------------
-    class QSdbListDomainParser < RightAWSParser #:nodoc:
+    class QSdbListDomainParser < AwsParser #:nodoc:
       def reset
         @result = { :domains => [] }
       end
@@ -702,7 +702,7 @@ module RightAws
       end
     end
 
-     class QSdbDomainMetadataParser < RightAWSParser #:nodoc:
+     class QSdbDomainMetadataParser < AwsParser #:nodoc:
       def reset
         @result = {}
       end
@@ -721,7 +721,7 @@ module RightAws
     end
 
 
-    class QSdbSimpleParser < RightAWSParser #:nodoc:
+    class QSdbSimpleParser < AwsParser #:nodoc:
       def reset
         @result = {}
       end
@@ -733,7 +733,7 @@ module RightAws
       end
     end
 
-    class QSdbGetAttributesParser < RightAWSParser #:nodoc:
+    class QSdbGetAttributesParser < AwsParser #:nodoc:
       def reset
         @last_attribute_name = nil
         @result = { :attributes => {} }
@@ -748,7 +748,7 @@ module RightAws
       end
     end
 
-    class QSdbQueryParser < RightAWSParser #:nodoc:
+    class QSdbQueryParser < AwsParser #:nodoc:
       def reset
         @result = { :items => [] }
       end
@@ -762,7 +762,7 @@ module RightAws
       end
     end
 
-    class QSdbQueryWithAttributesParser < RightAWSParser #:nodoc:
+    class QSdbQueryWithAttributesParser < AwsParser #:nodoc:
       def reset
         @result = { :items => [] }
       end
@@ -785,7 +785,7 @@ module RightAws
       end
     end
 
-    class QSdbSelectParser < RightAWSParser #:nodoc:
+    class QSdbSelectParser < AwsParser #:nodoc:
       def reset
         @result = { :items => [] }
       end

data/lib/sqs/right_sqs.rb

@@ -21,28 +21,28 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-module RightAws
+module Aws
 
     #
-    # RightAws::Sqs -- RightScale's Amazon SQS interface, API version
+    # Aws::Sqs -- RightScale's Amazon SQS interface, API version
     # 2008-01-01 and later.
-    # The RightAws::Sqs class provides a complete interface to the second generation of Amazon's Simple
+    # 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
     #
     #
-    # RightAws::Sqs is built atop RightAws::SqsInterface, a lower-level
+    # 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 RightAws::AwsError in case
+    # Error handling: all operations raise an Aws::AwsError in case
     # of problems. Note that transient errors are automatically retried.
     #
-    #  sqs    = RightAws::Sqs.new(aws_access_key_id, aws_secret_access_key)
+    #  sqs    = Aws::Sqs.new(aws_access_key_id, aws_secret_access_key)
     #  queue1 = sqs.queue('my_awesome_queue')
     #   ...
-    #  queue2 = RightAws::Sqs::Queue.create(sqs, 'my_cool_queue', true)
+    #  queue2 = Aws::Sqs::Queue.create(sqs, 'my_cool_queue', true)
     #  puts queue2.size
     #   ...
     #  message1 = queue2.receive
@@ -73,7 +73,7 @@ module RightAws
       # Retrieves a list of queues.
       # Returns an +array+ of +Queue+ instances.
       #
-      #  RightAws::Sqs.queues #=> array of queues
+      #  Aws::Sqs.queues #=> array of queues
       #
     def queues(prefix=nil)
       @interface.list_queues(prefix).map do |url|
@@ -84,7 +84,7 @@ module RightAws
       # Returns Queue instance by queue name.
       # If the queue does not exist at Amazon SQS and +create+ is true, the method creates it.
       #
-      #  RightAws::Sqs.queue('my_awesome_queue') #=> #<RightAws::Sqs::Queue:0xb7b626e4 ... >
+      #  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)
@@ -99,7 +99,7 @@ module RightAws
         # Returns Queue instance by queue name.
         # If the queue does not exist at Amazon SQS and +create+ is true, the method creates it.
         #
-        #  RightAws::Sqs::Queue.create(sqs, 'my_awesome_queue') #=> #<RightAws::Sqs::Queue:0xb7b626e4 ... >
+        #  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)
@@ -108,7 +108,7 @@ module RightAws
         # Creates new Queue instance.
         # Does not create a queue at Amazon.
         #
-        #  queue = RightAws::Sqs::Queue.new(sqs, 'my_awesome_queue')
+        #  queue = Aws::Sqs::Queue.new(sqs, 'my_awesome_queue')
         #
       def initialize(sqs, url_or_name)
         @sqs  = sqs
@@ -181,7 +181,7 @@ module RightAws
         # Retrieves first accessible message from queue.
         # Returns Message instance or +nil+ it the queue is empty.
         #
-        #  queue.receive #=> #<RightAws::Sqs::Message:0xb7bf0884 ... >
+        #  queue.receive #=> #<Aws::Sqs::Message:0xb7bf0884 ... >
         #
       def receive(visibility=nil)
         list = receive_messages(1, visibility)
@@ -191,7 +191,7 @@ module RightAws
         # Pops (and deletes) first accessible message from queue.
         # Returns Message instance or +nil+ if the queue is empty.
         #
-        #  queue.pop #=> #<RightAws::Sqs::Message:0xb7bf0884 ... >
+        #  queue.pop #=> #<Aws::Sqs::Message:0xb7bf0884 ... >
         #
       def pop
         list = @sqs.interface.pop_messages(@url, 1)