Skip to content

Commit

Permalink
added support for aggregating cookies when it follows a redirect
Browse files Browse the repository at this point in the history
  • Loading branch information
alexrothenberg committed May 8, 2009
1 parent 8da360f commit c84c6c9
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 1 deletion.
30 changes: 29 additions & 1 deletion lib/httparty/request.rb
Expand Up @@ -89,14 +89,42 @@ def query_string(uri)
query_string_parts.size > 0 ? query_string_parts.join('&') : nil
end

def stashed_set_cookies
@set_cookies ||= []
end

def stash_new_set_cookies set_cookie_header_value
stashed_set_cookies.push(set_cookie_header_value).flatten! unless set_cookie_header_value.nil?
end

def add_stashed_cookies_to_request
cookies_hash = CookieHash.new
stashed_set_cookies.each do |http_cookie|
name_value = http_cookie.split(';').first.split('=')
cookies_hash.add_cookies(name_value[0] => name_value[1])
end
options[:headers] ||= {}
options[:headers]["cookie"] = cookies_hash.to_cookie_string
end

def aggregate_cookies_and_perform http_response
stash_new_set_cookies http_response.to_hash['set-cookie']
add_stashed_cookies_to_request

response = perform
new_set_cookies = response.headers['set-cookie'] || []
response.headers['set-cookie'] = @set_cookies.concat(new_set_cookies)
response
end

# Raises exception Net::XXX (http error code) if an http error occured
def handle_response(response)
case response
when Net::HTTPRedirection
options[:limit] -= 1
self.path = response['location']
@redirect = true
perform
aggregate_cookies_and_perform(response)
else
parsed_response = parse_response(response.body)
Response.new(parsed_response, response.body, response.code, response.message, response.to_hash)
Expand Down
17 changes: 17 additions & 0 deletions spec/httparty/request_spec.rb
Expand Up @@ -173,6 +173,23 @@ def stub_response(body, code = 200)
@request.http_method = Net::HTTP::Put
@request.perform.should == {"hash" => {"foo" => "bar"}}
end

describe "aggregates set-cookie headers" do
before(:each) do
@redirect['set-cookie'] = 'session_id=12345; Path=/'
@ok['set-cookie'] = 'another_cookie=from_the_second_response=; Path=/'
end

it "should return concatenated list of set-cookie headers from all requests" do
@request.perform.headers['set-cookie'].should include('session_id=12345; Path=/', 'another_cookie=from_the_second_response=; Path=/')
end

it "should pass cookies set by the first request on the redirect" do
Net::HTTP::Get.stub!(:new).and_return(first_get=stub(:first_request).as_null_object, redirect_get=mock(:redirect_request))
redirect_get.should_receive(:initialize_http_header).with('cookie'=>'session_id=12345')
@request.perform.should == {"hash" => {"foo" => "bar"}}
end
end
end

describe "infinitely" do
Expand Down

0 comments on commit c84c6c9

Please sign in to comment.