@@ -91,7 +91,7 @@ module OAuth # @request_token=@consumer.get_request_token # def get_request_token(request_options={}, *arguments) - response=token_request(http_method,request_token_url, nil, request_options, *arguments) + response=token_request(http_method,(request_token_url? ? request_token_url : request_token_path), nil, request_options, *arguments) OAuth::RequestToken.new(self,response[:oauth_token],response[:oauth_token_secret]) end @@ -103,7 +103,14 @@ module OAuth # @consumer.request(:post,'/people',@token,{},@person.to_xml,{ 'Content-Type' => 'application/xml' }) # def request(http_method,path, token=nil,request_options={},*arguments) - http.request(create_signed_request(http_method,path,token,request_options,*arguments)) + if path=~/^\// + _http=http + else + _http=create_http(path) + _uri=URI.parse(path) + path="#{_uri.path}#{_uri.query ? "?#{_uri.query}" : ""}" + end + _http.request(create_signed_request(http_method,path,token,request_options,*arguments)) end # Creates and signs an http request. @@ -159,20 +166,37 @@ module OAuth @options[:request_token_url]||site+request_token_path end + def request_token_url? + @options[:request_token_url]!=nil + end + def authorize_url @options[:authorize_url]||site+authorize_path end + + def authorize_url? + @options[:authorize_url]!=nil + end def access_token_url @options[:access_token_url]||site+access_token_path end + def access_token_url? + @options[:access_token_url]!=nil + end + protected #Instantiates the http object - def create_http - http_object=Net::HTTP.new(uri.host, uri.port) - http_object.use_ssl = true if uri.scheme=="https" + def create_http(_url=nil) + if _url.nil?||_url[0]=~/^\// + our_uri=URI.parse(site) + else + our_uri=URI.parse(_url) + end + http_object=Net::HTTP.new(our_uri.host, our_uri.port) + http_object.use_ssl = true if our_uri.scheme=="https" http_object end lib/oauth/consumer.rb @@ -62,7 +62,7 @@ module OAuth # exchange for AccessToken on server def get_access_token(options={}) - response=consumer.token_request(consumer.http_method,consumer.access_token_url,self,options) + response=consumer.token_request(consumer.http_method,(consumer.access_token_url? ? consumer.access_token_url : consumer.access_token_path),self,options) OAuth::AccessToken.new(consumer,response[:oauth_token],response[:oauth_token_secret]) end end lib/oauth/token.rb @@ -1,3 +1,3 @@ module OAuth #:nodoc: - VERSION = '0.3.0' + VERSION = '0.3.1' end lib/oauth/version.rb @@ -2,11 +2,11 @@ Gem::Specification.new do |s| s.name = %q{oauth} - s.version = "0.3.0" + s.version = "0.3.1" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Pelle Braendgaard", "Blaine Cook", "Larry Halff", "Jesse Clark", "Jon Crosby", "Seth Fitzsimmons"] - s.date = %q{2009-01-25} + s.date = %q{2009-01-26} s.default_executable = %q{oauth} s.description = %q{OAuth Core Ruby implementation} s.email = %q{pelleb@gmail.com} oauth.gemspec @@ -208,6 +208,51 @@ class ConsumerTest < Test::Unit::TestCase :access_token_path=>"/oauth/example/access_token.php", :authorize_path=>"/oauth/example/authorize.php" }) + assert_equal "http://term.ie/oauth/example/request_token.php",@consumer.request_token_url + assert_equal "http://term.ie/oauth/example/access_token.php",@consumer.access_token_url + + assert !@consumer.request_token_url?, "Should not use fully qualified request token url" + assert !@consumer.access_token_url?, "Should not use fully qualified access token url" + assert !@consumer.authorize_url?, "Should not use fully qualified url" + + @request_token=@consumer.get_request_token + assert_not_nil @request_token + assert_equal "requestkey",@request_token.token + assert_equal "requestsecret",@request_token.secret + assert_equal "http://term.ie/oauth/example/authorize.php?oauth_token=requestkey",@request_token.authorize_url + + @access_token=@request_token.get_access_token + assert_not_nil @access_token + assert_equal "accesskey",@access_token.token + assert_equal "accesssecret",@access_token.secret + + @response=@access_token.get("/oauth/example/echo_api.php?ok=hello&test=this") + assert_not_nil @response + assert_equal "200",@response.code + assert_equal( "ok=hello&test=this",@response.body) + + @response=@access_token.post("/oauth/example/echo_api.php",{'ok'=>'hello','test'=>'this'}) + assert_not_nil @response + assert_equal "200",@response.code + assert_equal( "ok=hello&test=this",@response.body) + end + + def test_get_token_sequence_using_fqdn + @consumer=OAuth::Consumer.new( + "key", + "secret", + { + :site=>"http://term.ie", + :request_token_url=>"http://term.ie/oauth/example/request_token.php", + :access_token_url=>"http://term.ie/oauth/example/access_token.php", + :authorize_url=>"http://term.ie/oauth/example/authorize.php" + }) + assert_equal "http://term.ie/oauth/example/request_token.php",@consumer.request_token_url + assert_equal "http://term.ie/oauth/example/access_token.php",@consumer.access_token_url + + assert @consumer.request_token_url?, "Should use fully qualified request token url" + assert @consumer.access_token_url?, "Should use fully qualified access token url" + assert @consumer.authorize_url?, "Should use fully qualified url" @request_token=@consumer.get_request_token assert_not_nil @request_token test/test_consumer.rb 6653f5394fc16eebd3d581e5004a44b6e16e9169 Pelle Braendgaard pelleb@gmail.com http://github.com/jcrosby/oauth/commit/af01033fef86e10e8a2de8b6842fec4021388756 af01033fef86e10e8a2de8b6842fec4021388756 2009-01-26T12:27:51-08:00 2009-01-26T12:27:51-08:00 Fixed a problem with absolute and relative urls in token paths found by Michael Wood. c22eeb7542f5de9fe2da57e58f473840460ffc2f Pelle Braendgaard pelleb@gmail.com