fog 0.0.56 → 0.0.57

data/lib/fog/aws/requests/simpledb/list_domains.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module SimpleDB
+      class Real
 
-  module Fog
-    module AWS
-      class SimpleDB
+        require 'fog/aws/parsers/simpledb/list_domains'
 
         # List SimpleDB domains
         #
@@ -21,27 +22,22 @@ unless Fog.mocking?
         #     * 'RequestId'
         def list_domains(options = {})
           request({
-            'Action' => 'ListDomains'
-          }.merge!(options), Fog::Parsers::AWS::SimpleDB::ListDomains.new(@nil_string))
+            'Action' => 'ListDomains',
+            :parser  => Fog::Parsers::AWS::SimpleDB::ListDomains.new(@nil_string)
+          }.merge!(options))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class SimpleDB
+      class Mock
 
         def list_domains(options = {})
           response = Excon::Response.new
-          keys = Fog::AWS::SimpleDB.data[:domains].keys
+          keys = @data[:domains].keys
           max = options['MaxNumberOfDomains'] || keys.size
           offset = options['NextToken'] || 0
           domains = []
-          for key, value in Fog::AWS::SimpleDB.data[:domains].keys[offset...max]
+          for key, value in @data[:domains].keys[offset...max]
             domains << key
           end
           response.status = 200
@@ -59,5 +55,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/simpledb/put_attributes.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module AWS
-      class SimpleDB
+module Fog
+  module AWS
+    module SimpleDB
+      class Real
 
         # Put item attributes into a SimpleDB domain
         #
@@ -23,25 +22,26 @@ unless Fog.mocking?
         #     * 'BoxUsage'
         #     * 'RequestId'
         def put_attributes(domain_name, item_name, attributes, replace_attributes = [])
-          batch_put_attributes(domain_name, { item_name => attributes }, { item_name => replace_attributes })
+          batch_put_attributes(
+            domain_name,
+            { item_name => attributes },
+            { item_name => replace_attributes }
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class SimpleDb
+      class Mock
 
         def put_attributes(domain_name, item_name, attributes, replace_attributes = [])
-          batch_put_attributes(domain_name, { item_name => attributes }, { item_name => replace_attributes })
+          batch_put_attributes(
+            domain_name,
+            { item_name => attributes },
+            { item_name => replace_attributes }
+          )
         end
 
       end
     end
   end
-
 end

data/lib/fog/aws/requests/simpledb/select.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module SimpleDB
+      class Real
 
-  module Fog
-    module AWS
-      class SimpleDB
+        require 'fog/aws/parsers/simpledb/select'
 
         # Select item data from SimpleDB
         #
@@ -19,22 +20,17 @@ unless Fog.mocking?
         #       { 'item_name' => { 'attribute_name' => ['attribute_value'] }}
         #     * 'NextToken'<~String> - offset to start with if there are are more domains to list
         def select(select_expression, next_token = nil)
-          request({
-            'Action' => 'Select',
-            'NextToken' => next_token,
-            'SelectExpression' => select_expression
-          }, Fog::Parsers::AWS::SimpleDB::Select.new(@nil_string))
+          request(
+            'Action'            => 'Select',
+            'NextToken'         => next_token,
+            'SelectExpression'  => select_expression,
+            :parser             => Fog::Parsers::AWS::SimpleDB::Select.new(@nil_string)
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class SimpleDB
+      class Mock
 
         def select(select_expression, next_token = nil)
           raise MockNotImplemented.new("Contributions welcome!")
@@ -43,5 +39,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/s3.rb

@@ -1,82 +1,33 @@
+require 'fog/aws/models/s3/directories'
+require 'fog/aws/models/s3/directory'
+require 'fog/aws/models/s3/files'
+require 'fog/aws/models/s3/file'
+require 'fog/aws/requests/s3/copy_object'
+require 'fog/aws/requests/s3/delete_bucket'
+require 'fog/aws/requests/s3/delete_object'
+require 'fog/aws/requests/s3/get_bucket'
+require 'fog/aws/requests/s3/get_bucket_location'
+require 'fog/aws/requests/s3/get_object'
+require 'fog/aws/requests/s3/get_request_payment'
+require 'fog/aws/requests/s3/get_service'
+require 'fog/aws/requests/s3/head_object'
+require 'fog/aws/requests/s3/put_bucket'
+require 'fog/aws/requests/s3/put_object'
+require 'fog/aws/requests/s3/put_request_payment'
+
 module Fog
   module AWS
-    class S3
-
-      if Fog.mocking?
-        def self.reset_data
-          @data = { :buckets => {} }
-        end
-        def self.data
-          @data
-        end
-      end
-
-      def self.dependencies
-        [
-          "fog/aws/models/s3/directory.rb",
-          "fog/aws/models/s3/directories.rb",
-          "fog/aws/models/s3/file.rb",
-          "fog/aws/models/s3/files.rb",
-          "fog/aws/parsers/s3/copy_object.rb",
-          "fog/aws/parsers/s3/get_bucket.rb",
-          "fog/aws/parsers/s3/get_bucket_location.rb",
-          "fog/aws/parsers/s3/get_request_payment.rb",
-          "fog/aws/parsers/s3/get_service.rb",
-          "fog/aws/requests/s3/copy_object.rb",
-          "fog/aws/requests/s3/delete_bucket.rb",
-          "fog/aws/requests/s3/delete_object.rb",
-          "fog/aws/requests/s3/get_bucket.rb",
-          "fog/aws/requests/s3/get_bucket_location.rb",
-          "fog/aws/requests/s3/get_object.rb",
-          "fog/aws/requests/s3/get_request_payment.rb",
-          "fog/aws/requests/s3/get_service.rb",
-          "fog/aws/requests/s3/head_object.rb",
-          "fog/aws/requests/s3/put_bucket.rb",
-          "fog/aws/requests/s3/put_object.rb",
-          "fog/aws/requests/s3/put_request_payment.rb"
-        ]
-      end
+    module S3
 
-      def self.reload
-        self.dependencies.each {|dependency| load(dependency)}
+      def self.new(options={})
         if Fog.mocking?
-          reset_data
-        end
-      end
-
-      # Initialize connection to S3
-      #
-      # ==== Notes
-      # options parameter must include values for :aws_access_key_id and 
-      # :aws_secret_access_key in order to create a connection
-      #
-      # ==== Examples
-      #   s3 = S3.new(
-      #     :aws_access_key_id => your_aws_access_key_id,
-      #     :aws_secret_access_key => your_aws_secret_access_key
-      #   )
-      #
-      # ==== Parameters
-      # * options<~Hash> - config arguments for connection.  Defaults to {}.
-      #
-      # ==== Returns
-      # * S3 object with connection to aws.
-      def initialize(options={})
-        unless @aws_access_key_id = options[:aws_access_key_id]
-          raise ArgumentError.new('aws_access_key_id is required to access ec2')
-        end
-        unless @aws_secret_access_key = options[:aws_secret_access_key]
-          raise ArgumentError.new('aws_secret_access_key is required to access ec2')
+          Fog::AWS::S3::Mock.new(options)
+        else
+          Fog::AWS::S3::Real.new(options)
         end
-        @hmac       = HMAC::SHA1.new(@aws_secret_access_key)
-        @host       = options[:host]      || 's3.amazonaws.com'
-        @port       = options[:port]      || 443
-        @scheme     = options[:scheme]    || 'https'
       end
 
-      private
-
-      def parse_data(data)
+      def self.parse_data(data)
         metadata = {
           :body => nil,
           :headers => {}
@@ -97,27 +48,64 @@ module Fog
         metadata
       end
 
-      def request(params)
-        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
-        params[:headers]['Date'] = Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S +0000")
-        params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
+      class Mock
 
-        response = @connection.request(params)
+        def reset_data
+          @data = { :buckets => {} }
+        end
 
-        response
-      end
+        def initialize(options={})
+          reset_data
+        end
 
-      def url(params, expires)
-        params[:headers]['Date'] = expires.to_i
-        query = [params[:query]].compact
-        query << "AWSAccessKeyId=#{@aws_access_key_id}"
-        query << "Signature=#{CGI.escape(signature(params))}"
-        query << "Expires=#{params[:headers]['Date']}"
-        "http://#{params[:host]}/#{params[:path]}?#{query.join('&')}"
       end
 
-      def signature(params)
-        string_to_sign =
+      class Real
+
+        # Initialize connection to S3
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and 
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   s3 = S3.new(
+        #     :aws_access_key_id => your_aws_access_key_id,
+        #     :aws_secret_access_key => your_aws_secret_access_key
+        #   )
+        #
+        # ==== Parameters
+        # * options<~Hash> - config arguments for connection.  Defaults to {}.
+        #
+        # ==== Returns
+        # * S3 object with connection to aws.
+        def initialize(options={})
+          unless @aws_access_key_id = options[:aws_access_key_id]
+            raise ArgumentError.new('aws_access_key_id is required to access ec2')
+          end
+          unless @aws_secret_access_key = options[:aws_secret_access_key]
+            raise ArgumentError.new('aws_secret_access_key is required to access ec2')
+          end
+          @hmac       = HMAC::SHA1.new(@aws_secret_access_key)
+          @host       = options[:host]      || 's3.amazonaws.com'
+          @port       = options[:port]      || 443
+          @scheme     = options[:scheme]    || 'https'
+        end
+
+        private
+
+        def request(params)
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
+          params[:headers]['Date'] = Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S +0000")
+          params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
+
+          response = @connection.request(params)
+
+          response
+        end
+
+        def signature(params)
+          string_to_sign =
 <<-DATA
 #{params[:method]}
 #{params[:headers]['Content-MD5']}
@@ -125,46 +113,54 @@ module Fog
 #{params[:headers]['Date']}
 DATA
 
-        amz_headers, canonical_amz_headers = {}, ''
-        for key, value in params[:headers]
-          if key[0..5] == 'x-amz-'
-            amz_headers[key] = value
+          amz_headers, canonical_amz_headers = {}, ''
+          for key, value in params[:headers]
+            if key[0..5] == 'x-amz-'
+              amz_headers[key] = value
+            end
           end
-        end
-        amz_headers = amz_headers.sort {|x, y| x[0] <=> y[0]}
-        for pair in amz_headers
-          canonical_amz_headers << "#{pair[0]}:#{pair[1]}\n"
-        end
-        string_to_sign << "#{canonical_amz_headers}"
-
-        subdomain = params[:host].split(".#{@host}").first
-        unless subdomain =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
-          puts("[WARN] fog: the specified s3 bucket name(#{subdomain}) is not a valid dns name.  See: http://docs.amazonwebservices.com/AmazonS3/latest/dev/index.html?Introduction.html")
-          params[:host] = params[:host].split("#{subdomain}.")[-1]
-          if params[:path]
-            params[:path] = "#{subdomain}/#{params[:path]}"
-          else
-            params[:path] = "#{subdomain}"
+          amz_headers = amz_headers.sort {|x, y| x[0] <=> y[0]}
+          for pair in amz_headers
+            canonical_amz_headers << "#{pair[0]}:#{pair[1]}\n"
+          end
+          string_to_sign << "#{canonical_amz_headers}"
+
+          subdomain = params[:host].split(".#{@host}").first
+          unless subdomain =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+            puts("[WARN] fog: the specified s3 bucket name(#{subdomain}) is not a valid dns name.  See: http://docs.amazonwebservices.com/AmazonS3/latest/dev/index.html?Introduction.html")
+            params[:host] = params[:host].split("#{subdomain}.")[-1]
+            if params[:path]
+              params[:path] = "#{subdomain}/#{params[:path]}"
+            else
+              params[:path] = "#{subdomain}"
+            end
+            subdomain = nil
           end
-          subdomain = nil
-        end
 
-        canonical_resource  = "/"
-        unless subdomain.nil? || subdomain == @host
-          canonical_resource << "#{CGI.escape(subdomain).downcase}/"
+          canonical_resource  = "/"
+          unless subdomain.nil? || subdomain == @host
+            canonical_resource << "#{CGI.escape(subdomain).downcase}/"
+          end
+          canonical_resource << "#{params[:path]}"
+          if ['acl', 'location', 'logging', 'requestPayment', 'torrent'].include?(params[:query])
+            canonical_resource << "?#{params[:query]}"
+          end
+          string_to_sign << "#{canonical_resource}"
+
+          hmac = @hmac.update(string_to_sign)
+          signature = Base64.encode64(hmac.digest).chomp!
         end
-        canonical_resource << "#{params[:path]}"
-        if ['acl', 'location', 'logging', 'requestPayment', 'torrent'].include?(params[:query])
-          canonical_resource << "?#{params[:query]}"
+
+        def url(params, expires)
+          params[:headers]['Date'] = expires.to_i
+          query = [params[:query]].compact
+          query << "AWSAccessKeyId=#{@aws_access_key_id}"
+          query << "Signature=#{CGI.escape(signature(params))}"
+          query << "Expires=#{params[:headers]['Date']}"
+          "http://#{params[:host]}/#{params[:path]}?#{query.join('&')}"
         end
-        string_to_sign << "#{canonical_resource}"
 
-        hmac = @hmac.update(string_to_sign)
-        signature = Base64.encode64(hmac.digest).chomp!
       end
-
     end
   end
 end
-
-Fog::AWS::S3.reload

data/lib/fog/aws/simpledb.rb

@@ -1,159 +1,159 @@
+require 'fog/aws/requests/simpledb/batch_put_attributes'
+require 'fog/aws/requests/simpledb/create_domain'
+require 'fog/aws/requests/simpledb/delete_attributes'
+require 'fog/aws/requests/simpledb/delete_domain'
+require 'fog/aws/requests/simpledb/domain_metadata'
+require 'fog/aws/requests/simpledb/get_attributes'
+require 'fog/aws/requests/simpledb/list_domains'
+require 'fog/aws/requests/simpledb/put_attributes'
+require 'fog/aws/requests/simpledb/select'
+
 module Fog
   module AWS
-    class SimpleDB
+    module SimpleDB
 
-      if Fog.mocking?
-        def self.reset_data
-          @data = { :domains => {} }
-        end
-        def self.data
-          @data
+      def self.new(options={})
+        if Fog.mocking?
+          Fog::AWS::SimpleDB::Mock.new(options)
+        else
+          Fog::AWS::SimpleDB::Real.new(options)
         end
       end
 
-      def self.dependencies
-        [
-          "fog/aws/parsers/simpledb/basic.rb",
-          "fog/aws/parsers/simpledb/domain_metadata.rb",
-          "fog/aws/parsers/simpledb/get_attributes.rb",
-          "fog/aws/parsers/simpledb/list_domains.rb",
-          "fog/aws/parsers/simpledb/select.rb",
-          "fog/aws/requests/simpledb/batch_put_attributes.rb",
-          "fog/aws/requests/simpledb/create_domain.rb",
-          "fog/aws/requests/simpledb/delete_attributes.rb",
-          "fog/aws/requests/simpledb/delete_domain.rb",
-          "fog/aws/requests/simpledb/domain_metadata.rb",
-          "fog/aws/requests/simpledb/get_attributes.rb",
-          "fog/aws/requests/simpledb/list_domains.rb",
-          "fog/aws/requests/simpledb/put_attributes.rb",
-          "fog/aws/requests/simpledb/select.rb"
-        ]
-      end
+      class Mock
 
-      def self.reload
-        self.dependencies.each {|dependency| load(dependency)}
-        if Fog.mocking?
+        def reset_data
+          @data = { :domains => {} }
+        end
+
+        def initialize(options={})
           reset_data
         end
-      end
 
-      # Initialize connection to SimpleDB
-      #
-      # ==== Notes
-      # options parameter must include values for :aws_access_key_id and 
-      # :aws_secret_access_key in order to create a connection
-      #
-      # ==== Examples
-      #   sdb = SimpleDB.new(
-      #     :aws_access_key_id => your_aws_access_key_id,
-      #     :aws_secret_access_key => your_aws_secret_access_key
-      #   )
-      #
-      # ==== Parameters
-      # * options<~Hash> - config arguments for connection.  Defaults to {}.
-      #
-      # ==== Returns
-      # * SimpleDB object with connection to aws.
-      def initialize(options={})
-        @aws_access_key_id      = options[:aws_access_key_id]
-        @aws_secret_access_key  = options[:aws_secret_access_key]
-        @hmac       = HMAC::SHA256.new(@aws_secret_access_key)
-        @host       = options[:host]      || 'sdb.amazonaws.com'
-        @nil_string = options[:nil_string]|| 'nil'
-        @port       = options[:port]      || 443
-        @scheme     = options[:scheme]    || 'https'
       end
 
-      private
-
-      def encode_attributes(attributes, replace_attributes = [])
-        encoded_attributes = {}
-        if attributes
-          index = 0
-          for key in attributes.keys
-            for value in Array(attributes[key])
-              encoded_attributes["Attribute.#{index}.Name"] = key.to_s
-              if replace_attributes.include?(key)
-                encoded_attributes["Attribute.#{index}.Replace"] = 'true'
+      class Real
+
+        # Initialize connection to SimpleDB
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and 
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   sdb = SimpleDB.new(
+        #     :aws_access_key_id => your_aws_access_key_id,
+        #     :aws_secret_access_key => your_aws_secret_access_key
+        #   )
+        #
+        # ==== Parameters
+        # * options<~Hash> - config arguments for connection.  Defaults to {}.
+        #
+        # ==== Returns
+        # * SimpleDB object with connection to aws.
+        def initialize(options={})
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @hmac       = HMAC::SHA256.new(@aws_secret_access_key)
+          @host       = options[:host]      || 'sdb.amazonaws.com'
+          @nil_string = options[:nil_string]|| 'nil'
+          @port       = options[:port]      || 443
+          @scheme     = options[:scheme]    || 'https'
+        end
+
+        private
+
+        def encode_attributes(attributes, replace_attributes = [])
+          encoded_attributes = {}
+          if attributes
+            index = 0
+            for key in attributes.keys
+              for value in Array(attributes[key])
+                encoded_attributes["Attribute.#{index}.Name"] = key.to_s
+                if replace_attributes.include?(key)
+                  encoded_attributes["Attribute.#{index}.Replace"] = 'true'
+                end
+                encoded_attributes["Attribute.#{index}.Value"] = sdb_encode(value)
+                index += 1
               end
-              encoded_attributes["Attribute.#{index}.Value"] = sdb_encode(value)
-              index += 1
             end
           end
+          encoded_attributes
         end
-        encoded_attributes
-      end
 
-      def encode_attribute_names(attributes)
-        AWS.indexed_param('AttributeName', attributes.map {|attribute| attributes.to_s})
-      end
+        def encode_attribute_names(attributes)
+          AWS.indexed_param('AttributeName', attributes.map {|attribute| attributes.to_s})
+        end
 
-      def encode_batch_attributes(items, replace_attributes = Hash.new([]))
-        encoded_attributes = {}
-        if items
-          item_index = 0
-          for item_key in items.keys
-            encoded_attributes["Item.#{item_index}.ItemName"] = item_key.to_s
-            for attribute_key in items[item_key].keys
-              attribute_index = 0
-              for value in Array(items[item_key][attribute_key])
-                encoded_attributes["Item.#{item_index}.Attribute.#{attribute_index}.Name"] = attribute_key.to_s
-                if replace_attributes[item_key].include?(attribute_key)
-                  encoded_attributes["Item.#{item_index}.Attribute.#{attribute_index}.Replace"] = 'true'
+        def encode_batch_attributes(items, replace_attributes = Hash.new([]))
+          encoded_attributes = {}
+          if items
+            item_index = 0
+            for item_key in items.keys
+              encoded_attributes["Item.#{item_index}.ItemName"] = item_key.to_s
+              for attribute_key in items[item_key].keys
+                attribute_index = 0
+                for value in Array(items[item_key][attribute_key])
+                  encoded_attributes["Item.#{item_index}.Attribute.#{attribute_index}.Name"] = attribute_key.to_s
+                  if replace_attributes[item_key].include?(attribute_key)
+                    encoded_attributes["Item.#{item_index}.Attribute.#{attribute_index}.Replace"] = 'true'
+                  end
+                  encoded_attributes["Item.#{item_index}.Attribute.#{attribute_index}.Value"] = sdb_encode(value)
+                  attribute_index += 1
                 end
-                encoded_attributes["Item.#{item_index}.Attribute.#{attribute_index}.Value"] = sdb_encode(value)
-                attribute_index += 1
+                item_index += 1
               end
-              item_index += 1
             end
           end
+          encoded_attributes
         end
-        encoded_attributes
-      end
 
-      def request(params, parser)
-        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
-        params.merge!({
-          'AWSAccessKeyId' => @aws_access_key_id,
-          'SignatureMethod' => 'HmacSHA256',
-          'SignatureVersion' => '2',
-          'Timestamp' => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
-          'Version' => '2007-11-07'
-        })
-
-        body = ''
-        for key in params.keys.sort
-          unless (value = params[key]).nil?
-            body << "#{key}=#{CGI.escape(value.to_s).gsub(/\+/, '%20')}&"
+        def request(params)
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
+          idempotent = params.delete(:idempotent)
+          parser = params.delete(:parser)
+
+          params.merge!({
+            'AWSAccessKeyId' => @aws_access_key_id,
+            'SignatureMethod' => 'HmacSHA256',
+            'SignatureVersion' => '2',
+            'Timestamp' => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
+            'Version' => '2007-11-07'
+          })
+
+          body = ''
+          for key in params.keys.sort
+            unless (value = params[key]).nil?
+              body << "#{key}=#{CGI.escape(value.to_s).gsub(/\+/, '%20')}&"
+            end
           end
-        end
-
-        string_to_sign = "POST\n#{@host}\n/\n" << body.chop
-        hmac = @hmac.update(string_to_sign)
-        body << "Signature=#{CGI.escape(Base64.encode64(hmac.digest).chomp!).gsub(/\+/, '%20')}"
-
-        response = @connection.request({
-          :body => body,
-          :expects => 200,
-          :headers => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-          :host => @host,
-          :method => 'POST',
-          :parser => parser
-        })
 
-        response
-      end
+          string_to_sign = "POST\n#{@host}\n/\n" << body.chop
+          hmac = @hmac.update(string_to_sign)
+          body << "Signature=#{CGI.escape(Base64.encode64(hmac.digest).chomp!).gsub(/\+/, '%20')}"
+
+          response = @connection.request({
+            :body       => body,
+            :expects    => 200,
+            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :host       => @host,
+            :idempotent => idempotent,
+            :method     => 'POST',
+            :parser     => parser
+          })
+
+          response
+        end
 
-      def sdb_encode(value)
-        if value.nil?
-          @nil_string
-        else
-          value.to_s
+        def sdb_encode(value)
+          if value.nil?
+            @nil_string
+          else
+            value.to_s
+          end
         end
-      end
 
+      end
     end
   end
 end
-
-Fog::AWS::SimpleDB.reload