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 handle resource headers + additional headers (fix a bad marge)

Browse source
This commit is contained in:
François Beausoleil 2009-08-12 12:54:43 -04:00
parent 3425532660
commit 4ed5085446
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/restclient/resource.rb
View file

@ -46,33 +46,37 @@ module RestClient
end end
def get(additional_headers={}, &b) def get(additional_headers={}, &b)
headers = (options[:headers] || {}).merge(additional_headers)
Request.execute(options.merge( Request.execute(options.merge(
:method => :get, :method => :get,
:url => url, :url => url,
:headers => additional_headers), &b) :headers => headers), &b)
end end
def post(payload, additional_headers={}, &b) def post(payload, additional_headers={}, &b)
headers = (options[:headers] || {}).merge(additional_headers)
Request.execute(options.merge( Request.execute(options.merge(
:method => :post, :method => :post,
:url => url, :url => url,
:payload => payload, :payload => payload,
:headers => additional_headers), &b) :headers => headers), &b)
end end
def put(payload, additional_headers={}, &b) def put(payload, additional_headers={}, &b)
headers = (options[:headers] || {}).merge(additional_headers)
Request.execute(options.merge( Request.execute(options.merge(
:method => :put, :method => :put,
:url => url, :url => url,
:payload => payload, :payload => payload,
:headers => additional_headers), &b) :headers => headers), &b)
end end
def delete(additional_headers={}, &b) def delete(additional_headers={}, &b)
headers = (options[:headers] || {}).merge(additional_headers)
Request.execute(options.merge( Request.execute(options.merge(
:method => :delete, :method => :delete,
:url => url, :url => url,
:headers => additional_headers), &b) :headers => headers), &b)
end end
def to_s def to_s

6
spec/base.rb
View file

@ -1,4 +1,10 @@
require 'rubygems' require 'rubygems'
require 'spec' require 'spec'
begin
require "ruby-debug"
rescue LoadError
# NOP, ignore
end
require File.dirname(__FILE__) + '/../lib/restclient' require File.dirname(__FILE__) + '/../lib/restclient'