Skip to content

Commit

Permalink
extracted secure_instance_url_request
Browse files Browse the repository at this point in the history
  • Loading branch information
Diego Scataglini committed Sep 20, 2011
1 parent 5f19a98 commit 0788d3f
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions lib/databasedotcom/client.rb
Expand Up @@ -308,16 +308,18 @@ def http_multipart_post(path, parts, parameters={}, headers={})
private private


def within_request(path, opts = {}, parameters={}, headers={}) def within_request(path, opts = {}, parameters={}, headers={})
req = Net::HTTP.new(URI.parse(self.instance_url).host, 443)
req.use_ssl = true
encoded_path = prepare_encoded_path_from(path, parameters) encoded_path = prepare_encoded_path_from(path, parameters)
log_request(encoded_path, opts[:data]) log_request(encoded_path, opts[:data])
result = yield(req, encoded_path) result = yield(secure_instance_url_request, encoded_path)
log_response(result) log_response(result)
raise SalesForceError.new(result) unless result.is_a?(opts[:expected_result_class] || Net::HTTPSuccess) raise SalesForceError.new(result) unless result.is_a?(opts[:expected_result_class] || Net::HTTPSuccess)
result result
end end


def secure_instance_url_request
Net::HTTP.new(URI.parse(self.instance_url).host, 443).tap{|n| n.use_ssl = true }
end

def prepare_encoded_path_from(path, parameters={}) def prepare_encoded_path_from(path, parameters={})
path_parameters = (parameters || {}).collect { |k, v| "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}" }.join('&') path_parameters = (parameters || {}).collect { |k, v| "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}" }.join('&')
[URI.escape(path), path_parameters.empty? ? nil : path_parameters].compact.join('?') [URI.escape(path), path_parameters.empty? ? nil : path_parameters].compact.join('?')
Expand Down

0 comments on commit 0788d3f

Please sign in to comment.