kotovalexarian-likes-github/rest-client--rest-client
1
0
Fork 0
mirror of https://github.com/rest-client/rest-client.git synced 2022-11-09 13:49:40 -05:00
Code Releases Activity

Correctly send the payload's headers to the Net::HTTP::Request subclass.

Browse source
This commit is contained in:
François Beausoleil 2009-08-12 14:06:50 -04:00
parent 52de867e8e
commit b9d76c7fc6
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/restclient/request.rb
View file

@ -54,10 +54,13 @@ module RestClient
user_headers[:cookie] = @cookies.map {|key, val| "#{key.to_s}=#{val}" }.join('; ')
end
default_headers.merge(user_headers).inject({}) do |final, (key, value)|
headers = default_headers.merge(user_headers).inject({}) do |final, (key, value)|
final[key.to_s.gsub(/_/, '-').capitalize] = value.to_s
final
final
end
headers.merge!(@payload.headers) if @payload
headers
end
def net_http_class

14
spec/request_spec.rb
View file

@ -93,17 +93,25 @@ describe RestClient::Request do
it "merges user headers with the default headers" do
@request.should_receive(:default_headers).and_return({ '1' => '2' })
@request.make_headers('3' => '4').should == { '1' => '2', '3' => '4' }
headers = @request.make_headers('3' => '4')
headers.should have_key('1')
headers['1'].should == '2'
headers.should have_key('3')
headers['3'].should == '4'
end
it "prefers the user header when the same header exists in the defaults" do
@request.should_receive(:default_headers).and_return({ '1' => '2' })
@request.make_headers('1' => '3').should == { '1' => '3' }
headers = @request.make_headers('1' => '3')
headers.should have_key('1')
headers['1'].should == '3'
end
it "converts header symbols from :content_type to 'Content-type'" do
@request.should_receive(:default_headers).and_return({})
@request.make_headers(:content_type => 'abc').should == { 'Content-type' => 'abc' }
headers = @request.make_headers(:content_type => 'abc')
headers.should have_key('Content-type')
headers['Content-type'].should == 'abc'
end
it "converts header values to strings" do