lib/fog/storage/aws.rb in fog-0.5.2 vs lib/fog/storage/aws.rb in fog-0.5.3

- old
+ new

@@ -97,11 +97,10 @@ params[:path] = CGI.escape(params[:path]).gsub('%2F', '/') query = [params[:query]].compact query << "AWSAccessKeyId=#{@aws_access_key_id}" query << "Signature=#{CGI.escape(signature(params))}" query << "Expires=#{params[:headers]['Date']}" - bucket = params[:host].split('.').first "https://#{@host}/#{params[:path]}?#{query.join('&')}" end end @@ -219,11 +218,10 @@ def signature(params) "foo" end end - class Real include Utils extend Fog::Deprecation deprecate(:reset, :reload) @@ -276,11 +274,14 @@ raise ArgumentError, "Unknown region: #{options[:region].inspect}" end @path = options[:path] || '/' @port = options[:port] || 443 @scheme = options[:scheme] || 'https' + unless options.has_key?(:persistent) + options[:persistent] = true + end end - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true) + @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent]) end def reload @connection.reset end