oauth 0.4.3 → 0.4.4

data/HISTORY

@@ -1,3 +1,11 @@
+=== 0.4.4 2010-10-31
+
+* Fix LoadError rescue in tests: return can't be used in this context (Hans de Graaff)
+* HTTP headers should be strings. (seancribbs)
+* ensure consumer uri gets set back to original config even if an error occurs (Brian Finney)
+* Yahoo uses & to split records in OAuth headers (Brian Finney)
+* Added support for Rails 3 in client/action_controller_request (Pelle)
+
 == 0.4.3 2010-09-01
 
 * Fix for em-http proxy (ichverstehe)

data/Rakefile

@@ -12,7 +12,7 @@ begin
     s.description = "OAuth Core Ruby implementation"
     s.summary = s.description
     s.rubyforge_project = %q{oauth}
-    s.add_development_dependency(%q<actionpack>, ["2.3.8"])
+    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"])
     s.add_development_dependency(%q<typhoeus>, [">= 0.1.13"])

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.3"
+  VERSION = "0.4.4"
 end
 
 require 'oauth/oauth'

data/lib/oauth/client/action_controller_request.rb

@@ -1,15 +1,26 @@
 require 'oauth/client/helper'
-require 'oauth/request_proxy/action_controller_request'
-require 'action_controller/test_process'
+if defined? ActionDispatch
+  require 'oauth/request_proxy/rack_request'
+  require 'action_dispatch/testing/test_process'
+else
+  require 'oauth/request_proxy/action_controller_request'
+  require 'action_controller/test_process'
+end
 
 module ActionController
   class Base
-    def process_with_oauth(request, response=nil)
-      request.apply_oauth! if request.respond_to?(:apply_oauth!)
-      process_without_oauth(request, response)
+    if defined? ActionDispatch
+      def process_with_new_base_test(request, response=nil)
+        request.apply_oauth! if request.respond_to?(:apply_oauth!)
+        super(request, response)        
+      end
+    else
+      def process_with_oauth(request, response=nil)
+        request.apply_oauth! if request.respond_to?(:apply_oauth!)
+        process_without_oauth(request, response)
+      end
+      alias_method_chain :process, :oauth
     end
-
-    alias_method_chain :process, :oauth
   end
 
   class TestRequest
@@ -33,7 +44,7 @@ module ActionController
     def apply_oauth!
       return unless ActionController::TestRequest.use_oauth? && @oauth_options
 
-      @oauth_helper = OAuth::Client::Helper.new(self, @oauth_options.merge(:request_uri => request_uri))
+      @oauth_helper = OAuth::Client::Helper.new(self, @oauth_options.merge(:request_uri => (respond_to?(:fullpath) ? fullpath : request_uri)))
       @oauth_helper.amend_user_agent_header(env)
 
       self.send("set_oauth_#{@oauth_options[:scheme]}")

data/lib/oauth/consumer.rb

@@ -334,10 +334,10 @@ module OAuth
       case http_method
       when :post
         request = Net::HTTP::Post.new(path,headers)
-        request["Content-Length"] = 0 # Default to 0
+        request["Content-Length"] = '0' # Default to 0
       when :put
         request = Net::HTTP::Put.new(path,headers)
-        request["Content-Length"] = 0 # Default to 0
+        request["Content-Length"] = '0' # Default to 0
       when :get
         request = Net::HTTP::Get.new(path,headers)
       when :delete
@@ -356,15 +356,15 @@ module OAuth
         if data.respond_to?(:read)
           request.body_stream = data
           if data.respond_to?(:length)
-            request["Content-Length"] = data.length
+            request["Content-Length"] = data.length.to_s
           elsif data.respond_to?(:stat) && data.stat.respond_to?(:size)
-            request["Content-Length"] = data.stat.size
+            request["Content-Length"] = data.stat.size.to_s
           else
             raise ArgumentError, "Don't know how to send a body_stream that doesn't respond to .length or .stat.size"
           end
         else
           request.body = data.to_s
-          request["Content-Length"] = request.body.length
+          request["Content-Length"] = request.body.length.to_s
         end
       end
 

data/lib/oauth/helper.rb

@@ -57,7 +57,7 @@ module OAuth
     #
     def parse_header(header)
       # decompose
-      params = header[6,header.length].split(/[,=]/)
+      params = header[6,header.length].split(/[,=&]/)
 
       # odd number of arguments - must be a malformed header.
       raise OAuth::Problem.new("Invalid authorization header") if params.size % 2 != 0

data/lib/oauth/tokens/access_token.rb

@@ -7,11 +7,14 @@ module OAuth
       request_uri = URI.parse(path)
       site_uri = consumer.uri
       is_service_uri_different = (request_uri.absolute? && request_uri != site_uri)
-      consumer.uri(request_uri) if is_service_uri_different
-      @response = super(http_method, path, *arguments)
-      # NOTE: reset for wholesomeness? meaning that we admit only AccessToken service calls may use different URIs?
-      # so reset in case consumer is still used for other token-management tasks subsequently?
-      consumer.uri(site_uri) if is_service_uri_different
+      begin
+        consumer.uri(request_uri) if is_service_uri_different
+        @response = super(http_method, path, *arguments)
+      ensure
+        # NOTE: reset for wholesomeness? meaning that we admit only AccessToken service calls may use different URIs?
+        # so reset in case consumer is still used for other token-management tasks subsequently?
+        consumer.uri(site_uri) if is_service_uri_different
+      end
       @response
     end
 

data/oauth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   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-09-01}
+  s.date = %q{2010-10-31}
   s.default_executable = %q{oauth}
   s.description = %q{OAuth Core Ruby implementation}
   s.email = %q{oauth-ruby@googlegroups.com}
@@ -148,14 +148,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<actionpack>, ["= 2.3.8"])
+      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"])
       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"])
     else
-      s.add_dependency(%q<actionpack>, ["= 2.3.8"])
+      s.add_dependency(%q<actionpack>, [">= 2.3.5"])
       s.add_dependency(%q<rack>, [">= 1.0.0"])
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_dependency(%q<typhoeus>, [">= 0.1.13"])
@@ -163,7 +163,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<curb>, [">= 0.6.6.0"])
     end
   else
-    s.add_dependency(%q<actionpack>, ["= 2.3.8"])
+    s.add_dependency(%q<actionpack>, [">= 2.3.5"])
     s.add_dependency(%q<rack>, [">= 1.0.0"])
     s.add_dependency(%q<mocha>, [">= 0.9.8"])
     s.add_dependency(%q<typhoeus>, [">= 0.1.13"])

data/test/test_curb_request_proxy.rb

@@ -1,12 +1,9 @@
 require File.expand_path('../test_helper', __FILE__)
 
 begin
-  require 'oauth/request_proxy/curb_request'
-  require 'curb'
-rescue LoadError => e
-  warn "! problems loading curb, skipping these tests: #{e}"
-  return
-end
+
+require 'oauth/request_proxy/curb_request'
+require 'curb'
 
 
 class CurbRequestProxyTest < Test::Unit::TestCase
@@ -74,3 +71,7 @@ class CurbRequestProxyTest < Test::Unit::TestCase
     assert_equal 'http://example.com/test', request_proxy.normalized_uri
   end
 end
+
+rescue LoadError => e
+  warn "! problems loading curb, skipping these tests: #{e}"
+end

data/test/test_em_http_client.rb

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

data/test/test_em_http_request_proxy.rb

@@ -1,12 +1,9 @@
 require File.expand_path('../test_helper', __FILE__)
 
 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
+
+require 'em-http'
+require 'oauth/request_proxy/em_http_request'
 
 
 class EmHttpRequestProxyTest < Test::Unit::TestCase
@@ -110,5 +107,9 @@ class EmHttpRequestProxyTest < Test::Unit::TestCase
     arguments = opts.delete(:proxy_options) || {}
     OAuth::RequestProxy.proxy(create_client(opts), arguments)
   end
+  
+end
 
+rescue LoadError => e
+  warn "! problem loading em-http, skipping these tests: #{e}"
 end

data/test/test_oauth_helper.rb

@@ -46,4 +46,26 @@ class TestOAuthHelper < Test::Unit::TestCase
       OAuth::Helper.parse_header(header)
     end
   end
+
+  def test_parse_valid_header_with_and_signs
+    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
 end

data/test/test_typhoeus_request_proxy.rb

@@ -1,13 +1,9 @@
 require File.expand_path('../test_helper', __FILE__)
 
 begin
-  require 'oauth/request_proxy/typhoeus_request'
-  require 'typhoeus'
-rescue LoadError => e
-  warn "! problem loading typhoeus, skipping these tests: #{e}"
-  return
-end
 
+require 'oauth/request_proxy/typhoeus_request'
+require 'typhoeus'
 
 class TyphoeusRequestProxyTest < Test::Unit::TestCase
 
@@ -78,3 +74,8 @@ class TyphoeusRequestProxyTest < Test::Unit::TestCase
     assert_equal 'POST', request_proxy.method
   end
 end
+
+rescue LoadError => e
+  warn "! problem loading typhoeus, skipping these tests: #{e}"
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oauth
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -22,7 +22,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 -07:00
+date: 2010-10-31 00:00:00 -07:00
 default_executable: oauth
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,14 +31,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 9
         segments: 
         - 2
         - 3
-        - 8
-        version: 2.3.8
+        - 5
+        version: 2.3.5
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency