@@ -12,6 +12,10 @@ module RestClient # resource = RestClient::Resource.new('http://protected/resource', :user => 'user', :password => 'password') # resource.delete # + # With a timeout (seconds): + # + # RestClient::Resource.new('http://slow', :timeout => 10) + # # You can also use resources to share common headers. For headers keys, # symbols are converted to strings. Example: # @@ -38,37 +42,37 @@ module RestClient end def get(additional_headers={}) - Request.execute(:method => :get, + Request.execute(options.merge( + :method => :get, :url => url, - :user => user, - :password => password, - :headers => headers.merge(additional_headers)) + :headers => headers.merge(additional_headers) + )) end def post(payload, additional_headers={}) - Request.execute(:method => :post, + Request.execute(options.merge( + :method => :post, :url => url, :payload => payload, - :user => user, - :password => password, - :headers => headers.merge(additional_headers)) + :headers => headers.merge(additional_headers) + )) end def put(payload, additional_headers={}) - Request.execute(:method => :put, + Request.execute(options.merge( + :method => :put, :url => url, :payload => payload, - :user => user, - :password => password, - :headers => headers.merge(additional_headers)) + :headers => headers.merge(additional_headers) + )) end def delete(additional_headers={}) - Request.execute(:method => :delete, + Request.execute(options.merge( + :method => :delete, :url => url, - :user => user, - :password => password, - :headers => headers.merge(additional_headers)) + :headers => headers.merge(additional_headers) + )) end def to_s @@ -87,6 +91,10 @@ module RestClient options[:headers] || {} end + def timeout + options[:timeout] + end + # Construct a subresource, preserving authentication. # # Example: lib/resource.rb 1a4d8480257047ac70ac3c29f7b867b7c7ccaef4 Adam Wiggins adam@heroku.com http://github.com/pedro/rest-client/commit/e91fd21c1fb8df6eea788d31b6f397fdb7712331 e91fd21c1fb8df6eea788d31b6f397fdb7712331 2008-12-08T01:47:23-08:00 2008-12-08T01:47:23-08:00 :timeout option for RestClient::Resource constructor b4add3851bb53c792617ad2d2f5e11aeef5433ac Adam Wiggins adam@heroku.com