oauth 0.4.7 → 0.5.4

data/test/test_em_http_client.rb

@@ -1,80 +0,0 @@
-require File.expand_path('../test_helper', __FILE__)
-begin
-
-require 'oauth/client/em_http'
-
-class EmHttpClientTest < Test::Unit::TestCase
-
-  def setup
-    @consumer = OAuth::Consumer.new('consumer_key_86cad9', '5888bf0345e5d237')
-    @token = OAuth::Token.new('token_411a7f', '3196ffd991c8ebdb')
-    @request_uri = URI.parse('http://example.com/test?key=value')
-    @request_parameters = { 'key' => 'value' }
-    @nonce = 225579211881198842005988698334675835446
-    @timestamp = "1199645624"
-    # This is really unneeded I guess.
-    @http = Net::HTTP.new(@request_uri.host, @request_uri.port)
-  end
-
-  def test_that_using_auth_headers_on_get_requests_works
-    request = create_client
-    request.oauth!(@http, @consumer, @token, {:nonce => @nonce, :timestamp => @timestamp})
-
-    assert_equal 'GET', request.method
-    assert_equal '/test', request.normalize_uri.path
-    assert_equal "key=value", request.normalize_uri.query
-    assert_equal_authz_headers "OAuth oauth_nonce=\"225579211881198842005988698334675835446\", oauth_signature_method=\"HMAC-SHA1\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"1oO2izFav1GP4kEH2EskwXkCRFg%3D\", oauth_version=\"1.0\"", authz_header(request)
-  end
-
-  def test_that_using_auth_headers_on_get_requests_works_with_plaintext
-    require 'oauth/signature/plaintext'
-    c = OAuth::Consumer.new('consumer_key_86cad9', '5888bf0345e5d237',{
-      :signature_method => 'PLAINTEXT'
-    })
-    request = create_client
-    request.oauth!(@http, c, @token, {:nonce => @nonce, :timestamp => @timestamp, :signature_method => 'PLAINTEXT'})
-
-    assert_equal 'GET', request.method
-    assert_equal '/test', request.normalize_uri.path
-    assert_equal "key=value", request.normalize_uri.query
-    assert_equal_authz_headers "OAuth oauth_nonce=\"225579211881198842005988698334675835446\", oauth_signature_method=\"PLAINTEXT\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"5888bf0345e5d237%263196ffd991c8ebdb\", oauth_version=\"1.0\"", authz_header(request)
-  end
-
-  def test_that_using_auth_headers_on_post_requests_works
-    request = create_client(:uri => "http://example.com/test", :method => "POST", :body => @request_parameters, :head => {"Content-Type" => "application/x-www-form-urlencoded"})
-    request.oauth!(@http, @consumer, @token, {:nonce => @nonce, :timestamp => @timestamp})
-
-    assert_equal 'POST', request.method
-    assert_equal '/test', request.uri.path
-    assert_equal 'key=value', request.normalize_body
-    assert_equal_authz_headers "OAuth oauth_nonce=\"225579211881198842005988698334675835446\", oauth_signature_method=\"HMAC-SHA1\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"26g7wHTtNO6ZWJaLltcueppHYiI%3D\", oauth_version=\"1.0\"", authz_header(request)
-  end
-
-  protected
-
-  def create_client(options = {})
-    method         = options.delete(:method) || "GET"
-    uri            = options.delete(:uri)    || @request_uri.to_s
-    client         = EventMachine::HttpClient.new("")
-    client.uri     = URI.parse(uri)
-    client.method  = method.to_s.upcase
-    client.options = options
-    client
-  end
-
-  def authz_header(request)
-    headers = request.options[:head] || {}
-    headers['Authorization'].to_s
-  end
-
-  def assert_equal_authz_headers(expected, actual)
-    assert !actual.nil?
-    assert_equal expected[0,6], actual[0, 6]
-    assert_equal expected[6..1].split(', ').sort, actual[6..1].split(', ').sort
-  end
-
-end
-
-rescue LoadError => e
-  warn "! problem loading em-http, skipping these tests: #{e}"
-end

data/test/test_em_http_request_proxy.rb

@@ -1,115 +0,0 @@
-require File.expand_path('../test_helper', __FILE__)
-
-begin
-
-require 'em-http'
-require 'oauth/request_proxy/em_http_request'
-
-
-class EmHttpRequestProxyTest < Test::Unit::TestCase
-
-  def test_request_proxy_works_with_simple_request
-    proxy = create_request_proxy
-    assert_equal({}, proxy.parameters)
-  end
-
-  def test_request_proxy_works_with_query_string_params
-    assert_equal({"name" => ["Fred"]}, create_request_proxy(:query => "name=Fred").parameters)
-    assert_equal({"name" => ["Fred"]}, create_request_proxy(:query => {:name => "Fred"}).parameters)
-    proxy = create_request_proxy(:query => {:name => "Fred"}, :uri => "http://example.com/?awesome=true")
-    assert_equal({"name" => ["Fred"], "awesome" => ["true"]}, proxy.parameters)
-  end
-
-  def test_request_proxy_works_with_post_body_params_with_correct_content_type
-    proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "POST"
-    assert_equal({}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "POST", :body => "a=1"
-    assert_equal({"a" => ["1"]}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "POST", :body => {"a" => 1}
-    assert_equal({"a" => ["1"]}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "PUT"
-    assert_equal({}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "PUT", :body => "a=1"
-    assert_equal({"a" => ["1"]}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "PUT", :body => {"a" => 1}
-    assert_equal({"a" => ["1"]}, proxy.parameters)
-  end
-
-  def test_request_proxy_ignore_post_body_with_invalid_content_type
-    proxy = create_request_proxy :head => {'Content-Type' => 'text/plain'}, :method => "POST"
-    assert_equal({}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'text/plain'}, :method => "POST", :body => "a=1"
-    assert_equal({}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'text/plain'}, :method => "POST", :body => {"a" => 1}
-    assert_equal({}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'text/plain'}, :method => "PUT"
-    assert_equal({}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'text/plain'}, :method => "PUT", :body => "a=1"
-    assert_equal({}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'text/plain'}, :method => "PUT", :body => {"a" => 1}
-    assert_equal({}, proxy.parameters)
-  end
-
-  def test_request_proxy_ignores_post_body_with_invalid_method
-    proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "DELETE"
-    assert_equal({}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "DELETE", :body => "a=1"
-    assert_equal({}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "DELETE", :body => {"a" => 1}
-    assert_equal({}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "GET"
-    assert_equal({}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "GET", :body => "a=1"
-    assert_equal({}, proxy.parameters)
-    proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "GET", :body => {"a" => 1}
-    assert_equal({}, proxy.parameters)
-  end
-
-  def test_request_proxy_works_with_argument_params
-    assert_equal({"a" => ["1"]}, create_request_proxy(:proxy_options => {:parameters => {"a" => "1"}}).parameters)
-  end
-
-  def test_request_proxy_works_with_mixed_params
-    proxy = create_request_proxy(:proxy_options => {:parameters => {"a" => "1"}},:query => {"c" => "1"}, :uri => "http://example.com/test?b=1")
-    assert_equal({"a" => ["1"], "b" => ["1"], "c" => ["1"]}, proxy.parameters)
-    proxy = create_request_proxy(:proxy_options => {:parameters => {"a" => "1"}}, :body => {"b" => "1"}, :query => {"c" => "1"},
-      :uri => "http://example.com/test?d=1", :method => "POST", :head => {"Content-Type" => "application/x-www-form-urlencoded"})
-    assert_equal({"a" => ["1"], "b" => ["1"], "c" => ["1"], "d" => ["1"]}, proxy.parameters)
-  end
-
-  def test_request_has_the_correct_uri
-    assert_equal "http://example.com/", create_request_proxy.uri
-    assert_equal "http://example.com/?a=1", create_request_proxy(:query => "a=1").uri
-    assert_equal "http://example.com/?a=1", create_request_proxy(:query => {"a" => "1"}).uri
-
-  end
-
-  def test_request_proxy_has_correct_method
-    assert_equal "GET", create_request_proxy(:method => "GET").method
-    assert_equal "PUT", create_request_proxy(:method => "PUT").method
-    assert_equal "POST", create_request_proxy(:method => "POST").method
-    assert_equal "DELETE", create_request_proxy(:method => "DELETE").method
-  end
-
-  protected
-
-  def create_client(options = {})
-    method         = options.delete(:method) || "GET"
-    uri            = options.delete(:uri)    || "http://example.com/"
-    client         = EventMachine::HttpClient.new("")
-    client.uri     = URI.parse(uri)
-    client.method  = method.to_s.upcase
-    client.options = options
-    client
-  end
-
-  def create_request_proxy(opts = {})
-    arguments = opts.delete(:proxy_options) || {}
-    OAuth::RequestProxy.proxy(create_client(opts), arguments)
-  end
-
-end
-
-rescue LoadError => e
-  warn "! problem loading em-http, skipping these tests: #{e}"
-end

data/test/test_helper.rb

@@ -1,28 +0,0 @@
-require 'test/unit'
-require 'rubygems'
-
-$LOAD_PATH << File.dirname(__FILE__) + '/../lib/'
-require 'oauth'
-require 'mocha'
-require 'stringio'
-require 'webmock'
-
-class Test::Unit::TestCase
-  include WebMock::API
-
-  def assert_matching_headers(expected, actual)
-    # transform into sorted arrays
-    auth_intro, auth_params = actual.split(' ', 2)
-    assert_equal auth_intro, 'OAuth'
-    expected    = expected.split(/(,|\s)/).reject {|v| v == '' || v =~ /^[\,\s]+/}.sort
-    auth_params = auth_params.split(/(,|\s)/).reject {|v| v == '' || v =~ /^[\,\s]+/}.sort
-    assert_equal expected, auth_params
-  end
-
-  def stub_test_ie
-    stub_request(:any, "http://term.ie/oauth/example/request_token.php").to_return(:body => "oauth_token=requestkey&oauth_token_secret=requestsecret")
-    stub_request(:post, "http://term.ie/oauth/example/access_token.php").to_return(:body => "oauth_token=accesskey&oauth_token_secret=accesssecret")
-    stub_request(:get, %r{http://term\.ie/oauth/example/echo_api\.php\?.+}).to_return(lambda {|request| {:body => request.uri.query}})
-    stub_request(:post, "http://term.ie/oauth/example/echo_api.php").to_return(lambda {|request| {:body => request.body}})
-  end
-end

data/test/test_hmac_sha1.rb

@@ -1,20 +0,0 @@
-require File.expand_path('../test_helper', __FILE__)
-
-class TestSignatureHmacSha1 < Test::Unit::TestCase
-  def test_that_hmac_sha1_implements_hmac_sha1
-    assert OAuth::Signature.available_methods.include?('hmac-sha1')
-  end
-
-  def test_that_get_request_from_oauth_test_cases_produces_matching_signature
-    request = Net::HTTP::Get.new('/photos?file=vacation.jpg&size=original&oauth_version=1.0&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_token=nnch734d00sl2jdk&oauth_timestamp=1191242096&oauth_nonce=kllo9940pd9333jh&oauth_signature_method=HMAC-SHA1')
-
-    consumer = OAuth::Consumer.new('dpf43f3p2l4k3l03', 'kd94hf93k423kf44')
-    token = OAuth::Token.new('nnch734d00sl2jdk', 'pfkkdhi9sl3r4s00')
-
-    signature = OAuth::Signature.sign(request, { :consumer => consumer,
-                                                 :token => token,
-                                                 :uri => 'http://photos.example.net/photos' } )
-
-    assert_equal 'tR3+Ty81lMeYAr/Fid0kMTYa/WM=', signature
-  end
-end

data/test/test_net_http_client.rb

@@ -1,292 +0,0 @@
-require File.expand_path('../test_helper', __FILE__)
-
-class NetHTTPClientTest < Test::Unit::TestCase
-
-  def setup
-    @consumer = OAuth::Consumer.new('consumer_key_86cad9', '5888bf0345e5d237')
-    @token = OAuth::Token.new('token_411a7f', '3196ffd991c8ebdb')
-    @request_uri = URI.parse('http://example.com/test?key=value')
-    @request_parameters = { 'key' => 'value' }
-    @nonce = 225579211881198842005988698334675835446
-    @timestamp = "1199645624"
-    @http = Net::HTTP.new(@request_uri.host, @request_uri.port)
-  end
-
-  def test_that_using_auth_headers_on_get_requests_works
-    request = Net::HTTP::Get.new(@request_uri.path + "?" + request_parameters_to_s)
-    request.oauth!(@http, @consumer, @token, {:nonce => @nonce, :timestamp => @timestamp})
-
-    assert_equal 'GET', request.method
-    assert_equal '/test?key=value', request.path
-    correct_sorted_params = "oauth_nonce=\"225579211881198842005988698334675835446\", oauth_signature_method=\"HMAC-SHA1\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"1oO2izFav1GP4kEH2EskwXkCRFg%3D\", oauth_version=\"1.0\""
-    auth_intro, auth_params = request['authorization'].split(' ', 2)
-    assert_equal auth_intro, 'OAuth'
-    assert_matching_headers correct_sorted_params, request['authorization']
-  end
-
-  def test_that_using_auth_headers_on_get_requests_works_with_plaintext
-    require 'oauth/signature/plaintext'
-    c = OAuth::Consumer.new('consumer_key_86cad9', '5888bf0345e5d237',{
-      :signature_method => 'PLAINTEXT'
-    })
-    request = Net::HTTP::Get.new(@request_uri.path + "?" + request_parameters_to_s)
-    request.oauth!(@http, c, @token, {:nonce => @nonce, :timestamp => @timestamp, :signature_method => 'PLAINTEXT'})
-
-    assert_equal 'GET', request.method
-    assert_equal '/test?key=value', request.path
-    assert_matching_headers "oauth_nonce=\"225579211881198842005988698334675835446\", oauth_signature_method=\"PLAINTEXT\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"5888bf0345e5d237%263196ffd991c8ebdb\", oauth_version=\"1.0\"", request['authorization']
-  end
-
-  def test_that_using_auth_headers_on_post_requests_works
-    request = Net::HTTP::Post.new(@request_uri.path)
-    request.set_form_data( @request_parameters )
-    request.oauth!(@http, @consumer, @token, {:nonce => @nonce, :timestamp => @timestamp})
-
-    assert_equal 'POST', request.method
-    assert_equal '/test', request.path
-    assert_equal 'key=value', request.body
-    correct_sorted_params = "oauth_nonce=\"225579211881198842005988698334675835446\", oauth_signature_method=\"HMAC-SHA1\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"26g7wHTtNO6ZWJaLltcueppHYiI%3D\", oauth_version=\"1.0\""
-    assert_matching_headers correct_sorted_params, request['authorization']
-  end
-
-  def test_that_using_auth_headers_on_post_requests_with_data_works
-    request = Net::HTTP::Post.new(@request_uri.path)
-    request.body = "data"
-    request.content_type = 'text/ascii'
-    request.oauth!(@http, @consumer, @token, {:nonce => @nonce, :timestamp => @timestamp})
-
-    assert_equal 'POST', request.method
-    assert_equal '/test', request.path
-    assert_equal 'data', request.body
-    assert_equal 'text/ascii', request.content_type
-    assert_matching_headers "oauth_nonce=\"225579211881198842005988698334675835446\", oauth_body_hash=\"oXyaqmHoChv3HQ2FCvTluqmAC70%3D\", oauth_signature_method=\"HMAC-SHA1\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"0DA6pGTapdHSqC15RZelY5rNLDw%3D\", oauth_version=\"1.0\"", request['authorization']
-  end
-
-  def test_that_body_hash_is_obmitted_when_no_algorithm_is_defined
-    request = Net::HTTP::Post.new(@request_uri.path)
-    request.body = "data"
-    request.content_type = 'text/ascii'
-    request.oauth!(@http, @consumer, @token, {:nonce => @nonce, :timestamp => @timestamp, :signature_method => 'plaintext'})
-
-    assert_equal 'POST', request.method
-    assert_equal '/test', request.path
-    assert_equal 'data', request.body
-    assert_equal 'text/ascii', request.content_type
-    assert_matching_headers "oauth_nonce=\"225579211881198842005988698334675835446\", oauth_signature_method=\"plaintext\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"5888bf0345e5d237%263196ffd991c8ebdb\", oauth_version=\"1.0\"", request['authorization']
-  end
-
-  def test_that_version_is_added_to_existing_user_agent
-    request = Net::HTTP::Post.new(@request_uri.path)
-    request['User-Agent'] = "MyApp"
-    request.set_form_data( @request_parameters )
-    request.oauth!(@http, @consumer, @token, {:nonce => @nonce, :timestamp => @timestamp})
-
-    assert_equal "MyApp (OAuth gem v#{OAuth::VERSION})", request['User-Agent']
-  end
-
-  def test_that_version_is_set_when_no_user_agent
-    request = Net::HTTP::Post.new(@request_uri.path)
-    request.set_form_data( @request_parameters )
-    request.oauth!(@http, @consumer, @token, {:nonce => @nonce, :timestamp => @timestamp})
-
-    assert_equal "OAuth gem v#{OAuth::VERSION}", request['User-Agent']
-  end
-
-  def test_that_using_get_params_works
-    request = Net::HTTP::Get.new(@request_uri.path + "?" + request_parameters_to_s)
-    request.oauth!(@http, @consumer, @token, {:scheme => 'query_string', :nonce => @nonce, :timestamp => @timestamp})
-
-    assert_equal 'GET', request.method
-    uri = URI.parse(request.path)
-    assert_equal '/test', uri.path
-    assert_equal nil, uri.fragment
-    assert_equal "key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=1oO2izFav1GP4kEH2EskwXkCRFg%3D&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join("&")
-    assert_equal nil, request['authorization']
-  end
-
-  def test_that_using_get_params_works_with_plaintext
-    request = Net::HTTP::Get.new(@request_uri.path + "?" + request_parameters_to_s)
-    request.oauth!(@http, @consumer, @token, {:scheme => 'query_string', :nonce => @nonce, :timestamp => @timestamp, :signature_method => 'PLAINTEXT'})
-
-    assert_equal 'GET', request.method
-    uri = URI.parse(request.path)
-    assert_equal '/test', uri.path
-    assert_equal nil, uri.fragment
-    assert_equal "key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=5888bf0345e5d237%263196ffd991c8ebdb&oauth_signature_method=PLAINTEXT&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join("&")
-    assert_equal nil, request['authorization']
-  end
-
-  def test_that_using_post_params_works
-    request = Net::HTTP::Post.new(@request_uri.path)
-    request.set_form_data( @request_parameters )
-    request.oauth!(@http, @consumer, @token, {:scheme => 'body', :nonce => @nonce, :timestamp => @timestamp})
-
-    assert_equal 'POST', request.method
-    assert_equal '/test', request.path
-    assert_match /key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=26g7wHTtNO6ZWJaLltcueppHYiI%3[Dd]&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0/, request.body.split("&").sort.join("&")
-    assert_equal nil, request['authorization']
-  end
-
-  def test_that_using_post_params_works_with_plaintext
-    request = Net::HTTP::Post.new(@request_uri.path)
-    request.set_form_data( @request_parameters )
-    request.oauth!(@http, @consumer, @token, {:scheme => 'body', :nonce => @nonce, :timestamp => @timestamp, :signature_method => 'PLAINTEXT'})
-
-    assert_equal 'POST', request.method
-    assert_equal '/test', request.path
-    assert_equal "key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=5888bf0345e5d237%263196ffd991c8ebdb&oauth_signature_method=PLAINTEXT&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", request.body.split("&").sort.join("&")
-    assert_equal nil, request['authorization']
-  end
-
-  def test_that_using_post_body_works
-    request = Net::HTTP::Post.new(@request_uri.path)
-    request['content-type'] = 'application/x-www-form-urlencoded'
-    request.body = 'this is a test of the emergency broad cast system. This is only a test.'
-    request.oauth!(@http, @consumer, @token, {:nonce => @nonce, :timestamp => @timestamp})
-
-    assert_equal 'POST', request.method
-    assert_equal '/test', request.path
-    assert_match /OAuth oauth_consumer_key="consumer_key_86cad9", oauth_nonce="225579211881198842005988698334675835446", oauth_signature="%2[fF]DMMBOJzQ6JmEaXlAXDLGtD1z2I%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1199645624", oauth_token="token_411a7f", oauth_version="1.0"/, request['authorization'].split("&").sort.join("&")
-    # assert_equal nil, request['authorization']
-  end
-
-  def test_that_using_post_with_uri_params_works
-    request = Net::HTTP::Post.new(@request_uri.path + "?" + request_parameters_to_s)
-    request.set_form_data( {} ) # just to make sure we have a correct mime type and thus no body hash
-    request.oauth!(@http, @consumer, @token, {:scheme => 'query_string', :nonce => @nonce, :timestamp => @timestamp})
-
-    assert_equal 'POST', request.method
-    uri = URI.parse(request.path)
-    assert_equal '/test', uri.path
-    assert_equal nil, uri.fragment
-    assert_equal "key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=26g7wHTtNO6ZWJaLltcueppHYiI%3D&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join('&')
-    assert_equal "", request.body
-    assert_equal nil, request['authorization']
-  end
-
-  def test_that_using_post_with_uri_and_form_params_works
-    request = Net::HTTP::Post.new(@request_uri.path + "?" + request_parameters_to_s)
-    request.set_form_data( { 'key2' => 'value2' } )
-    request.oauth!(@http, @consumer, @token, {:scheme => :query_string, :nonce => @nonce, :timestamp => @timestamp})
-
-    assert_equal 'POST', request.method
-    uri = URI.parse(request.path)
-    assert_equal '/test', uri.path
-    assert_equal nil, uri.fragment
-    assert_equal "key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=4kSU8Zd1blWo3W6qJH7eaRTMkg0%3D&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join('&')
-    assert_equal "key2=value2", request.body
-    assert_equal nil, request['authorization']
-  end
-
-  def test_that_using_post_with_uri_and_data_works
-    request = Net::HTTP::Post.new(@request_uri.path + "?" + request_parameters_to_s)
-    request.body = "data"
-    request.content_type = 'text/ascii'
-    request.oauth!(@http, @consumer, @token, {:scheme => :query_string, :nonce => @nonce, :timestamp => @timestamp})
-
-    assert_equal 'POST', request.method
-    uri = URI.parse(request.path)
-    assert_equal '/test', uri.path
-    assert_equal nil, uri.fragment
-    assert_equal "data", request.body
-    assert_equal 'text/ascii', request.content_type
-    assert_equal "key=value&oauth_body_hash=oXyaqmHoChv3HQ2FCvTluqmAC70%3D&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=MHRKU42iVHU4Ke9kBUDa9Zw6IAM%3D&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join('&')
-    assert_equal nil, request['authorization']
-  end
-
-
-  def test_example_from_specs
-    consumer=OAuth::Consumer.new("dpf43f3p2l4k3l03","kd94hf93k423kf44")
-    token = OAuth::Token.new('nnch734d00sl2jdk', 'pfkkdhi9sl3r4s00')
-    request_uri = URI.parse('http://photos.example.net/photos?file=vacation.jpg&size=original')
-    nonce = 'kllo9940pd9333jh'
-    timestamp = "1191242096"
-    http = Net::HTTP.new(request_uri.host, request_uri.port)
-
-    request = Net::HTTP::Get.new(request_uri.path + "?" + request_uri.query)
-    signature_base_string=request.signature_base_string(http, consumer, token, {:nonce => nonce, :timestamp => timestamp})
-    assert_equal 'GET&http%3A%2F%2Fphotos.example.net%2Fphotos&file%3Dvacation.jpg%26oauth_consumer_key%3Ddpf43f3p2l4k3l03%26oauth_nonce%3Dkllo9940pd9333jh%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1191242096%26oauth_token%3Dnnch734d00sl2jdk%26oauth_version%3D1.0%26size%3Doriginal',signature_base_string
-
-#    request = Net::HTTP::Get.new(request_uri.path + "?" + request_uri.query)
-    request.oauth!(http, consumer, token, {:nonce => nonce, :timestamp => timestamp, :realm=>"http://photos.example.net/"})
-
-    assert_equal 'GET', request.method
-    correct_sorted_params = 'oauth_nonce="kllo9940pd9333jh", oauth_signature_method="HMAC-SHA1", oauth_token="nnch734d00sl2jdk", oauth_timestamp="1191242096", oauth_consumer_key="dpf43f3p2l4k3l03", oauth_signature="tR3%2BTy81lMeYAr%2FFid0kMTYa%2FWM%3D", oauth_version="1.0"'.split(', ').sort
-    correct_sorted_params.unshift 'OAuth realm="http://photos.example.net/"'
-    assert_equal correct_sorted_params, request['authorization'].split(', ').sort
-  end
-
-  def test_step_by_step_token_request
-    token_response = "oauth_token=requestkey&oauth_token_secret=requestsecret"
-    stub_request(:get, %r{http://term\.ie/oauth/example/request_token\.php(\?.*)?}).to_return(:body => token_response)
-
-    consumer=OAuth::Consumer.new(
-        "key",
-        "secret")
-    request_uri = URI.parse('http://term.ie/oauth/example/request_token.php')
-    nonce = rand(2**128).to_s
-    timestamp = Time.now.to_i.to_s
-    http = Net::HTTP.new(request_uri.host, request_uri.port)
-
-    request = Net::HTTP::Get.new(request_uri.path)
-    signature_base_string=request.signature_base_string(http, consumer, nil, {:scheme=>:query_string,:nonce => nonce, :timestamp => timestamp})
-    assert_equal "GET&http%3A%2F%2Fterm.ie%2Foauth%2Fexample%2Frequest_token.php&oauth_consumer_key%3Dkey%26oauth_nonce%3D#{nonce}%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D#{timestamp}%26oauth_version%3D1.0",signature_base_string
-
-#    request = Net::HTTP::Get.new(request_uri.path)
-    request.oauth!(http, consumer, nil, {:scheme=>:query_string,:nonce => nonce, :timestamp => timestamp})
-    assert_equal 'GET', request.method
-    assert_nil request.body
-    assert_nil request['authorization']
-#    assert_equal 'OAuth oauth_nonce="kllo9940pd9333jh", oauth_signature_method="HMAC-SHA1", oauth_token="", oauth_timestamp="'+timestamp+'", oauth_consumer_key="key", oauth_signature="tR3%2BTy81lMeYAr%2FFid0kMTYa%2FWM%3D", oauth_version="1.0"', request['authorization']
-
-    response=http.request(request)
-    assert_equal "200",response.code
-#    assert_equal request['authorization'],response.body
-    assert_equal token_response, response.body
-  end
-
-  def test_that_put_bodies_signed
-    request = Net::HTTP::Put.new(@request_uri.path)
-    request.body = "<?xml version=\"1.0\"?><foo><bar>baz</bar></foo>"
-    request["Content-Type"] = "application/xml"
-    signature_base_string=request.signature_base_string(@http, @consumer, nil, { :nonce => @nonce, :timestamp => @timestamp })
-    assert_equal "PUT&http%3A%2F%2Fexample.com%2Ftest&oauth_body_hash%3DDvAa1AWdFoH9K%252B%252F2AHm3f6wH27k%253D%26oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_version%3D1.0", signature_base_string
-  end
-
-  def test_that_put_bodies_not_signed_even_if_form_urlencoded
-    request = Net::HTTP::Put.new(@request_uri.path)
-    request.set_form_data( { 'key2' => 'value2' } )
-    signature_base_string=request.signature_base_string(@http, @consumer, nil, { :nonce => @nonce, :timestamp => @timestamp })
-    assert_equal "PUT&http%3A%2F%2Fexample.com%2Ftest&key2%3Dvalue2%26oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_version%3D1.0", signature_base_string
-  end
-
-  def test_that_post_bodies_signed_if_form_urlencoded
-    request = Net::HTTP::Post.new(@request_uri.path)
-    request.set_form_data( { 'key2' => 'value2' } )
-    signature_base_string=request.signature_base_string(@http, @consumer, nil, { :nonce => @nonce, :timestamp => @timestamp })
-    assert_equal "POST&http%3A%2F%2Fexample.com%2Ftest&key2%3Dvalue2%26oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_version%3D1.0", signature_base_string
-  end
-
-  def test_that_post_bodies_signed_if_other_content_type
-    request = Net::HTTP::Post.new(@request_uri.path)
-    request.body = "<?xml version=\"1.0\"?><foo><bar>baz</bar></foo>"
-    request["Content-Type"] = "application/xml"
-    signature_base_string=request.signature_base_string(@http, @consumer, nil, { :nonce => @nonce, :timestamp => @timestamp })
-    assert_equal "POST&http%3A%2F%2Fexample.com%2Ftest&oauth_body_hash%3DDvAa1AWdFoH9K%252B%252F2AHm3f6wH27k%253D%26oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_version%3D1.0", signature_base_string
-  end
-
-  def test_that_site_address_is_not_modified_in_place
-    options = { :site => 'http://twitter.com', :request_endpoint => 'http://api.twitter.com' }
-    request = Net::HTTP::Get.new(@request_uri.path + "?" + request_parameters_to_s)
-    request.oauth!(@http, @consumer, @token, options)
-    assert_equal "http://twitter.com", options[:site]
-    assert_equal "http://api.twitter.com", options[:request_endpoint]
-  end
-
-  protected
-
-    def request_parameters_to_s
-      @request_parameters.map { |k,v| "#{k}=#{v}" }.join("&")
-    end
-
-end