oauth 0.3.6 → 0.3.7.pre1

data/lib/oauth/core_ext.rb

@@ -0,0 +1,31 @@
+# these are to backport methods from 1.8.7/1.9.1 to 1.8.6
+
+class Object
+
+  unless method_defined?(:tap)
+    def tap
+      yield self
+      self
+    end
+  end
+  
+end
+
+class String
+
+
+
+  unless method_defined?(:bytesize)
+    def bytesize
+      self.size
+    end
+  end
+
+  unless method_defined?(:bytes)
+    def bytes
+      require 'enumerator'
+      Enumerable::Enumerator.new(self, :each_byte)
+    end
+  end
+
+end

data/lib/oauth/helper.rb

@@ -10,6 +10,8 @@ module OAuth
     # See Also: {OAuth core spec version 1.0, section 5.1}[http://oauth.net/core/1.0#rfc.section.5.1]
     def escape(value)
       URI::escape(value.to_s, OAuth::RESERVED_CHARACTERS)
+    rescue ArgumentError
+      URI::escape(value.to_s.force_encoding(Encoding::UTF_8), OAuth::RESERVED_CHARACTERS)
     end
 
     # Generate a random key of up to +size+ bytes. The value returned is Base64 encoded with non-word
@@ -74,5 +76,13 @@ module OAuth
     def unescape(value)
       URI.unescape(value.gsub('+', '%2B'))
     end
+    
+    def stringify_keys(hash)
+      new_h = {}
+      hash.each do |k, v| 
+        new_h[k.to_s] = v.is_a?(Hash) ? stringify_keys(v) : v
+      end
+      new_h
+    end
   end
-end
+end

data/lib/oauth/request_proxy/base.rb

@@ -9,10 +9,11 @@ module OAuth::RequestProxy
       OAuth::RequestProxy.available_proxies[klass] = self
     end
 
-    attr_accessor :request, :options
+    attr_accessor :request, :options, :unsigned_parameters
 
     def initialize(request, options = {})
       @request = request
+      @unsigned_parameters = (options[:unsigned_parameters] || []).map {|param| param.to_s}
       @options = options
     end
 
@@ -32,7 +33,7 @@ module OAuth::RequestProxy
 
     def oauth_signature
       # TODO can this be nil?
-      parameters['oauth_signature'] || ""
+      [parameters['oauth_signature']].flatten.first || ""
     end
 
     def oauth_signature_method
@@ -75,7 +76,7 @@ module OAuth::RequestProxy
     end
 
     def parameters_for_signature
-      parameters.reject { |k,v| k == "oauth_signature" }
+      parameters.reject { |k,v| k == "oauth_signature" || unsigned_parameters.include?(k)}
     end
 
     def oauth_parameters

data/lib/oauth/request_proxy/curb_request.rb

@@ -0,0 +1,55 @@
+  require 'oauth/request_proxy/base'
+require 'curb'
+require 'uri'
+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}      
+    # req = Curl::Easy.new(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        
+    
+    def method
+      nil
+    end
+    
+    def uri
+      options[:uri].to_s
+    end
+    
+    def parameters
+      if options[:clobber_request]
+        options[:parameters]
+      else
+        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]
+        end
+      end
+      post_body
+    end
+  end
+end

data/lib/oauth/request_proxy/em_http_request.rb

@@ -0,0 +1,67 @@
+require 'oauth/request_proxy/base'
+# em-http also uses adddressable so there is no need to require uri.
+require 'em-http'
+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]
+      else
+        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'
+      if ['POST', 'PUT'].include?(method) && form_encoded
+        CGI.parse(request.normalize_body.to_s)
+      else
+        {}
+      end
+    end
+    
+    def merged_parameters(params, *extra_params)
+      extra_params.compact.each do |params_pairs|
+        params_pairs.each_pair do |key, value|
+          if params.has_key?(key)
+            params[key] += value
+          else
+            params[key] = [value].flatten
+          end
+        end
+      end
+      params
+    end
+    
+  end
+end
+

data/lib/oauth/request_proxy/net_http.rb

@@ -13,8 +13,7 @@ module OAuth::RequestProxy::Net
       end
 
       def uri
-        uri = options[:uri]
-        uri.to_s
+        options[:uri].to_s
       end
 
       def parameters
@@ -29,12 +28,13 @@ module OAuth::RequestProxy::Net
 
       def all_parameters
         request_params = CGI.parse(query_string)
+
         if options[:parameters]
           options[:parameters].each do |k,v|
-            if request_params.has_key?(k)
+            if request_params.has_key?(k) && v
               request_params[k] << v
             else
-              request_params[k] = [v].flatten
+              request_params[k] = [v]
             end
           end
         end
@@ -43,11 +43,14 @@ module OAuth::RequestProxy::Net
 
       def query_string
         params = [ query_params, auth_header_params ]
-        is_form_urlencoded = request['Content-Type'] != nil && request['Content-Type'].downcase == 'application/x-www-form-urlencoded'
-        params << post_params if method.to_s.upcase == 'POST' && is_form_urlencoded
+        params << post_params if method.to_s.upcase == 'POST' && form_url_encoded?
         params.compact.join('&')
       end
 
+      def form_url_encoded?
+        request['Content-Type'] != nil && request['Content-Type'].downcase == 'application/x-www-form-urlencoded'
+      end
+
       def query_params
         URI.parse(request.path).query
       end

data/lib/oauth/request_proxy/typhoeus_request.rb

@@ -0,0 +1,53 @@
+require 'oauth/request_proxy/base'
+require 'typhoeus'
+require 'typhoeus/request'
+require 'uri'
+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}      
+    # req = Typhoeus::Request.new(uri, options)
+    # 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        
+
+    def method
+      request.method.to_s.upcase
+    end
+    
+    def uri
+      options[:uri].to_s
+    end
+    
+    def parameters
+      if options[:clobber_request]
+        options[:parameters]
+      else
+        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

data/lib/oauth/signature.rb

@@ -10,7 +10,10 @@ module OAuth
     # Raises UnknownSignatureMethod exception if the signature method is unknown.
     def self.build(request, options = {}, &block)
       request = OAuth::RequestProxy.proxy(request, options)
-      klass = available_methods[(request.signature_method || "").downcase]
+      klass = available_methods[
+        (request.signature_method ||
+        ((c = request.options[:consumer]) && c.options[:signature_method]) ||
+        "").downcase]
       raise UnknownSignatureMethod, request.signature_method unless klass
       klass.new(request, options, &block)
     end

data/lib/oauth/signature/base.rb

@@ -10,14 +10,21 @@ module OAuth::Signature
     attr_accessor :options
     attr_reader :token_secret, :consumer_secret, :request
 
-    def self.implements(signature_method)
-      OAuth::Signature.available_methods[signature_method] = self
+    def self.implements(signature_method = nil)
+      return @implements if signature_method.nil? 
+      @implements = signature_method
+      OAuth::Signature.available_methods[@implements] = self
     end
 
     def self.digest_class(digest_class = nil)
       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
+    end
 
     def initialize(request, options = {}, &block)
       raise TypeError unless request.kind_of?(OAuth::RequestProxy::Base)
@@ -38,7 +45,6 @@ module OAuth::Signature
       # presence of :token_secret option will override any Token that's provided
       @token_secret = options[:token_secret] if options[:token_secret]
 
-
       # override secrets based on the values returned from the block (if any)
       if block_given?
         # consumer secret and token secret need to be looked up based on pieces of the request

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

@@ -1,12 +1,15 @@
+# -*- encoding: utf-8 -*-
+
 require 'oauth/signature/base'
+require 'digest/hmac'
 
 module OAuth::Signature::HMAC
   class Base < OAuth::Signature::Base
 
   private
-
     def digest
-      self.class.digest_class.digest(secret, signature_base_string)
+      self.class.digest_class Object.module_eval("::Digest::#{self.class.digest_klass}")
+      Digest::HMAC.digest(signature_base_string, secret, self.class.digest_class)
     end
   end
 end

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

@@ -1,9 +1,8 @@
 require 'oauth/signature/hmac/base'
-require 'hmac-md5'
 
 module OAuth::Signature::HMAC
   class MD5 < Base
     implements 'hmac-md5'
-    digest_class ::HMAC::MD5
+    digest_class 'MD5'
   end
 end

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

@@ -1,9 +1,8 @@
 require 'oauth/signature/hmac/base'
-require 'hmac-rmd160'
 
 module OAuth::Signature::HMAC
   class RMD160 < Base
     implements 'hmac-rmd160'
-    digest_class ::HMAC::RMD160
+    digest_klass 'RMD160'
   end
 end

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

@@ -1,9 +1,8 @@
 require 'oauth/signature/hmac/base'
-require 'hmac-sha1'
 
 module OAuth::Signature::HMAC
-  class SHA1 < Base
+  class SHA1 < Base    
     implements 'hmac-sha1'
-    digest_class ::HMAC::SHA1
+    digest_klass 'SHA1'
   end
 end

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

@@ -1,9 +1,8 @@
 require 'oauth/signature/hmac/base'
-require 'hmac-sha2'
 
 module OAuth::Signature::HMAC
   class SHA2 < Base
     implements 'hmac-sha2'
-    digest_class ::HMAC::SHA2
+    digest_klass 'SHA2'
   end
 end

data/lib/oauth/signature/plaintext.rb

@@ -9,7 +9,7 @@ module OAuth::Signature
     end
 
     def ==(cmp_signature)
-      signature == escape(cmp_signature)
+      signature.to_s == cmp_signature.to_s
     end
 
     def signature_base_string
@@ -17,7 +17,7 @@ module OAuth::Signature
     end
 
     def secret
-      escape(super)
+      super
     end
   end
 end

data/lib/oauth/version.rb

@@ -1,3 +1,3 @@
 module OAuth #:nodoc:
-  VERSION = '0.3.6'
+  VERSION = '0.3.7.pre1'
 end