right_aws 2.0.0 → 2.1.0

data/lib/s3/right_s3.rb

@@ -59,7 +59,6 @@ module RightAws
     #    {:server       => 's3.amazonaws.com'   # Amazon service host: 's3.amazonaws.com'(default)
     #     :port         => 443                  # Amazon service port: 80 or 443(default)
     #     :protocol     => 'https'              # Amazon service protocol: 'http' or 'https'(default)
-    #     :multi_thread => true|false           # Multi-threaded (connection per each thread): true or false(default)
     #     :logger       => Logger Object}       # Logger instance: logs to STDOUT if omitted }
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
       @interface = S3Interface.new(aws_access_key_id, aws_secret_access_key, params)
@@ -217,11 +216,10 @@ module RightAws
         #
         #  keys, service = bucket.keys_and_service({'max-keys'=> 2, 'prefix' => 'logs'})
         #  p keys    #=> # 2 keys array
-        #  p service #=> {"max-keys"=>"2", "prefix"=>"logs", "name"=>"my_awesome_bucket", "marker"=>"", "is_truncated"=>true}
+        #  p service #=> {"max-keys"=>"2", "prefix"=>"logs", "name"=>"my_awesome_bucket", "marker"=>"", "is_truncated"=>true, :common_prefixes=>[]}
         #
       def keys_and_service(options={}, head=false)
         opt = {}; options.each{ |key, value| opt[key.to_s] = value }
-        service_data = {}
         thislist = {}
         list = []
         @s3.interface.incrementally_list_bucket(@name, opt) do |thislist|
@@ -232,10 +230,8 @@ module RightAws
             list << key
           end
         end
-        thislist.each_key do |key|
-          service_data[key] = thislist[key] unless (key == :contents || key == :common_prefixes)
-        end
-        [list, service_data]
+        thislist.delete(:contents)
+        [list, thislist]
       end
 
         # Retrieve key information from Amazon. 
@@ -249,7 +245,7 @@ module RightAws
         #  key.head
         #
       def key(key_name, head=false)
-        raise 'Key name can not be empty.' if key_name.blank?
+        raise 'Key name can not be empty.' if key_name.right_blank?
         key_instance = nil
           # if this key exists - find it ....
         keys({'prefix'=>key_name}, head).each do |key|
@@ -346,9 +342,10 @@ module RightAws
         # If +force+ is set, clears and deletes the bucket. 
         # Returns +true+. 
         #
-        #  bucket.delete(true) #=> true
+        #  bucket.delete(:force => true) #=> true
         #
-      def delete(force=false)
+      def delete(options={})
+        force = options.is_a?(Hash) && options[:force]==true
         force ? @s3.interface.force_delete_bucket(@name) : @s3.interface.delete_bucket(@name)
       end
 
@@ -650,7 +647,7 @@ module RightAws
         #  key.delete #=> true
         #
       def delete
-        raise 'Key name must be specified.' if @name.blank?
+        raise 'Key name must be specified.' if @name.right_blank?
         @bucket.s3.interface.delete(@bucket, @name) 
       end
       
@@ -1086,7 +1083,7 @@ module RightAws
         @bucket       = bucket
         @name         = name.to_s
         @meta_headers = meta_headers
-        raise 'Key name can not be empty.' if @name.blank?
+        raise 'Key name can not be empty.' if @name.right_blank?
       end
       
         # Generate link to PUT key data. 

data/lib/s3/right_s3_interface.rb

@@ -63,14 +63,13 @@ 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 = RightAws::S3Interface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX', {:logger => Logger.new('/tmp/x.log')}) #=> #<RightAws::S3Interface:0xb7b3c27c>
       #  
       # Params is a hash:
       #
       #    {:server       => 's3.amazonaws.com'   # Amazon service host: 's3.amazonaws.com'(default)
       #     :port         => 443                  # Amazon service port: 80 or 443(default)
       #     :protocol     => 'https'              # Amazon service protocol: 'http' or 'https'(default)
-      #     :multi_thread => true|false           # Multi-threaded (connection per each thread): true or false(default)
       #     :logger       => Logger Object}       # Logger instance: logs to STDOUT if omitted }
       #
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
@@ -162,7 +161,7 @@ module RightAws
       headers['content-type'] ||= ''
       headers['date']           = Time.now.httpdate
         # create request
-      request      = "Net::HTTP::#{method.capitalize}".constantize.new(path)
+      request      = "Net::HTTP::#{method.capitalize}".right_constantize.new(path)
       request.body = data if data
         # set request headers and meta headers
       headers.each      { |key, value| request[key.to_s] = value }
@@ -214,7 +213,7 @@ module RightAws
                  else                headers[:location].to_s
                  end
       
-      unless location.blank?
+      unless location.right_blank?
         data = "<CreateBucketConfiguration><LocationConstraint>#{location}</LocationConstraint></CreateBucketConfiguration>"
       end
       req_hash = generate_rest_request('PUT', headers.merge(:url=>bucket, :data => data))
@@ -300,7 +299,7 @@ module RightAws
       #                  'max-keys'     => "5"}, ..., {...}]
       #
     def list_bucket(bucket, options={}, headers={})
-      bucket  += '?'+options.map{|k, v| "#{k.to_s}=#{CGI::escape v.to_s}"}.join('&') unless options.blank?
+      bucket  += '?'+options.map{|k, v| "#{k.to_s}=#{CGI::escape v.to_s}"}.join('&') unless options.right_blank?
       req_hash = generate_rest_request('GET', headers.merge(:url=>bucket))
       request_info(req_hash, S3ListBucketParser.new(:logger => @logger))
     rescue
@@ -335,10 +334,10 @@ module RightAws
     #     ]
     #   }
     def incrementally_list_bucket(bucket, options={}, headers={}, &block)
-      internal_options = options.symbolize_keys
+      internal_options = options.right_symbolize_keys
       begin 
         internal_bucket = bucket.dup
-        internal_bucket  += '?'+internal_options.map{|k, v| "#{k.to_s}=#{CGI::escape v.to_s}"}.join('&') unless internal_options.blank?
+        internal_bucket  += '?'+internal_options.map{|k, v| "#{k.to_s}=#{CGI::escape v.to_s}"}.join('&') unless internal_options.right_blank?
         req_hash = generate_rest_request('GET', headers.merge(:url=>internal_bucket))
         response = request_info(req_hash, S3ImprovedListBucketParser.new(:logger => @logger))
         there_are_more_keys = response[:is_truncated]
@@ -701,7 +700,7 @@ module RightAws
       #                  <Permission>FULL_CONTROL</Permission></Grant></AccessControlList></AccessControlPolicy>" }
       #
     def get_acl(bucket, key='', headers={})
-      key = key.blank? ? '' : "/#{CGI::escape key}"
+      key = key.right_blank? ? '' : "/#{CGI::escape key}"
       req_hash = generate_rest_request('GET', headers.merge(:url=>"#{bucket}#{key}?acl"))
       request_info(req_hash, S3HttpResponseBodyParser.new) 
     rescue
@@ -731,7 +730,7 @@ module RightAws
       #       :display_name=>"root"}}
       #
     def get_acl_parse(bucket, key='', headers={})
-      key = key.blank? ? '' : "/#{CGI::escape key}"
+      key = key.right_blank? ? '' : "/#{CGI::escape key}"
       req_hash = generate_rest_request('GET', headers.merge(:url=>"#{bucket}#{key}?acl"))
       acl = request_info(req_hash, S3AclParser.new(:logger => @logger))
       result = {}
@@ -755,7 +754,7 @@ module RightAws
     
       # Sets the ACL on a bucket or object.
     def put_acl(bucket, key, acl_xml_doc, headers={})
-      key = key.blank? ? '' : "/#{CGI::escape key}"
+      key = key.right_blank? ? '' : "/#{CGI::escape key}"
       req_hash = generate_rest_request('PUT', headers.merge(:url=>"#{bucket}#{key}?acl", :data=>acl_xml_doc))
       request_info(req_hash, S3HttpResponseBodyParser.new)
     rescue
@@ -889,7 +888,7 @@ module RightAws
       #  s3.list_bucket_link('my_awesome_bucket') #=> url string
       #
     def list_bucket_link(bucket, options=nil, expires=nil, headers={})
-      bucket += '?' + options.map{|k, v| "#{k.to_s}=#{CGI::escape v.to_s}"}.join('&') unless options.blank?
+      bucket += '?' + options.map{|k, v| "#{k.to_s}=#{CGI::escape v.to_s}"}.join('&') unless options.right_blank?
       generate_link('GET', headers.merge(:url=>bucket), expires)
     rescue
       on_exception

data/lib/sdb/active_sdb.rb

@@ -21,13 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-begin
-  require 'uuidtools'
-rescue LoadError => e
-  STDERR.puts("RightSDB requires the uuidtools gem.  Run \'gem install uuidtools\' and try again.")
-  exit
-end
-
 module RightAws
 
   # = RightAws::ActiveSdb -- RightScale SDB interface (alpha release)
@@ -39,9 +32,6 @@ module RightAws
   #   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.
-  #
   # Simple ActiveSdb usage example:
   #
   #  class Client < RightAws::ActiveSdb::Base 
@@ -159,7 +149,6 @@ module RightAws
       #      :port         => 443                  # Amazon service port: 80 or 443(default)
       #      :protocol     => 'https'              # Amazon service protocol: 'http' or 'https'(default)
       #      :signature_version => '0'             # The signature version : '0' or '1'(default)
-      #      :multi_thread => true|false           # Multi-threaded (connection per each thread): true or false(default)
       #      :logger       => Logger Object        # Logger instance: logs to STDOUT if omitted 
       #      :nil_representation => 'mynil'}       # interpret Ruby nil as this string value; i.e. use this string in SDB to represent Ruby nils (default is the string 'nil')
 
@@ -441,11 +430,7 @@ module RightAws
         end
 
         def generate_id # :nodoc:
-          if UUID::VERSION::STRING < '2.0.0'
-            UUID.timestamp_create().to_s
-          else
-            UUIDTools::UUID.timestamp_create().to_s
-          end
+          AwsUtils::generate_unique_token
         end
 
       protected
@@ -463,7 +448,7 @@ module RightAws
           # user defined :conditions to string (if it was defined)
           options[:conditions] = build_conditions(options[:conditions])
           # join ids condition and user defined conditions
-          options[:conditions] = options[:conditions].blank? ? ids_cond : "(#{options[:conditions]}) AND #{ids_cond}"
+          options[:conditions] = options[:conditions].right_blank? ? ids_cond : "(#{options[:conditions]}) AND #{ids_cond}"
           result = sql_select(options)
           # if one record was requested then return it
           unless bunch_of_records_requested
@@ -552,7 +537,7 @@ module RightAws
             query_expression = query_expression.to_s
             # quote from Amazon:
             # The sort attribute must be present in at least one of the predicates of the query expression.
-            if query_expression.blank?
+            if query_expression.right_blank?
               query_expression = sort_query_expression
             elsif !query_attributes(query_expression).include?(sort_by)
               query_expression += " intersection #{sort_query_expression}"
@@ -605,7 +590,7 @@ module RightAws
           # user defined :conditions to string (if it was defined)
           options[:conditions] = build_conditions(options[:conditions])
           # join ids condition and user defined conditions
-          options[:conditions] = options[:conditions].blank? ? ids_cond : "#{options[:conditions]} intersection #{ids_cond}"
+          options[:conditions] = options[:conditions].right_blank? ? ids_cond : "#{options[:conditions]} intersection #{ids_cond}"
           result = find_every(options)
           # if one record was requested then return it
           unless bunch_of_records_requested
@@ -656,9 +641,9 @@ module RightAws
           order      = options[:order]      ? " ORDER BY #{options[:order]}"                     : ''
           limit      = options[:limit]      ? " LIMIT #{options[:limit]}"                        : ''
           # mix sort by argument (it must present in response)
-          unless order.blank?
+          unless order.right_blank?
             sort_by, sort_order = sort_options(options[:order])
-            conditions << (conditions.blank? ? " WHERE " : " AND ") << "(#{sort_by} IS NOT NULL)"
+            conditions << (conditions.right_blank? ? " WHERE " : " AND ") << "(#{sort_by} IS NOT NULL)"
           end
           "SELECT #{select} FROM #{from}#{conditions}#{order}#{limit}"
         end
@@ -745,7 +730,7 @@ module RightAws
       def attributes=(attrs)
         old_id = @attributes['id']
         @attributes = uniq_values(attrs)
-        @attributes['id'] = old_id if @attributes['id'].blank? && !old_id.blank?
+        @attributes['id'] = old_id if @attributes['id'].right_blank? && !old_id.right_blank?
         self.attributes
       end
 
@@ -799,7 +784,7 @@ module RightAws
         old_id = id
         attrs = connection.get_attributes(domain, id)[:attributes]
         @attributes = {}
-        unless attrs.blank?
+        unless attrs.right_blank?
           attrs.each { |attribute, values| @attributes[attribute] = values }
           @attributes['id'] = old_id
         end
@@ -825,7 +810,7 @@ module RightAws
         attrs_list.flatten.uniq.each do |attribute|
           attribute = attribute.to_s
           values = connection.get_attributes(domain, id, attribute)[:attributes][attribute]
-          unless values.blank?
+          unless values.right_blank?
             @attributes[attribute] = result[attribute] = values
           else
             @attributes.delete(attribute)
@@ -855,7 +840,7 @@ module RightAws
         prepare_for_update
         attrs = @attributes.dup
         attrs.delete('id')
-        connection.put_attributes(domain, id, attrs) unless attrs.blank?
+        connection.put_attributes(domain, id, attrs) unless attrs.right_blank?
         connection.put_attributes(domain, id, { 'id' => id }, :replace)
         mark_as_old
         @attributes
@@ -871,10 +856,10 @@ module RightAws
         prepare_for_update
         # if 'id' is present in attrs hash:
         # replace internal 'id' attribute and remove it from the attributes to be sent
-        @attributes['id'] = attrs['id'] unless attrs['id'].blank?
+        @attributes['id'] = attrs['id'] unless attrs['id'].right_blank?
         attrs.delete('id')
         # add new values to all attributes from list
-        connection.put_attributes(domain, id, attrs) unless attrs.blank?
+        connection.put_attributes(domain, id, attrs) unless attrs.right_blank?
         connection.put_attributes(domain, id, { 'id' => id }, :replace)
         attrs.each do |attribute, values|
           @attributes[attribute] ||= []
@@ -918,12 +903,12 @@ module RightAws
         prepare_for_update
         attrs = uniq_values(attrs)
         # if 'id' is present in attrs hash then replace internal 'id' attribute
-        unless attrs['id'].blank?
+        unless attrs['id'].right_blank?
           @attributes['id'] = attrs['id']
         else
           attrs['id'] = id
         end
-        connection.put_attributes(domain, id, attrs, :replace) unless attrs.blank?
+        connection.put_attributes(domain, id, attrs, :replace) unless attrs.right_blank?
         attrs.each { |attribute, values| attrs[attribute] = values }
         mark_as_old
         attrs
@@ -942,7 +927,7 @@ module RightAws
         raise_on_id_absence
         attrs = uniq_values(attrs)
         attrs.delete('id')
-        unless attrs.blank?
+        unless attrs.right_blank?
           connection.delete_attributes(domain, id, attrs)
           attrs.each do |attribute, values|
             # remove the values from the attribute
@@ -971,7 +956,7 @@ module RightAws
         raise_on_id_absence
         attrs_list = attrs_list.flatten.map{ |attribute| attribute.to_s }
         attrs_list.delete('id')
-        unless attrs_list.blank?
+        unless attrs_list.right_blank?
           connection.delete_attributes(domain, id, attrs_list)
           attrs_list.each { |attribute| @attributes.delete(attribute) }
         end
@@ -1026,7 +1011,7 @@ module RightAws
       end
       
       def prepare_for_update
-        @attributes['id'] = self.class.generate_id if @attributes['id'].blank?
+        @attributes['id'] = self.class.generate_id if @attributes['id'].right_blank?
         columns.all.each do |col_name|
           self[col_name] ||= columns.default(col_name)
         end
@@ -1044,7 +1029,7 @@ module RightAws
           else
             Array(values).uniq
           end
-          attrs.delete(attribute) if values.blank?
+          attrs.delete(attribute) if values.right_blank?
         end
         attrs
       end

data/lib/sdb/right_sdb_interface.rb

@@ -49,13 +49,12 @@ module RightAws
     #      :port         => 443                  # Amazon service port: 80 or 443(default)
     #      :protocol     => 'https'              # Amazon service protocol: 'http' or 'https'(default)
     #      :signature_version => '0'             # The signature version : '0','1 or '2'(default)
-    #      :multi_thread => true|false           # Multi-threaded (connection per each thread): true or false(default)
     #      :logger       => Logger Object        # Logger instance: logs to STDOUT if omitted 
     #      :nil_representation => 'mynil'}       # interpret Ruby nil as this string value; i.e. use this string in SDB to represent Ruby nils (default is the string 'nil')
     #      
     # Example:
     # 
-    #  sdb = RightAws::SdbInterface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX', {:multi_thread => true, :logger => Logger.new('/tmp/x.log')}) #=> #<RightSdb:0xa6b8c27c>
+    #  sdb = RightAws::SdbInterface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX', {:logger => Logger.new('/tmp/x.log')}) #=> #<RightSdb:0xa6b8c27c>
     #  
     # see: http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/
     #
@@ -170,7 +169,7 @@ module RightAws
     # (similar to ActiveRecord::Base#find using :conditions => ['query', param1, .., paramN])
     #
     def query_expression_from_array(params) #:nodoc:
-      return '' if params.blank?
+      return '' if params.right_blank?
       query = params.shift.to_s
       query.gsub(/(\\)?(\?)/) do
         if $1 # if escaped '\?' is found - replace it by '?' without backslash
@@ -182,7 +181,7 @@ module RightAws
     end
 
     def query_expression_from_hash(hash)
-      return '' if hash.blank?
+      return '' if hash.right_blank?
       expression = []
       hash.each do |key, value|
         expression << "#{key}=#{escape(value)}"
@@ -255,6 +254,27 @@ module RightAws
       on_exception
     end
 
+    # Query Metadata for Domain
+    #
+    # Returns a hash on success or an exception on error.
+    #
+    # example: 
+    # sdb = RightAWS:::SdbInterface.new
+    # sdb.domain_metadata('toys') # => {:attribute_values_size_bytes=>"2754",
+    #                                   :item_count=>"25",
+    #                                   :item_names_size_bytes=>"900",
+    #                                   :timestamp=>"1291890409",
+    #                                   :attribute_name_count=>"7",
+    #                                   :box_usage=>"0.0000071759",
+    #                                   :attribute_names_size_bytes=>"48",
+    #                                   :attribute_value_count=>"154",
+    #                                   :request_id=>"79bbfe8f-f0c9-59a2-0963-16d5fc6c3c52"}
+    # see http://docs.amazonwebservices.com/AmazonSimpleDB/latest/DeveloperGuide/index.html?SDB_API_DomainMetadata.html
+    def domain_metadata(domain)
+      link = generate_request("DomainMetadata","DomainName"=>domain)
+      request_info(link,QSdbGenericParser.new)
+    end
+
     # Delete SDB domain at Amazon.
     # 
     # Returns a hash: { :box_usage, :request_id } on success or an exception on error.
@@ -615,6 +635,18 @@ module RightAws
     #-----------------------------------------------------------------
     #      PARSERS:
     #-----------------------------------------------------------------
+    class QSdbGenericParser < RightAWSParser #:nodoc:
+      def reset
+        @result = {}
+      end
+      def tagend(name)
+        case full_tag_name
+        when %r{/(DomainMetadataResult|ResponseMetadata)/}
+          @result[name.right_underscore.to_sym] = @text
+        end
+      end
+    end
+      
     class QSdbListDomainParser < RightAWSParser #:nodoc:
       def reset
         @result = { :domains => [] }

data/lib/sqs/right_sqs.rb

@@ -59,7 +59,6 @@ module RightAws
     #
     #    {:server       => 'queue.amazonaws.com' # Amazon service host: 'queue.amazonaws.com' (default)
     #     :port         => 443                   # Amazon service port: 80 or 443 (default)
-    #     :multi_thread => true|false            # Multi-threaded (connection per each thread): true or false (default)
     #     :signature_version => '0'              # The signature version : '0' or '1'(default)
     #     :logger       => Logger Object}        # Logger instance: logs to STDOUT if omitted }
     #
@@ -271,7 +270,7 @@ module RightAws
           grantees << Grantee.new(self, grantee_email_address, key, value[:name], value[:perms])
         end
         if grantee_email_address
-          grantees.blank? ? nil : grantees.shift
+          grantees.right_blank? ? nil : grantees.shift
         else
           grantees
         end

data/lib/sqs/right_sqs_gen2.rb

@@ -60,7 +60,6 @@ module RightAws
     #
     #    {:server       => 'queue.amazonaws.com' # Amazon service host: 'queue.amazonaws.com' (default)
     #     :port         => 443                   # Amazon service port: 80 or 443 (default)
-    #     :multi_thread => true|false            # Multi-threaded (connection per each thread): true or false (default)
     #     :signature_version => '0'              # The signature version : '0' or '1'(default)
     #     :logger       => Logger Object}        # Logger instance: logs to STDOUT if omitted }
   class SqsGen2

data/lib/sqs/right_sqs_gen2_interface.rb

@@ -65,13 +65,12 @@ 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', '1' or '2'(default)
     #     :logger       => Logger Object}        # Logger instance: logs to STDOUT if omitted }
     #
@@ -201,7 +200,7 @@ module RightAws
       # 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.blank?
+      attributes << 'All' if attributes.right_blank?
       params = amazonize_list('AttributeName', attributes)
       params.merge!(:queue_url  => queue_url)
       req_hash = generate_request('GetQueueAttributes', params)
@@ -282,7 +281,7 @@ module RightAws
     def receive_message(queue_url, max_number_of_messages=1, visibility_timeout=nil, attributes=nil)
       return [] if max_number_of_messages == 0
       params = {}
-      params.merge!(amazonize_list('AttributeName', Array(attributes))) unless attributes.blank?
+      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 )
@@ -429,7 +428,7 @@ module RightAws
       #
     def pop_message(queue_url, attributes=nil)
       messages = pop_messages(queue_url, 1, attributes)
-      messages.blank? ? nil : messages[0]
+      messages.right_blank? ? nil : messages[0]
     rescue
       on_exception
     end