oauth 0.4.2 → 0.4.3

data/Gemfile

@@ -8,6 +8,6 @@ group :test do
   gem 'actionpack', '2.3.8'
   gem 'mocha', '>=0.9.8'
   gem 'typhoeus', '>=0.1.13'
-  gem 'em-http-request'
+  gem 'em-http-request', "0.2.11"
   gem 'curb', ">= 0.6.6.0"
 end

data/Gemfile.lock

@@ -7,7 +7,7 @@ GEM
     activesupport (2.3.8)
     addressable (2.2.0)
     curb (0.7.7.1)
-    em-http-request (0.2.10)
+    em-http-request (0.2.11)
       addressable (>= 2.0.0)
       eventmachine (>= 0.12.9)
     eventmachine (0.12.10)
@@ -34,7 +34,7 @@ PLATFORMS
 DEPENDENCIES
   actionpack (= 2.3.8)
   curb (>= 0.6.6.0)
-  em-http-request
+  em-http-request (= 0.2.11)
   jeweler
   mocha (>= 0.9.8)
   typhoeus (>= 0.1.13)

data/HISTORY

@@ -1,3 +1,7 @@
+== 0.4.3 2010-09-01
+
+* Fix for em-http proxy (ichverstehe)
+
 == 0.4.2 2010-08-13
 
 * Fixed compatibility with Ruby 1.9.2 (ecavazos)

data/lib/digest/hmac.rb

@@ -2,8 +2,8 @@
 #
 # An implementation of HMAC keyed-hashing algorithm
 #
-# == Overview 
-# 
+# == Overview
+#
 # This library adds a method named hmac() to Digest classes, which
 # creates a Digest class for calculating HMAC digests.
 #
@@ -101,4 +101,4 @@ unless defined?(Digest::HMAC)
       end
     end
   end
-end
+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.2"
+  VERSION = "0.4.3"
 end
 
 require 'oauth/oauth'

data/lib/oauth/client/em_http.rb

@@ -13,7 +13,7 @@ class EventMachine::HttpClient
   # 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, ignored in this scenario except for getting host.
   # * consumer - OAuth::Consumer instance
   # * token - OAuth::Token instance
@@ -41,13 +41,13 @@ class EventMachine::HttpClient
   # 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]
   def signature_base_string(http, consumer = nil, token = nil, options = {})
     options = { :request_uri      => normalized_oauth_uri(http),
@@ -65,14 +65,14 @@ class EventMachine::HttpClient
   # the gem June 19, 2010
   # see: http://github.com/igrigorik/em-http-request/commit/d536fc17d56dbe55c487eab01e2ff9382a62598b
   def normalize_uri
-      @normalized_uri ||= begin
-        uri = @uri.dup
-        encoded_query = encode_query(@uri.path, @options[:query], @uri.query)
-        path, query = encoded_query.split("?", 2)
-        uri.query = query unless encoded_query.empty?
-        uri.path  = path
-        uri
-      end
+    @normalized_uri ||= begin
+      uri = @uri.dup
+      encoded_query = encode_query(@uri, @options[:query])
+      path, query = encoded_query.split("?", 2)
+      uri.query = query unless encoded_query.empty?
+      uri.path  = path
+      uri
+    end
   end
 
   protected
@@ -116,5 +116,5 @@ class EventMachine::HttpClient
   def set_oauth_query_string
     raise NotImplementedError, 'please use the set_oauth_header method instead'
   end
-  
+
 end

data/lib/oauth/client/helper.rb

@@ -63,7 +63,7 @@ module OAuth::Client
     def amend_user_agent_header(headers)
       @oauth_ua_string ||= "OAuth gem v#{OAuth::VERSION}"
       # Net::HTTP in 1.9 appends Ruby
-      if headers['User-Agent'] && headers['User-Agent'] != 'Ruby' 
+      if headers['User-Agent'] && headers['User-Agent'] != 'Ruby'
         headers['User-Agent'] += " (#{@oauth_ua_string})"
       else
         headers['User-Agent'] = @oauth_ua_string

data/lib/oauth/consumer.rb

@@ -39,7 +39,7 @@ 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'
 
@@ -235,8 +235,8 @@ module OAuth
     end
 
     def request_endpoint
-	return nil if @options[:request_endpoint].nil?
-	@options[:request_endpoint].to_s
+  return nil if @options[:request_endpoint].nil?
+  @options[:request_endpoint].to_s
     end
 
     def scheme

data/lib/oauth/core_ext.rb

@@ -8,7 +8,7 @@ class Object
       self
     end
   end
-  
+
 end
 
 class String
@@ -28,4 +28,4 @@ class String
     end
   end
 
-end
+end

data/lib/oauth/errors/problem.rb

@@ -11,4 +11,4 @@ module OAuth
       problem
     end
   end
-end
+end

data/lib/oauth/errors/unauthorized.rb

@@ -9,4 +9,4 @@ module OAuth
       [request.code, request.message] * " "
     end
   end
-end
+end

data/lib/oauth/helper.rb

@@ -5,7 +5,7 @@ module OAuth
   module Helper
     extend self
 
-    # Escape +value+ by URL encoding all non-reserved character. 
+    # Escape +value+ by URL encoding all non-reserved character.
     #
     # See Also: {OAuth core spec version 1.0, section 5.1}[http://oauth.net/core/1.0#rfc.section.5.1]
     def escape(value)
@@ -54,7 +54,7 @@ module OAuth
     #   hash = parse_header(headers['Authorization'] || headers['WWW-Authenticate'])
     #   hash['oauth_timestamp']
     #     #=>"1234567890"
-    # 
+    #
     def parse_header(header)
       # decompose
       params = header[6,header.length].split(/[,=]/)
@@ -76,10 +76,10 @@ module OAuth
     def unescape(value)
       URI.unescape(value.gsub('+', '%2B'))
     end
-    
+
     def stringify_keys(hash)
       new_h = {}
-      hash.each do |k, v| 
+      hash.each do |k, v|
         new_h[k.to_s] = v.is_a?(Hash) ? stringify_keys(v) : v
       end
       new_h

data/lib/oauth/oauth.rb

@@ -4,7 +4,7 @@ module OAuth
   OUT_OF_BAND = "oob"
 
   # required parameters, per sections 6.1.1, 6.3.1, and 7
-  PARAMETERS = %w(oauth_callback oauth_consumer_key oauth_token 
+  PARAMETERS = %w(oauth_callback oauth_consumer_key oauth_token
     oauth_signature_method oauth_timestamp oauth_nonce oauth_verifier
     oauth_version oauth_signature oauth_body_hash)
 

data/lib/oauth/oauth_test_helper.rb

@@ -22,4 +22,4 @@ module OAuth
       incoming
     end
   end
-end
+end

data/lib/oauth/request_proxy/curb_request.rb

@@ -6,23 +6,23 @@ require 'cgi'
 module OAuth::RequestProxy::Curl
   class Easy < OAuth::RequestProxy::Base
     # Proxy for signing Curl::Easy requests
-    # Usage example:   
-    # oauth_params = {:consumer => oauth_consumer, :token => access_token}      
+    # Usage example:
+    # oauth_params = {:consumer => oauth_consumer, :token => access_token}
     # req = Curl::Easy.new(uri)
-    # oauth_helper = OAuth::Client::Helper.new(req, oauth_params.merge(:request_uri => uri))      
+    # oauth_helper = OAuth::Client::Helper.new(req, oauth_params.merge(:request_uri => uri))
     # req.headers.merge!({"Authorization" => oauth_helper.header})
     # req.http_get
     # response = req.body_str
-    proxies ::Curl::Easy        
-    
+    proxies ::Curl::Easy
+
     def method
       nil
     end
-    
+
     def uri
       options[:uri].to_s
     end
-    
+
     def parameters
       if options[:clobber_request]
         options[:parameters]
@@ -30,20 +30,20 @@ module OAuth::RequestProxy::Curl
         post_parameters.merge(query_parameters).merge(options[:parameters] || {})
       end
     end
-    
+
     private
-    
+
     def query_parameters
       query = URI.parse(request.url).query
       return(query ? CGI.parse(query) : {})
     end
-    
+
     def post_parameters
       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')
-      
+
         request.post_body.split("&").each do |str|
           param = str.split("=")
           post_body[param[0]] = param[1]
@@ -52,4 +52,4 @@ module OAuth::RequestProxy::Curl
       post_body
     end
   end
-end
+end

data/lib/oauth/request_proxy/em_http_request.rb

@@ -5,22 +5,22 @@ require 'cgi'
 
 module OAuth::RequestProxy::EventMachine
   class HttpRequest < OAuth::RequestProxy::Base
-    
+
     # A Proxy for use when you need to sign EventMachine::HttpClient instances.
     # It needs to be called once the client is construct but before data is sent.
     # Also see oauth/client/em-http
     proxies ::EventMachine::HttpClient
-    
+
     # Request in this con
-    
+
     def method
       request.method
     end
-    
+
     def uri
       request.normalize_uri.to_s
     end
-    
+
     def parameters
       if options[:clobber_request]
         options[:parameters]
@@ -28,17 +28,17 @@ module OAuth::RequestProxy::EventMachine
         all_parameters
       end
     end
-    
+
     protected
-    
+
     def all_parameters
       merged_parameters({}, post_parameters, query_parameters, options[:parameters])
     end
-    
+
     def query_parameters
       CGI.parse(request.normalize_uri.query.to_s)
     end
-    
+
     def post_parameters
       headers = request.options[:head] || {}
       form_encoded = headers['Content-Type'].to_s.downcase == 'application/x-www-form-urlencoded'
@@ -48,7 +48,7 @@ module OAuth::RequestProxy::EventMachine
         {}
       end
     end
-    
+
     def merged_parameters(params, *extra_params)
       extra_params.compact.each do |params_pairs|
         params_pairs.each_pair do |key, value|
@@ -61,7 +61,6 @@ module OAuth::RequestProxy::EventMachine
       end
       params
     end
-    
+
   end
 end
-

data/lib/oauth/request_proxy/typhoeus_request.rb

@@ -7,25 +7,25 @@ require 'cgi'
 module OAuth::RequestProxy::Typhoeus
   class Request < OAuth::RequestProxy::Base
     # Proxy for signing Typhoeus::Request requests
-    # Usage example:   
-    # oauth_params = {:consumer => oauth_consumer, :token => access_token}      
+    # Usage example:
+    # oauth_params = {:consumer => oauth_consumer, :token => access_token}
     # req = Typhoeus::Request.new(uri, options)
-    # oauth_helper = OAuth::Client::Helper.new(req, oauth_params.merge(:request_uri => uri))      
+    # oauth_helper = OAuth::Client::Helper.new(req, oauth_params.merge(:request_uri => uri))
     # req.headers.merge!({"Authorization" => oauth_helper.header})
     # hydra = Typhoeus::Hydra.new()
     # hydra.queue(req)
     # hydra.run
     # response = req.response
-    proxies Typhoeus::Request        
+    proxies Typhoeus::Request
 
     def method
       request.method.to_s.upcase
     end
-    
+
     def uri
       options[:uri].to_s
     end
-    
+
     def parameters
       if options[:clobber_request]
         options[:parameters]
@@ -33,21 +33,21 @@ module OAuth::RequestProxy::Typhoeus
         post_parameters.merge(query_parameters).merge(options[:parameters] || {})
       end
     end
-    
+
     private
-    
+
     def query_parameters
       query = URI.parse(request.url).query
       return(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 || {}
       else
         {}
-      end      
+      end
     end
   end
 end

data/lib/oauth/signature/base.rb

@@ -11,7 +11,7 @@ module OAuth::Signature
     attr_reader :token_secret, :consumer_secret, :request
 
     def self.implements(signature_method = nil)
-      return @implements if signature_method.nil? 
+      return @implements if signature_method.nil?
       @implements = signature_method
       OAuth::Signature.available_methods[@implements] = self
     end
@@ -20,7 +20,7 @@ module OAuth::Signature
       return @digest_class if digest_class.nil?
       @digest_class = digest_class
     end
-    
+
     def self.digest_klass(digest_klass = nil)
       return @digest_klass if digest_klass.nil?
       @digest_klass = digest_klass

data/lib/oauth/signature/hmac/sha1.rb

@@ -1,7 +1,7 @@
 require 'oauth/signature/hmac/base'
 
 module OAuth::Signature::HMAC
-  class SHA1 < Base    
+  class SHA1 < Base
     implements 'hmac-sha1'
     digest_klass 'SHA1'
     hash_class ::Digest::SHA1

data/oauth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   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-08-13}
+  s.date = %q{2010-09-01}
   s.default_executable = %q{oauth}
   s.description = %q{OAuth Core Ruby implementation}
   s.email = %q{oauth-ruby@googlegroups.com}

data/test/cases/oauth_case.rb

@@ -9,11 +9,11 @@ class OAuthCase < Test::Unit::TestCase
     return if @method_name.to_s == "default_test"
     super
   end
-  
+
   protected
-  
+
   # Creates a fake request
   def request(params={},method='GET',uri="http://photos.example.net/photos")
     OAuth::RequestProxy.proxy({'parameters'=>params,'method'=>method,'uri'=>uri})
   end
-end
+end

data/test/cases/spec/1_0-final/test_construct_request_url.rb

@@ -19,11 +19,11 @@ require File.expand_path('../../../oauth_case', __FILE__)
 
 
 class ConstructRequestUrlTest < OAuthCase
-  
+
   def test_from_spec
     assert_request_url("http://example.com/resource","HTTP://Example.com:80/resource?id=123")
   end
-  
+
   def test_simple_url_with_ending_slash
     assert_request_url("http://example.com/","http://example.com/")
   end
@@ -31,7 +31,7 @@ class ConstructRequestUrlTest < OAuthCase
   def test_simple_url_without_ending_slash
     assert_request_url("http://example.com/","http://example.com")
   end
-  
+
   def test_of_normalized_http
     assert_request_url("http://example.com/resource","http://example.com/resource")
   end
@@ -43,20 +43,20 @@ class ConstructRequestUrlTest < OAuthCase
   def test_of_normalized_https
     assert_request_url("https://example.com/resource","https://example.com/resource")
   end
-  
+
   def test_of_http_with_non_standard_port
     assert_request_url("http://example.com:8080/resource","http://example.com:8080/resource")
   end
-  
+
   def test_of_https_with_non_standard_port
     assert_request_url("https://example.com:8080/resource","https://example.com:8080/resource")
   end
-  
+
   protected
-  
-  
+
+
   def assert_request_url(expected,given,message=nil)
     assert_equal expected, request({},'GET',given).normalized_uri, message
   end
-  
+
 end

data/test/cases/spec/1_0-final/test_normalize_request_parameters.rb

@@ -3,29 +3,29 @@ require File.expand_path('../../../oauth_case', __FILE__)
 # See http://oauth.net/core/1.0/#anchor14
 #
 # 9.1.1.  Normalize Request Parameters
-# 
+#
 # The request parameters are collected, sorted and concatenated into a normalized string:
-# 
+#
 # Parameters in the OAuth HTTP Authorization header excluding the realm parameter.
 # Parameters in the HTTP POST request body (with a content-type of application/x-www-form-urlencoded).
 # HTTP GET parameters added to the URLs in the query part (as defined by [RFC3986] section 3).
 # The oauth_signature parameter MUST be excluded.
-# 
+#
 # The parameters are normalized into a single string as follows:
-# 
-# Parameters are sorted by name, using lexicographical byte value ordering. 
+#
+# Parameters are sorted by name, using lexicographical byte value ordering.
 # If two or more parameters share the same name, they are sorted by their value. For example:
 #
 #   a=1, c=hi%20there, f=25, f=50, f=a, z=p, z=t
-# Parameters are concatenated in their sorted order into a single string. For each parameter, 
-# the name is separated from the corresponding value by an ‘=’ character (ASCII code 61), even 
+# Parameters are concatenated in their sorted order into a single string. For each parameter,
+# the name is separated from the corresponding value by an ‘=’ character (ASCII code 61), even
 # if the value is empty. Each name-value pair is separated by an ‘&’ character (ASCII code 38). For example:
 #   a=1&c=hi%20there&f=25&f=50&f=a&z=p&z=t
-# 
+#
 
 
 class NormalizeRequestParametersTest < OAuthCase
-  
+
   def test_parameters_for_signature
     params={'a'=>1, 'c'=>'hi there', 'f'=>'25', 'f'=>'50', 'f'=>'a', 'z'=>'p', 'z'=>'t'}
     assert_equal params,request(params).parameters_for_signature
@@ -36,7 +36,7 @@ class NormalizeRequestParametersTest < OAuthCase
     params={'a'=>1, 'c'=>'hi there', 'f'=>'25', 'f'=>'50', 'f'=>'a', 'z'=>'p', 'z'=>'t'}
     assert_equal params,request(params.merge({'oauth_signature'=>'blalbla'})).parameters_for_signature
   end
-  
+
   def test_spec_example
     assert_normalized 'a=1&c=hi%20there&f=25&f=50&f=a&z=p&z=t', { 'a' => 1, 'c' => 'hi there', 'f' => ['25', '50', 'a'], 'z' => ['p', 't'] }
   end
@@ -49,26 +49,26 @@ class NormalizeRequestParametersTest < OAuthCase
   def test_empty
     assert_normalized "",{}
   end
-  
-  
+
+
   # These are from the wiki http://wiki.oauth.net/TestCases
   # in the section Normalize Request Parameters
   # Parameters have already been x-www-form-urlencoded (i.e. + = <space>)
   def test_wiki1
     assert_normalized "name=",{"name"=>nil}
   end
-  
+
   def test_wiki2
     assert_normalized "a=b",{'a'=>'b'}
   end
-  
+
   def test_wiki3
     assert_normalized "a=b&c=d",{'a'=>'b','c'=>'d'}
   end
-  
+
   def test_wiki4
     assert_normalized "a=x%20y&a=x%21y",{'a'=>["x!y","x y"]}
-    
+
   end
 
   def test_wiki5
@@ -76,12 +76,12 @@ class NormalizeRequestParametersTest < OAuthCase
   end
 
   protected
-  
-  
+
+
   def assert_normalized(expected,params,message=nil)
     assert_equal expected, normalize_request_parameters(params), message
   end
-  
+
   def normalize_request_parameters(params={})
     request(params).normalized_parameters
   end

data/test/cases/spec/1_0-final/test_parameter_encodings.rb

@@ -3,14 +3,14 @@ require File.expand_path('../../../oauth_case', __FILE__)
 # See http://oauth.net/core/1.0/#encoding_parameters
 #
 # 5.1.  Parameter Encoding
-# 
-# All parameter names and values are escaped using the [RFC3986] percent-encoding (%xx) mechanism. 
-# Characters not in the unreserved character set ([RFC3986] section 2.3) MUST be encoded. Characters 
-# in the unreserved character set MUST NOT be encoded. Hexadecimal characters in encodings MUST be 
+#
+# All parameter names and values are escaped using the [RFC3986] percent-encoding (%xx) mechanism.
+# Characters not in the unreserved character set ([RFC3986] section 2.3) MUST be encoded. Characters
+# in the unreserved character set MUST NOT be encoded. Hexadecimal characters in encodings MUST be
 # upper case. Text names and values MUST be encoded as UTF-8 octets before percent-encoding them per [RFC3629].
-# 
+#
 #   unreserved = ALPHA, DIGIT, '-', '.', '_', '~'
-# 
+#
 
 class ParameterEncodingTest < OAuthCase
   def test_encodings_alpha_num

data/test/cases/spec/1_0-final/test_signature_base_strings.rb

@@ -3,18 +3,18 @@ require File.expand_path('../../../oauth_case', __FILE__)
 # See http://oauth.net/core/1.0/#anchor14
 #
 # 9.1.  Signature Base String
-# 
+#
 # The Signature Base String is a consistent reproducible concatenation of the request elements
-# into a single string. The string is used as an input in hashing or signing algorithms. The 
-# HMAC-SHA1 signature method provides both a standard and an example of using the Signature 
-# Base String with a signing algorithm to generate signatures. All the request parameters MUST 
+# into a single string. The string is used as an input in hashing or signing algorithms. The
+# HMAC-SHA1 signature method provides both a standard and an example of using the Signature
+# Base String with a signing algorithm to generate signatures. All the request parameters MUST
 # be encoded as described in Parameter Encoding prior to constructing the Signature Base String.
-# 
+#
 
 class SignatureBaseStringTest < OAuthCase
-  
+
   def test_A_5_1
-    parameters={ 
+    parameters={
       'oauth_consumer_key'=>'dpf43f3p2l4k3l03',
       'oauth_token'=>'nnch734d00sl2jdk',
       'oauth_signature_method'=>'HMAC-SHA1',
@@ -25,34 +25,34 @@ class SignatureBaseStringTest < OAuthCase
       'size'=>'original'
     }
     sbs='GET&http%3A%2F%2Fphotos.example.net%2Fphotos&file%3Dvacation.jpg%26oauth_consumer_key%3Ddpf43f3p2l4k3l03%26oauth_nonce%3Dkllo9940pd9333jh%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1191242096%26oauth_token%3Dnnch734d00sl2jdk%26oauth_version%3D1.0%26size%3Doriginal'
-    
+
     assert_signature_base_string sbs,parameters,'GET',"http://photos.example.net/photos"
   end
-  
+
   # These are from the wiki http://wiki.oauth.net/TestCases
   # in the section Concatenate Test Elements
-  
+
   def test_wiki_1_simple_with_ending_slash
-    parameters={ 
+    parameters={
       'n'=>'v'
     }
     sbs='GET&http%3A%2F%2Fexample.com%2F&n%3Dv'
-    
+
     assert_signature_base_string sbs,parameters,'GET',"http://example.com/"
   end
 
-  
+
   def test_wiki_2_simple_without_ending_slash
-    parameters={ 
+    parameters={
       'n'=>'v'
     }
     sbs='GET&http%3A%2F%2Fexample.com%2F&n%3Dv'
-    
+
     assert_signature_base_string sbs,parameters,'GET',"http://example.com"
   end
 
   def test_wiki_2_request_token
-    parameters={ 
+    parameters={
 'oauth_version'=>'1.0',
 'oauth_consumer_key'=>'dpf43f3p2l4k3l03',
 'oauth_timestamp'=>'1191242090',
@@ -60,17 +60,17 @@ class SignatureBaseStringTest < OAuthCase
 'oauth_signature_method'=>'PLAINTEXT',
 'oauth_signature'=>'ignored'    }
     sbs='POST&https%3A%2F%2Fphotos.example.net%2Frequest_token&oauth_consumer_key%3Ddpf43f3p2l4k3l03%26oauth_nonce%3Dhsu94j3884jdopsl%26oauth_signature_method%3DPLAINTEXT%26oauth_timestamp%3D1191242090%26oauth_version%3D1.0'
-    
+
     assert_signature_base_string sbs,parameters,'POST',"https://photos.example.net/request_token"
   end
-  
+
   protected
-  
-  
+
+
   def assert_signature_base_string(expected,params={},method='GET',uri="http://photos.example.net/photos",message="Signature Base String does not match")
     assert_equal expected, signature_base_string(params,method,uri), message
   end
-  
+
   def signature_base_string(params={},method='GET',uri="http://photos.example.net/photos")
     request(params,method,uri).signature_base_string
   end

data/test/test_consumer.rb

@@ -119,7 +119,7 @@ class ConsumerTest < Test::Unit::TestCase
     assert_equal 'token', token.token
     assert_equal 'secret', token.secret
   end
-  
+
   def test_that_can_provide_a_block_to_interpret_an_access_token_response
     stub_token = mock
     @consumer.expects(:request).returns(create_stub_http_response)
@@ -129,8 +129,8 @@ class ConsumerTest < Test::Unit::TestCase
     assert_equal 'token', token.token
     assert_equal 'secret', token.secret
   end
-  
-  def test_that_not_setting_ignore_callback_will_include_oauth_callback_in_request_options 
+
+  def test_that_not_setting_ignore_callback_will_include_oauth_callback_in_request_options
     request_options = {}
     @consumer.stubs(:request).returns(create_stub_http_response)
 
@@ -147,7 +147,7 @@ class ConsumerTest < Test::Unit::TestCase
 
     assert_nil request_options[:oauth_callback]
   end
-  
+
   private
 
   def create_stub_http_response expected_body=nil

data/test/test_curb_request_proxy.rb

@@ -19,7 +19,7 @@ class CurbRequestProxyTest < Test::Unit::TestCase
     assert_equal expected_parameters, request_proxy.parameters_for_signature
     assert_equal 'http://example.com/test', request_proxy.normalized_uri
   end
-  
+
   def test_that_proxy_simple_post_request_works_with_arguments
     request = Curl::Easy.new('/test')
     params = {'key' => 'value'}
@@ -29,19 +29,19 @@ class CurbRequestProxyTest < Test::Unit::TestCase
     assert_equal expected_parameters, request_proxy.parameters_for_signature
     assert_equal 'http://example.com/test', request_proxy.normalized_uri
   end
-  
+
   def test_that_proxy_simple_post_request_works_with_form_data
     request = Curl::Easy.new('/test')
     request.post_body = 'key=value'
     request.headers['Content-Type'] = 'application/x-www-form-urlencoded'
-    
+
     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
   end
-  
+
   def test_that_proxy_simple_put_request_works_with_arguments
     request = Curl::Easy.new('/test')
     params = {'key' => 'value'}
@@ -51,11 +51,11 @@ class CurbRequestProxyTest < Test::Unit::TestCase
     assert_equal expected_parameters, request_proxy.parameters_for_signature
     assert_equal 'http://example.com/test', request_proxy.normalized_uri
   end
-  
+
   def test_that_proxy_simple_put_request_works_with_form_data
-    request = Curl::Easy.new('/test') 
+    request = Curl::Easy.new('/test')
     request.post_body = 'key=value'
-    
+
     request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test'})
 
     expected_parameters = {}
@@ -65,7 +65,7 @@ class CurbRequestProxyTest < Test::Unit::TestCase
 
   def test_that_proxy_post_request_works_with_mixed_parameter_sources
     request = Curl::Easy.new('/test?key=value')
-    request.post_body = 'key2=value2' 
+    request.post_body = 'key2=value2'
     request.headers['Content-Type'] = 'application/x-www-form-urlencoded'
     request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test?key=value', :parameters => {'key3' => 'value3'}})
 

data/test/test_em_http_client.rb

@@ -18,7 +18,7 @@ class EmHttpClientTest < Test::Unit::TestCase
     # This is really unneeded I guess.
     @http = Net::HTTP.new(@request_uri.host, @request_uri.port)
   end
-  
+
   def test_that_using_auth_headers_on_get_requests_works
     request = create_client
     request.oauth!(@http, @consumer, @token, {:nonce => @nonce, :timestamp => @timestamp})
@@ -28,7 +28,7 @@ class EmHttpClientTest < Test::Unit::TestCase
     assert_equal "key=value", request.normalize_uri.query
     assert_equal_authz_headers "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\"", authz_header(request)
   end
-  
+
   def test_that_using_auth_headers_on_get_requests_works_with_plaintext
     require 'oauth/signature/plaintext'
     c = OAuth::Consumer.new('consumer_key_86cad9', '5888bf0345e5d237',{
@@ -52,9 +52,9 @@ class EmHttpClientTest < Test::Unit::TestCase
     assert_equal 'key=value', request.normalize_body
     assert_equal_authz_headers "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\"", authz_header(request)
   end
-  
+
   protected
-  
+
   def create_client(options = {})
     method         = options.delete(:method) || "GET"
     uri            = options.delete(:uri)    || @request_uri.to_s
@@ -64,7 +64,7 @@ class EmHttpClientTest < Test::Unit::TestCase
     client.options = options
     client
   end
-  
+
   def authz_header(request)
     headers = request.options[:head] || {}
     headers['Authorization'].to_s
@@ -75,5 +75,5 @@ class EmHttpClientTest < Test::Unit::TestCase
     assert_equal expected[0,6], actual[0, 6]
     assert_equal expected[6..1].split(', ').sort, actual[6..1].split(', ').sort
   end
-  
+
 end

data/test/test_em_http_request_proxy.rb

@@ -10,19 +10,19 @@ end
 
 
 class EmHttpRequestProxyTest < Test::Unit::TestCase
-  
+
   def test_request_proxy_works_with_simple_request
     proxy = create_request_proxy
     assert_equal({}, proxy.parameters)
   end
-  
+
   def test_request_proxy_works_with_query_string_params
     assert_equal({"name" => ["Fred"]}, create_request_proxy(:query => "name=Fred").parameters)
     assert_equal({"name" => ["Fred"]}, create_request_proxy(:query => {:name => "Fred"}).parameters)
     proxy = create_request_proxy(:query => {:name => "Fred"}, :uri => "http://example.com/?awesome=true")
     assert_equal({"name" => ["Fred"], "awesome" => ["true"]}, proxy.parameters)
   end
-  
+
   def test_request_proxy_works_with_post_body_params_with_correct_content_type
     proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "POST"
     assert_equal({}, proxy.parameters)
@@ -37,7 +37,7 @@ class EmHttpRequestProxyTest < Test::Unit::TestCase
     proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "PUT", :body => {"a" => 1}
     assert_equal({"a" => ["1"]}, proxy.parameters)
   end
-  
+
   def test_request_proxy_ignore_post_body_with_invalid_content_type
     proxy = create_request_proxy :head => {'Content-Type' => 'text/plain'}, :method => "POST"
     assert_equal({}, proxy.parameters)
@@ -52,7 +52,7 @@ class EmHttpRequestProxyTest < Test::Unit::TestCase
     proxy = create_request_proxy :head => {'Content-Type' => 'text/plain'}, :method => "PUT", :body => {"a" => 1}
     assert_equal({}, proxy.parameters)
   end
-  
+
   def test_request_proxy_ignores_post_body_with_invalid_method
     proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "DELETE"
     assert_equal({}, proxy.parameters)
@@ -67,35 +67,35 @@ class EmHttpRequestProxyTest < Test::Unit::TestCase
     proxy = create_request_proxy :head => {'Content-Type' => 'application/x-www-form-urlencoded'}, :method => "GET", :body => {"a" => 1}
     assert_equal({}, proxy.parameters)
   end
-  
+
   def test_request_proxy_works_with_argument_params
     assert_equal({"a" => ["1"]}, create_request_proxy(:proxy_options => {:parameters => {"a" => "1"}}).parameters)
   end
-  
+
   def test_request_proxy_works_with_mixed_params
     proxy = create_request_proxy(:proxy_options => {:parameters => {"a" => "1"}},:query => {"c" => "1"}, :uri => "http://example.com/test?b=1")
     assert_equal({"a" => ["1"], "b" => ["1"], "c" => ["1"]}, proxy.parameters)
     proxy = create_request_proxy(:proxy_options => {:parameters => {"a" => "1"}}, :body => {"b" => "1"}, :query => {"c" => "1"},
       :uri => "http://example.com/test?d=1", :method => "POST", :head => {"Content-Type" => "application/x-www-form-urlencoded"})
-    assert_equal({"a" => ["1"], "b" => ["1"], "c" => ["1"], "d" => ["1"]}, proxy.parameters)  
+    assert_equal({"a" => ["1"], "b" => ["1"], "c" => ["1"], "d" => ["1"]}, proxy.parameters)
   end
-  
+
   def test_request_has_the_correct_uri
     assert_equal "http://example.com/", create_request_proxy.uri
     assert_equal "http://example.com/?a=1", create_request_proxy(:query => "a=1").uri
     assert_equal "http://example.com/?a=1", create_request_proxy(:query => {"a" => "1"}).uri
-    
+
   end
-  
+
   def test_request_proxy_has_correct_method
     assert_equal "GET", create_request_proxy(:method => "GET").method
     assert_equal "PUT", create_request_proxy(:method => "PUT").method
     assert_equal "POST", create_request_proxy(:method => "POST").method
     assert_equal "DELETE", create_request_proxy(:method => "DELETE").method
   end
-  
+
   protected
-  
+
   def create_client(options = {})
     method         = options.delete(:method) || "GET"
     uri            = options.delete(:uri)    || "http://example.com/"
@@ -105,10 +105,10 @@ class EmHttpRequestProxyTest < Test::Unit::TestCase
     client.options = options
     client
   end
-  
+
   def create_request_proxy(opts = {})
     arguments = opts.delete(:proxy_options) || {}
     OAuth::RequestProxy.proxy(create_client(opts), arguments)
   end
-  
+
 end

data/test/test_helper.rb

@@ -7,7 +7,7 @@ require 'mocha'
 require 'stringio'
 
 class Test::Unit::TestCase
-  
+
   def assert_matching_headers(expected, actual)
     # transform into sorted arrays
     auth_intro, auth_params = actual.split(' ', 2)
@@ -16,5 +16,5 @@ class Test::Unit::TestCase
     auth_params = auth_params.split(/(,|\s)/).reject {|v| v == '' || v =~ /^[\,\s]+/}.sort
     assert_equal expected, auth_params
   end
-  
-end
+
+end

data/test/test_net_http_client.rb

@@ -103,7 +103,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
     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
-  
+
   def test_that_using_get_params_works_with_plaintext
     request = Net::HTTP::Get.new(@request_uri.path + "?" + request_parameters_to_s)
     request.oauth!(@http, @consumer, @token, {:scheme => 'query_string', :nonce => @nonce, :timestamp => @timestamp, :signature_method => 'PLAINTEXT'})
@@ -126,7 +126,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
     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_params_works_with_plaintext
     request = Net::HTTP::Post.new(@request_uri.path)
     request.set_form_data( @request_parameters )

data/test/test_rsa_sha1.rb

@@ -3,18 +3,18 @@ require 'oauth/consumer'
 require 'oauth/signature/rsa/sha1'
 
 class TestSignatureRsaSha1 < Test::Unit::TestCase
-  
+
   def setup
     @request = Net::HTTP::Get.new('/photos?file=vacaction.jpg&size=original&oauth_version=1.0&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_timestamp=1196666512&oauth_nonce=13917289812797014437&oauth_signature_method=RSA-SHA1')
 
     @consumer = OAuth::Consumer.new('dpf43f3p2l4k3l03', OpenSSL::PKey::RSA.new(IO.read(File.dirname(__FILE__) + "/keys/rsa.pem")))
-    
+
   end
-  
+
   def test_that_rsa_sha1_implements_rsa_sha1
     assert OAuth::Signature.available_methods.include?('rsa-sha1')
   end
-  
+
   def test_that_get_request_from_oauth_test_cases_produces_matching_signature_base_string
     sbs = OAuth::Signature.signature_base_string(@request, { :consumer => @consumer,
                                                  :uri => 'http://photos.example.net/photos' } )
@@ -27,7 +27,7 @@ class TestSignatureRsaSha1 < Test::Unit::TestCase
                                                  :uri => 'http://photos.example.net/photos' } )
 
     assert_equal 'jvTp/wX1TYtByB1m+Pbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2/9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW//e+RinhejgCuzoH26dyF8iY2ZZ/5D1ilgeijhV/vBka5twt399mXwaYdCwFYE=', signature
-    
+
   end
 
   def test_that_get_request_from_oauth_test_cases_produces_matching_signature_using_private_key_file
@@ -48,7 +48,7 @@ class TestSignatureRsaSha1 < Test::Unit::TestCase
                                                  :uri => 'http://photos.example.net/photos' } )
 
   end
-  
+
   def test_that_get_request_from_oauth_test_cases_verifies_signature_with_pem
     @request = Net::HTTP::Get.new('/photos?oauth_signature_method=RSA-SHA1&oauth_version=1.0&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_timestamp=1196666512&oauth_nonce=13917289812797014437&file=vacaction.jpg&size=original&oauth_signature=jvTp%2FwX1TYtByB1m%2BPbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2%2F9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW%2F%2Fe%2BRinhejgCuzoH26dyF8iY2ZZ%2F5D1ilgeijhV%2FvBka5twt399mXwaYdCwFYE%3D')
     assert OAuth::Signature.verify(@request, { :consumer => @consumer,

data/test/test_server.rb

@@ -4,19 +4,19 @@ class ServerTest < Test::Unit::TestCase
   def setup
     @server=OAuth::Server.new "http://test.com"
   end
-  
+
   def test_default_paths
     assert_equal "/oauth/request_token",@server.request_token_path
     assert_equal "/oauth/authorize",@server.authorize_path
     assert_equal "/oauth/access_token",@server.access_token_path
   end
-  
+
   def test_default_urls
     assert_equal "http://test.com/oauth/request_token",@server.request_token_url
     assert_equal "http://test.com/oauth/authorize",@server.authorize_url
     assert_equal "http://test.com/oauth/access_token",@server.access_token_url
   end
-  
+
   def test_generate_consumer_credentials
     consumer=@server.generate_consumer_credentials
     assert_not_nil consumer.key
@@ -35,6 +35,6 @@ class ServerTest < Test::Unit::TestCase
     assert_equal "http://test.com/oauth/request_token",@consumer.request_token_url
     assert_equal "http://test.com/oauth/authorize",@consumer.authorize_url
     assert_equal "http://test.com/oauth/access_token",@consumer.access_token_url
-  end  
-  
+  end
+
 end

data/test/test_token.rb

@@ -1,14 +1,14 @@
-require File.expand_path('../test_helper', __FILE__)
-require 'oauth/token'
-
-class TestToken < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  def test_token_constructor_produces_valid_token
-    token = OAuth::Token.new('xyz', '123')
-    assert_equal 'xyz', token.token
-    assert_equal '123', token.secret
-  end
-end
+require File.expand_path('../test_helper', __FILE__)
+require 'oauth/token'
+
+class TestToken < Test::Unit::TestCase
+
+  def setup
+  end
+
+  def test_token_constructor_produces_valid_token
+    token = OAuth::Token.new('xyz', '123')
+    assert_equal 'xyz', token.token
+    assert_equal '123', token.secret
+  end
+end

data/test/test_typhoeus_request_proxy.rb

@@ -66,7 +66,7 @@ class TyphoeusRequestProxyTest < Test::Unit::TestCase
   end
 
   def test_that_proxy_post_request_works_with_mixed_parameter_sources
-    request = Typhoeus::Request.new('/test?key=value', 
+    request = Typhoeus::Request.new('/test?key=value',
       :method => :post,
       :body => {'key2' => 'value2'},
       :headers => {'Content-Type' => 'application/x-www-form-urlencoded'})

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oauth
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -22,7 +22,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 -07:00
+date: 2010-09-01 00:00:00 -07:00
 default_executable: oauth
 dependencies: 
 - !ruby/object:Gem::Dependency