oauth 0.5.8 → 0.5.11

data/lib/oauth/request_proxy/rest_client_request.rb

@@ -51,9 +51,9 @@ module OAuth
           query.split("&").inject({}) do |result, q|
             k, v = q.split("=")
             if !v.nil?
-              result.merge({ k => v })
+              result.merge(k => v)
             elsif !result.key?(k)
-              result.merge({ k => true })
+              result.merge(k => true)
             else
               result
             end

data/lib/oauth/request_proxy.rb

@@ -5,13 +5,13 @@ module OAuth
     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
 
@@ -19,6 +19,6 @@ module OAuth
       klass.new(request, options)
     end
 
-    class UnknownRequestType < Exception; end
+    class UnknownRequestType < RuntimeError; end
   end
 end

data/lib/oauth/server.rb

@@ -8,9 +8,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 +23,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 +31,10 @@ 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

@@ -17,7 +17,7 @@ module OAuth::Signature
     end
 
     def initialize(request, options = {}, &block)
-      raise TypeError unless request.kind_of?(OAuth::RequestProxy::Base)
+      raise TypeError unless request.is_a?(OAuth::RequestProxy::Base)
       @request = request
       @options = options
 
@@ -47,7 +47,7 @@ module OAuth::Signature
     end
 
     def signature
-      Base64.encode64(digest).chomp.gsub(/\n/,"")
+      Base64.encode64(digest).chomp.delete("\n")
     end
 
     def ==(cmp_signature)
@@ -57,7 +57,7 @@ module OAuth::Signature
     end
 
     def verify
-      self == self.request.signature
+      self == request.signature
     end
 
     def signature_base_string
@@ -93,6 +93,5 @@ module OAuth::Signature
     def raise_instantiation_error
       raise NotImplementedError, "Cannot instantiate #{self.class.name} class directly."
     end
-
   end
 end

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

@@ -5,7 +5,7 @@ module OAuth::Signature::HMAC
     implements "hmac-sha1"
 
     def body_hash
-      Base64.encode64(OpenSSL::Digest::SHA1.digest(request.body || "")).chomp.gsub(/\n/,"")
+      Base64.encode64(OpenSSL::Digest::SHA1.digest(request.body || "")).chomp.delete("\n")
     end
 
     private

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

@@ -5,7 +5,7 @@ module OAuth::Signature::HMAC
     implements "hmac-sha256"
 
     def body_hash
-      Base64.encode64(OpenSSL::Digest::SHA256.digest(request.body || "")).chomp.gsub(/\n/,"")
+      Base64.encode64(OpenSSL::Digest::SHA256.digest(request.body || "")).chomp.delete("\n")
     end
 
     private

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

@@ -19,7 +19,7 @@ module OAuth::Signature::RSA
     end
 
     def body_hash
-      Base64.encode64(OpenSSL::Digest::SHA1.digest(request.body || "")).chomp.gsub(/\n/,"")
+      Base64.encode64(OpenSSL::Digest::SHA1.digest(request.body || "")).chomp.delete("\n")
     end
 
     private
@@ -27,9 +27,9 @@ module OAuth::Signature::RSA
     def decode_public_key
       case consumer_secret
       when /-----BEGIN CERTIFICATE-----/
-        OpenSSL::X509::Certificate.new( consumer_secret).public_key
+        OpenSSL::X509::Certificate.new(consumer_secret).public_key
       else
-        OpenSSL::PKey::RSA.new( consumer_secret)
+        OpenSSL::PKey::RSA.new(consumer_secret)
       end
     end
 

data/lib/oauth/signature.rb

@@ -20,26 +20,26 @@ module OAuth
 
     # 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/tokens/consumer_token.rb

@@ -5,12 +5,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

@@ -2,19 +2,18 @@ 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
 
@@ -28,16 +27,16 @@ module OAuth
       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
+      # 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,6 @@
 module OAuth
   # Used on the server for generating tokens
   class ServerToken < Token
-
     def initialize
       super(generate_key(16), generate_key)
     end

data/lib/oauth/version.rb

@@ -1,3 +1,3 @@
 module OAuth
-  VERSION = "0.5.8"
+  VERSION = "0.5.11".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.11
 platform: ruby
 authors:
 - Pelle Braendgaard
@@ -16,22 +16,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -78,16 +64,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.16'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -106,16 +92,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -134,16 +120,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +144,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-lts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -253,12 +253,40 @@ homepage: https://github.com/oauth-xx/oauth-ruby
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: https://github.com/oauth-xx/oauth-ruby/issues
-  changelog_uri: https://github.com/oauth-xx/oauth-ruby/blob/master/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/github/oauth-xx/oauth-ruby/master
   homepage_uri: https://github.com/oauth-xx/oauth-ruby
-  source_code_uri: https://github.com/oauth-xx/oauth-ruby
-post_install_message:
+  source_code_uri: https://github.com/oauth-xx/oauth-ruby/tree/v0.5.11
+  changelog_uri: https://github.com/oauth-xx/oauth-ruby/blob/v0.5.11/CHANGELOG.md
+  bug_tracker_uri: https://github.com/oauth-xx/oauth-ruby/issues
+  documentation_uri: https://www.rubydoc.info/gems/oauth/0.5.11
+  wiki_uri: https://github.com/oauth-xx/oauth-ruby/wiki
+  rubygems_mfa_required: 'true'
+post_install_message: |2+
+
+  You have installed oauth2 version 0.5.11, congratulations!
+
+  Support for the 0.5.x series will end in April, 2023. Please upgrade to 0.6.x as soon as possible!
+  The only breaking change will be dropped support for Ruby 2.0, 2.1, 2.2, and 2.3.
+
+  Please see:
+  • https://github.com/oauth-xx/oauth/blob/main/SECURITY.md
+
+  Note also that I, and this project, am in the process of leaving Github.
+  I wrote about some of the reasons here:
+  • https://dev.to/galtzo/im-leaving-github-50ba
+
+  If you are a human, please consider a donation as I move toward supporting myself with Open Source work:
+  • https://liberapay.com/pboling
+  • https://ko-fi.com/pboling
+  • https://patreon.com/galtzo
+
+  If you are a corporation, please consider supporting this project, and open source work generally, with a TideLift subscription.
+  • https://tidelift.com/funding/github/rubygems/oauth
+  • Or hire me. I am looking for a job!
+
+  Please report issues, and support the project!
+
+  Thanks, |7eter l-|. l3oling
+
 rdoc_options: []
 require_paths:
 - lib
@@ -273,8 +301,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.20
 signing_key:
 specification_version: 4
 summary: OAuth Core Ruby implementation
 test_files: []
+...