oauth 0.5.8 → 1.1.0

data/lib/oauth/request_proxy/net_http.rb

@@ -38,13 +38,11 @@ module OAuth
             request_params = CGI.parse(query_string)
             # request_params.each{|k,v| request_params[k] = [nil] if v == []}
 
-            if options[:parameters]
-              options[:parameters].each do |k,v|
-                if request_params.has_key?(k) && v
-                  request_params[k] << v
-                else
-                  request_params[k] = [v]
-                end
+            options[:parameters]&.each do |k, v|
+              if request_params.key?(k) && v
+                request_params[k] << v
+              else
+                request_params[k] = [v]
               end
             end
             request_params

data/lib/oauth/request_proxy/rest_client_request.rb

@@ -38,7 +38,8 @@ module OAuth
 
         def post_parameters
           # Post params are only used if posting form data
-          if method == "POST" || method == "PUT"
+          is_form_data = request.payload && request.payload.headers["Content-Type"] == "application/x-www-form-urlencoded"
+          if is_form_data && (method == "POST" || method == "PUT")
             OAuth::Helper.stringify_keys(query_string_to_hash(request.payload.to_s) || {})
           else
             {}

data/lib/oauth/request_proxy.rb

@@ -1,24 +1,27 @@
+# frozen_string_literal: true
+
 module OAuth
   module RequestProxy
-    def self.available_proxies #:nodoc:
+    def self.available_proxies # :nodoc:
       @available_proxies ||= {}
     end
 
     def self.proxy(request, options = {})
-      return request if request.kind_of?(OAuth::RequestProxy::Base)
+      return request if request.is_a?(OAuth::RequestProxy::Base)
 
       klass = available_proxies[request.class]
 
       # Search for possible superclass matches.
       if klass.nil?
-        request_parent = available_proxies.keys.find { |rc| request.kind_of?(rc) }
+        request_parent = available_proxies.keys.find { |rc| request.is_a?(rc) }
         klass = available_proxies[request_parent]
       end
 
       raise UnknownRequestType, request.class.to_s unless klass
+
       klass.new(request, options)
     end
 
-    class UnknownRequestType < Exception; end
+    class UnknownRequestType < RuntimeError; end
   end
 end

data/lib/oauth/server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "oauth/helper"
 require "oauth/consumer"
 
@@ -8,9 +10,9 @@ module OAuth
     attr_accessor :base_url
 
     @@server_paths = {
-      :request_token_path => "/oauth/request_token",
-      :authorize_path     => "/oauth/authorize",
-      :access_token_path  => "/oauth/access_token"
+      request_token_path: "/oauth/request_token",
+      authorize_path: "/oauth/authorize",
+      access_token_path: "/oauth/access_token"
     }
 
     # Create a new server instance
@@ -23,7 +25,7 @@ module OAuth
       [generate_key(16), generate_key]
     end
 
-    def generate_consumer_credentials(params = {})
+    def generate_consumer_credentials(_params = {})
       Consumer.new(*generate_credentials)
     end
 
@@ -31,12 +33,12 @@ module OAuth
     def create_consumer
       creds = generate_credentials
       Consumer.new(creds[0], creds[1],
-        {
-          :site               => base_url,
-          :request_token_path => request_token_path,
-          :authorize_path     => authorize_path,
-          :access_token_path  => access_token_path
-        })
+                   {
+                     site: base_url,
+                     request_token_path: request_token_path,
+                     authorize_path: authorize_path,
+                     access_token_path: access_token_path
+                   })
     end
 
     def request_token_path

data/lib/oauth/signature/base.rb

@@ -1,98 +1,103 @@
+# frozen_string_literal: true
+
 require "oauth/signature"
 require "oauth/helper"
 require "oauth/request_proxy/base"
 require "base64"
 
-module OAuth::Signature
-  class Base
-    include OAuth::Helper
+module OAuth
+  module Signature
+    class Base
+      include OAuth::Helper
 
-    attr_accessor :options
-    attr_reader :token_secret, :consumer_secret, :request
+      attr_accessor :options
+      attr_reader :token_secret, :consumer_secret, :request
 
-    def self.implements(signature_method = nil)
-      return @implements if signature_method.nil?
-      @implements = signature_method
-      OAuth::Signature.available_methods[@implements] = self
-    end
+      def self.implements(signature_method = nil)
+        return @implements if signature_method.nil?
+
+        @implements = signature_method
+        OAuth::Signature.available_methods[@implements] = self
+      end
 
-    def initialize(request, options = {}, &block)
-      raise TypeError unless request.kind_of?(OAuth::RequestProxy::Base)
-      @request = request
-      @options = options
+      def initialize(request, options = {}, &block)
+        raise TypeError unless request.is_a?(OAuth::RequestProxy::Base)
 
-      ## consumer secret was determined beforehand
+        @request = request
+        @options = options
 
-      @consumer_secret = options[:consumer].secret if options[:consumer]
+        ## consumer secret was determined beforehand
 
-      # presence of :consumer_secret option will override any Consumer that's provided
-      @consumer_secret = options[:consumer_secret] if options[:consumer_secret]
+        @consumer_secret = options[:consumer].secret if options[:consumer]
 
-      ## token secret was determined beforehand
+        # presence of :consumer_secret option will override any Consumer that's provided
+        @consumer_secret = options[:consumer_secret] if options[:consumer_secret]
 
-      @token_secret = options[:token].secret if options[:token]
+        ## token secret was determined beforehand
 
-      # presence of :token_secret option will override any Token that's provided
-      @token_secret = options[:token_secret] if options[:token_secret]
+        @token_secret = options[:token].secret if options[:token]
 
-      # 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
-        secrets = yield block.arity == 1 ? request : [token, consumer_key, nonce, request.timestamp]
-        if secrets.is_a?(Array) && secrets.size == 2
-          @token_secret = secrets[0]
-          @consumer_secret = secrets[1]
+        # 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
+          # consumer secret and token secret need to be looked up based on pieces of the request
+          secrets = yield block.arity == 1 ? request : [token, consumer_key, nonce, request.timestamp]
+          if secrets.is_a?(Array) && secrets.size == 2
+            @token_secret = secrets[0]
+            @consumer_secret = secrets[1]
+          end
         end
       end
-    end
 
-    def signature
-      Base64.encode64(digest).chomp.gsub(/\n/,"")
-    end
+      def signature
+        Base64.encode64(digest).chomp.delete("\n")
+      end
 
-    def ==(cmp_signature)
-      check = signature.bytesize ^ cmp_signature.bytesize
-      signature.bytes.zip(cmp_signature.bytes) { |x, y| check |= x ^ y.to_i }
-      check.zero?
-    end
+      def ==(other)
+        check = signature.bytesize ^ other.bytesize
+        signature.bytes.zip(other.bytes) { |x, y| check |= x ^ y.to_i }
+        check.zero?
+      end
 
-    def verify
-      self == self.request.signature
-    end
+      def verify
+        self == request.signature
+      end
 
-    def signature_base_string
-      request.signature_base_string
-    end
+      def signature_base_string
+        request.signature_base_string
+      end
 
-    def body_hash
-      raise_instantiation_error
-    end
+      def body_hash
+        raise_instantiation_error
+      end
 
-    private
+      private
 
-    def token
-      request.token
-    end
+      def token
+        request.token
+      end
 
-    def consumer_key
-      request.consumer_key
-    end
+      def consumer_key
+        request.consumer_key
+      end
 
-    def nonce
-      request.nonce
-    end
+      def nonce
+        request.nonce
+      end
 
-    def secret
-      "#{escape(consumer_secret)}&#{escape(token_secret)}"
-    end
+      def secret
+        "#{escape(consumer_secret)}&#{escape(token_secret)}"
+      end
 
-    def digest
-      raise_instantiation_error
-    end
+      def digest
+        raise_instantiation_error
+      end
 
-    def raise_instantiation_error
-      raise NotImplementedError, "Cannot instantiate #{self.class.name} class directly."
+      def raise_instantiation_error
+        raise NotImplementedError, "Cannot instantiate #{self.class.name} class directly."
+      end
     end
-
   end
 end

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

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

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

@@ -1,17 +1,23 @@
+# frozen_string_literal: true
+
 require "oauth/signature/base"
 
-module OAuth::Signature::HMAC
-  class SHA256 < OAuth::Signature::Base
-    implements "hmac-sha256"
+module OAuth
+  module Signature
+    module HMAC
+      class SHA256 < OAuth::Signature::Base
+        implements "hmac-sha256"
 
-    def body_hash
-      Base64.encode64(OpenSSL::Digest::SHA256.digest(request.body || "")).chomp.gsub(/\n/,"")
-    end
+        def body_hash
+          Base64.encode64(OpenSSL::Digest.digest("SHA256", request.body || "")).chomp.delete("\n")
+        end
 
-    private
+        private
 
-    def digest
-      OpenSSL::HMAC.digest(OpenSSL::Digest.new("sha256"), secret, signature_base_string)
+        def digest
+          OpenSSL::HMAC.digest(OpenSSL::Digest.new("sha256"), secret, signature_base_string)
+        end
+      end
     end
   end
 end

data/lib/oauth/signature/plaintext.rb

@@ -1,29 +1,27 @@
-require "oauth/signature/base"
+# frozen_string_literal: true
 
-module OAuth::Signature
-  class PLAINTEXT < Base
-    implements "plaintext"
+require "oauth/signature/base"
 
-    def signature
-      signature_base_string
-    end
+module OAuth
+  module Signature
+    class PLAINTEXT < Base
+      implements "plaintext"
 
-    def ==(cmp_signature)
-      signature.to_s == cmp_signature.to_s
-    end
+      def signature
+        signature_base_string
+      end
 
-    def signature_base_string
-      secret
-    end
-
-    def body_hash
-      nil
-    end
+      def ==(other)
+        signature.to_s == other.to_s
+      end
 
-    private
+      def signature_base_string
+        secret
+      end
 
-    def secret
-      super
+      def body_hash
+        nil
+      end
     end
   end
 end

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

@@ -1,50 +1,58 @@
-require "oauth/signature/base"
+# frozen_string_literal: true
 
-module OAuth::Signature::RSA
-  class SHA1 < OAuth::Signature::Base
-    implements "rsa-sha1"
+require "oauth/signature/base"
 
-    def ==(cmp_signature)
-      public_key.verify(OpenSSL::Digest::SHA1.new, Base64.decode64(cmp_signature.is_a?(Array) ? cmp_signature.first : cmp_signature), signature_base_string)
-    end
+module OAuth
+  module Signature
+    module RSA
+      class SHA1 < OAuth::Signature::Base
+        implements "rsa-sha1"
 
-    def public_key
-      if consumer_secret.is_a?(String)
-        decode_public_key
-      elsif consumer_secret.is_a?(OpenSSL::X509::Certificate)
-        consumer_secret.public_key
-      else
-        consumer_secret
-      end
-    end
+        def ==(other)
+          public_key.verify(OpenSSL::Digest.new("SHA1"),
+                            Base64.decode64(other.is_a?(Array) ? other.first : other), signature_base_string)
+        end
 
-    def body_hash
-      Base64.encode64(OpenSSL::Digest::SHA1.digest(request.body || "")).chomp.gsub(/\n/,"")
-    end
+        def public_key
+          case consumer_secret
+          when String
+            decode_public_key
+          when OpenSSL::X509::Certificate
+            consumer_secret.public_key
+          else
+            consumer_secret
+          end
+        end
 
-    private
+        def body_hash
+          Base64.encode64(OpenSSL::Digest.digest("SHA1", request.body || "")).chomp.delete("\n")
+        end
 
-    def decode_public_key
-      case consumer_secret
-      when /-----BEGIN CERTIFICATE-----/
-        OpenSSL::X509::Certificate.new( consumer_secret).public_key
-      else
-        OpenSSL::PKey::RSA.new( consumer_secret)
-      end
-    end
+        private
 
-    def digest
-      private_key = OpenSSL::PKey::RSA.new(
-        if options[:private_key_file]
-          IO.read(options[:private_key_file])
-        elsif options[:private_key]
-          options[:private_key]
-        else
-          consumer_secret
+        def decode_public_key
+          case consumer_secret
+          when /-----BEGIN CERTIFICATE-----/
+            OpenSSL::X509::Certificate.new(consumer_secret).public_key
+          else
+            OpenSSL::PKey::RSA.new(consumer_secret)
+          end
         end
-      )
 
-      private_key.sign(OpenSSL::Digest::SHA1.new, signature_base_string)
+        def digest
+          private_key = OpenSSL::PKey::RSA.new(
+            if options[:private_key_file]
+              File.read(options[:private_key_file])
+            elsif options[:private_key]
+              options[:private_key]
+            else
+              consumer_secret
+            end
+          )
+
+          private_key.sign(OpenSSL::Digest.new("SHA1"), signature_base_string)
+        end
+      end
     end
   end
 end

data/lib/oauth/signature.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OAuth
   module Signature
     # Returns a list of available signature methods
@@ -15,31 +17,32 @@ module OAuth
         ((c = request.options[:consumer]) && c.options[:signature_method]) ||
         "").downcase]
       raise UnknownSignatureMethod, request.signature_method unless klass
+
       klass.new(request, options, &block)
     end
 
     # Sign a +request+
     def self.sign(request, options = {}, &block)
-      self.build(request, options, &block).signature
+      build(request, options, &block).signature
     end
 
     # Verify the signature of +request+
     def self.verify(request, options = {}, &block)
-      self.build(request, options, &block).verify
+      build(request, options, &block).verify
     end
 
     # Create the signature base string for +request+. This string is the normalized parameter information.
     #
     # See Also: {OAuth core spec version 1.0, section 9.1.1}[http://oauth.net/core/1.0#rfc.section.9.1.1]
     def self.signature_base_string(request, options = {}, &block)
-      self.build(request, options, &block).signature_base_string
+      build(request, options, &block).signature_base_string
     end
 
     # Create the body hash for a request
     def self.body_hash(request, options = {}, &block)
-      self.build(request, options, &block).body_hash
+      build(request, options, &block).body_hash
     end
 
-    class UnknownSignatureMethod < Exception; end
+    class UnknownSignatureMethod < RuntimeError; end
   end
 end

data/lib/oauth/token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # this exists for backwards-compatibility
 
 require "oauth/tokens/token"

data/lib/oauth/tokens/access_token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OAuth
   # The Access Token is used for the actual "real" web service calls that you perform against the server
   class AccessToken < ConsumerToken

data/lib/oauth/tokens/consumer_token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OAuth
   # Superclass for tokens used by OAuth Clients
   class ConsumerToken < Token
@@ -5,12 +7,12 @@ module OAuth
     attr_reader   :response
 
     def self.from_hash(consumer, hash)
-      token = self.new(consumer, hash[:oauth_token], hash[:oauth_token_secret])
+      token = new(consumer, hash[:oauth_token], hash[:oauth_token_secret])
       token.params = hash
       token
     end
 
-    def initialize(consumer, token="", secret="")
+    def initialize(consumer, token = "", secret = "")
       super(token, secret)
       @consumer = consumer
       @params   = {}

data/lib/oauth/tokens/request_token.rb

@@ -1,20 +1,21 @@
+# frozen_string_literal: true
+
 module OAuth
   # The RequestToken is used for the initial Request.
   # This is normally created by the Consumer object.
   class RequestToken < ConsumerToken
-
     # Generate an authorization URL for user authorization
     def authorize_url(params = nil)
-      return nil if self.token.nil?
+      return nil if token.nil?
 
-      params = (params || {}).merge(:oauth_token => self.token)
+      params = (params || {}).merge(oauth_token: token)
       build_url(consumer.authorize_url, params)
     end
 
     def authenticate_url(params = nil)
-      return nil if self.token.nil?
+      return nil if token.nil?
 
-      params = (params || {}).merge(:oauth_token => self.token)
+      params = (params || {}).merge(oauth_token: token)
       build_url(consumer.authenticate_url, params)
     end
 
@@ -24,20 +25,21 @@ module OAuth
 
     # exchange for AccessToken on server
     def get_access_token(options = {}, *arguments)
-      response = consumer.token_request(consumer.http_method, (consumer.access_token_url? ? consumer.access_token_url : consumer.access_token_path), self, options, *arguments)
+      response = consumer.token_request(consumer.http_method,
+                                        (consumer.access_token_url? ? consumer.access_token_url : consumer.access_token_path), self, options, *arguments)
       OAuth::AccessToken.from_hash(consumer, response)
     end
 
-  protected
+    protected
 
     # construct an authorization or authentication url
     def build_url(base_url, params)
       uri = URI.parse(base_url.to_s)
       queries = {}
-      queries = Hash[URI.decode_www_form(uri.query)] if uri.query
-      # TODO doesn't handle array values correctly
+      queries = URI.decode_www_form(uri.query).to_h if uri.query
+      # TODO: doesn't handle array values correctly
       queries.merge!(params) if params
-      uri.query = URI.encode_www_form(queries) if !queries.empty?
+      uri.query = URI.encode_www_form(queries) unless queries.empty?
       uri.to_s
     end
   end

data/lib/oauth/tokens/server_token.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module OAuth
   # Used on the server for generating tokens
   class ServerToken < Token
-
     def initialize
       super(generate_key(16), generate_key)
     end

data/lib/oauth/tokens/token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OAuth
   # Superclass for the various tokens used by OAuth
   class Token

data/lib/oauth/version.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
 module OAuth
-  VERSION = "0.5.8"
+  module Version
+    VERSION = "1.1.0"
+  end
 end