monkeyhelper-oauth 0.3.1 → 0.3.5

data/test/test_net_http_client.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 require 'oauth/client/net_http'
+require 'oauth/version'
 
 class NetHTTPClientTest < Test::Unit::TestCase
 
@@ -16,7 +17,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
   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
     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
@@ -32,16 +33,22 @@ class NetHTTPClientTest < Test::Unit::TestCase
     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
   end
- 
-  def test_that_using_post_params_works
+
+  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, {:scheme => 'body', :nonce => @nonce, :timestamp => @timestamp})
+    request.oauth!(@http, @consumer, @token, {:nonce => @nonce, :timestamp => @timestamp})
 
-    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=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']
+    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
@@ -56,7 +63,18 @@ class NetHTTPClientTest < Test::Unit::TestCase
     assert_equal nil, request['authorization']
   end
 
-  def test_that_using_get_params_works_with_post_requests
+  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_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_with_uri_params_works
     request = Net::HTTP::Post.new(@request_uri.path + "?" + request_parameters_to_s)
     request.oauth!(@http, @consumer, @token, {:scheme => 'query_string', :nonce => @nonce, :timestamp => @timestamp})
 
@@ -69,7 +87,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
     assert_equal nil, request['authorization']
   end
 
-  def test_that_using_get_params_works_with_post_requests_that_have_post_bodies
+  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})
@@ -82,8 +100,8 @@ class NetHTTPClientTest < Test::Unit::TestCase
     assert_equal "key2=value2", request.body
     assert_equal nil, request['authorization']
   end
-  
-  
+
+
   def test_example_from_specs
     consumer=OAuth::Consumer.new("dpf43f3p2l4k3l03","kd94hf93k423kf44")
     token = OAuth::Token.new('nnch734d00sl2jdk', 'pfkkdhi9sl3r4s00')
@@ -101,22 +119,22 @@ class NetHTTPClientTest < Test::Unit::TestCase
 
     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
-    
+
   end
-  
+
   def test_step_by_step_token_request
-    consumer=OAuth::Consumer.new( 
+    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
@@ -129,7 +147,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
 #    assert_equal request['authorization'],response.body
     assert_equal "oauth_token=requestkey&oauth_token_secret=requestsecret",response.body
   end
-  
+
   def test_that_put_bodies_not_signed
     request = Net::HTTP::Put.new(@request_uri.path)
     request.body = "<?xml version=\"1.0\"?><foo><bar>baz</bar></foo>"
@@ -144,14 +162,14 @@ class NetHTTPClientTest < Test::Unit::TestCase
     signature_base_string=request.signature_base_string(@http, @consumer, nil, { :nonce => @nonce, :timestamp => @timestamp })
     assert_equal "PUT&http%3A%2F%2Fexample.com%2Ftest&oauth_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_not_signed_if_other_content_type
     request = Net::HTTP::Post.new(@request_uri.path)
     request.body = "<?xml version=\"1.0\"?><foo><bar>baz</bar></foo>"

data/test/test_net_http_request_proxy.rb

@@ -8,29 +8,64 @@ class NetHTTPRequestProxyTest < Test::Unit::TestCase
     request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test?key=value'})
 
     expected_parameters = {'key' => ['value']}
-    assert_equal expected_parameters, request_proxy.parameters
+    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
+  def test_that_proxy_simple_post_request_works_with_arguments
     request = Net::HTTP::Post.new('/test')
     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
+    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_post_and_get_request_works
+  def test_that_proxy_simple_post_request_works_with_form_data
+    request = Net::HTTP::Post.new('/test')
+    params = {'key' => 'value'}
+    request.set_form_data(params)
+    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_argugments
+    request = Net::HTTP::Put.new('/test')
+    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 = Net::HTTP::Put.new('/test')
+    params = {'key' => 'value'}
+    request.set_form_data(params)
+    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 = Net::HTTP::Post.new('/test?key=value')
-    params = {'key2' => 'value2'}
-    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test?key=value', :parameters => params})
+    request.set_form_data({'key2' => 'value2'})
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test?key=value', :parameters => {'key3' => 'value3'}})
 
-    expected_parameters = {'key' => ['value'], 'key2' => ['value2']}
-    assert_equal expected_parameters, request_proxy.parameters
+    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

data/test/test_oauth_helper.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'oauth/helper'
+
+class TestOAuthHelper < Test::Unit::TestCase
+
+  def test_parse_valid_header
+    header = 'OAuth ' \
+             'realm="http://example.com/method", ' \
+             'oauth_consumer_key="vince_clortho", ' \
+             'oauth_token="token_value", ' \
+             'oauth_signature_method="HMAC-SHA1", ' \
+             'oauth_signature="signature_here", ' \
+             'oauth_timestamp="1240004133", oauth_nonce="nonce", ' \
+             'oauth_version="1.0" '
+
+    params = OAuth::Helper.parse_header(header)
+
+    assert_equal "http://example.com/method", params['realm']
+    assert_equal "vince_clortho", params['oauth_consumer_key']
+    assert_equal "token_value", params['oauth_token']
+    assert_equal "HMAC-SHA1", params['oauth_signature_method']
+    assert_equal "signature_here", params['oauth_signature']
+    assert_equal "1240004133", params['oauth_timestamp']
+    assert_equal "nonce", params['oauth_nonce']
+    assert_equal "1.0", params['oauth_version']
+  end
+
+  def test_parse_header_ill_formed
+    header = "OAuth garbage"
+
+    assert_raise OAuth::Problem do
+      OAuth::Helper.parse_header(header)
+    end
+  end
+
+  def test_parse_header_contains_equals
+    header = 'OAuth ' \
+             'realm="http://example.com/method", ' \
+             'oauth_consumer_key="vince_clortho", ' \
+             'oauth_token="token_value", ' \
+             'oauth_signature_method="HMAC-SHA1", ' \
+             'oauth_signature="signature_here_with_=", ' \
+             'oauth_timestamp="1240004133", oauth_nonce="nonce", ' \
+             'oauth_version="1.0" '
+
+    assert_raise OAuth::Problem do
+      OAuth::Helper.parse_header(header)
+    end
+  end
+end

data/test/test_request_token.rb

@@ -0,0 +1,53 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'oauth/token'
+require 'oauth/consumer'
+
+class StubbedToken < OAuth::RequestToken
+  define_method :build_authorize_url_promoted do |root_domain, params|
+    build_authorize_url root_domain, params
+  end
+end
+
+class TestRequestToken < Test::Unit::TestCase
+  def setup
+    # setup a fake req. token. mocking Consumer would be more appropriate...
+    @request_token = OAuth::RequestToken.new(
+      OAuth::Consumer.new("key", "secret", {}),
+      "key",
+      "secret"
+    )
+  end
+
+  def test_request_token_builds_authorize_url_connectly_with_additional_params
+    auth_url = @request_token.authorize_url({:oauth_callback => "github.com"})
+    assert_not_nil auth_url
+    assert_match(/oauth_token/, auth_url)
+    assert_match(/oauth_callback/, auth_url)
+  end
+
+  def test_request_token_builds_authorize_url_connectly_with_no_or_nil_params
+    # we should only have 1 key in the url returned if we didn't pass anything.
+    # this is the only required param to authenticate the client.
+    auth_url = @request_token.authorize_url(nil)
+    assert_not_nil auth_url
+    assert_match(/\?oauth_token=/, auth_url)
+
+    auth_url = @request_token.authorize_url
+    assert_not_nil auth_url
+    assert_match(/\?oauth_token=/, auth_url)
+  end
+
+  #TODO: mock out the Consumer to test the Consumer/AccessToken interaction.
+  def test_get_access_token
+  end
+
+  def test_build_authorize_url
+   @stubbed_token = StubbedToken.new(nil, nil, nil)
+    assert_respond_to @stubbed_token, :build_authorize_url_promoted
+    url = @stubbed_token.build_authorize_url_promoted(
+      "http://github.com/oauth/authorize",
+      {:foo => "bar bar"})
+    assert url
+    assert_equal "http://github.com/oauth/authorize?foo=bar+bar", url
+  end
+end

data/test/test_server.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require File.dirname(__FILE__) + '/test_helper'
 require 'oauth/server'
 class ServerTest < Test::Unit::TestCase
   def setup

data/test/test_signature.rb

@@ -1,11 +1,19 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestOauth < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  def test_truth
-    assert true
-  end
-end
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestOauth < Test::Unit::TestCase
+
+  def test_parameter_escaping_kcode_invariant
+    old = $KCODE
+    begin
+      %w(n N e E s S u U).each do |kcode|
+        $KCODE = kcode
+        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
+    end
+  end
+end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Ruby OAuth GEM</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/oauth"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/oauth" class="numbers">0.3.0</a>
+      <a href="http://rubyforge.org/projects/oauth" class="numbers">0.3.5</a>
     </div>
     <h2>What</h2>
 <p>This is a RubyGem for implementing both OAuth clients and servers in Ruby applications.</p>
@@ -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/pelle/oauth/tree/master">OAuth GitHub Project</a></p>
+<p>The source code is now hosted on the <a href="http://github.com/mojodna/oauth">OAuth GitHub Project</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>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: monkeyhelper-oauth
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.5
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -10,11 +10,12 @@ authors:
 - Jesse Clark
 - Jon Crosby
 - Seth Fitzsimmons
+- Matt Sanford
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-01-26 00:00:00 -08:00
+date: 2009-06-03 00:00:00 -07:00
 default_executable: oauth
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,6 +38,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -48,7 +69,7 @@ dependencies:
         version: 1.8.0
     version: 
 description: OAuth Core Ruby implementation
-email: pelleb@gmail.com
+email: oauth-ruby@googlegroups.com
 executables: 
 - oauth
 extensions: []
@@ -67,13 +88,19 @@ files:
 - Rakefile
 - TODO
 - bin/oauth
+- examples/yql.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/helper.rb
 - lib/oauth/client/net_http.rb
 - lib/oauth/consumer.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_test_helper.rb
 - lib/oauth/request_proxy.rb
@@ -96,6 +123,11 @@ files:
 - lib/oauth/signature/rsa/sha1.rb
 - lib/oauth/signature/sha1.rb
 - lib/oauth/token.rb
+- lib/oauth/tokens/access_token.rb
+- lib/oauth/tokens/consumer_token.rb
+- lib/oauth/tokens/request_token.rb
+- lib/oauth/tokens/server_token.rb
+- lib/oauth/tokens/token.rb
 - lib/oauth/version.rb
 - oauth.gemspec
 - script/destroy
@@ -112,13 +144,16 @@ files:
 - test/cases/spec/1_0-final/test_signature_base_strings.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_helper.rb
 - test/test_hmac_sha1.rb
 - test/test_net_http_client.rb
 - test/test_net_http_request_proxy.rb
+- test/test_oauth_helper.rb
 - test/test_rack_request_proxy.rb
+- test/test_request_token.rb
 - test/test_rsa_sha1.rb
 - test/test_server.rb
 - test/test_signature.rb
@@ -162,13 +197,16 @@ test_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/test_access_token.rb
 - test/test_action_controller_request_proxy.rb
 - test/test_consumer.rb
 - test/test_helper.rb
 - test/test_hmac_sha1.rb
 - test/test_net_http_client.rb
 - test/test_net_http_request_proxy.rb
+- test/test_oauth_helper.rb
 - test/test_rack_request_proxy.rb
+- test/test_request_token.rb
 - test/test_rsa_sha1.rb
 - test/test_server.rb
 - test/test_signature.rb