oauth 0.3.6 → 0.3.7.pre1

data/test/test_em_http_client.rb

@@ -0,0 +1,74 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+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

data/test/test_em_http_request_proxy.rb

@@ -0,0 +1,107 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+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

data/test/test_helper.rb

@@ -1,14 +1,20 @@
 require 'test/unit'
+require 'rubygems'
 
 $LOAD_PATH << File.dirname(__FILE__) + '/../lib/'
 require 'oauth'
+require 'mocha'
+require 'stringio'
 
-# require File.dirname(__FILE__) + '/../lib/oauth'
-
-begin
-  # load redgreen unless running from within TextMate (in which case ANSI
-  # color codes mess with the output)
-  require 'redgreen' unless ENV['TM_CURRENT_LINE']
-rescue LoadError
-  nil
-end
+class Test::Unit::TestCase
+  
+  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
+  
+end

data/test/test_net_http_client.rb

@@ -18,7 +18,36 @@ class NetHTTPClientTest < Test::Unit::TestCase
 
     assert_equal 'GET', request.method
     assert_equal '/test?key=value', request.path
-    assert_equal "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\"".split(', ').sort, request['authorization'].split(', ').sort
+    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=\"1oO2izFav1GP4kEH2EskwXkCRFg%3D\", oauth_version=\"1.0\"", 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
@@ -29,7 +58,8 @@ class NetHTTPClientTest < Test::Unit::TestCase
     assert_equal 'POST', request.method
     assert_equal '/test', request.path
     assert_equal 'key=value', request.body
-    assert_equal "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\"".split(', ').sort, request['authorization'].split(', ').sort
+    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_version_is_added_to_existing_user_agent
@@ -60,6 +90,18 @@ class NetHTTPClientTest < Test::Unit::TestCase
     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)
@@ -71,6 +113,17 @@ class NetHTTPClientTest < Test::Unit::TestCase
     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", 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_with_uri_params_works
     request = Net::HTTP::Post.new(@request_uri.path + "?" + request_parameters_to_s)
@@ -113,11 +166,12 @@ class NetHTTPClientTest < Test::Unit::TestCase
     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/"})
+    request.oauth!(http, consumer, token, {:nonce => nonce, :timestamp => timestamp, :realm=>"http://photos.example.net/"})
 
     assert_equal 'GET', request.method
-    assert_equal 'OAuth realm="http://photos.example.net/", 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, request['authorization'].split(', ').sort
-
+    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

data/test/test_net_http_request_proxy.rb

@@ -58,7 +58,7 @@ class NetHTTPRequestProxyTest < Test::Unit::TestCase
     assert_equal 'PUT', request_proxy.method
   end
 
-  def test_that_proxy_post_request_works_with_mixed_parameter_sources
+  def test_that_proxy_post_request_uses_post_parameters
     request = Net::HTTP::Post.new('/test?key=value')
     request.set_form_data({'key2' => 'value2'})
     request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test?key=value', :parameters => {'key3' => 'value3'}})

data/test/test_signature.rb

@@ -1,19 +1,22 @@
+# -*- encoding: utf-8 -*-
+
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestOauth < Test::Unit::TestCase
 
   def test_parameter_escaping_kcode_invariant
-    old = $KCODE
+    ruby19 = RUBY_VERSION =~ /^1\.9/
+    old = $KCODE if !ruby19
     begin
       %w(n N e E s S u U).each do |kcode|
-        $KCODE = kcode
+        $KCODE = kcode if !ruby19
         assert_equal '%E3%81%82', OAuth::Helper.escape('あ'),
                       "Failed to correctly escape Japanese under $KCODE = #{kcode}"
         assert_equal '%C3%A9', OAuth::Helper.escape('é'),
                       "Failed to correctly escape e+acute under $KCODE = #{kcode}"
       end
     ensure
-      $KCODE = old
+      $KCODE = old if !ruby19
     end
   end
 end

data/test/test_typhoeus_request_proxy.rb

@@ -0,0 +1,73 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'oauth/request_proxy/typhoeus_request'
+require 'typhoeus'
+
+class TyphoeusRequestProxyTest < Test::Unit::TestCase
+
+  def test_that_proxy_simple_get_request_works
+    request = ::Typhoeus::Request.new('/test?key=value')
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test?key=value'})
+
+    expected_parameters = {'key' => ['value']}
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
+    assert_equal 'GET', request_proxy.method
+  end
+
+  def test_that_proxy_simple_post_request_works_with_arguments
+    request = Typhoeus::Request.new('/test', :method => :post)
+    params = {'key' => 'value'}
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test', :parameters => params})
+
+    expected_parameters = {'key' => 'value'}
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
+    assert_equal 'POST', request_proxy.method
+  end
+
+  def test_that_proxy_simple_post_request_works_with_form_data
+    request = Typhoeus::Request.new('/test', :method => :post,
+      :body => {'key' => 'value'},
+      :headers => {'Content-Type' => 'application/x-www-form-urlencoded'})
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test'})
+
+    expected_parameters = {'key' => 'value'}
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
+    assert_equal 'POST', request_proxy.method
+  end
+
+  def test_that_proxy_simple_put_request_works_with_arguments
+    request = Typhoeus::Request.new('/test', :method => :put)
+    params = {'key' => 'value'}
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test', :parameters => params})
+
+    expected_parameters = {'key' => 'value'}
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
+    assert_equal 'PUT', request_proxy.method
+  end
+
+  def test_that_proxy_simple_put_request_works_with_form_data
+    request = Typhoeus::Request.new('/test', :method => :put, :body => {'key' => 'value'})
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test'})
+
+    expected_parameters = {}
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
+    assert_equal 'PUT', request_proxy.method
+  end
+
+  def test_that_proxy_post_request_works_with_mixed_parameter_sources
+    request = Typhoeus::Request.new('/test?key=value', 
+      :method => :post,
+      :body => {'key2' => 'value2'},
+      :headers => {'Content-Type' => 'application/x-www-form-urlencoded'})
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test?key=value', :parameters => {'key3' => 'value3'}})
+
+    expected_parameters = {'key' => ['value'], 'key2' => 'value2', 'key3' => 'value3'}
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
+    assert_equal 'POST', request_proxy.method
+  end
+end

data/website/index.html

@@ -41,7 +41,7 @@
 <h2>Installing</h2>
 <p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">oauth</span></pre></p>
 <p>You can also install it from the <a href="http://rubyforge.org/projects/oauth/">oauth rubyforge project</a>.</p>
-<p>The source code is now hosted on the <a href="http://github.com/mojodna/oauth">OAuth GitHub Project</a></p>
+<p>The source code is hosted on <a href="http://github.com/oauth/oauth-ruby">GitHub</a></p>
 <h2>The basics</h2>
 <p>This is a ruby library which is intended to be used in creating Ruby Consumer and Service Provider applications. It is <span class="caps">NOT</span> a Rails plugin, but could easily be used for the foundation for such a Rails plugin.</p>
 <p>As a matter of fact it has been pulled out from an <a href="http://code.google.com/p/oauth-plugin/">OAuth Rails Plugin</a> which now requires this <span class="caps">GEM</span>.</p>
@@ -74,7 +74,7 @@ redirect_to @request_token.authorize_url</code></pre>
 <h2>License</h2>
 <p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
 <h2>Contact</h2>
-<p>Comments are welcome. Send an email to <a href="mailto:pelleb@gmail.com">Pelle Braendgaard</a> email via the <a href="http://groups.google.com/group/oauth-ruby">OAuth Ruby mailing list</a></p>
+<p>Comments are welcome. Send an email to the <a href="http://groups.google.com/group/oauth-ruby">OAuth Ruby mailing list</a></p>
     <p class="coda">
       <a href="FIXME email">FIXME full name</a>, 9th September 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oauth
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7.pre1
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -10,62 +10,64 @@ authors:
 - Jesse Clark
 - Jon Crosby
 - Seth Fitzsimmons
+- Matt Sanford
+- Aaron Quint
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-09-14 00:00:00 -07:00
-default_executable: 
+date: 2010-02-15 00:00:00 -08:00
+default_executable: oauth
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ruby-hmac
-  type: :runtime
+  name: actionpack
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.1
+        version: 2.2.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: newgem
+  name: rack
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.2
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  name: mocha
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: typhoeus
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.1.13
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: em-http-request
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: "0"
     version: 
 description: OAuth Core Ruby implementation
 email: oauth-ruby@googlegroups.com
@@ -74,11 +76,10 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- website/index.txt
+- README.rdoc
+- TODO
 files: 
+- .gitignore
 - History.txt
 - License.txt
 - Manifest.txt
@@ -87,27 +88,33 @@ files:
 - TODO
 - bin/oauth
 - examples/yql.rb
+- lib/digest/hmac.rb
 - lib/oauth.rb
-- lib/oauth/oauth.rb
 - lib/oauth/cli.rb
 - lib/oauth/client.rb
 - lib/oauth/client/action_controller_request.rb
+- lib/oauth/client/em_http.rb
 - lib/oauth/client/helper.rb
 - lib/oauth/client/net_http.rb
 - lib/oauth/consumer.rb
+- lib/oauth/core_ext.rb
 - lib/oauth/errors.rb
 - lib/oauth/errors/error.rb
 - lib/oauth/errors/problem.rb
 - lib/oauth/errors/unauthorized.rb
 - lib/oauth/helper.rb
+- lib/oauth/oauth.rb
 - lib/oauth/oauth_test_helper.rb
 - lib/oauth/request_proxy.rb
 - lib/oauth/request_proxy/action_controller_request.rb
 - lib/oauth/request_proxy/base.rb
+- lib/oauth/request_proxy/curb_request.rb
+- lib/oauth/request_proxy/em_http_request.rb
 - lib/oauth/request_proxy/jabber_request.rb
 - lib/oauth/request_proxy/mock_request.rb
 - lib/oauth/request_proxy/net_http.rb
 - lib/oauth/request_proxy/rack_request.rb
+- lib/oauth/request_proxy/typhoeus_request.rb
 - lib/oauth/server.rb
 - lib/oauth/signature.rb
 - lib/oauth/signature/base.rb
@@ -140,11 +147,15 @@ files:
 - test/cases/spec/1_0-final/test_normalize_request_parameters.rb
 - test/cases/spec/1_0-final/test_parameter_encodings.rb
 - test/cases/spec/1_0-final/test_signature_base_strings.rb
+- test/integration/consumer_test.rb
 - test/keys/rsa.cert
 - test/keys/rsa.pem
 - test/test_access_token.rb
 - test/test_action_controller_request_proxy.rb
 - test/test_consumer.rb
+- test/test_curb_request_proxy.rb
+- test/test_em_http_client.rb
+- test/test_em_http_request_proxy.rb
 - test/test_helper.rb
 - test/test_hmac_sha1.rb
 - test/test_net_http_client.rb
@@ -158,19 +169,19 @@ files:
 - test/test_signature_base.rb
 - test/test_signature_plain_text.rb
 - test/test_token.rb
+- test/test_typhoeus_request_proxy.rb
 - website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js
 - website/stylesheets/screen.css
 - website/template.rhtml
 has_rdoc: true
-homepage: http://oauth.rubyforge.org
+homepage: 
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -181,25 +192,30 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
 rubyforge_project: oauth
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: OAuth Core Ruby implementation
 test_files: 
+- test/cases/oauth_case.rb
 - test/cases/spec/1_0-final/test_construct_request_url.rb
 - test/cases/spec/1_0-final/test_normalize_request_parameters.rb
 - test/cases/spec/1_0-final/test_parameter_encodings.rb
 - test/cases/spec/1_0-final/test_signature_base_strings.rb
+- test/integration/consumer_test.rb
 - test/test_access_token.rb
 - test/test_action_controller_request_proxy.rb
 - test/test_consumer.rb
+- test/test_curb_request_proxy.rb
+- test/test_em_http_client.rb
+- test/test_em_http_request_proxy.rb
 - test/test_helper.rb
 - test/test_hmac_sha1.rb
 - test/test_net_http_client.rb
@@ -213,3 +229,5 @@ test_files:
 - test/test_signature_base.rb
 - test/test_signature_plain_text.rb
 - test/test_token.rb
+- test/test_typhoeus_request_proxy.rb
+- examples/yql.rb