RubyGems - oauth - Versions diffs - 0.6.1 → 1.0.1 - Mend

oauth 0.6.1 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +30 -1
data/CONTRIBUTING.md +1 -1
data/LICENSE +2 -1
data/README.md +25 -22
data/SECURITY.md +10 -5
data/lib/oauth/cli/sign_command.rb +1 -3
data/lib/oauth/client/em_http.rb +1 -3
data/lib/oauth/consumer.rb +49 -54
data/lib/oauth/request_proxy/action_controller_request.rb +3 -24
data/lib/oauth/request_proxy/base.rb +1 -1
data/lib/oauth/request_proxy/net_http.rb +1 -3
data/lib/oauth/signature/base.rb +1 -3
data/lib/oauth/version.rb +1 -1
data/lib/oauth.rb +1 -0
metadata +30 -16

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 414ee66cdf6d7d20e2caddba76264dc3a5d5d058157abe8cd77907cfe42e2fbe
-  data.tar.gz: de2152db1bf49cb9397bb95eaf10ebbe67f755f3de478cb36e4350beda3b2b5f
+  metadata.gz: 6209290a96231a2cca740d8fbfec7831e97f7b2b848997ebae0ea1a130a48a3d
+  data.tar.gz: 34689bed290728cb8e628bce2fd781fbec783b2dca832267093a228ef247e8ee
 SHA512:
-  metadata.gz: 2ab63e0e09c842637f45bf7053eae8c834238b36cee7ae8771a70766c51cea0a1b1277c025a46caa9fb5499fd93ff342749dc42e70bb5a3351a169b894602f0d
-  data.tar.gz: aca6573f60c0926534fa3f6b1e40695c3ddb96ee9153cc9a3bc3bf6948d831918c1f358afde4273eca4a9608b2e20cc75e8b86a2e9cc53ab257d1084a6130e0a
+  metadata.gz: a1725bcd2a976993bba7a2b61da4b24dd2b5086dfd01da52724f21dac2e87f7fff9ca595c479716aeec8a490c3ad16bc4a308a93edfb6c9cc957afbd4f0805cd
+  data.tar.gz: 516b1f0823a5f8a294e5b27fa0eda305af35c77bfaf448dd17144f1d67f9d6f6ea2807b77827c62e3a583ad92f7b8a586e3812e518b06687ac05cc5e6649dc17

data/CHANGELOG.md CHANGED Viewed

@@ -13,6 +13,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
+## [1.0.1] 2022-08-29
+### Changed
+* `OAuth::Comsumer#options` hash is now handled by `snaky_hash`, which was extracted from `oauth2`
+  * symbolized keys, dot-access and snake-case are now normalized
+## [1.0.0] 2022-08-23
+### Changed
+* Dropped support for Ruby < 2.7
+* Dropped support for Rails < 6
+### Added
+* New EOL Policy
+  * Non-commercial support for the oldest version of Ruby (which itself is going EOL) will be dropped each year in April
+## [0.6.2] 2022-08-29
+### Changed
+* `OAuth::Comsumer#options` hash is now handled by `snaky_hash`, which was extracted from `oauth2`
+  * symbolized keys, dot-access and snake-case are now normalized
 ## [0.6.1] 2022-08-23
 ### Changed
 * Fixed documentation in SECURITY.md
@@ -35,6 +54,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 * Ruby 2.0, 2.1, 2.2, and 2.3 are no longer valid install targets
+## [0.5.14] 2022-08-29
+The "hopeful last 0.5.x" Release
+### Fixed
+* More typos fixed
 ## [0.5.13] 2022-08-23
 The "I think I caught 'em all!" Release
@@ -431,9 +456,13 @@ but please have a look at the unit tests.
 * Moved all non-Rails functionality from the Rails plugin:
   http://code.google.com/p/oauth-plugin/
-[Unreleased]: https://github.com/oauth-xx/oauth-ruby/compare/v0.6.1...v0.6-maintenance
+[Unreleased]: https://github.com/oauth-xx/oauth-ruby/compare/v1.0.1...main
+[1.0.1]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v1.0.1
+[1.0.0]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v1.0.0
+[0.6.2]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.6.2
 [0.6.1]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.6.1
 [0.6.0]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.6.0
+[0.5.14]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.5.14
 [0.5.13]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.5.13
 [0.5.12]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.5.12
 [0.5.11]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.5.11

data/CONTRIBUTING.md CHANGED Viewed

@@ -17,7 +17,7 @@ Made with [contributors-img][contrib-rocks].
 [comment]: <> (Following links are used by README, CONTRIBUTING, Homepage)
 [conduct]: https://github.com/oauth-xx/oauth-ruby/blob/main/CODE_OF_CONDUCT.md
-[contributing]: https://github.com/oauth-xx/oauth-ruby/blob/main/CONTRIBUTING.md
 [contributors]: https://github.com/oauth-xx/oauth-ruby/graphs/contributors
 [mailinglist]: http://groups.google.com/group/oauth-ruby
 [source]: https://github.com/oauth-xx/oauth-ruby/
+[contrib-rocks]: https://contrib.rocks

data/LICENSE CHANGED Viewed

@@ -1,6 +1,7 @@
 The MIT License (MIT)
-Copyright (c) 2007-2012, 2016-2017, 2020-2021 Blaine Cook, Larry Halff, Pelle Braendgaard, Peter Boling
+Copyright (c) 2007-2012, 2016-2017 Blaine Cook, Larry Halff, Pelle Braendgaard
+Copyright (c) 2020-2022 Peter Boling
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md CHANGED Viewed

@@ -20,11 +20,17 @@ See the sibling `oauth2` gem for OAuth 2.0 implementations in Ruby.
 [oauth1-spec]: http://oauth.net/core/1.0/
 [sibling-gem]: https://github.com/oauth-xx/oauth-ruby
-**NOTE**
+**New EOL Policy**
-This README, on branch `v0.6-maintenance`, targets 0.6.x series releases.
-The v0.6.x series of releases will be EOL no later than April, 2024.
-For later releases please see the `main` branch README.
+Versions 1.0.x will be EOL no later than April, 2025.
+Versions 0.6.x will be EOL no later than April, 2024.
+Versions 0.5.x will be EOL no later than April, 2023.
+This will facilitate dropping support for old, dead, and crusty versions of Ruby.
+Non-commercial support for the oldest version of Ruby (which itself is going EOL) will be dropped each year in April.
+Please upgrade to version 1.0.  The only breaking change in 1.0 is dropping old Rubies.
 ## Status
@@ -57,10 +63,10 @@ appended indicators:
 |     | Project               | bundle add oauth                                                                                                                                                                                                                                                                                |
 |:----|-----------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| 1️⃣ | name, license, docs   | [![RubyGems.org][⛳️name-img]][⛳️gem] [![License: MIT][🖇src-license-img]][🖇src-license] [![FOSSA][🏘fossa-img]][🏘fossa] [![RubyDoc.info][🚎yard-img]][🚎yard] [![InchCI][🖐inch-ci-img]][🚎yard]                                                                                              |
+| 1️⃣ | name, license, docs   | [![RubyGems.org][⛳️name-img]][⛳️gem] [![License: MIT][🖇src-license-img]][🖇src-license] [![RubyDoc.info][🚎yard-img]][🚎yard]                                                                                                                                                                  |
 | 2️⃣ | version & activity    | [![Gem Version][⛳️version-img]][⛳️gem] [![Total Downloads][🖇DL-total-img]][⛳️gem] [![Download Rank][🏘DL-rank-img]][⛳️gem] [![Source Code][🚎src-home-img]][🚎src-home] [![Open PRs][🖐prs-o-img]][🖐prs-o] [![Closed PRs][🧮prs-c-img]][🧮prs-c] <!--[![Next Version][📗next-img]][📗next]--> |
 | 3️⃣ | maintenance & linting | [![Maintainability][⛳cclim-maint-img♻️]][⛳cclim-maint] [![Helpers][🖇triage-help-img]][🖇triage-help] [![Depfu][🏘depfu-img♻️]][🏘depfu♻️] [![Contributors][🚎contributors-img]][🚎contributors] [![Style][🖐style-wf-img]][🖐style-wf] [![Kloc Roll][🧮kloc-img]][🧮kloc]                      |
-| 4️⃣ | testing               | [![Open Issues][⛳iss-o-img]][⛳iss-o] [![Closed Issues][🖇iss-c-img]][🖇iss-c] [![Supported][🏘sup-wf-img]][🏘sup-wf] [![Heads][🚎heads-wf-img]][🚎heads-wf] [![Unofficial Support][🖐uns-wf-img]][🖐uns-wf] [![MacOS][🧮mac-wf-img]][🧮mac-wf] [![Windows][📗win-wf-img]][📗win-wf]             |
+| 4️⃣ | testing               | [![Open Issues][⛳iss-o-img]][⛳iss-o] [![Closed Issues][🖇iss-c-img]][🖇iss-c] [![Supported][🏘sup-wf-img]][🏘sup-wf] [![Heads][🚎heads-wf-img]][🚎heads-wf] [![MacOS][🧮mac-wf-img]][🧮mac-wf] [![Windows][📗win-wf-img]][📗win-wf]                                                             |
 | 5️⃣ | coverage & security   | [![CodeClimate][⛳cclim-cov-img♻️]][⛳cclim-cov] [![CodeCov][🖇codecov-img♻️]][🖇codecov] [![Coveralls][🏘coveralls-img]][🏘coveralls] [![Security Policy][🚎sec-pol-img]][🚎sec-pol] [![CodeQL][🖐codeQL-img]][🖐codeQL] [![Code Coverage][🧮cov-wf-img]][🧮cov-wf]                              |
 | 6️⃣ | resources             | [![Discussion][⛳gh-discussions-img]][⛳gh-discussions] [![Get help on Codementor][🖇codementor-img]][🖇codementor] [![Chat][🏘chat-img]][🏘chat] [![Blog][🚎blog-img]][🚎blog] [![Blog][🖐wiki-img]][🖐wiki]                                                                                     |
 | 7️⃣ | spread 💖             | [![Liberapay Patrons][⛳liberapay-img]][⛳liberapay] [![Sponsor Me][🖇sponsor-img]][🖇sponsor] [![Tweet @ Peter][🏘tweet-img]][🏘tweet] [🌏][aboutme] [👼][angelme] [💻][coderme]                                                                                                                 |
@@ -74,11 +80,8 @@ The link tokens in the following sections should be kept ordered by the row and
 [⛳️name-img]: https://img.shields.io/badge/name-oauth-brightgreen.svg?style=flat
 [🖇src-license]: https://opensource.org/licenses/MIT
 [🖇src-license-img]: https://img.shields.io/badge/License-MIT-green.svg
-[🏘fossa]: https://app.fossa.io/projects/git%2Bgithub.com%2Foauth-xx%2Foauth-ruby?ref=badge_shield
-[🏘fossa-img]: https://app.fossa.io/api/projects/git%2Bgithub.com%2Foauth-xx%2Foauth-ruby.svg?type=shield
 [🚎yard]: https://www.rubydoc.info/github/oauth-xx/oauth-ruby
 [🚎yard-img]: https://img.shields.io/badge/documentation-rubydoc-brightgreen.svg?style=flat
-[🖐inch-ci-img]: http://inch-ci.org/github/oauth-xx/oauth-ruby.png
 <!-- 2️⃣ version & activity -->
 [⛳️version-img]: http://img.shields.io/gem/v/oauth.svg
@@ -116,8 +119,6 @@ The link tokens in the following sections should be kept ordered by the row and
 [🏘sup-wf-img]: https://github.com/oauth-xx/oauth-ruby/actions/workflows/supported.yml/badge.svg
 [🚎heads-wf]: https://github.com/oauth-xx/oauth-ruby/actions/workflows/heads.yml
 [🚎heads-wf-img]: https://github.com/oauth-xx/oauth-ruby/actions/workflows/heads.yml/badge.svg
-[🖐uns-wf]: https://github.com/oauth-xx/oauth-ruby/actions/workflows/unsupported.yml
-[🖐uns-wf-img]: https://github.com/oauth-xx/oauth-ruby/actions/workflows/unsupported.yml/badge.svg
 [🧮mac-wf]: https://github.com/oauth-xx/oauth-ruby/actions/workflows/macos.yml
 [🧮mac-wf-img]: https://github.com/oauth-xx/oauth-ruby/actions/workflows/macos.yml/badge.svg
 [📗win-wf]: https://github.com/oauth-xx/oauth-ruby/actions/workflows/windows.yml
@@ -187,12 +188,12 @@ For more see [SECURITY.md][🚎sec-pol].
 ## Compatibility
 Targeted ruby compatibility is non-EOL versions of Ruby, currently 2.7, 3.0, and
-3.1. Ruby is limited to 2.4+ in the gemspec, and this will change with minor version bumps,
+3.1. Ruby is limited to 2.7+ in the gemspec, and this will change with minor version bumps,
 while the gem is still in 0.x, in accordance with the SemVer spec.
-The `main` branch now targets 1.0.x releases.
-See `v0.6-maintenance` branch for Ruby >= 2.4.
-See `v0.5-maintenance` branch for Ruby >= 2.0.
+The `main` branch now targets 1.0.x releases, for Ruby >= 2.7.
+See `v0.6-maintenance` (EOL April, 2024) branch for Ruby >= 2.4.
+See `v0.5-maintenance` (EOL April, 2023) branch for Ruby >= 2.0.
 NOTE: No further releases of version < 1.0.x are anticipated.
@@ -224,12 +225,12 @@ fashion. If critical issues for a particular implementation exist at the time
 of a major release, support for that Ruby version may be dropped.
 </details>
-|     | Ruby OAuth Version | Maintenance Branch | 🚂 Compatibility       | Official 💎          | Unofficial 💎                | Incidental 💎 |
-|:----|--------------------|--------------------|------------------------|----------------------|------------------------------|---------------|
-| 1️⃣ | 1.0.x              | `main`             | Rails 6, 7             | 2.7, 3.0, 3.1        | sorry, not sorry             | nope          |
-| 2️⃣ | 0.6.x              | `v0.6-maintenance` | Rails 5, 6, 7          | 2.7, 3.0, 3.1        | 2.5, 2.6                     | 2.4           |
-| 3️⃣ | 0.5.x              | `v0.5-maintenance` | Rails 2, 3, 4, 5, 6, 7 | 2.7, 3.0, 3.1        | 2.1, 2.2, 2.3, 2.4, 2.5, 2.6 | 2.0           |
-| 4️⃣ | older              | N/A                |                        | Best of luck to you! | Please upgrade!              | noop          |
+|     | Ruby OAuth Version | Maintenance Branch | EOL       | 🚂 Compatibility       | Official 💎          | Unofficial 💎                | Incidental 💎 |
+|:----|--------------------|--------------------|-----------|------------------------|----------------------|------------------------------|---------------|
+| 1️⃣ | 1.0.x              | `main`             |           | Rails 6, 7             | 2.7, 3.0, 3.1        | sorry, not sorry             | nope          |
+| 2️⃣ | 0.6.x              | `v0.6-maintenance` | 04/2024   | Rails 5, 6, 7          | 2.7, 3.0, 3.1        | 2.5, 2.6                     | 2.4           |
+| 3️⃣ | 0.5.x              | `v0.5-maintenance` | 04/2023   | Rails 2, 3, 4, 5, 6, 7 | 2.7, 3.0, 3.1        | 2.1, 2.2, 2.3, 2.4, 2.5, 2.6 | 2.0           |
+| 4️⃣ | older              | N/A                | yesterday |                        | Best of luck to you! | Please upgrade!              | noop          |
 NOTE: Once 1.0 is released, the 0.x series will only receive critical bug and security updates.
 See [SECURITY.md][🚎sec-pol]
@@ -319,6 +320,8 @@ See [CONTRIBUTING.md][contributing]
 Made with [contributors-img][contrib-rocks].
+[contrib-rocks]: https://contrib.rocks
 ## Versioning
 This library aims to adhere to [Semantic Versioning 2.0.0][semver]. Violations of this scheme should be reported as
@@ -332,7 +335,7 @@ the [Pessimistic Version Constraint][pvc] with two digits of precision.
 For example:
 ```ruby
-spec.add_dependency "oauth", "~> 0.6.0"
+spec.add_dependency "oauth", "~> 1.0"
 ```
 ## License

data/SECURITY.md CHANGED Viewed

@@ -2,11 +2,16 @@
 ## Supported Versions
-| Version | Supported          |
-|---------|--------------------|
-| 0.6.x   | :white_check_mark: |
-| 0.5.x   | :white_check_mark: |
-| <= 0.5  | :x:                |
+| Version | Supported          | EOL     |
+|---------|--------------------|---------|
+| 1.0.x   | :white_check_mark: | 04/2025 |
+| 0.6.x   | :white_check_mark: | 04/2024 |
+| 0.5.x   | :white_check_mark: | 04/2023 |
+| <= 0.5  | :x:                | :x:     |
+### EOL Policy
+Non-commercial support for the oldest version of Ruby (which itself is going EOL) will be dropped each year in April.
 ## Reporting a Vulnerability

data/lib/oauth/cli/sign_command.rb CHANGED Viewed

@@ -45,9 +45,7 @@ module OAuth
       def puts_verbose_request(request)
         puts "Method: #{request.method}"
         puts "URI: #{request.uri}"
-        unless options[:xmpp]
-          puts "Normalized params: #{request.normalized_parameters}"
-        end
+        puts "Normalized params: #{request.normalized_parameters}" unless options[:xmpp]
         puts "Signature base string: #{request.signature_base_string}"
         if xmpp?

data/lib/oauth/client/em_http.rb CHANGED Viewed

@@ -84,9 +84,7 @@ module EventMachine
                        else
                          query.to_s
                        end
-      unless uri_query.to_s.empty?
-        combined_query = [combined_query, uri_query].reject(&:empty?).join("&")
-      end
+      combined_query = [combined_query, uri_query].reject(&:empty?).join("&") unless uri_query.to_s.empty?
       combined_query.to_s.empty? ? path : "#{path}?#{combined_query}"
     end

data/lib/oauth/consumer.rb CHANGED Viewed

@@ -30,47 +30,49 @@ module OAuth
     end
     CA_FILE = nil unless defined?(CA_FILE)
-    @@default_options = {
-      # Signature method used by server. Defaults to HMAC-SHA1
-      signature_method: "HMAC-SHA1",
-      # default paths on site. These are the same as the defaults set up by the generators
-      request_token_path: "/oauth/request_token",
-      authenticate_path: "/oauth/authenticate",
-      authorize_path: "/oauth/authorize",
-      access_token_path: "/oauth/access_token",
-      proxy: nil,
-      # How do we send the oauth values to the server see
-      # https://oauth.net/core/1.0/#consumer_req_param for more info
-      #
-      # Possible values:
-      #
-      #   :header - via the Authorize header (Default) ( option 1. in spec)
-      #   :body - url form encoded in body of POST request ( option 2. in spec)
-      #   :query_string - via the query part of the url ( option 3. in spec)
-      scheme: :header,
-      # Default http method used for OAuth Token Requests (defaults to :post)
-      http_method: :post,
-      # Add a custom ca_file for consumer
-      # :ca_file       => '/etc/certs.pem'
-      # Possible values:
-      #
-      # nil, false - no debug output
-      # true - uses $stdout
-      # some_value - uses some_value
-      debug_output: nil,
-      # Defaults to producing a body_hash as part of the signature but
-      # can be disabled since it's not officially part of the OAuth 1.0
-      # spec. Possible values are true and false
-      body_hash_enabled: true,
-      oauth_version: "1.0"
-    }
+    @@default_options = SnakyHash::SymbolKeyed.new(
+      {
+        # Signature method used by server. Defaults to HMAC-SHA1
+        signature_method: "HMAC-SHA1",
+        # default paths on site. These are the same as the defaults set up by the generators
+        request_token_path: "/oauth/request_token",
+        authenticate_path: "/oauth/authenticate",
+        authorize_path: "/oauth/authorize",
+        access_token_path: "/oauth/access_token",
+        proxy: nil,
+        # How do we send the oauth values to the server see
+        # https://oauth.net/core/1.0/#consumer_req_param for more info
+        #
+        # Possible values:
+        #
+        #   :header - via the Authorize header (Default) ( option 1. in spec)
+        #   :body - url form encoded in body of POST request ( option 2. in spec)
+        #   :query_string - via the query part of the url ( option 3. in spec)
+        scheme: :header,
+        # Default http method used for OAuth Token Requests (defaults to :post)
+        http_method: :post,
+        # Add a custom ca_file for consumer
+        # :ca_file       => '/etc/certs.pem'
+        # Possible values:
+        #
+        # nil, false - no debug output
+        # true - uses $stdout
+        # some_value - uses some_value
+        debug_output: nil,
+        # Defaults to producing a body_hash as part of the signature but
+        # can be disabled since it's not officially part of the OAuth 1.0
+        # spec. Possible values are true and false
+        body_hash_enabled: true,
+        oauth_version: "1.0"
+      }
+    )
     attr_accessor :options, :key, :secret
     attr_writer   :site, :http
@@ -103,7 +105,8 @@ module OAuth
       @secret = consumer_secret
       # ensure that keys are symbols
-      @options = @@default_options.merge(options.transform_keys(&:to_sym))
+      snaky_options = SnakyHash::SymbolKeyed.new(options)
+      @options = @@default_options.merge(snaky_options)
     end
     # The default http method
@@ -159,9 +162,7 @@ module OAuth
     def get_request_token(request_options = {}, *arguments, &block)
       # if oauth_callback wasn't provided, it is assumed that oauth_verifiers
       # will be exchanged out of band
-      unless request_options[:exclude_callback]
-        request_options[:oauth_callback] ||= OAuth::OUT_OF_BAND
-      end
+      request_options[:oauth_callback] ||= OAuth::OUT_OF_BAND unless request_options[:exclude_callback]
       response = if block
                    token_request(
@@ -386,13 +387,9 @@ module OAuth
       end
       http_object.read_timeout = http_object.open_timeout = @options[:timeout] || 60
-      if @options[:open_timeout]
-        http_object.open_timeout = @options[:open_timeout]
-      end
+      http_object.open_timeout = @options[:open_timeout] if @options[:open_timeout]
       http_object.ssl_version = @options[:ssl_version] if @options[:ssl_version]
-      if @options[:ssl_client_cert]
-        http_object.cert = @options[:ssl_client_cert]
-      end
+      http_object.cert = @options[:ssl_client_cert] if @options[:ssl_client_cert]
       http_object.key = @options[:ssl_client_key] if @options[:ssl_client_key]
       http_object.set_debug_output(debug_output) if debug_output
@@ -409,9 +406,7 @@ module OAuth
       # only add if the site host matches the current http object's host
       # (in case we've specified a full url for token requests)
       uri = URI.parse(site)
-      if uri.path && uri.path != "/" && uri.host == http.address
-        path = uri.path + path
-      end
+      path = uri.path + path if uri.path && uri.path != "/" && uri.host == http.address
       headers = arguments.first.is_a?(Hash) ? arguments.shift : {}

data/lib/oauth/request_proxy/action_controller_request.rb CHANGED Viewed

@@ -1,36 +1,15 @@
 # frozen_string_literal: true
 require "active_support"
-require "active_support/version"
 require "action_controller"
 require "uri"
-if Gem::Version.new(ActiveSupport::VERSION::STRING) < Gem::Version.new("3")
-  # 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")
-  # 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 and later - already has patch
-  require "action_dispatch/http/request"
-end
+require "action_dispatch/http/request"
 module OAuth
   module RequestProxy
     class ActionControllerRequest < OAuth::RequestProxy::Base
-      proxies(defined?(::ActionDispatch::AbstractRequest) ? ::ActionDispatch::AbstractRequest : ::ActionDispatch::Request)
+      proxies(::ActionDispatch::Request)
       def method
         request.method.to_s.upcase
@@ -50,7 +29,7 @@ module OAuth
         end
       end
-      # Override from OAuth::RequestProxy::Base to avoid roundtrip
+      # 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

data/lib/oauth/request_proxy/base.rb CHANGED Viewed

@@ -79,7 +79,7 @@ module OAuth
       end
       def parameters_for_signature
-        parameters.select { |k, _v| !signature_and_unsigned_parameters.include?(k) }
+        parameters.reject { |k, _v| signature_and_unsigned_parameters.include?(k) }
       end
       def oauth_parameters

data/lib/oauth/request_proxy/net_http.rb CHANGED Viewed

@@ -69,9 +69,7 @@ module OAuth
           end
           def auth_header_params
-            unless request["Authorization"] && request["Authorization"][0, 5] == "OAuth"
-              return nil
-            end
+            return nil unless request["Authorization"] && request["Authorization"][0, 5] == "OAuth"
             request["Authorization"]
           end

data/lib/oauth/signature/base.rb CHANGED Viewed

@@ -31,9 +31,7 @@ module OAuth
         @consumer_secret = options[:consumer].secret if options[:consumer]
         # presence of :consumer_secret option will override any Consumer that's provided
-        if options[:consumer_secret]
-          @consumer_secret = options[:consumer_secret]
-        end
+        @consumer_secret = options[:consumer_secret] if options[:consumer_secret]
         ## token secret was determined beforehand

data/lib/oauth/version.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 module OAuth
   module Version
-    VERSION = "0.6.1"
+    VERSION = "1.0.1"
   end
 end

data/lib/oauth.rb CHANGED Viewed

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 # third party gems
+require "snaky_hash"
 require "version_gem"
 require "oauth/version"

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Pelle Braendgaard
@@ -16,8 +16,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: snaky_hash
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -150,14 +164,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '18.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '18.0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -178,14 +192,14 @@ dependencies:
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 3.14.0
+        version: 3.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 3.14.0
+        version: 3.19.0
 description:
 email: oauth-ruby@googlegroups.com
 executables:
@@ -254,23 +268,23 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/oauth-xx/oauth-ruby
-  source_code_uri: https://github.com/oauth-xx/oauth-ruby/tree/v0.6.1
-  changelog_uri: https://github.com/oauth-xx/oauth-ruby/blob/v0.6.1/CHANGELOG.md
+  source_code_uri: https://github.com/oauth-xx/oauth-ruby/tree/v1.0.1
+  changelog_uri: https://github.com/oauth-xx/oauth-ruby/blob/v1.0.1/CHANGELOG.md
   bug_tracker_uri: https://github.com/oauth-xx/oauth-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/oauth/0.6.1
+  documentation_uri: https://www.rubydoc.info/gems/oauth/1.0.1
   wiki_uri: https://github.com/oauth-xx/oauth-ruby/wiki
   rubygems_mfa_required: 'true'
 post_install_message: |2
-  You have installed oauth version 0.6.1, congratulations!
+  You have installed oauth version 1.0.1, congratulations!
-  Non-commercial support for the 0.6.x series will end in April, 2024. Please upgrade to 1.0.x as soon as possible!
-  The only breaking change will be dropped support for Ruby 2.4, 2.5, and 2.6.
+  Non-commercial support for the 1.x series will end by April, 2025. Please make a plan to upgrade to the next version prior to that date.
+  The only breaking change will be dropped support for Ruby 2.7 and any other versions which will also have reached EOL by then.
   Please see:
-  • https://github.com/oauth-xx/oauth/blob/main/SECURITY.md
+  • https://github.com/oauth-xx/oauth-ruby/blob/main/SECURITY.md
-  Note also that I, and this project, am in the process of leaving Github.
+  Note also that I am, and this project is, in the process of leaving Github.
   I wrote about some of the reasons here:
   • https://dev.to/galtzo/im-leaving-github-50ba
@@ -293,14 +307,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.3.21
 signing_key:
 specification_version: 4
 summary: OAuth Core Ruby implementation