oauth 0.4.4 → 0.4.5

data/Gemfile

@@ -1,13 +1,16 @@
-source :gemcutter
+source :rubygems
+
 
 group :development do
+  gem 'rake'
   gem 'jeweler'
 end
 
 group :test do
-  gem 'actionpack', '2.3.8'
+  gem 'actionpack', '~>2.3.8'
   gem 'mocha', '>=0.9.8'
   gem 'typhoeus', '>=0.1.13'
   gem 'em-http-request', "0.2.11"
   gem 'curb', ">= 0.6.6.0"
+  gem 'webmock'
 end

data/Gemfile.lock

@@ -6,6 +6,7 @@ GEM
       rack (~> 1.1.0)
     activesupport (2.3.8)
     addressable (2.2.0)
+    crack (0.1.8)
     curb (0.7.7.1)
     em-http-request (0.2.11)
       addressable (>= 2.0.0)
@@ -27,14 +28,19 @@ GEM
       json_pure (>= 1.1.7)
     typhoeus (0.1.31)
       rack
+    webmock (1.3.5)
+      addressable (>= 2.1.1)
+      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (= 2.3.8)
+  actionpack (~> 2.3.8)
   curb (>= 0.6.6.0)
   em-http-request (= 0.2.11)
   jeweler
   mocha (>= 0.9.8)
+  rake
   typhoeus (>= 0.1.13)
+  webmock

data/HISTORY

@@ -1,3 +1,13 @@
+=== 0.4.5 2011-06-25
+
+* Add explicit require for rsa/sha1 (Juris Galang)
+* Use webmock to mock all http-requests in tests (Adrian Feldman)
+* Add gemtest support (Adrian Feldman)
+* Fix POST Requests with Typhoeus proxy (niedhui)
+* Mention Typhoeus require in the README (Kim Ahlström)
+* Fix incorrect hardcoded port (Ian Taylor)
+* Use Net::HTTPGenericRequest (Jakub Kuźma)
+
 === 0.4.4 2010-10-31
 
 * Fix LoadError rescue in tests: return can't be used in this context (Hans de Graaff)

data/README.rdoc

@@ -20,15 +20,19 @@ As a matter of fact it has been pulled out from an OAuth Rails Plugin http://cod
 
 == Demonstration of usage
 
+We need to specify the oauth_callback url explicitly, otherwise it defaults to "oob" (Out of Band)
+
+  @callback_url = "http://127.0.0.1:3000/oauth/callback"
+
 Create a new consumer instance by passing it a configuration hash:
 
   @consumer = OAuth::Consumer.new("key","secret", :site => "https://agree2")
 
 Start the process by requesting a token
 
-  @request_token = @consumer.get_request_token
+  @request_token = @consumer.get_request_token(:oauth_callback => @callback_url)
   session[:request_token] = @request_token
-  redirect_to @request_token.authorize_url
+  redirect_to @request_token.authorize_url(:oauth_callback => @callback_url)
 
 When user returns create an access_token
 
@@ -37,6 +41,7 @@ When user returns create an access_token
 
 Now that you have an access token, you can use Typhoeus to interact with the OAuth provider if you choose.
 
+  require 'oauth/request_proxy/typhoeus_request'
   oauth_params = {:consumer => oauth_consumer, :token => access_token}
   hydra = Typhoeus::Hydra.new
   req = Typhoeus::Request.new(uri, options) 

data/Rakefile

@@ -18,6 +18,8 @@ begin
     s.add_development_dependency(%q<typhoeus>, [">= 0.1.13"])
     s.add_development_dependency(%q<em-http-request>, [">= 0.2.10"])
     s.add_development_dependency(%q<curb>, [">= 0.6.6.0"])
+    
+    s.files.include '.gemtest'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -26,7 +28,7 @@ end
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.test_files = FileList['test/*test*.rb']
+  t.test_files = FileList['test/**/*test*.rb']
   t.verbose = true
 end
 

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.4"
+  VERSION = "0.4.5"
 end
 
 require 'oauth/oauth'
@@ -9,4 +9,5 @@ require 'oauth/core_ext'
 
 require 'oauth/client/helper'
 require 'oauth/signature/hmac/sha1'
+require 'oauth/signature/rsa/sha1'
 require 'oauth/request_proxy/mock_request'

data/lib/oauth/client/action_controller_request.rb

@@ -12,7 +12,7 @@ module ActionController
     if defined? ActionDispatch
       def process_with_new_base_test(request, response=nil)
         request.apply_oauth! if request.respond_to?(:apply_oauth!)
-        super(request, response)        
+        super(request, response)
       end
     else
       def process_with_oauth(request, response=nil)

data/lib/oauth/client/net_http.rb

@@ -2,7 +2,7 @@ require 'oauth/helper'
 require 'oauth/client/helper'
 require 'oauth/request_proxy/net_http'
 
-class Net::HTTPRequest
+class Net::HTTPGenericRequest
   include OAuth::Helper
 
   attr_reader :oauth_helper
@@ -69,8 +69,9 @@ private
     uri.port = http.port
 
     if options[:request_endpoint] && options[:site]
+      is_https = options[:site].match(%r(^https://))
       uri.host = options[:site].gsub(%r(^https?://), '')
-      uri.port = 80
+      uri.port ||= is_https ? 443 : 80
     end
 
     if http.respond_to?(:use_ssl?) && http.use_ssl?
@@ -83,7 +84,7 @@ private
   end
 
   def oauth_body_hash_required?
-    request_body_permitted? && content_type != "application/x-www-form-urlencoded"
+    request_body_permitted? && !content_type.to_s.downcase.start_with?("application/x-www-form-urlencoded")
   end
 
   def set_oauth_header

data/lib/oauth/consumer.rb

@@ -212,7 +212,9 @@ module OAuth
         end
       when (300..399)
         # this is a redirect
-        response.error!
+        uri = URI.parse(response.header['location'])
+        response.error! if uri.path == path # careful of those infinite redirects
+        self.token_request(http_method, uri.path, token, request_options, arguments)
       when (400..499)
         raise OAuth::Unauthorized, response
       else

data/lib/oauth/request_proxy/action_controller_request.rb

@@ -36,7 +36,7 @@ module OAuth::RequestProxy
         params << header_params.to_query
         params << request.query_string unless query_string_blank?
 
-        if request.post? && request.content_type == Mime::Type.lookup("application/x-www-form-urlencoded")
+        if request.post? && request.content_type.to_s.downcase.start_with?("application/x-www-form-urlencoded")
           params << request.raw_post
         end
       end

data/lib/oauth/request_proxy/curb_request.rb

@@ -42,7 +42,7 @@ module OAuth::RequestProxy::Curl
       post_body = {}
 
       # Post params are only used if posting form data
-      if (request.headers['Content-Type'] && request.headers['Content-Type'].downcase == 'application/x-www-form-urlencoded')
+      if (request.headers['Content-Type'] && request.headers['Content-Type'].to_s.downcase.start_with?("application/x-www-form-urlencoded"))
 
         request.post_body.split("&").each do |str|
           param = str.split("=")

data/lib/oauth/request_proxy/em_http_request.rb

@@ -41,7 +41,7 @@ module OAuth::RequestProxy::EventMachine
 
     def post_parameters
       headers = request.options[:head] || {}
-      form_encoded = headers['Content-Type'].to_s.downcase == 'application/x-www-form-urlencoded'
+      form_encoded = headers['Content-Type'].to_s.downcase.start_with?("application/x-www-form-urlencoded")
       if ['POST', 'PUT'].include?(method) && form_encoded
         CGI.parse(request.normalize_body.to_s)
       else

data/lib/oauth/request_proxy/net_http.rb

@@ -6,7 +6,7 @@ require 'cgi'
 module OAuth::RequestProxy::Net
   module HTTP
     class HTTPRequest < OAuth::RequestProxy::Base
-      proxies ::Net::HTTPRequest
+      proxies ::Net::HTTPGenericRequest
 
       def method
         request.method
@@ -52,7 +52,7 @@ module OAuth::RequestProxy::Net
       end
 
       def form_url_encoded?
-        request['Content-Type'] != nil && request['Content-Type'].downcase == 'application/x-www-form-urlencoded'
+        request['Content-Type'] != nil && request['Content-Type'].to_s.downcase.start_with?('application/x-www-form-urlencoded')
       end
 
       def query_params

data/lib/oauth/request_proxy/rack_request.rb

@@ -34,7 +34,11 @@ module OAuth::RequestProxy
     end
 
     def request_params
-      request.POST
+      if request.content_type and request.content_type.to_s.downcase.start_with?("application/x-www-form-urlencoded")
+        request.POST
+      else
+        {}
+      end
     end
   end
 end

data/lib/oauth/request_proxy/typhoeus_request.rb

@@ -38,13 +38,13 @@ module OAuth::RequestProxy::Typhoeus
 
     def query_parameters
       query = URI.parse(request.url).query
-      return(query ? CGI.parse(query) : {})
+      query ? CGI.parse(query) : {}
     end
 
     def post_parameters
       # Post params are only used if posting form data
-      if(method == 'POST' && request.headers['Content-Type'] && request.headers['Content-Type'].downcase == 'application/x-www-form-urlencoded')
-        request.body || {}
+      if method == 'POST'
+        OAuth::Helper.stringify_keys(request.params || {})
       else
         {}
       end

data/oauth.gemspec

@@ -1,153 +1,125 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{oauth}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   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-10-31}
+  s.date = %q{2011-06-25}
   s.default_executable = %q{oauth}
   s.description = %q{OAuth Core Ruby implementation}
   s.email = %q{oauth-ruby@googlegroups.com}
   s.executables = ["oauth"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc",
-     "TODO"
+    "README.rdoc",
+    "TODO"
   ]
   s.files = [
-    ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "HISTORY",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "TODO",
-     "bin/oauth",
-     "examples/yql.rb",
-     "lib/digest/hmac.rb",
-     "lib/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",
-     "lib/oauth/signature/hmac/base.rb",
-     "lib/oauth/signature/hmac/md5.rb",
-     "lib/oauth/signature/hmac/rmd160.rb",
-     "lib/oauth/signature/hmac/sha1.rb",
-     "lib/oauth/signature/hmac/sha2.rb",
-     "lib/oauth/signature/md5.rb",
-     "lib/oauth/signature/plaintext.rb",
-     "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",
-     "oauth.gemspec",
-     "tasks/deployment.rake",
-     "tasks/environment.rake",
-     "tasks/website.rake",
-     "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/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",
-     "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",
-     "test/test_signature_base.rb",
-     "test/test_signature_plain_text.rb",
-     "test/test_token.rb",
-     "test/test_typhoeus_request_proxy.rb"
+    ".gemtest",
+    "Gemfile",
+    "Gemfile.lock",
+    "HISTORY",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "TODO",
+    "bin/oauth",
+    "examples/yql.rb",
+    "lib/digest/hmac.rb",
+    "lib/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",
+    "lib/oauth/signature/hmac/base.rb",
+    "lib/oauth/signature/hmac/md5.rb",
+    "lib/oauth/signature/hmac/rmd160.rb",
+    "lib/oauth/signature/hmac/sha1.rb",
+    "lib/oauth/signature/hmac/sha2.rb",
+    "lib/oauth/signature/md5.rb",
+    "lib/oauth/signature/plaintext.rb",
+    "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",
+    "oauth.gemspec",
+    "tasks/deployment.rake",
+    "tasks/environment.rake",
+    "tasks/website.rake",
+    "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/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",
+    "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",
+    "test/test_signature_base.rb",
+    "test/test_signature_plain_text.rb",
+    "test/test_token.rb",
+    "test/test_typhoeus_request_proxy.rb"
   ]
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{oauth}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{OAuth Core Ruby implementation}
-  s.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",
-     "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",
-     "test/test_signature_base.rb",
-     "test/test_signature_plain_text.rb",
-     "test/test_token.rb",
-     "test/test_typhoeus_request_proxy.rb",
-     "examples/yql.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<actionpack>, [">= 2.3.5"])
       s.add_development_dependency(%q<rack>, [">= 1.0.0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
@@ -155,6 +127,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<em-http-request>, [">= 0.2.10"])
       s.add_development_dependency(%q<curb>, [">= 0.6.6.0"])
     else
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<actionpack>, [">= 2.3.5"])
       s.add_dependency(%q<rack>, [">= 1.0.0"])
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
@@ -163,6 +137,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<curb>, [">= 0.6.6.0"])
     end
   else
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<actionpack>, [">= 2.3.5"])
     s.add_dependency(%q<rack>, [">= 1.0.0"])
     s.add_dependency(%q<mocha>, [">= 0.9.8"])

data/test/integration/consumer_test.rb

@@ -28,7 +28,7 @@ module Integration
 
       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
+      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\"".delete(',').split.sort, request['authorization'].delete(',').split.sort
     end
 
     def test_that_setting_signature_method_on_consumer_effects_signing
@@ -76,7 +76,7 @@ module Integration
       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
+      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\"".delete(',').split.sort, request['authorization'].delete(',').split.sort
     end
 
     def test_that_signing_post_params_works
@@ -95,7 +95,7 @@ module Integration
 
       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
+      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\"".delete(',').split.sort, request['authorization'].delete(',').split.sort
     end
 
     def test_that_using_auth_headers_on_post_on_create_signed_requests_works
@@ -103,7 +103,7 @@ module Integration
       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
+      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\"".delete(',').split.sort, request['authorization'].delete(',').split.sort
     end
 
     def test_that_signing_post_params_works_2
@@ -116,6 +116,8 @@ module Integration
     end
 
     def test_step_by_step_token_request
+      stub_test_ie
+
       @consumer=OAuth::Consumer.new(
           "key",
           "secret",
@@ -141,6 +143,8 @@ module Integration
     end
 
     def test_get_token_sequence
+      stub_test_ie
+
       @consumer=OAuth::Consumer.new(
           "key",
           "secret",
@@ -180,6 +184,8 @@ module Integration
     end
 
     def test_get_token_sequence_using_fqdn
+      stub_test_ie
+
       @consumer=OAuth::Consumer.new(
           "key",
           "secret",
@@ -238,6 +244,8 @@ module Integration
   #  end
   #
     def test_get_request_token_with_custom_arguments
+      stub_test_ie
+
       @consumer=OAuth::Consumer.new(
           "key",
           "secret",
@@ -248,20 +256,15 @@ module Integration
           :authorize_path=>"/oauth/example/authorize.php"
           })
 
-
-      debug = ""
-      @consumer.http.set_debug_output(debug)
-
-      # get_request_token should receive our custom request_options and *arguments parameters from get_request_token.
       @consumer.get_request_token({}, {:scope => "http://www.google.com/calendar/feeds http://picasaweb.google.com/data"})
 
       # Because this is a POST request, create_http_request should take the first element of *arguments
       # and turn it into URL-encoded data in the body of the POST.
-      assert_match( /^<- "scope=http%3a%2f%2fwww.google.com%2fcalendar%2ffeeds%20http%3a%2f%2fpicasaweb.google.com%2fdata"/,
-        debug)
     end
 
     def test_post_with_body_stream
+      stub_test_ie
+
       @consumer=OAuth::Consumer.new(
           "key",
           "secret",

data/test/test_action_controller_request_proxy.rb

@@ -1,4 +1,4 @@
-gem 'actionpack', '2.3.8'
+gem 'actionpack', '~> 2.3.8'
 require File.expand_path('../test_helper', __FILE__)
 
 require 'oauth/request_proxy/action_controller_request'

data/test/test_consumer.rb

@@ -101,6 +101,18 @@ class ConsumerTest < Test::Unit::TestCase
     assert_equal 'secret', hash[:oauth_token_secret]
   end
 
+  def test_token_request_follows_redirect
+    redirect_url = @request_uri.clone
+    redirect_url.path = "/oauth/example/request_token_redirect.php"
+    stub_request(:get, /.*#{@request_uri.path}/).to_return(:status => 301, :headers => {'Location' => redirect_url.to_s})
+    stub_request(:get, /.*#{redirect_url.path}/).to_return(:body => "oauth_token=token&oauth_token_secret=secret")
+
+    hash = @consumer.token_request(:get, @request_uri.path) {{ :oauth_token => 'token', :oauth_token_secret => 'secret' }}
+
+    assert_equal 'token', hash[:oauth_token]
+    assert_equal 'secret', hash[:oauth_token_secret]
+  end
+
   def test_that_can_provide_a_block_to_interpret_a_request_token_response
     @consumer.expects(:request).returns(create_stub_http_response)
 

data/test/test_em_http_request_proxy.rb

@@ -107,7 +107,7 @@ class EmHttpRequestProxyTest < Test::Unit::TestCase
     arguments = opts.delete(:proxy_options) || {}
     OAuth::RequestProxy.proxy(create_client(opts), arguments)
   end
-  
+
 end
 
 rescue LoadError => e

data/test/test_helper.rb

@@ -5,9 +5,9 @@ $LOAD_PATH << File.dirname(__FILE__) + '/../lib/'
 require 'oauth'
 require 'mocha'
 require 'stringio'
+require 'webmock/test_unit'
 
 class Test::Unit::TestCase
-
   def assert_matching_headers(expected, actual)
     # transform into sorted arrays
     auth_intro, auth_params = actual.split(' ', 2)
@@ -17,4 +17,10 @@ class Test::Unit::TestCase
     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_net_http_client.rb

@@ -205,6 +205,9 @@ class NetHTTPClientTest < Test::Unit::TestCase
   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")
@@ -227,7 +230,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
     response=http.request(request)
     assert_equal "200",response.code
 #    assert_equal request['authorization'],response.body
-    assert_equal "oauth_token=requestkey&oauth_token_secret=requestsecret",response.body
+    assert_equal token_response, response.body
   end
 
   def test_that_put_bodies_signed

data/test/test_typhoeus_request_proxy.rb

@@ -30,7 +30,7 @@ class TyphoeusRequestProxyTest < Test::Unit::TestCase
 
   def test_that_proxy_simple_post_request_works_with_form_data
     request = Typhoeus::Request.new('/test', :method => :post,
-      :body => {'key' => 'value'},
+      :params => {'key' => 'value'},
       :headers => {'Content-Type' => 'application/x-www-form-urlencoded'})
     request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test'})
 
@@ -52,10 +52,10 @@ class TyphoeusRequestProxyTest < Test::Unit::TestCase
   end
 
   def test_that_proxy_simple_put_request_works_with_form_data
-    request = Typhoeus::Request.new('/test', :method => :put, :body => {'key' => 'value'})
+    request = Typhoeus::Request.new('/test', :method => :put, :params => {'key' => 'value'})
     request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test'})
 
-    expected_parameters = {}
+    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
@@ -64,7 +64,7 @@ class TyphoeusRequestProxyTest < Test::Unit::TestCase
   def test_that_proxy_post_request_works_with_mixed_parameter_sources
     request = Typhoeus::Request.new('/test?key=value',
       :method => :post,
-      :body => {'key2' => 'value2'},
+      :params => {'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'}})
 
@@ -78,4 +78,3 @@ end
 rescue LoadError => e
   warn "! problem loading typhoeus, skipping these tests: #{e}"
 end
-

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: oauth
 version: !ruby/object:Gem::Version 
-  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -22,98 +21,117 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 -07:00
+date: 2011-06-25 00:00:00 -07:00
 default_executable: oauth
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: actionpack
-  prerelease: false
+  name: rake
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 3
         - 5
         version: 2.3.5
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rack
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mocha
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 9
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: typhoeus
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 0
         - 1
         - 13
         version: 0.1.13
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: em-http-request
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         - 2
         - 10
         version: 0.2.10
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: curb
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 103
         segments: 
         - 0
         - 6
@@ -121,7 +139,8 @@ dependencies:
         - 0
         version: 0.6.6.0
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *id008
 description: OAuth Core Ruby implementation
 email: oauth-ruby@googlegroups.com
 executables: 
@@ -133,7 +152,7 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files: 
-- .gitignore
+- .gemtest
 - Gemfile
 - Gemfile.lock
 - HISTORY
@@ -225,8 +244,8 @@ homepage:
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -234,7 +253,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -243,7 +261,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -254,31 +271,5 @@ rubygems_version: 1.3.7
 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
-- 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
-- test/test_signature_base.rb
-- test/test_signature_plain_text.rb
-- test/test_token.rb
-- test/test_typhoeus_request_proxy.rb
-- examples/yql.rb
+test_files: []
+

data/.gitignore

@@ -1,3 +0,0 @@
-pkg/*
-_site
-.bundle