Skip to content

Commit

Permalink
enable url parameters for all actions. Closes rest-client#53
Browse files Browse the repository at this point in the history
  • Loading branch information
archiloque committed Jun 26, 2011
1 parent 60145b3 commit 1060bae
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 17 deletions.
1 change: 1 addition & 0 deletions history.md
@@ -1,6 +1,7 @@
# 1.6.5

- RFC6265 requires single SP after ';' for separating parameters pairs in the 'Cookie:' header (patch provided by Hiroshi Nakamura)
- enable url parameters for all actions

# 1.6.4

Expand Down
30 changes: 13 additions & 17 deletions lib/restclient/request.rb
Expand Up @@ -37,7 +37,7 @@ def initialize args
@method = args[:method] or raise ArgumentError, "must pass :method"
@headers = args[:headers] || {}
if args[:url]
@url = process_get_params(args[:url], headers)
@url = process_url_params(args[:url], headers)
else
raise ArgumentError, "must pass :url"
end
Expand All @@ -64,24 +64,20 @@ def execute & block
transmit uri, net_http_request_class(method).new(uri.request_uri, processed_headers), payload, & block
end

# Extract the query parameters for get request and append them to the url
def process_get_params url, headers
if [:get, :head, :delete].include? method
get_params = {}
headers.delete_if do |key, value|
if 'params' == key.to_s.downcase && value.is_a?(Hash)
get_params.merge! value
true
else
false
end
end
unless get_params.empty?
query_string = get_params.collect { |k, v| "#{k.to_s}=#{CGI::escape(v.to_s)}" }.join('&')
url + "?#{query_string}"
# Extract the query parameters and append them to the url
def process_url_params url, headers
url_params = {}
headers.delete_if do |key, value|
if 'params' == key.to_s.downcase && value.is_a?(Hash)
url_params .merge! value
true
else
url
false
end
end
unless url_params .empty?
query_string = url_params .collect { |k, v| "#{k.to_s}=#{CGI::escape(v.to_s)}" }.join('&')
url + "?#{query_string}"
else
url
end
Expand Down

0 comments on commit 1060bae

Please sign in to comment.