aws 2.4.5 → 2.5.0

data/lib/s3/s3.rb

@@ -80,6 +80,7 @@ module Aws
     #    {: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)
+    #     :virtual_hosting  => false            # Force using bucket virtual hosting: https://s3.amazonaws.com/my-bucket vs. https://my-bucket.s3.amazonaws.com
     #     :connection_mode  => :default         # options are
     #                                                  :default (will use best known safe (as in won't need explicit close) option, may change in the future)
     #                                                  :per_request (opens and closes a connection on every request)
@@ -306,7 +307,7 @@ module Aws
         @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 Aws::Utils.blank?(@name)
       end
 
       # Generate link to PUT key data.

data/lib/s3/s3_interface.rb

@@ -50,10 +50,6 @@ module Aws
       @@bench
     end
 
-    def self.bench
-      @@bench
-    end
-
     def self.bench_xml
       @@bench.xml
     end
@@ -135,13 +131,18 @@ module Aws
       server  = @params[:server]
       service = @params[:service].to_s
       service.chop! if service[%r{/$}] # remove trailing '/' from service
-      # extract bucket name and check it's dns compartibility
+      # extract bucket name and check it's dns compatibility
       headers[:url].to_s[%r{^([a-z0-9._-]*)(/[^?]*)?(\?.+)?}i]
       bucket_name, key_path, params_list = $1, $2, $3
       # select request model
-      #if is_dns_bucket?(bucket_name) 
-      # is_dns_bucket isn't called since naming a bucket using URL's path always works (naming using dns cname may have an issue with Eucalyptus)
-      path = "#{service}/#{bucket_name}#{key_path}#{params_list}"
+      if is_dns_bucket?(bucket_name) and !@params[:virtual_hosting]
+        # fix a path
+        server   = "#{bucket_name}.#{server}"
+        key_path ||= '/'
+        path     = "#{service}#{key_path}#{params_list}"
+      else
+        path = "#{service}/#{bucket_name}#{key_path}#{params_list}"
+      end
       path_to_sign = "#{service}/#{bucket_name}#{key_path}#{params_list}"
       [server, path, path_to_sign]
     end
@@ -158,13 +159,13 @@ module Aws
       headers['content-type'] ||= ''
       headers['date']         = Time.now.httpdate
       # create request
-      request                 = "Net::HTTP::#{method.capitalize}".constantize.new(path)
+      request                 = Net::HTTP.const_get(method.capitalize).new(path)
       request.body = data if data
       # set request headers and meta headers
       headers.each { |key, value| request[key.to_s] = value }
       #generate auth strings
       auth_string              = canonical_string(request.method, path_to_sign, request.to_hash)
-      signature                = AwsUtils::sign(@aws_secret_access_key, auth_string)
+      signature                = Utils::sign(@aws_secret_access_key, auth_string)
       # set other headers
       request['Authorization'] = "AWS #{@aws_access_key_id}:#{signature}"
       # prepare output hash
@@ -206,7 +207,7 @@ module Aws
     #
     def create_bucket(bucket, headers={})
       data = nil
-      unless headers[:location].blank?
+      unless Aws::Utils.blank?(headers[:location])
 #                data = "<CreateBucketConfiguration><LocationConstraint>#{headers[:location].to_s.upcase}</LocationConstraint></CreateBucketConfiguration>"
         location = headers[:location].to_s
         location.upcase! if location == 'eu'
@@ -242,8 +243,8 @@ module Aws
     #
     #
     def get_logging_parse(params)
-      AwsUtils.mandatory_arguments([:bucket], params)
-      AwsUtils.allow_only([:bucket, :headers], params)
+      Utils.mandatory_arguments([:bucket], params)
+      Utils.allow_only([:bucket, :headers], params)
       params[:headers] = {} unless params[:headers]
       req_hash = generate_rest_request('GET', params[:headers].merge(:url=>"#{params[:bucket]}?logging"))
       request_info(req_hash, S3LoggingParser.new)
@@ -256,8 +257,8 @@ module Aws
     #    :bucket
     #    :xmldoc
     def put_logging(params)
-      AwsUtils.mandatory_arguments([:bucket, :xmldoc], params)
-      AwsUtils.allow_only([:bucket, :xmldoc, :headers], params)
+      Utils.mandatory_arguments([:bucket, :xmldoc], params)
+      Utils.allow_only([:bucket, :xmldoc, :headers], params)
       params[:headers] = {} unless params[:headers]
       req_hash = generate_rest_request('PUT', params[:headers].merge(:url=>"#{params[:bucket]}?logging", :data => params[:xmldoc]))
       request_info(req_hash, S3TrueParser.new)
@@ -295,7 +296,10 @@ module Aws
     #                  '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?
+      unless options.nil? || options.empty?
+        bucket << '?'
+        bucket << options.map { |k, v| "#{k.to_s}=#{CGI::escape v.to_s}" }.join('&')
+      end
       req_hash = generate_rest_request('GET', headers.merge(:url=>bucket))
       request_info(req_hash, S3ListBucketParser.new(:logger => @logger))
     rescue
@@ -330,10 +334,13 @@ module Aws
     #     ]
     #   }
     def incrementally_list_bucket(bucket, options={}, headers={}, &block)
-      internal_options = options.symbolize_keys
+      internal_options = Hash[ options.map {|k,v| [k.to_sym, v] } ]
       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?
+        unless internal_options.nil? || internal_options.empty?
+          internal_bucket << '?' 
+          internal_bucket << internal_options.map { |k, v| "#{k.to_s}=#{CGI::escape v.to_s}" }.join('&')
+        end
         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]
@@ -462,8 +469,8 @@ module Aws
     #       "content-length"=>"0"}
 
     def store_object(params)
-      AwsUtils.allow_only([:bucket, :key, :data, :headers, :md5], params)
-      AwsUtils.mandatory_arguments([:bucket, :key, :data], params)
+      Utils.allow_only([:bucket, :key, :data, :headers, :md5], params)
+      Utils.mandatory_arguments([:bucket, :key, :data], params)
       params[:headers] = {} unless params[:headers]
 
       params[:data].binmode if (params[:data].respond_to?(:binmode)) # On Windows, if someone opens a file in text mode, we must reset it to binary mode for streaming to work properly
@@ -506,7 +513,7 @@ module Aws
     #                                                                          "server"=>"AmazonS3",
     #                                                                          "content-length"=>"0"}
     def store_object_and_verify(params)
-      AwsUtils.mandatory_arguments([:md5], params)
+      Utils.mandatory_arguments([:md5], params)
       r = store_object(params)
       r[:verified_md5] ? (return r) : (raise AwsError.new("Uploaded object failed MD5 checksum verification: #{r.inspect}"))
     end
@@ -587,8 +594,8 @@ module Aws
     # the response can be 'streamed'.  The hash containing header fields is
     # still returned.
     def retrieve_object(params, &block)
-      AwsUtils.mandatory_arguments([:bucket, :key], params)
-      AwsUtils.allow_only([:bucket, :key, :headers, :md5], params)
+      Utils.mandatory_arguments([:bucket, :key], params)
+      Utils.allow_only([:bucket, :key, :headers, :md5], params)
       params[:headers] = {} unless params[:headers]
       req_hash            = generate_rest_request('GET', params[:headers].merge(:url=>"#{params[:bucket]}/#{CGI::escape params[:key]}"))
       resp                = request_info(req_hash, S3HttpResponseBodyParser.new, &block)
@@ -605,7 +612,7 @@ module Aws
     # If the check passes, returns the response metadata with the "verified_md5" field set true.  Raises an exception if the checksums conflict.
     # This call is implemented as a wrapper around retrieve_object and the user may gain different semantics by creating a custom wrapper.
     def retrieve_object_and_verify(params, &block)
-      AwsUtils.mandatory_arguments([:md5], params)
+      Utils.mandatory_arguments([:md5], params)
       resp = retrieve_object(params, &block)
       return resp if resp[:verified_md5]
       raise AwsError.new("Retrieved object failed MD5 checksum verification: #{resp.inspect}")
@@ -707,7 +714,7 @@ module Aws
     #                  <Permission>FULL_CONTROL</Permission></Grant></AccessControlList></AccessControlPolicy>" }
     #
     def get_acl(bucket, key='', headers={})
-      key      = key.blank? ? '' : "/#{CGI::escape key}"
+      key      = Aws::Utils.blank?(key) ? '' : "/#{CGI::escape key}"
       req_hash = generate_rest_request('GET', headers.merge(:url=>"#{bucket}#{key}?acl"))
       request_info(req_hash, S3HttpResponseBodyParser.new)
     rescue
@@ -737,7 +744,7 @@ module Aws
     #       :display_name=>"root"}}
     #
     def get_acl_parse(bucket, key='', headers={})
-      key               = key.blank? ? '' : "/#{CGI::escape key}"
+      key               = Aws::Utils.blank?(key) ? '' : "/#{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            = {}
@@ -761,7 +768,7 @@ module Aws
 
     # Sets the ACL on a bucket or object.
     def put_acl(bucket, key, acl_xml_doc, headers={})
-      key      = key.blank? ? '' : "/#{CGI::escape key}"
+      key      = Aws::Utils.blank?(key) ? '' : "/#{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
@@ -790,7 +797,7 @@ module Aws
     end
 
     def put_bucket_policy(bucket, policy)
-      key      = key.blank? ? '' : "/#{CGI::escape key}"
+      key      = Aws::Utils.blank?(key) ? '' : "/#{CGI::escape key}"
       req_hash = generate_rest_request('PUT', {:url=>"#{bucket}?policy", :data=>policy})
       request_info(req_hash, S3HttpResponseBodyParser.new)
     rescue
@@ -910,7 +917,10 @@ module Aws
     #  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?
+      unless options.nil? || options.empty?
+        bucket << '?'
+        bucket << options.map { |k, v| "#{k.to_s}=#{CGI::escape v.to_s}" }.join('&')
+      end
       generate_link('GET', headers.merge(:url=>bucket), expires)
     rescue
       on_exception
@@ -921,7 +931,7 @@ module Aws
     #  s3.put_link('my_awesome_bucket',key, object) #=> url string
     #
     def put_link(bucket, key, data=nil, expires=nil, headers={})
-      generate_link('PUT', headers.merge(:url=>"#{bucket}/#{AwsUtils::URLencode key}", :data=>data), expires)
+      generate_link('PUT', headers.merge(:url=>"#{bucket}/#{Utils::URLencode key}", :data=>data), expires)
     rescue
       on_exception
     end
@@ -939,7 +949,7 @@ module Aws
     #
     # see http://docs.amazonwebservices.com/AmazonS3/2006-03-01/VirtualHosting.html
     def get_link(bucket, key, expires=nil, headers={})
-      generate_link('GET', headers.merge(:url=>"#{bucket}/#{AwsUtils::URLencode key}"), expires)
+      generate_link('GET', headers.merge(:url=>"#{bucket}/#{Utils::URLencode key.to_s}"), expires)
     rescue
       on_exception
     end
@@ -949,7 +959,7 @@ module Aws
     #  s3.head_link('my_awesome_bucket',key) #=> url string
     #
     def head_link(bucket, key, expires=nil, headers={})
-      generate_link('HEAD', headers.merge(:url=>"#{bucket}/#{AwsUtils::URLencode key}"), expires)
+      generate_link('HEAD', headers.merge(:url=>"#{bucket}/#{Utils::URLencode key}"), expires)
     rescue
       on_exception
     end
@@ -959,7 +969,7 @@ module Aws
     #  s3.delete_link('my_awesome_bucket',key) #=> url string
     #
     def delete_link(bucket, key, expires=nil, headers={})
-      generate_link('DELETE', headers.merge(:url=>"#{bucket}/#{AwsUtils::URLencode key}"), expires)
+      generate_link('DELETE', headers.merge(:url=>"#{bucket}/#{Utils::URLencode key}"), expires)
     rescue
       on_exception
     end
@@ -970,7 +980,7 @@ module Aws
     #  s3.get_acl_link('my_awesome_bucket',key) #=> url string
     #
     def get_acl_link(bucket, key='', headers={})
-      return generate_link('GET', headers.merge(:url=>"#{bucket}/#{AwsUtils::URLencode key}?acl"))
+      return generate_link('GET', headers.merge(:url=>"#{bucket}/#{Utils::URLencode key}?acl"))
     rescue
       on_exception
     end
@@ -980,7 +990,7 @@ module Aws
     #  s3.put_acl_link('my_awesome_bucket',key) #=> url string
     #
     def put_acl_link(bucket, key='', headers={})
-      return generate_link('PUT', headers.merge(:url=>"#{bucket}/#{AwsUtils::URLencode key}?acl"))
+      return generate_link('PUT', headers.merge(:url=>"#{bucket}/#{Utils::URLencode key}?acl"))
     rescue
       on_exception
     end

data/lib/sdb/active_sdb.rb

@@ -1,7 +1,4 @@
-# THIS IS DEPRECATED NOW, PLEASE USE SimpleRecord instead:
-# http://github.com/appoxy/simple_record
-
-
+puts 'WARNING: ActiveSdb is deprecated, please use SimpleRecord at https://github.com/appoxy/simple_record/ instead.'
 
 # Copyright (c) 2008 RightScale Inc
 #
@@ -32,8 +29,6 @@ rescue LoadError => e
     exit
 end
 
-puts 'WARNING: ActiveSdb is deprecated, please use SimpleRecord at https://github.com/appoxy/simple_record/ instead.'
-
 module Aws
 
     # = Aws::ActiveSdb -- RightScale SDB interface (alpha release)
@@ -375,7 +370,7 @@ module Aws
                     # 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] = Aws::Utils.blank?(options[:conditions]) ? ids_cond : "(#{options[:conditions]}) AND #{ids_cond}"
                     #puts 'options=' + options.inspect
                     result = sql_select(options)
                     #puts 'select_from_ids result=' + result.inspect
@@ -482,7 +477,7 @@ module Aws
                         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 Aws::Utils.blank?(query_expression)
                             query_expression = sort_query_expression
                         elsif !query_attributes(query_expression).include?(sort_by)
                             query_expression += " intersection #{sort_query_expression}"
@@ -536,7 +531,7 @@ module Aws
                     # 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] = Aws::Utils.blank?(options[:conditions]) ? ids_cond : "#{options[:conditions]} intersection #{ids_cond}"
                     result = find_every(options)
                     # if one record was requested then return it
                     unless bunch_of_records_requested
@@ -598,9 +593,9 @@ module Aws
                     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 Aws::Utils.blank?(order)
                         sort_by, sort_order = sort_options(options[:order])
-                        conditions << (conditions.blank? ? " WHERE " : " AND ") << "(#{sort_by} IS NOT NULL)"
+                        conditions << (Aws::Utils.blank?(conditions) ? " WHERE " : " AND ") << "(#{sort_by} IS NOT NULL)"
                     end
                     "SELECT #{select} FROM `#{from}`#{conditions}#{order}#{limit}"
                 end
@@ -688,7 +683,9 @@ module Aws
             def attributes=(attrs)
                 old_id = @attributes['id']
                 @attributes = uniq_values(attrs)
-                @attributes['id'] = old_id if @attributes['id'].blank? && !old_id.blank?
+                if Aws::Utils.blank?(@attributes['id']) && !Aws::Utils.blank?(old_id)
+                  @attributes['id'] = old_id
+                end
                 self.attributes
             end
 
@@ -731,7 +728,7 @@ module Aws
                 old_id = id
                 attrs = connection.get_attributes(domain, id)[:attributes]
                 @attributes = {}
-                unless attrs.blank?
+                unless attrs.nil? || attrs.empty?
                     attrs.each { |attribute, values| @attributes[attribute] = values }
                     @attributes['id'] = old_id
                 end
@@ -757,7 +754,7 @@ module Aws
                 attrs_list.flatten.uniq.each do |attribute|
                     attribute = attribute.to_s
                     values = connection.get_attributes(domain, id, attribute)[:attributes][attribute]
-                    unless values.blank?
+                    unless Aws::Utils.blank?(values)
                         @attributes[attribute] = result[attribute] = values
                     else
                         @attributes.delete(attribute)
@@ -787,7 +784,7 @@ module Aws
                 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 Aws::Utils.blank?(attrs)
                 connection.put_attributes(domain, id, { 'id' => id }, :replace)
                 mark_as_old
                 @attributes
@@ -803,10 +800,10 @@ module Aws
                 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 Aws::Utils.blank?(attrs['id'])
                 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 Aws::Utils.blank?(attrs)
                 connection.put_attributes(domain, id, { 'id' => id }, :replace)
                 attrs.each do |attribute, values|
                     @attributes[attribute] ||= []
@@ -875,7 +872,7 @@ module Aws
                 prepare_for_update
                 attrs = uniq_values(attrs)
                 # if 'id' is present in attrs hash then replace internal 'id' attribute
-                unless attrs['id'].blank?
+                unless Aws::Utils.blank?(attrs['id'])
                     @attributes['id'] = attrs['id']
                 else
                     attrs['id'] = id
@@ -899,7 +896,7 @@ module Aws
                 raise_on_id_absence
                 attrs = uniq_values(attrs)
                 attrs.delete('id')
-                unless attrs.blank?
+                unless attrs.nil? || attrs.empty?
                     connection.delete_attributes(domain, id, attrs)
                     attrs.each do |attribute, values|
                         # remove the values from the attribute
@@ -928,7 +925,7 @@ module Aws
                 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.empty?
                     connection.delete_attributes(domain, id, attrs_list)
                     attrs_list.each { |attribute| @attributes.delete(attribute) }
                 end
@@ -970,7 +967,7 @@ module Aws
             end
 
             def prepare_for_update
-                @attributes['id'] = self.class.generate_id if @attributes['id'].blank?
+                @attributes['id'] = self.class.generate_id if Aws::Utils.blank?(@attributes['id'])
             end
 
             def uniq_values(attributes=nil) # :nodoc:
@@ -979,7 +976,7 @@ module Aws
                     attribute = attribute.to_s
                     newval = attribute == 'id' ? values.to_s : values.is_a?(Array) ? values.uniq : [values]
                     attrs[attribute] = newval
-                    if newval.blank?
+                    if Aws::Utils.blank?(newval)
 #                        puts "VALUE IS BLANK " + attribute.to_s + " val=" + values.inspect
                         attrs.delete(attribute)
                     end

data/lib/sdb/sdb_interface.rb

@@ -21,8 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-require "aws"
-
 module Aws
 
   class SdbInterface < AwsBase
@@ -143,7 +141,8 @@ module Aws
     # see: http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/SDB_API.html
     #
     def escape(value)
-      %Q{'#{value.to_s.gsub(/(['\\])/) { "\\#{$1}" }}'} if value
+#       %Q{'#{value.to_s.gsub(/(['\\])/) { "\\#{$1}" }}'} if value
+     %{'#{value.to_s.gsub(/(['\\])/){"#{$1}#{$1}"}}'} if value
     end
 
     # Convert a Ruby language value to a SDB value by replacing Ruby nil with the user's chosen string representation of nil.
@@ -177,7 +176,7 @@ module Aws
     # (similar to ActiveRecord::Base#find using :conditions => ['query', param1, .., paramN])
     #
     def query_expression_from_array(params) #:nodoc:
-      return '' if params.blank?
+      return '' if Aws::Utils.blank?(params)
       query = params[0].to_s
       i     = 1
       query.gsub(/(\\)?(\?)/) do
@@ -192,7 +191,7 @@ module Aws
     end
 
     def query_expression_from_hash(hash)
-      return '' if hash.blank?
+      return '' if Aws::Utils.blank?(hash)
       expression = []
       hash.each do |key, value|
         expression << "#{key}=#{escape(value)}"

data/lib/ses/ses.rb

@@ -0,0 +1,123 @@
+require_relative "../awsbase/awsbase"
+module Aws
+
+  require 'xmlsimple'
+
+  class Ses < AwsBase
+
+    include AwsBaseInterface
+
+    API_VERSION = "2010-12-01"
+    DEFAULT_HOST = "email.us-east-1.amazonaws.com"
+    DEFAULT_PATH = '/'
+    DEFAULT_PROTOCOL = 'https'
+    DEFAULT_PORT = 443
+
+    def self.connection_name
+      :ses_connection
+    end
+
+    @@bench = AwsBenchmarkingBlock.new
+
+    def self.bench
+      @@bench
+    end
+
+    def self.bench_xml
+      @@bench.xml
+    end
+
+    def self.bench_ec2
+      @@bench.service
+    end
+
+    # Current API version (sometimes we have to check it outside the GEM).
+    @@api = ENV['SES_API_VERSION'] || API_VERSION
+
+    def self.api
+      @@api
+    end
+
+
+    def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
+      init({:name => 'SES',
+            :default_host => ENV['SES_URL'] ? URI.parse(ENV['SES_URL']).host : DEFAULT_HOST,
+            :default_port => ENV['SES_URL'] ? URI.parse(ENV['SES_URL']).port : DEFAULT_PORT,
+            :default_service => ENV['SES_URL'] ? URI.parse(ENV['SES_URL']).path : DEFAULT_PATH,
+            :default_protocol => ENV['SES_URL'] ? URI.parse(ENV['SES_URL']).scheme : DEFAULT_PROTOCOL,
+            :api_version => API_VERSION,
+            :signature_version=>'3'},
+           aws_access_key_id || ENV['AWS_ACCESS_KEY_ID'],
+           aws_secret_access_key|| ENV['AWS_SECRET_ACCESS_KEY'],
+           params)
+    end
+
+    def do_request(action, params, options={})
+      link = generate_request(action, params)
+      puts "request=" + link[:request].inspect
+      resp = request_info_xml_simple3(self, link,
+                                      :group_tags =>{"LoadBalancersDescriptions"=>"LoadBalancersDescription",
+                                                     "DBParameterGroups" =>"DBParameterGroup",
+                                                     "DBSecurityGroups" =>"DBSecurityGroup",
+                                                     "EC2SecurityGroups" =>"EC2SecurityGroup",
+                                                     "IPRanges" =>"IPRange"},
+                                      :force_array =>["DBInstances",
+                                                      "DBParameterGroups",
+                                                      "DBSecurityGroups",
+                                                      "EC2SecurityGroups",
+                                                      "IPRanges"],
+                                      :pull_out_array =>options[:pull_out_array],
+                                      :pull_out_single=>options[:pull_out_single],
+                                      :wrapper =>options[:wrapper])
+    end
+
+
+    #-----------------------------------------------------------------
+    #      REQUESTS
+    #-----------------------------------------------------------------
+
+
+    # options:
+    #    :marker => value received from previous response if IsTruncated = true
+    #    :max_items => number of items you want returned
+    #    :path_previx => for filtering results, default is /
+    def get_send_quota(options={})
+      @logger.info("get_send_quota")
+
+      resp = do_request("GetSendQuota", options)
+
+
+    rescue Exception
+      on_exception
+    end
+
+    #
+    # name: name of certificate
+    # public_key: public key certificate in PEM-encoded format
+    # private_key: private key in PEM-encoded format
+    # options:
+    #    :path => specify a path you want it stored in
+    #    :certificate_chain => contents of certificate chain
+    def upload_server_certificate(name, public_key, private_key, options={})
+      params = {}
+      params['ServerCertificateName'] = name
+      params['PrivateKey'] = private_key
+      params['CertificateBody'] = public_key
+
+      params['CertificateChain'] = options[:certificate_chain] if options[:certificate_chain]
+      params['Path'] = options[:path] if options[:path]
+
+      p params
+
+      resp = do_request("UploadServerCertificate", params, :pull_out_array=>[:list_server_certificates_result, :server_certificate_metadata_list])
+
+
+    rescue Exception
+      on_exception
+    end
+
+
+  end
+
+
+end