oauth 0.2.2 → 0.2.4

data/Manifest.txt

@@ -16,6 +16,7 @@ lib/oauth/request_proxy.rb
 lib/oauth/request_proxy/action_controller_request.rb
 lib/oauth/request_proxy/base.rb
 lib/oauth/request_proxy/net_http.rb
+lib/oauth/request_proxy/rack_request.rb
 lib/oauth/server.rb
 lib/oauth/signature.rb
 lib/oauth/signature/base.rb
@@ -43,6 +44,7 @@ test/test_helper.rb
 test/test_hmac_sha1.rb
 test/test_net_http_client.rb
 test/test_net_http_request_proxy.rb
+test/test_rack_request_proxy.rb
 test/test_signature.rb
 test/test_signature_base.rb
 test/test_token.rb

data/config/hoe.rb

@@ -1,6 +1,6 @@
 require 'oauth/version'
 
-AUTHOR = ['Pelle Braendgaard','Blaine Cook','Larry Halff','Jesse Clark']  # can also be an array of Authors
+AUTHOR = ['Pelle Braendgaard','Blaine Cook','Larry Halff','Jesse Clark','Jon Crosby', 'Seth Fitzsimmons']  # can also be an array of Authors
 EMAIL = "pelleb@gmail.com"
 DESCRIPTION = "OAuth Core Ruby implementation"
 GEM_NAME = 'oauth' # what ppl will type to install your gem

data/lib/oauth/client/net_http.rb

@@ -2,6 +2,8 @@ require 'oauth/client/helper'
 require 'oauth/request_proxy/net_http'
 
 class Net::HTTPRequest
+  include OAuth::Helper
+
   def oauth!(http, consumer = nil, token = nil, options = {})
     options = { :request_uri => oauth_full_request_uri(http),
                 :consumer => consumer,
@@ -67,6 +69,6 @@ class Net::HTTPRequest
 
     @path = uri.to_s
 
-    @path << "&oauth_signature=#{@oauth_helper.signature}"
+    @path << "&oauth_signature=#{escape(@oauth_helper.signature)}"
   end
 end

data/lib/oauth/consumer.rb

@@ -14,7 +14,7 @@ module OAuth
       :access_token_path=>'/oauth/access_token',
       
       # How do we send the oauth values to the server see 
-      # http://oauth.googlecode.com/svn/spec/branches/1.0/drafts/6/spec.html#consumer_req_param for more info
+      # http://oauth.net/core/1.0/#consumer_req_param for more info
       #
       # Possible values:
       #
@@ -66,27 +66,32 @@ module OAuth
       @secret = consumer_secret
     end
     
+    # The default http method
     def http_method
       @http_method||=@options[:http_method]||:post
     end
     
+    # The HTTP object for the site. The HTTP Object is what you get when you do Net::HTTP.new
     def http
       @http ||= create_http
     end
     
-    # will change
+    # Contains the root URI for this site
     def uri(url=nil)
       @uri||=URI.parse(url||site)
     end
     
-    # Get a Request Token
+    # Makes a request to the service for a new OAuth::RequestToken
+    #   
+    #  @request_token=@consumer.get_request_token
+    #
     def get_request_token
       response=token_request(http_method,request_token_path)
       OAuth::RequestToken.new(self,response[:oauth_token],response[:oauth_token_secret])
     end
     
     # Creates, signs and performs an http request.
-    # It's recommended to use the Token classes to set this up correctly.
+    # It's recommended to use the OAuth::Token classes to set this up correctly.
     # The arguments parameters are a hash or string encoded set of parameters if it's a post request as well as optional http headers.
     # 
     #   @consumer.request(:get,'/people',@token,{:scheme=>:query_string})

data/lib/oauth/request_proxy/action_controller_request.rb

@@ -30,25 +30,6 @@ module OAuth::RequestProxy
 
     protected
 
-    def header_params
-      %w( X-HTTP_AUTHORIZATION Authorization HTTP_AUTHORIZATION ).each do |header|
-        next unless request.env.include?(header)
-
-        header = request.env[header]
-        next unless header[0,6] == 'OAuth '
-
-        oauth_param_string = header[6,header.length].split(/[,=]/)
-        oauth_param_string.map! { |v| unescape(v.strip) }
-        oauth_param_string.map! { |v| v =~ /^\".*\"$/ ? v[1..-2] : v }
-        oauth_params = Hash[*oauth_param_string.flatten]
-        oauth_params.reject! { |k,v| k !~ /^oauth_/ }
-
-        return oauth_params
-      end
-
-      return {}
-    end
-
     def query_params
       request.query_parameters
     end
@@ -57,9 +38,5 @@ module OAuth::RequestProxy
       request.request_parameters
     end
 
-    def unescape(value)
-      URI.unescape(value.gsub('+', '%2B'))
-    end
-
   end
 end

data/lib/oauth/request_proxy/base.rb

@@ -46,5 +46,31 @@ module OAuth::RequestProxy
     def signature
       parameters['oauth_signature'] || ""
     end
+    
+    protected
+    
+    def header_params
+      %w( X-HTTP_AUTHORIZATION Authorization HTTP_AUTHORIZATION ).each do |header|
+        next unless request.env.include?(header)
+
+        header = request.env[header]
+        next unless header[0,6] == 'OAuth '
+
+        oauth_param_string = header[6,header.length].split(/[,=]/)
+        oauth_param_string.map! { |v| unescape(v.strip) }
+        oauth_param_string.map! { |v| v =~ /^\".*\"$/ ? v[1..-2] : v }
+        oauth_params = Hash[*oauth_param_string.flatten]
+        oauth_params.reject! { |k,v| k !~ /^oauth_/ }
+
+        return oauth_params
+      end
+
+      return {}
+    end
+    
+    def unescape(value)
+      URI.unescape(value.gsub('+', '%2B'))
+    end
+    
   end
 end

data/lib/oauth/request_proxy/rack_request.rb

@@ -0,0 +1,42 @@
+require 'oauth/request_proxy/base'
+require 'uri'
+require 'rack'
+
+module OAuth::RequestProxy
+  class RackRequest < OAuth::RequestProxy::Base
+    proxies Rack::Request
+    
+    def method
+      request.request_method
+    end
+    
+    def uri
+      uri = URI.parse(request.url)
+      uri.query = nil
+      uri.to_s
+    end
+
+    def parameters
+      if options[:clobber_request]
+        options[:parameters] || {}
+      else
+        params = request_params.merge(query_params).merge(header_params)
+        params.merge(options[:parameters] || {})
+      end
+    end
+    
+    def signature
+      parameters['oauth_signature']
+    end
+    
+    protected
+
+    def query_params
+      request.GET
+    end
+
+    def request_params
+      request.params
+    end
+  end
+end

data/lib/oauth/version.rb

@@ -2,7 +2,7 @@ module Oauth #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_net_http_client.rb

@@ -52,7 +52,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
     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=&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join("&")
+    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
 
@@ -64,7 +64,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
     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=&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join('&')
+    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 nil, request.body
     assert_equal nil, request['authorization']
   end
@@ -78,7 +78,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
     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=&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join('&')
+    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

data/test/test_rack_request_proxy.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'oauth/request_proxy/rack_request'
+require 'rack/request'
+require 'rack/mock'
+
+class RackRequestProxyTest < Test::Unit::TestCase
+
+  def test_that_proxy_simple_get_request_works
+    request = Rack::Request.new(Rack::MockRequest.env_for('http://example.com/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
+    assert_equal 'http://example.com/test', request_proxy.uri
+    assert_equal 'GET', request_proxy.method
+  end
+
+  def test_that_proxy_simple_post_request_works
+    request = Rack::Request.new(Rack::MockRequest.env_for('http://example.com/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
+    assert_equal 'http://example.com/test', request_proxy.uri
+    assert_equal 'POST', request_proxy.method
+  end
+
+  def test_that_proxy_post_and_get_request_works
+    request = Rack::Request.new(Rack::MockRequest.env_for('http://example.com/test?key=value', :method => 'POST', :input => 'key2=value2'))
+    params = {'key2' => 'value2'}
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test?key=value', :parameters => params})
+
+    expected_parameters = {'key' => 'value', 'key2' => 'value2'}
+    assert_equal expected_parameters, request_proxy.parameters
+    assert_equal 'http://example.com/test', request_proxy.uri
+    assert_equal 'POST', request_proxy.method
+  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.2.2</a>
+      <a href="http://rubyforge.org/projects/oauth" class="numbers">0.2.3</a>
     </div>
     <h2>What</h2>
 
@@ -59,7 +59,7 @@
 	<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 in the future will require this <span class="caps">GEM</span>.</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>
 
 
 	<h2>Demonstration of usage</h2>
@@ -85,6 +85,12 @@ redirect_to @request_token.authorize_url</code></pre>
 <pre><code>@access_token=@request_token.get_access_token
 @photos=@access_token.get('/photos.xml')</code></pre>
 
+	<p>For more detailed instructions I have written this <a href="http://stakeventures.com/articles/2008/02/23/developing-oauth-clients-in-ruby">OAuth Client Tutorial</a> and <a href="http://stakeventures.com/articles/2007/11/26/how-to-turn-your-rails-site-into-an-oauth-provider">How to turn your rails site into an OAuth Provider</a>.</p>
+
+
+	<p>Finally be sure to check out the <a href="http://oauth.rubyforge.org/rdoc/">OAuth RDoc Manual</a>.</p>
+
+
 	<h2>Documentation Wiki</h2>
 
 
@@ -123,7 +129,7 @@ redirect_to @request_token.authorize_url</code></pre>
 
 	<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 class="coda">
-      <a href="FIXME email">FIXME full name</a>, 21st January 2008<br>
+      <a href="FIXME email">FIXME full name</a>, 25th February 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -16,7 +16,7 @@ h2. The basics
 
 This is a ruby library which is intended to be used in creating Ruby Consumer and Service Provider applications. It is NOT a Rails plugin, but could easily be used for the foundation for such a Rails plugin.
 
-As a matter of fact it has been pulled out from an "OAuth Rails Plugin":http://code.google.com/p/oauth-plugin/ which in the future will require this GEM.
+As a matter of fact it has been pulled out from an "OAuth Rails Plugin":http://code.google.com/p/oauth-plugin/ which now requires this GEM.
 
 h2. Demonstration of usage
 
@@ -37,6 +37,10 @@ When user returns create an access_token
 <pre><code>@access_token=@request_token.get_access_token
 @photos=@access_token.get('/photos.xml')</code></pre>
 
+For more detailed instructions I have written this "OAuth Client Tutorial":http://stakeventures.com/articles/2008/02/23/developing-oauth-clients-in-ruby and "How to turn your rails site into an OAuth Provider ":http://stakeventures.com/articles/2007/11/26/how-to-turn-your-rails-site-into-an-oauth-provider.
+
+Finally be sure to check out the "OAuth RDoc Manual":http://oauth.rubyforge.org/rdoc/.
+
 h2. Documentation Wiki
 
 There is some documentation on the Google Code project for the "OAuth Rails Plugin":http://code.google.com/p/oauth-plugin/ :

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: oauth
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors: 
 - Pelle Braendgaard
 - Blaine Cook
 - Larry Halff
 - Jesse Clark
+- Jon Crosby
+- Seth Fitzsimmons
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-02-22 00:00:00 -08:00
+date: 2008-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +57,7 @@ files:
 - lib/oauth/request_proxy/action_controller_request.rb
 - lib/oauth/request_proxy/base.rb
 - lib/oauth/request_proxy/net_http.rb
+- lib/oauth/request_proxy/rack_request.rb
 - lib/oauth/server.rb
 - lib/oauth/signature.rb
 - lib/oauth/signature/base.rb
@@ -82,6 +85,7 @@ files:
 - test/test_hmac_sha1.rb
 - test/test_net_http_client.rb
 - test/test_net_http_request_proxy.rb
+- test/test_rack_request_proxy.rb
 - test/test_signature.rb
 - test/test_signature_base.rb
 - test/test_token.rb
@@ -113,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: oauth
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: OAuth Core Ruby implementation
@@ -124,6 +128,7 @@ test_files:
 - test/test_hmac_sha1.rb
 - test/test_net_http_client.rb
 - test/test_net_http_request_proxy.rb
+- test/test_rack_request_proxy.rb
 - test/test_server.rb
 - test/test_signature.rb
 - test/test_signature_base.rb