oauth 0.4.7 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5b45dc41aae4a7483d4dc3f37231ed79084a7c8e
+  data.tar.gz: c82a432eb7f1a7ab2cb704eedd1ae9da15daed2c
+SHA512:
+  metadata.gz: 6b3a8ebb69c99d98762a66ddaec9074ee6161824405f04dab2d057e8059fa6cb298985c951479980c41800508a11edbc439a38602e39384add3c2a9424be8975
+  data.tar.gz: 65f7255a19a1def380575faa1a97d95ec78821fcf687ff8f914a10d367dcc6e05d1681e4a7b9106973e5a50618457e35d8c1b07adbf21919e668345ca18143ab

data/README.rdoc

@@ -10,7 +10,7 @@ See the OAuth specs http://oauth.net/core/1.0/
 
   sudo gem install oauth
 
-The source code is now hosted on the OAuth GitHub Project http://github.com/oauth/oauth-ruby
+The source code is now hosted on the OAuth GitHub Project http://github.com/oauth-xx/oauth-ruby
 
 == The basics
 
@@ -44,9 +44,9 @@ Now that you have an access token, you can use Typhoeus to interact with the OAu
   require 'oauth/request_proxy/typhoeus_request'
   oauth_params = {:consumer => oauth_consumer, :token => access_token}
   hydra = Typhoeus::Hydra.new
-  req = Typhoeus::Request.new(uri, options) 
+  req = Typhoeus::Request.new(uri, options) # :method needs to be specified in options
   oauth_helper = OAuth::Client::Helper.new(req, oauth_params.merge(:request_uri => uri))
-  req.headers.merge!({"Authorization" => oauth_helper.header}) # Signs the request
+  req.options[:headers].merge!({"Authorization" => oauth_helper.header}) # Signs the request
   hydra.queue(req)
   hydra.run
   @response = req.response
@@ -54,22 +54,22 @@ Now that you have an access token, you can use Typhoeus to interact with the OAu
 
 == More Information
 
-* RDoc: http://rdoc.info/projects/oauth/oauth-ruby/
+* RDoc: http://rdoc.info/github/oauth-xx/oauth-ruby/master/frames
 * Mailing List/Google Group: http://groups.google.com/group/oauth-ruby
 
 == How to submit patches
 
-The source code is now hosted on the OAuth GitHub Project http://github.com/oauth/oauth-ruby
+The source code is now hosted on the OAuth GitHub Project http://github.com/oauth-xx/oauth-ruby
 
 To submit a patch, please fork the oauth project and create a patch with tests. Once you're happy with it send a pull request and post a message to the google group.
 
 == License
 
-This code is free to use under the terms of the MIT license. 
+This code is free to use under the terms of the MIT license.
 
 == Contact
 
-OAuth Ruby has been created and maintained by a large number of talented individuals. 
+OAuth Ruby has been created and maintained by a large number of talented individuals.
 The current maintainer is Aaron Quint (quirkey).
 
-Comments are welcome. Send an email to via the OAuth Ruby mailing list http://groups.google.com/group/oauth-ruby
+Comments are welcome. Send an email to via the OAuth Ruby mailing list http://groups.google.com/group/oauth-ruby

data/lib/oauth.rb

@@ -1,8 +1,6 @@
 $LOAD_PATH << File.dirname(__FILE__) unless $LOAD_PATH.include?(File.dirname(__FILE__))
 
-module OAuth
-  VERSION = "0.4.7"
-end
+require 'oauth/version'
 
 require 'oauth/oauth'
 require 'oauth/core_ext'

data/lib/oauth/cli.rb

@@ -57,7 +57,7 @@ module OAuth
             oauth_verifier = nil
 
             # get a request token
-            request_token = consumer.get_request_token({ :oauth_callback => options[:oauth_callback] }, { "scope" => options[:scope] })
+            request_token = consumer.get_request_token({ :oauth_callback => options[:oauth_callback] }, options[:scope] ? { "scope" => options[:scope] } : {})
 
             if request_token.callback_confirmed?
               stdout.puts "Server appears to support OAuth 1.0a; enabling support."
@@ -107,7 +107,7 @@ module OAuth
           uri.query = [uri.query, *params].reject { |x| x.nil? } * "&"
           p uri.to_s
 
-          response = access_token.request(options[:method].downcase.to_sym, uri.to_s)
+          response = access_token.request(options[:method].to_s.downcase.to_sym, uri.to_s)
           puts "#{response.code} #{response.message}"
           puts response.body
         when "sign"
@@ -268,7 +268,7 @@ module OAuth
           options[:uri] = v
         end
 
-        opts.on(:OPTIONAL, "--version VERSION", "Specifies the OAuth version to use.") do |v|
+        opts.on("--version [VERSION]", "Specifies the OAuth version to use.") do |v|
           if v
             options[:oauth_version] = v
           else

data/lib/oauth/client/helper.rb

@@ -56,6 +56,10 @@ module OAuth::Client
                                                          :parameters => oauth_parameters}.merge(extra_options) )
     end
 
+    def token_request?
+      @options[:token_request].eql?(true)
+    end
+
     def hash_body
       @options[:body_hash] = OAuth::Signature.body_hash(@request, :parameters => oauth_parameters)
     end

data/lib/oauth/client/net_http.rb

@@ -21,7 +21,8 @@ class Net::HTTPGenericRequest
   # This method also modifies the <tt>User-Agent</tt> header to add the OAuth gem version.
   #
   # See Also: {OAuth core spec version 1.0, section 5.4.1}[http://oauth.net/core/1.0#rfc.section.5.4.1],
-  #           {OAuth Request Body Hash 1.0 Draft 4}[http://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/drafts/4/spec.html]
+  #           {OAuth Request Body Hash 1.0 Draft 4}[http://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/drafts/4/spec.html,
+  #                                                 http://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/oauth-bodyhash.html#when_to_include]
   def oauth!(http, consumer = nil, token = nil, options = {})
     helper_options = oauth_helper_options(http, consumer, token, options)
     @oauth_helper = OAuth::Client::Helper.new(self, helper_options)
@@ -42,13 +43,14 @@ class Net::HTTPGenericRequest
   # * options - Request-specific options (e.g. +request_uri+, +consumer+, +token+, +scheme+,
   #   +signature_method+, +nonce+, +timestamp+)
   #
-  # See Also: {OAuth core spec version 1.0, section 9.1.1}[http://oauth.net/core/1.0#rfc.section.9.1.1],
-  #           {OAuth Request Body Hash 1.0 Draft 4}[http://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/drafts/4/spec.html]
+  # See Also: {OAuth core spec version 1.0, section 5.4.1}[http://oauth.net/core/1.0#rfc.section.5.4.1],
+  #           {OAuth Request Body Hash 1.0 Draft 4}[http://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/drafts/4/spec.html,
+  #                                                 http://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/oauth-bodyhash.html#when_to_include]
   def signature_base_string(http, consumer = nil, token = nil, options = {})
     helper_options = oauth_helper_options(http, consumer, token, options)
-    oauth_helper = OAuth::Client::Helper.new(self, helper_options)
-    oauth_helper.hash_body if oauth_body_hash_required?
-    oauth_helper.signature_base_string
+    @oauth_helper = OAuth::Client::Helper.new(self, helper_options)
+    @oauth_helper.hash_body if oauth_body_hash_required?
+    @oauth_helper.signature_base_string
   end
 
 private
@@ -84,7 +86,7 @@ private
   end
 
   def oauth_body_hash_required?
-    request_body_permitted? && !content_type.to_s.downcase.start_with?("application/x-www-form-urlencoded")
+    !@oauth_helper.token_request? && 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

@@ -8,9 +8,9 @@ require 'cgi'
 module OAuth
   class Consumer
     # determine the certificate authority path to verify SSL certs
-    CA_FILES = %w(/etc/ssl/certs/ca-certificates.crt /usr/share/curl/curl-ca-bundle.crt)
+    CA_FILES = %W(#{ENV['SSL_CERT_FILE']} /etc/ssl/certs/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt /usr/share/curl/curl-ca-bundle.crt)
     CA_FILES.each do |ca_file|
-      if File.exists?(ca_file)
+      if File.exist?(ca_file)
         CA_FILE = ca_file
         break
       end
@@ -191,6 +191,7 @@ module OAuth
 
     # Creates a request and parses the result as url_encoded. This is used internally for the RequestToken and AccessToken requests.
     def token_request(http_method, path, token = nil, request_options = {}, *arguments)
+      request_options[:token_request] ||= true
       response = request(http_method, path, token, request_options, *arguments)
       case response.code.to_i
 
@@ -234,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
@@ -328,7 +329,7 @@ module OAuth
     def create_http_request(http_method, path, *arguments)
       http_method = http_method.to_sym
 
-      if [:post, :put].include?(http_method)
+      if [:post, :put, :patch].include?(http_method)
         data = arguments.shift
       end
 
@@ -345,6 +346,9 @@ module OAuth
       when :put
         request = Net::HTTP::Put.new(path,headers)
         request["Content-Length"] = '0' # Default to 0
+      when :patch
+        request = Net::HTTP::Patch.new(path,headers)
+        request["Content-Length"] = '0' # Default to 0
       when :get
         request = Net::HTTP::Get.new(path,headers)
       when :delete

data/lib/oauth/helper.rb

@@ -9,9 +9,9 @@ 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)
+      URI::escape(value.to_s.to_str, OAuth::RESERVED_CHARACTERS)
     rescue ArgumentError
-      URI::escape(value.to_s.force_encoding(Encoding::UTF_8), OAuth::RESERVED_CHARACTERS)
+      URI::escape(value.to_s.to_str.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
@@ -49,7 +49,7 @@ module OAuth
         end
       end * "&"
     end
-    
+
     #Returns a string representation of the Hash like in URL query string
     # build_nested_query({:level_1 => {:level_2 => ['value_1','value_2']}}, 'prefix'))
     #   #=> ["prefix%5Blevel_1%5D%5Blevel_2%5D%5B%5D=value_1", "prefix%5Blevel_1%5D%5Blevel_2%5D%5B%5D=value_2"]

data/lib/oauth/request_proxy/action_controller_request.rb

@@ -1,11 +1,35 @@
 require 'active_support'
+require "active_support/version"
 require 'action_controller'
-require 'action_controller/request'
 require 'uri'
 
+if
+  Gem::Version.new(ActiveSupport::VERSION::STRING) < Gem::Version.new("3")
+then # rails 2.x
+  require 'action_controller/request'
+  unless ActionController::Request::HTTP_METHODS.include?("patch")
+    ActionController::Request::HTTP_METHODS << "patch"
+    ActionController::Request::HTTP_METHOD_LOOKUP["PATCH"] = :patch
+    ActionController::Request::HTTP_METHOD_LOOKUP["patch"] = :patch
+  end
+
+elsif
+  Gem::Version.new(ActiveSupport::VERSION::STRING) < Gem::Version.new("4")
+then # rails 3.x
+  require 'action_dispatch/http/request'
+  unless ActionDispatch::Request::HTTP_METHODS.include?("patch")
+    ActionDispatch::Request::HTTP_METHODS << "patch"
+    ActionDispatch::Request::HTTP_METHOD_LOOKUP["PATCH"] = :patch
+    ActionDispatch::Request::HTTP_METHOD_LOOKUP["patch"] = :patch
+  end
+
+else # rails 4.x - already has patch
+  require 'action_dispatch/http/request'
+end
+
 module OAuth::RequestProxy
   class ActionControllerRequest < OAuth::RequestProxy::Base
-    proxies(defined?(ActionController::AbstractRequest) ? ActionController::AbstractRequest : ActionController::Request)
+    proxies(defined?(ActionDispatch::AbstractRequest) ? ActionDispatch::AbstractRequest : ActionDispatch::Request)
 
     def method
       request.method.to_s.upcase

data/lib/oauth/request_proxy/base.rb

@@ -143,7 +143,7 @@ module OAuth::RequestProxy
     end
 
     def query_string_blank?
-      if uri = request.request_uri
+      if uri = request.env['REQUEST_URI']
         uri.split('?', 2)[1].nil?
       else
         request.query_string.blank?

data/lib/oauth/request_proxy/net_http.rb

@@ -66,7 +66,7 @@ module OAuth::RequestProxy::Net
 
       def auth_header_params
         return nil unless request['Authorization'] && request['Authorization'][0,5] == 'OAuth'
-        auth_params = request['Authorization']
+        request['Authorization']
       end
     end
   end

data/lib/oauth/request_proxy/rest_client_request.rb

@@ -0,0 +1,62 @@
+require 'oauth/request_proxy/base'
+require 'rest-client'
+require 'uri'
+require 'cgi'
+
+module OAuth::RequestProxy::RestClient
+  class Request < OAuth::RequestProxy::Base
+    proxies RestClient::Request
+    
+      def method
+        request.method.to_s.upcase
+      end
+
+      def uri
+        request.url
+      end
+
+      def parameters
+        if options[:clobber_request]
+          options[:parameters] || {}
+        else
+          post_parameters.merge(query_params).merge(options[:parameters] || {})
+        end
+      end
+
+    protected
+
+      def query_params
+        query = URI.parse(request.url).query
+        query ? CGI.parse(query) : {}
+      end
+
+      def request_params
+      end
+      
+      def post_parameters
+        # Post params are only used if posting form data
+        if method == 'POST' || method == 'PUT'
+          OAuth::Helper.stringify_keys(query_string_to_hash(request.payload.to_s) || {})
+        else
+          {}
+        end
+      end
+      
+   private
+      
+      def query_string_to_hash(query)
+        keyvals = query.split('&').inject({}) do |result, q| 
+          k,v = q.split('=')
+          if !v.nil?
+             result.merge({k => v})
+          elsif !result.key?(k)
+            result.merge({k => true})
+          else
+            result
+          end
+        end
+        keyvals
+      end
+      
+  end
+end

data/lib/oauth/request_proxy/typhoeus_request.rb

@@ -11,7 +11,7 @@ module OAuth::RequestProxy::Typhoeus
     # 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})
+    # req.options[:headers].merge!({"Authorization" => oauth_helper.header})
     # hydra = Typhoeus::Hydra.new()
     # hydra.queue(req)
     # hydra.run
@@ -19,7 +19,8 @@ module OAuth::RequestProxy::Typhoeus
     proxies Typhoeus::Request
 
     def method
-      request.method.to_s.upcase
+      request_method = request.options[:method].to_s.upcase
+      request_method.empty? ? 'GET' : request_method
     end
 
     def uri
@@ -44,7 +45,7 @@ module OAuth::RequestProxy::Typhoeus
     def post_parameters
       # Post params are only used if posting form data
       if method == 'POST'
-        OAuth::Helper.stringify_keys(request.params || {})
+        OAuth::Helper.stringify_keys(request.options[:params] || {})
       else
         {}
       end

data/lib/oauth/signature/base.rb

@@ -16,21 +16,6 @@ module OAuth::Signature
       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 self.hash_class(hash_class = nil)
-      return @hash_class if hash_class.nil?
-      @hash_class = hash_class
-    end
-
     def initialize(request, options = {}, &block)
       raise TypeError unless request.kind_of?(OAuth::RequestProxy::Base)
       @request = request
@@ -66,7 +51,7 @@ module OAuth::Signature
     end
 
     def ==(cmp_signature)
-      Base64.decode64(signature) == Base64.decode64(cmp_signature)
+      signature == cmp_signature
     end
 
     def verify
@@ -78,14 +63,10 @@ module OAuth::Signature
     end
 
     def body_hash
-      if self.class.hash_class
-        Base64.encode64(self.class.hash_class.digest(request.body || '')).chomp.gsub(/\n/,'')
-      else
-        nil # no body hash algorithm defined, so don't generate one
-      end
+      raise_instantiation_error
     end
 
-  private
+    private
 
     def token
       request.token
@@ -104,7 +85,12 @@ module OAuth::Signature
     end
 
     def digest
-      self.class.digest_class.digest(signature_base_string)
+      raise_instantiation_error
     end
+
+    def raise_instantiation_error
+      raise NotImplementedError, "Cannot instantiate #{self.class.name} class directly."
+    end
+
   end
 end

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

@@ -1,9 +1,17 @@
-require 'oauth/signature/hmac/base'
+require 'oauth/signature/base'
 
 module OAuth::Signature::HMAC
-  class SHA1 < Base
+  class SHA1 < OAuth::Signature::Base
     implements 'hmac-sha1'
-    digest_klass 'SHA1'
-    hash_class ::Digest::SHA1
+
+    def body_hash
+      Base64.encode64(OpenSSL::Digest::SHA1.digest(request.body || '')).chomp.gsub(/\n/,'')
+    end
+
+    private
+
+    def digest
+      OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha1'), secret, signature_base_string)
+    end
   end
 end