oauth 0.4.0 → 0.4.1

data/HISTORY

@@ -1,3 +1,9 @@
+== 0.4.1 2010-06-16
+
+* Added support for using OAuth with proxies (Marsh Gardiner)
+* Rails 3 Compatibility fixes (Pelle Braendgaard)
+* Fixed load errors on tests for missing (non-required) libraries
+
 == 0.4.0 2010-04-22
 
 * Added computation of oauth_body_hash as per OAuth Request Body Hash 1.0

data/README.rdoc

@@ -10,8 +10,6 @@ See the OAuth specs http://oauth.net/core/1.0/
 
   sudo gem install oauth
 
-You can also install it from the oauth rubyforge project http://rubyforge.org/projects/oauth/.
-
 The source code is now hosted on the OAuth GitHub Project http://github.com/oauth/oauth-ruby
 
 == The basics
@@ -48,28 +46,14 @@ Now that you have an access token, you can use Typhoeus to interact with the OAu
   hydra.run
   @response = req.response
 
-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 .
-
-If you wish to use em-http-request, you can find an example "in the official em-http-request repository":http://github.com/igrigorik/em-http-request/blob/master/examples/oauth-tweet.rb
-
-Finally be sure to check out the OAuth RDoc Manual http://oauth.rubyforge.org/rdoc/ .
-
-== Documentation Wiki
-
-There is some documentation on the Google Code project for the "OAuth Rails Plugin":http://code.google.com/p/oauth-plugin/ :
 
-* RequestToken http://code.google.com/p/oauth-plugin/wiki/RequestToken
-* AccessToken http://code.google.com/p/oauth-plugin/wiki/AccessToken
-
-== Forum
-
-http://groups.google.com/group/oauth-ruby
+== More Information
 
+* RDoc: http://rdoc.info/projects/oauth/oauth-ruby/
+* Mailing List/Google Group: http://groups.google.com/group/oauth-ruby
 
 == How to submit patches
 
-Read the "8 steps for fixing other people's code" http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/.
-
 The source code is now hosted on the OAuth GitHub Project http://github.com/oauth/oauth-ruby
 
 To submit a patch, please fork the oauth project and create a patch with tests. Once you're happy with it send a pull request and post a message to the google group.
@@ -83,5 +67,4 @@ This code is free to use under the terms of the MIT license.
 OAuth Ruby has been created and maintained by a large number of talented individuals. 
 The current maintainer is Aaron Quint (quirkey).
 
-Comments are welcome. Send an email to via the OAuth Ruby mailing list http://groups.google.com/group/oauth-ruby
-
+Comments are welcome. Send an email to via the OAuth Ruby mailing list http://groups.google.com/group/oauth-ruby

data/lib/oauth.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH << File.dirname(__FILE__) unless $LOAD_PATH.include?(File.dirname(__FILE__))
 
 module OAuth
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end
 
 require 'oauth/oauth'

data/lib/oauth/client/net_http.rb

@@ -11,7 +11,7 @@ class Net::HTTPRequest
   # this may add a header, additional query string parameters, or additional POST body parameters.
   # The default scheme is +header+, in which the OAuth parameters as put into the +Authorization+
   # header.
-  # 
+  #
   # * http - Configured Net::HTTP instance
   # * consumer - OAuth::Consumer instance
   # * token - OAuth::Token instance
@@ -35,13 +35,13 @@ class Net::HTTPRequest
   # on the <tt>options[:scheme]</tt> being used so this must match what will be used for the request
   # itself. The default scheme is +header+, in which the OAuth parameters as put into the +Authorization+
   # header.
-  # 
+  #
   # * http - Configured Net::HTTP instance
   # * consumer - OAuth::Consumer instance
   # * token - OAuth::Token instance
   # * options - Request-specific options (e.g. +request_uri+, +consumer+, +token+, +scheme+,
   #   +signature_method+, +nonce+, +timestamp+)
-  # 
+  #
   # See Also: {OAuth core spec version 1.0, section 9.1.1}[http://oauth.net/core/1.0#rfc.section.9.1.1],
   #           {OAuth Request Body Hash 1.0 Draft 4}[http://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/drafts/4/spec.html]
   def signature_base_string(http, consumer = nil, token = nil, options = {})
@@ -54,7 +54,7 @@ class Net::HTTPRequest
 private
 
   def oauth_helper_options(http, consumer, token, options)
-    { :request_uri      => oauth_full_request_uri(http),
+    { :request_uri      => oauth_full_request_uri(http,options),
       :consumer         => consumer,
       :token            => token,
       :scheme           => 'header',
@@ -63,17 +63,30 @@ private
       :timestamp        => nil }.merge(options)
   end
 
-  def oauth_full_request_uri(http)
+  def oauth_full_request_uri(http,options)
     uri = URI.parse(self.path)
     uri.host = http.address
     uri.port = http.port
 
+    if options[:request_endpoint] and options[:site]
+        hostval = options[:site]
+        if hostval.include?("http://")
+	   hostval["http://"] = ""
+        end
+        if hostval.include?("https://")
+	   hostval["https://"] = ""
+        end
+	uri.host = hostval
+        uri.port = 80
+    end
+
     if http.respond_to?(:use_ssl?) && http.use_ssl?
       uri.scheme = "https"
     else
       uri.scheme = "http"
     end
 
+
     uri.to_s
   end
 

data/lib/oauth/consumer.rb

@@ -39,6 +39,9 @@ module OAuth
 
       # Default http method used for OAuth Token Requests (defaults to :post)
       :http_method   => :post,
+      
+      # Add a custom ca_file for consumer
+      # :ca_file       => '/etc/certs.pem'
 
       # Add a custom ca_file for consumer
       # :ca_file       => '/etc/certs.pem'
@@ -159,7 +162,6 @@ module OAuth
       req = create_signed_request(http_method, path, token, request_options, *arguments)
       return nil if block_given? and yield(req) == :done
       rsp = http.request(req)
-
       # check for an error reported by the Problem Reporting extension
       # (http://wiki.oauth.net/ProblemReporting)
       # note: a 200 may actually be an error; check for an oauth_problem key to be sure
@@ -232,6 +234,11 @@ module OAuth
       @options[:site].to_s
     end
 
+    def request_endpoint
+	return nil if @options[:request_endpoint].nil?
+	@options[:request_endpoint].to_s
+    end
+
     def scheme
       @options[:scheme]
     end
@@ -281,12 +288,20 @@ module OAuth
 
     # Instantiates the http object
     def create_http(_url = nil)
+
+
+      if !request_endpoint.nil?
+       _url = request_endpoint
+      end
+
+
       if _url.nil? || _url[0] =~ /^\//
         our_uri = URI.parse(site)
       else
         our_uri = URI.parse(_url)
       end
 
+
       if proxy.nil?
         http_object = Net::HTTP.new(our_uri.host, our_uri.port)
       else
@@ -303,7 +318,6 @@ module OAuth
       else
         http_object.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
-
       http_object
     end
 
@@ -336,7 +350,7 @@ module OAuth
 
       if data.is_a?(Hash)
         form_data = {}
-        data.each {|k,v| form_data[k.to_s] = v if !v.nil?} 
+        data.each {|k,v| form_data[k.to_s] = v if !v.nil?}
         request.set_form_data(form_data)
       elsif data
         if data.respond_to?(:read)

data/lib/oauth/request_proxy/rack_request.rb

@@ -34,7 +34,7 @@ module OAuth::RequestProxy
     end
 
     def request_params
-      request.params
+      request.POST
     end
   end
 end

data/oauth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pelle Braendgaard", "Blaine Cook", "Larry Halff", "Jesse Clark", "Jon Crosby", "Seth Fitzsimmons", "Matt Sanford", "Aaron Quint"]
-  s.date = %q{2010-04-21}
+  s.date = %q{2010-06-16}
   s.default_executable = %q{oauth}
   s.description = %q{OAuth Core Ruby implementation}
   s.email = %q{oauth-ruby@googlegroups.com}

data/test/test_curb_request_proxy.rb

@@ -1,6 +1,13 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'oauth/request_proxy/curb_request'
-require 'curb'
+require 'test_helper'
+
+begin
+  require 'oauth/request_proxy/curb_request'
+  require 'curb'
+rescue LoadError => e
+  warn "! problems loading curb, skipping these tests: #{e}"
+  return
+end
+
 
 class CurbRequestProxyTest < Test::Unit::TestCase
 

data/test/test_em_http_client.rb

@@ -1,5 +1,10 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'oauth/client/em_http'
+require 'test_helper'
+begin
+  require 'oauth/client/em_http'
+rescue LoadError => e
+  warn "! problem loading em-http, skipping these tests: #{e}"
+  return
+end
 
 class EmHttpClientTest < Test::Unit::TestCase
 

data/test/test_em_http_request_proxy.rb

@@ -1,6 +1,13 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'em-http'
-require 'oauth/request_proxy/em_http_request'
+require 'test_helper'
+
+begin
+  require 'em-http'
+  require 'oauth/request_proxy/em_http_request'
+rescue LoadError => e
+  warn "! problem loading em-http, skipping these tests: #{e}"
+  return
+end
+
 
 class EmHttpRequestProxyTest < Test::Unit::TestCase
   

data/test/test_typhoeus_request_proxy.rb

@@ -1,6 +1,13 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'oauth/request_proxy/typhoeus_request'
-require 'typhoeus'
+require 'test_helper'
+
+begin
+  require 'oauth/request_proxy/typhoeus_request'
+  require 'typhoeus'
+rescue LoadError => e
+  warn "! problem loading typhoeus, skipping these tests: #{e}"
+  return
+end
+
 
 class TyphoeusRequestProxyTest < Test::Unit::TestCase
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -21,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 -04:00
+date: 2010-06-16 00:00:00 -04:00
 default_executable: oauth
 dependencies: 
 - !ruby/object:Gem::Dependency