@@ -91,7 +91,9 @@ class Satisfaction end def request_token - response = CGI.parse(@loader.get("#{options[:request_token_url]}", :force => true, :consumer => @consumer, :token => nil)) + result, body = *@loader.get("#{options[:request_token_url]}", :force => true, :consumer => @consumer, :token => nil) + raise "Could not retrieve request token" unless result == :ok + response = CGI.parse(body) OAuth::Token.new(response["oauth_token"], response["oauth_token_secret"]) end @@ -100,7 +102,9 @@ class Satisfaction end def access_token(token) - response = CGI.parse(@loader.get("#{options[:access_token_url]}", :force => true, :consumer => @consumer, :token => token)) + result, body = *@loader.get("#{options[:access_token_url]}", :force => true, :consumer => @consumer, :token => token) + raise "Could not retrieve access token" unless result == :ok + response = CGI.parse(body) OAuth::Token.new(response["oauth_token"], response["oauth_token_secret"]) end lib/satisfaction.rb @@ -34,7 +34,7 @@ class Sfn::Loader end http = Net::HTTP.new(uri.host, uri.port) - add_authentication(request, options) + add_authentication(request, http, options) response = execute(http, request) case response @@ -73,7 +73,7 @@ class Sfn::Loader request.set_form_data(form) http = Net::HTTP.new(uri.host, uri.port) - add_authentication(request, options) + add_authentication(request, http, options) response = execute(http, request) case response @@ -104,7 +104,7 @@ class Sfn::Loader end end - def add_authentication(request, options) + def add_authentication(request, http, options) if options[:user] request.basic_auth(options[:user], options[:password]) elsif options[:consumer] lib/satisfaction/loader.rb 645500b8fbd31dfdaeacb7272ddacd6d97c7faec Scott Fleckenstein nullstyle@gmail.com http://github.com/nullstyle/ruby-satisfaction/commit/f4d7eb555ea58bd36c6aa58f7a5c9120d8392337 f4d7eb555ea58bd36c6aa58f7a5c9120d8392337 2008-05-17T11:55:36-07:00 2008-05-17T11:55:36-07:00 fix bugs with getting request and access tokens 2f16044c973e1df41382a139027d5195bc416164 Scott Fleckenstein nullstyle@gmail.com