oauth 0.5.6 → 1.1.0

data/lib/oauth/oauth_test_helper.rb

@@ -1,5 +1,7 @@
-require 'action_controller'
-require 'action_controller/test_process'
+# frozen_string_literal: true
+
+require "action_controller"
+require "action_controller/test_process"
 
 module OAuth
   module OAuthTestHelper
@@ -8,7 +10,7 @@ module OAuth
       incoming.request_uri = request.path
       incoming.host = request.uri.host
       incoming.env["SERVER_PORT"] = request.uri.port
-      incoming.env['REQUEST_METHOD'] = request.http_method
+      incoming.env["REQUEST_METHOD"] = request.http_method
       incoming
     end
 
@@ -18,7 +20,7 @@ module OAuth
       incoming.host = request.uri.host
       incoming.env["HTTP_AUTHORIZATION"] = request.to_auth_string
       incoming.env["SERVER_PORT"] = request.uri.port
-      incoming.env['REQUEST_METHOD'] = request.http_method
+      incoming.env["REQUEST_METHOD"] = request.http_method
       incoming
     end
   end

data/lib/oauth/request_proxy/action_controller_request.rb

@@ -1,90 +1,68 @@
-require 'active_support'
-require "active_support/version"
-require 'action_controller'
-require 'uri'
+# frozen_string_literal: true
 
-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
+require "active_support"
+require "action_controller"
+require "uri"
 
-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
+require "action_dispatch/http/request"
 
-else # rails 4.x and later - already has patch
-  require 'action_dispatch/http/request'
-end
+module OAuth
+  module RequestProxy
+    class ActionControllerRequest < OAuth::RequestProxy::Base
+      proxies(::ActionDispatch::Request)
 
-module OAuth::RequestProxy
-  class ActionControllerRequest < OAuth::RequestProxy::Base
-    proxies(defined?(ActionDispatch::AbstractRequest) ? ActionDispatch::AbstractRequest : ActionDispatch::Request)
-
-    def method
-      request.method.to_s.upcase
-    end
+      def method
+        request.method.to_s.upcase
+      end
 
-    def uri
-      request.url
-    end
+      def uri
+        request.url
+      end
 
-    def parameters
-      if options[:clobber_request]
-        options[:parameters] || {}
-      else
-        params = request_params.merge(query_params).merge(header_params)
-        params.stringify_keys! if params.respond_to?(:stringify_keys!)
-        params.merge(options[:parameters] || {})
+      def parameters
+        if options[:clobber_request]
+          options[:parameters] || {}
+        else
+          params = request_params.merge(query_params).merge(header_params)
+          params.stringify_keys! if params.respond_to?(:stringify_keys!)
+          params.merge(options[:parameters] || {})
+        end
       end
-    end
 
-    # Override from OAuth::RequestProxy::Base to avoid roundtrip
-    # conversion to Hash or Array and thus preserve the original
-    # parameter names
-    def parameters_for_signature
-      params = []
-      params << options[:parameters].to_query if options[:parameters]
+      # Override from OAuth::RequestProxy::Base to avoid round-trip
+      # conversion to Hash or Array and thus preserve the original
+      # parameter names
+      def parameters_for_signature
+        params = []
+        params << options[:parameters].to_query if options[:parameters]
 
-      unless options[:clobber_request]
-        params << header_params.to_query
-        params << request.query_string unless query_string_blank?
+        unless options[:clobber_request]
+          params << header_params.to_query
+          params << request.query_string unless query_string_blank?
 
-        if raw_post_signature?
-          params << request.raw_post
+          params << request.raw_post if raw_post_signature?
         end
-      end
 
-      params.
-        join('&').split('&').
-        reject { |s| s.match(/\A\s*\z/) }.
-        map { |p| p.split('=').map{|esc| CGI.unescape(esc)} }.
-        reject { |kv| kv[0] == 'oauth_signature'}
-    end
+        params.
+          join("&").split("&").
+          reject { |s| s.match(/\A\s*\z/) }.
+          map { |p| p.split("=").map { |esc| CGI.unescape(esc) } }.
+          reject { |kv| kv[0] == "oauth_signature" }
+      end
 
-    def raw_post_signature?
-      (request.post? || request.put?) && request.content_type.to_s.downcase.start_with?("application/x-www-form-urlencoded")
-    end
+      def raw_post_signature?
+        (request.post? || request.put?) && request.content_type.to_s.downcase.start_with?("application/x-www-form-urlencoded")
+      end
 
-  protected
+      protected
 
-    def query_params
-      request.query_parameters
-    end
+      def query_params
+        request.query_parameters
+      end
 
-    def request_params
-      request.request_parameters
+      def request_params
+        request.request_parameters
+      end
     end
-
   end
 end

data/lib/oauth/request_proxy/action_dispatch_request.rb

@@ -1,7 +1,11 @@
-require 'oauth/request_proxy/rack_request'
+# frozen_string_literal: true
 
-module OAuth::RequestProxy
-  class ActionDispatchRequest < OAuth::RequestProxy::RackRequest
-    proxies ActionDispatch::Request
+require "oauth/request_proxy/rack_request"
+
+module OAuth
+  module RequestProxy
+    class ActionDispatchRequest < OAuth::RequestProxy::RackRequest
+      proxies ::ActionDispatch::Request
+    end
   end
 end

data/lib/oauth/request_proxy/base.rb

@@ -1,178 +1,182 @@
-require 'oauth/request_proxy'
-require 'oauth/helper'
+# frozen_string_literal: true
 
-module OAuth::RequestProxy
-  class Base
-    include OAuth::Helper
+require "oauth/request_proxy"
+require "oauth/helper"
 
-    def self.proxies(klass)
-      OAuth::RequestProxy.available_proxies[klass] = self
-    end
+module OAuth
+  module RequestProxy
+    class Base
+      include OAuth::Helper
 
-    attr_accessor :request, :options, :unsigned_parameters
+      def self.proxies(klass)
+        OAuth::RequestProxy.available_proxies[klass] = self
+      end
 
-    def initialize(request, options = {})
-      @request = request
-      @unsigned_parameters = (options[:unsigned_parameters] || []).map {|param| param.to_s}
-      @options = options
-    end
+      attr_accessor :request, :options, :unsigned_parameters
 
-    ## OAuth parameters
+      def initialize(request, options = {})
+        @request = request
+        @unsigned_parameters = (options[:unsigned_parameters] || []).map(&:to_s)
+        @options = options
+      end
 
-    def oauth_callback
-      parameters['oauth_callback']
-    end
+      ## OAuth parameters
 
-    def oauth_consumer_key
-      parameters['oauth_consumer_key']
-    end
+      def oauth_callback
+        parameters["oauth_callback"]
+      end
 
-    def oauth_nonce
-      parameters['oauth_nonce']
-    end
+      def oauth_consumer_key
+        parameters["oauth_consumer_key"]
+      end
 
-    def oauth_signature
-      # TODO can this be nil?
-      [parameters['oauth_signature']].flatten.first || ""
-    end
+      def oauth_nonce
+        parameters["oauth_nonce"]
+      end
 
-    def oauth_signature_method
-      case parameters['oauth_signature_method']
-      when Array
-        parameters['oauth_signature_method'].first
-      else
-        parameters['oauth_signature_method']
+      def oauth_signature
+        # TODO: can this be nil?
+        [parameters["oauth_signature"]].flatten.first || ""
       end
-    end
 
-    def oauth_timestamp
-      parameters['oauth_timestamp']
-    end
+      def oauth_signature_method
+        case parameters["oauth_signature_method"]
+        when Array
+          parameters["oauth_signature_method"].first
+        else
+          parameters["oauth_signature_method"]
+        end
+      end
 
-    def oauth_token
-      parameters['oauth_token']
-    end
+      def oauth_timestamp
+        parameters["oauth_timestamp"]
+      end
 
-    def oauth_verifier
-      parameters['oauth_verifier']
-    end
+      def oauth_token
+        parameters["oauth_token"]
+      end
 
-    def oauth_version
-      parameters["oauth_version"]
-    end
+      def oauth_verifier
+        parameters["oauth_verifier"]
+      end
 
-    # TODO deprecate these
-    alias_method :consumer_key,     :oauth_consumer_key
-    alias_method :token,            :oauth_token
-    alias_method :nonce,            :oauth_nonce
-    alias_method :timestamp,        :oauth_timestamp
-    alias_method :signature,        :oauth_signature
-    alias_method :signature_method, :oauth_signature_method
+      def oauth_version
+        parameters["oauth_version"]
+      end
 
-    ## Parameter accessors
+      # TODO: deprecate these
+      alias consumer_key oauth_consumer_key
+      alias token oauth_token
+      alias nonce oauth_nonce
+      alias timestamp oauth_timestamp
+      alias signature oauth_signature
+      alias signature_method oauth_signature_method
 
-    def parameters
-      raise NotImplementedError, "Must be implemented by subclasses"
-    end
+      ## Parameter accessors
 
-    def parameters_for_signature
-      parameters.select { |k,v| not signature_and_unsigned_parameters.include?(k) }
-    end
+      def parameters
+        raise NotImplementedError, "Must be implemented by subclasses"
+      end
 
-    def oauth_parameters
-      parameters.select { |k,v| OAuth::PARAMETERS.include?(k) }.reject { |k,v| v == "" }
-    end
+      def parameters_for_signature
+        parameters.select { |k, _v| !signature_and_unsigned_parameters.include?(k) }
+      end
 
-    def non_oauth_parameters
-      parameters.reject { |k,v| OAuth::PARAMETERS.include?(k) }
-    end
+      def oauth_parameters
+        parameters.select { |k, v| OAuth::PARAMETERS.include?(k) && !v.nil? && v != "" }
+      end
 
-    def signature_and_unsigned_parameters
-      unsigned_parameters+["oauth_signature"]
-    end
+      def non_oauth_parameters
+        parameters.select { |k, _v| !OAuth::PARAMETERS.include?(k) }
+      end
 
-    # See 9.1.2 in specs
-    def normalized_uri
-      u = URI.parse(uri)
-      "#{u.scheme.downcase}://#{u.host.downcase}#{(u.scheme.downcase == 'http' && u.port != 80) || (u.scheme.downcase == 'https' && u.port != 443) ? ":#{u.port}" : ""}#{(u.path && u.path != '') ? u.path : '/'}"
-    end
+      def signature_and_unsigned_parameters
+        unsigned_parameters + ["oauth_signature"]
+      end
 
-    # See 9.1.1. in specs Normalize Request Parameters
-    def normalized_parameters
-      normalize(parameters_for_signature)
-    end
+      # See 9.1.2 in specs
+      def normalized_uri
+        u = URI.parse(uri)
+        "#{u.scheme.downcase}://#{u.host.downcase}#{(u.scheme.casecmp("http").zero? && u.port != 80) || (u.scheme.casecmp("https").zero? && u.port != 443) ? ":#{u.port}" : ""}#{u.path && u.path != "" ? u.path : "/"}"
+      end
 
-    def sign(options = {})
-      OAuth::Signature.sign(self, options)
-    end
+      # See 9.1.1. in specs Normalize Request Parameters
+      def normalized_parameters
+        normalize(parameters_for_signature)
+      end
 
-    def sign!(options = {})
-      parameters["oauth_signature"] = sign(options)
-      @signed = true
-      signature
-    end
+      def sign(options = {})
+        OAuth::Signature.sign(self, options)
+      end
 
-    # See 9.1 in specs
-    def signature_base_string
-      base = [method, normalized_uri, normalized_parameters]
-      base.map { |v| escape(v) }.join("&")
-    end
+      def sign!(options = {})
+        parameters["oauth_signature"] = sign(options)
+        @signed = true
+        signature
+      end
 
-    # Has this request been signed yet?
-    def signed?
-      @signed
-    end
+      # See 9.1 in specs
+      def signature_base_string
+        base = [method, normalized_uri, normalized_parameters]
+        base.map { |v| escape(v) }.join("&")
+      end
+
+      # Has this request been signed yet?
+      def signed?
+        @signed
+      end
+
+      # URI, including OAuth parameters
+      def signed_uri(with_oauth: true)
+        if signed?
+          params = if with_oauth
+                     parameters
+                   else
+                     non_oauth_parameters
+                   end
 
-    # URI, including OAuth parameters
-    def signed_uri(with_oauth = true)
-      if signed?
-        if with_oauth
-          params = parameters
+          [uri, normalize(params)].join("?")
         else
-          params = non_oauth_parameters
+          warn "This request has not yet been signed!"
         end
-
-        [uri, normalize(params)] * "?"
-      else
-        STDERR.puts "This request has not yet been signed!"
       end
-    end
 
-    # Authorization header for OAuth
-    def oauth_header(options = {})
-      header_params_str = oauth_parameters.map { |k,v| "#{k}=\"#{escape(v)}\"" }.join(', ')
+      # Authorization header for OAuth
+      def oauth_header(options = {})
+        header_params_str = oauth_parameters.map { |k, v| "#{k}=\"#{escape(v)}\"" }.join(", ")
 
-      realm = "realm=\"#{options[:realm]}\", " if options[:realm]
-      "OAuth #{realm}#{header_params_str}"
-    end
+        realm = "realm=\"#{options[:realm]}\", " if options[:realm]
+        "OAuth #{realm}#{header_params_str}"
+      end
 
-    def query_string_blank?
-      if uri = request.env['REQUEST_URI']
-        uri.split('?', 2)[1].nil?
-      else
-        request.query_string.match(/\A\s*\z/)
+      def query_string_blank?
+        if (uri = request.env["REQUEST_URI"])
+          uri.split("?", 2)[1].nil?
+        else
+          request.query_string.match(/\A\s*\z/)
+        end
       end
-    end
 
-  protected
+      protected
 
-    def header_params
-      %w( X-HTTP_AUTHORIZATION Authorization HTTP_AUTHORIZATION ).each do |header|
-        next unless request.env.include?(header)
+      def header_params
+        %w[X-HTTP_AUTHORIZATION Authorization HTTP_AUTHORIZATION].each do |header|
+          next unless request.env.include?(header)
 
-        header = request.env[header]
-        next unless header[0,6] == 'OAuth '
+          header = request.env[header]
+          next unless header[0, 6] == "OAuth "
 
-        # parse the header into a Hash
-        oauth_params = OAuth::Helper.parse_header(header)
+          # parse the header into a Hash
+          oauth_params = OAuth::Helper.parse_header(header)
 
-        # remove non-OAuth parameters
-        oauth_params.reject! { |k,v| k !~ /^oauth_/ }
+          # remove non-OAuth parameters
+          oauth_params.select! { |k, _v| k =~ /^oauth_/ }
 
-        return oauth_params
-      end
+          return oauth_params
+        end
 
-      return {}
+        {}
+      end
     end
   end
 end

data/lib/oauth/request_proxy/curb_request.rb

@@ -1,55 +1,61 @@
-  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
+# frozen_string_literal: true
+
+require "oauth/request_proxy/base"
+require "curb"
+require "uri"
+require "cgi"
+
+module OAuth
+  module RequestProxy
+    module 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 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
+        def parameters
+          if options[:clobber_request]
+            options[:parameters]
+          else
+            post_parameters.merge(query_parameters).merge(options[:parameters] || {})
+          end
+        end
 
-    private
+        private
 
-    def query_parameters
-      query = URI.parse(request.url).query
-      return(query ? CGI.parse(query) : {})
-    end
+        def query_parameters
+          query = URI.parse(request.url).query
+          (query ? CGI.parse(query) : {})
+        end
 
-    def post_parameters
-      post_body = {}
+        def post_parameters
+          post_body = {}
 
-      # Post params are only used if posting form data
-      if (request.headers['Content-Type'] && request.headers['Content-Type'].to_s.downcase.start_with?("application/x-www-form-urlencoded"))
+          # Post params are only used if posting form data
+          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("=")
-          post_body[param[0]] = param[1]
+            request.post_body.split("&").each do |str|
+              param = str.split("=")
+              post_body[param[0]] = param[1]
+            end
+          end
+          post_body
         end
       end
-      post_body
     end
   end
 end