From f672badddcc931a51ae95a2f7a22170af221ea0b Mon Sep 17 00:00:00 2001 From: geemus Date: Tue, 1 Jun 2010 21:45:07 -0700 Subject: [PATCH] [bbg|slicehost] cleanup/consistency update request --- lib/fog/bluebox.rb | 14 +++----------- lib/fog/slicehost.rb | 14 +++----------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/lib/fog/bluebox.rb b/lib/fog/bluebox.rb index eefffd16f..8c202e91d 100644 --- a/lib/fog/bluebox.rb +++ b/lib/fog/bluebox.rb @@ -63,8 +63,8 @@ module Fog def request(params) @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}") headers = { - 'Authorization' => "Basic #{Base64.encode64(@bluebox_api_key).delete("\r\n")}" - } + 'Authorization' => "Basic #{Base64.encode64(@bluebox_api_key).chop!}" + }.merge!(params[:headers] || {}) case params[:method] when 'DELETE', 'GET', 'HEAD' headers['Accept'] = 'application/xml' @@ -72,15 +72,7 @@ module Fog headers['Content-Type'] = 'application/xml' end - @connection.request({ - :body => params[:body], - :expects => params[:expects], - :headers => headers.merge!(params[:headers] || {}), - :host => @host, - :method => params[:method], - :parser => params[:parser], - :path => params[:path] - }) + @connection.request({:host => @host}.merge!(params)) end end diff --git a/lib/fog/slicehost.rb b/lib/fog/slicehost.rb index 698f73738..cda66d4d2 100644 --- a/lib/fog/slicehost.rb +++ b/lib/fog/slicehost.rb @@ -73,8 +73,8 @@ module Fog def request(params) @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}") headers = { - 'Authorization' => "Basic #{Base64.encode64(@slicehost_password).delete("\r\n")}" - } + 'Authorization' => "Basic #{Base64.encode64(@slicehost_password).chop!}" + }.merge!(params[:headers] || {}) case params[:method] when 'DELETE', 'GET', 'HEAD' headers['Accept'] = 'application/xml' @@ -83,15 +83,7 @@ module Fog end begin - response = @connection.request({ - :body => params[:body], - :expects => params[:expects], - :headers => headers.merge!(params[:headers] || {}), - :host => @host, - :method => params[:method], - :parser => params[:parser], - :path => params[:path] - }) + response = @connection.request({:host => @host}.merge!(params)) rescue Excon::Errors::Error => error case error when Excon::Errors::NotFound