oauth2 1.3.1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1d24cc94d483fc7bde0d6a39d05efc7c5493b895
-  data.tar.gz: b26a8c77bcf7eee5e66972856d3c6c3e0150fade
+SHA256:
+  metadata.gz: c91742d7784cd1d8b7e085cefa2ad5e0f5931112741ca2e6fd50a925d404854e
+  data.tar.gz: befcd535b9af7309adf7f320b29280ee020b9d66517cd08824b143b9b41dbd79
 SHA512:
-  metadata.gz: 78e2e1761ee6e5284fbd8ab7778a37d6da78184129f1571987ac17ba3db629b5f9f956b49d873f1bbb65cfb5d6a15efdcc341916dca23f589a85b6709823c890
-  data.tar.gz: b46eda492f06d68430c14aebf2e5e6886fe32ccc40ac394db8d8c2ce77ffe75018e077ce30ae51acda5793ab730f4131952987feace9a7cd6904bcb4f5b2132b
+  metadata.gz: 8175756609903d2bd60b635301c6f3a67fe55a3c8ebb6bda5e1e6f8c66cc0d861685f4ed78882ec2602ba6e8ce113b50e3aa94cb4f907515ada5fe93e4bcb579
+  data.tar.gz: 711dbe14418c8599fe5ae05cffa4dd60d0a0891a1438999ef00bcea495f87ecf0a6c1d928795f61e06396a11983b9670d4a933b5db93f10b4eb350406ea348e0

data/.gitignore

@@ -0,0 +1,12 @@
+*.gem
+*~
+.bundle
+.rvmrc
+Gemfile.lock
+coverage/*
+log/*
+measurement/*
+pkg/*
+rdoc/*
+
+.rspec_status

data/.jrubyrc

@@ -0,0 +1 @@
+debug.fullTrace=true

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--order random

data/.rubocop.yml

@@ -0,0 +1,80 @@
+require: rubocop-rspec
+inherit_from:
+  - .rubocop_todo.yml
+  - .rubocop_rspec.yml
+AllCops:
+  DisplayCopNames: true # Display the name of the failing cops
+  TargetRubyVersion: 2.1
+  Exclude:
+    - 'gemfiles/vendor/**/*'
+    - 'vendor/**/*'
+    - '**/.irbrc'
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Max: 2
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Max: 15
+
+Metrics/ParameterLists:
+  Max: 4
+
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+Lint/UnusedBlockArgument:
+  Exclude:
+    - 'spec/**/*.rb'
+    - 'gemfiles/vendor/**/*'
+    - 'vendor/**/*'
+    - '**/.irbrc'
+
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/examples/*'
+
+RSpec/NestedGroups:
+  Enabled: false
+
+Style/ClassVars:
+  Enabled: false
+
+Style/CollectionMethods:
+  PreferredMethods:
+    map:      'collect'
+    reduce:   'inject'
+    find:     'detect'
+    find_all: 'select'
+
+Style/Documentation:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/EmptyMethod:
+  EnforcedStyle: expanded
+
+Style/Encoding:
+  Enabled: false
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma

data/.rubocop_rspec.yml

@@ -0,0 +1,26 @@
+RSpec/FilePath:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/NamedSubject:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Enabled: false
+
+RSpec/VerifiedDoubles:
+  Enabled: false
+
+RSpec/MessageSpies:
+  Enabled: false
+
+RSpec/InstanceVariable:
+  Enabled: false
+
+RSpec/NestedGroups:
+  Enabled: false
+  
+RSpec/ExpectInHook:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,15 @@
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/Lambda:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/EachWithObject:
+  Enabled: false
+
+# Once we drop Rubies that lack support for __dir__ we can turn this on.
+Style/ExpandPathArguments:
+  Enabled: false

data/.travis.yml

@@ -0,0 +1,49 @@
+before_install:
+  - gem update --system
+  - gem install bundler
+
+bundler_args: --no-deployment --jobs 3 --retry 3
+
+cache: bundler
+
+language: ruby
+
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: ruby-head
+    - rvm: rbx-3
+  fast_finish: true
+  include:
+    - rvm: jruby-1.7.27 # targets MRI v1.9
+      gemfile: gemfiles/jruby_1.7.gemfile
+    - rvm: 1.9.3-p551
+      gemfile: gemfiles/ruby_1.9.gemfile
+    - rvm: 2.0.0-p648
+      gemfile: gemfiles/ruby_2.0.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/ruby_2.1.gemfile
+    - rvm: jruby-9.0.5.0 # targets MRI v2.0
+      gemfile: gemfiles/jruby_9.0.gemfile
+    # DEPRECATION WARNING
+    # oauth2 1.x series releases are the last to support Ruby versions above
+    # oauth2 2.x series releases will support Ruby versions below, and not above
+    - rvm: jruby-9.1.9.0 # targets MRI v2.3
+      gemfile: gemfiles/jruby_9.1.gemfile
+    - rvm: 2.2.10
+      gemfile: gemfiles/ruby_2.2.gemfile
+    - rvm: 2.3.7
+      gemfile: gemfiles/ruby_2.3.gemfile
+    - rvm: 2.4.4
+      gemfile: gemfiles/ruby_2.4.gemfile
+    - rvm: jruby-9.2.0.0 # targets MRI v2.5
+      gemfile: gemfiles/jruby_9.2.gemfile
+    - rvm: 2.5.1
+      gemfile: gemfiles/ruby_2.5.gemfile
+    - rvm: jruby-head
+      gemfile: gemfiles/jruby_head.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/ruby_head.gemfile
+    - rvm: rbx-3
+
+sudo: false

data/CHANGELOG.md

@@ -0,0 +1,139 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+## [unreleased]
+
+- no changes yet
+
+## [1.4.1] - 2018-10-13
+
+- [#417](oauth-xx/oauth2#417) - update jwt dependency (@thewoolleyman)
+- [#418](oauth-xx/oauth2#418) - remove rubocop dependency (temporary, added back in [#423](oauth-xx/oauth2#423)) (@pboling)
+- [#419](oauth-xx/oauth2#419) - update faraday dependency (@pboling)
+- [#420](oauth-xx/oauth2#420) - update [oauth2.gemspec](oauth2.gemspec) (@pboling)
+- [#421](oauth-xx/oauth2#421) - fix [CHANGELOG.md](CHANGELOG.md) for previous releases (@pboling)
+- [#422](oauth-xx/oauth2#422) - update [LICENSE](LICENSE) and [README.md](README.md) (@pboling)
+- [#423](oauth-xx/oauth2#423) - update [builds](https://travis-ci.org/oauth-xx/oauth2/builds), [Rakefile](Rakefile) (@pboling)
+  - officially document supported Rubies
+    * Ruby 1.9.3
+    * Ruby 2.0.0
+    * Ruby 2.1
+    * Ruby 2.2
+    * [JRuby 1.7][jruby-1.7] (targets MRI v1.9)
+    * [JRuby 9.0][jruby-9.0] (targets MRI v2.0)
+    * Ruby 2.3
+    * Ruby 2.4
+    * Ruby 2.5
+    * [JRuby 9.1][jruby-9.1] (targets MRI v2.3)
+    * [JRuby 9.2][jruby-9.2] (targets MRI v2.5)
+
+[jruby-1.7]: https://www.jruby.org/2017/05/11/jruby-1-7-27.html
+[jruby-9.0]: https://www.jruby.org/2016/01/26/jruby-9-0-5-0.html
+[jruby-9.1]: https://www.jruby.org/2017/05/16/jruby-9-1-9-0.html
+[jruby-9.2]: https://www.jruby.org/2018/05/24/jruby-9-2-0-0.html
+
+## [1.4.0] - 2017-06-09
+
+- Drop Ruby 1.8.7 support (@sferik)
+- Fix some RuboCop offenses (@sferik)
+- _Dependency_: Remove Yardstick (@sferik)
+- _Dependency_: Upgrade Faraday to 0.12 (@sferik)
+
+## [1.3.1] - 2017-03-03
+
+- Add support for Ruby 2.4.0 (@pschambacher)
+- _Dependency_: Upgrade Faraday to Faraday 0.11 (@mcfiredrill, @rhymes, @pschambacher)
+
+## [1.3.0] - 2016-12-28
+
+- Add support for header-based authentication to the `Client` so it can be used across the library (@bjeanes)
+- Default to header-based authentication when getting a token from an authorisation code (@maletor)
+- **Breaking**: Allow an `auth_scheme` (`:basic_auth` or `:request_body`) to be set on the client, defaulting to `:request_body` to maintain backwards compatibility (@maletor, @bjeanes)
+- Handle `redirect_uri` according to the OAuth 2 spec, so it is passed on redirect and at the point of token exchange (@bjeanes)
+- Refactor handling of encoding of error responses (@urkle)
+- Avoid instantiating an `Error` if there is no error to raise (@urkle)
+- Add support for Faraday 0.10 (@rhymes)
+
+## [1.2.0] - 2016-07-01
+
+- Properly handle encoding of error responses (so we don't blow up, for example, when Google's response includes a ∞) (@Motoshi-Nishihira)
+- Make a copy of the options hash in `AccessToken#from_hash` to avoid accidental mutations (@Linuus)
+- Use `raise` rather than `fail` to throw exceptions (@sferik)
+
+## [1.1.0] - 2016-01-30
+
+- Various refactors (eliminating `Hash#merge!` usage in `AccessToken#refresh!`, use `yield` instead of `#call`, freezing mutable objects in constants, replacing constants with class variables) (@sferik)
+- Add support for Rack 2, and bump various other dependencies (@sferik)
+
+## [1.0.0] - 2014-07-09
+
+### Added
+- Add an implementation of the MAC token spec.
+
+### Fixed
+- Fix Base64.strict_encode64 incompatibility with Ruby 1.8.7.
+
+## [0.5.0] - 2011-07-29
+
+### Changed
+- [breaking] `oauth_token` renamed to `oauth_bearer`.
+- [breaking] `authorize_path` Client option renamed to `authorize_url`.
+- [breaking] `access_token_path` Client option renamed to `token_url`.
+- [breaking] `access_token_method` Client option renamed to `token_method`.
+- [breaking] `web_server` renamed to `auth_code`.
+
+## [0.4.1] - 2011-04-20
+
+## [0.4.0] - 2011-04-20
+
+## [0.3.0] - 2011-04-08
+
+## [0.2.0] - 2011-04-01
+
+## [0.1.1] - 2011-01-12
+
+## [0.1.0] - 2010-10-13
+
+## [0.0.13] + [0.0.12] + [0.0.11] - 2010-08-17
+
+## [0.0.10] - 2010-06-19
+
+## [0.0.9] - 2010-06-18
+
+## [0.0.8] + [0.0.7] - 2010-04-27
+
+## [0.0.6] - 2010-04-25
+
+## [0.0.5] - 2010-04-23
+
+## [0.0.4] + [0.0.3] + [0.0.2] + [0.0.1] - 2010-04-22
+
+
+[0.0.1]: https://github.com/oauth-xx/oauth2/compare/311d9f4...v0.0.1
+[0.0.2]: https://github.com/oauth-xx/oauth2/compare/v0.0.1...v0.0.2
+[0.0.3]: https://github.com/oauth-xx/oauth2/compare/v0.0.2...v0.0.3
+[0.0.4]: https://github.com/oauth-xx/oauth2/compare/v0.0.3...v0.0.4
+[0.0.5]: https://github.com/oauth-xx/oauth2/compare/v0.0.4...v0.0.5
+[0.0.6]: https://github.com/oauth-xx/oauth2/compare/v0.0.5...v0.0.6
+[0.0.7]: https://github.com/oauth-xx/oauth2/compare/v0.0.6...v0.0.7
+[0.0.8]: https://github.com/oauth-xx/oauth2/compare/v0.0.7...v0.0.8
+[0.0.9]: https://github.com/oauth-xx/oauth2/compare/v0.0.8...v0.0.9
+[0.0.10]: https://github.com/oauth-xx/oauth2/compare/v0.0.9...v0.0.10
+[0.0.11]: https://github.com/oauth-xx/oauth2/compare/v0.0.10...v0.0.11
+[0.0.12]: https://github.com/oauth-xx/oauth2/compare/v0.0.11...v0.0.12
+[0.0.13]: https://github.com/oauth-xx/oauth2/compare/v0.0.12...v0.0.13
+[0.1.0]: https://github.com/oauth-xx/oauth2/compare/v0.0.13...v0.1.0
+[0.1.1]: https://github.com/oauth-xx/oauth2/compare/v0.1.0...v0.1.1
+[0.2.0]: https://github.com/oauth-xx/oauth2/compare/v0.1.1...v0.2.0
+[0.3.0]: https://github.com/oauth-xx/oauth2/compare/v0.2.0...v0.3.0
+[0.4.0]: https://github.com/oauth-xx/oauth2/compare/v0.3.0...v0.4.0
+[0.4.1]: https://github.com/oauth-xx/oauth2/compare/v0.4.0...v0.4.1
+[0.5.0]: https://github.com/oauth-xx/oauth2/compare/v0.4.1...v0.5.0
+[1.0.0]: https://github.com/oauth-xx/oauth2/compare/v0.9.4...v1.0.0
+[1.1.0]: https://github.com/oauth-xx/oauth2/compare/v1.0.0...v1.1.0
+[1.2.0]: https://github.com/oauth-xx/oauth2/compare/v1.1.0...v1.2.0
+[1.3.0]: https://github.com/oauth-xx/oauth2/compare/v1.2.0...v1.3.0
+[1.3.1]: https://github.com/oauth-xx/oauth2/compare/v1.3.0...v1.3.1
+[1.4.0]: https://github.com/oauth-xx/oauth2/compare/v1.3.1...v1.4.0
+[1.4.1]: https://github.com/oauth-xx/oauth2/compare/v1.4.0...v1.4.1
+[unreleased]: https://github.com/oauth-xx/oauth2/compare/v1.4.0...1-4-stable

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at peter.boling@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -0,0 +1,41 @@
+source 'https://rubygems.org'
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+gem 'faraday', '~> 0.9.2', :platforms => [:jruby_18, :ruby_18]
+gem 'jwt', '< 1.5.2', :platforms => [:jruby_18, :ruby_18]
+gem 'rake', '< 11.0'
+gem 'rdoc', '~> 4.2.2'
+
+group :test do
+  ruby_version = Gem::Version.new(RUBY_VERSION)
+  if ruby_version >= Gem::Version.new('2.1')
+    # TODO: Upgrade to >= 0.59 when we drop Rubies below 2.2
+    #     Error: Unsupported Ruby version 2.1 found in `TargetRubyVersion` parameter (in .rubocop.yml). 2.1-compatible analysis was dropped after version 0.58.
+    #     Supported versions: 2.2, 2.3, 2.4, 2.5
+    gem 'rubocop', '~> 0.57.0'
+    gem 'rubocop-rspec', '~> 1.27.0' # last version that can use rubocop < 0.58
+  end
+  gem 'pry', '~> 0.11' if ruby_version >= Gem::Version.new('2.0')
+  gem 'rspec-pending_for'
+
+  gem 'addressable', '~> 2.3.8'
+  gem 'backports'
+  gem 'coveralls'
+  gem 'rack', '~> 1.2', :platforms => [:jruby_18, :jruby_19, :ruby_18, :ruby_19, :ruby_20, :ruby_21]
+  gem 'rspec', '>= 3'
+  gem 'simplecov', '>= 0.9'
+
+  platforms :jruby_18, :ruby_18 do
+    gem 'mime-types', '~> 1.25'
+    gem 'rest-client', '~> 1.6.0'
+  end
+
+  platforms :ruby_18, :ruby_19 do
+    gem 'json', '< 2.0'
+    gem 'term-ansicolor', '< 1.4.0'
+    gem 'tins', '< 1.7'
+  end
+end
+
+gemspec

data/LICENSE

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2011 - 2013 Michael Bleigh and Intridea, Inc.
+Copyright (c) 2017 - 2018 oauth-xx organization, https://github.com/oauth-xx
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,30 +1,55 @@
 # OAuth2
 
 [![Gem Version](http://img.shields.io/gem/v/oauth2.svg)][gem]
-[![Build Status](http://img.shields.io/travis/intridea/oauth2.svg)][travis]
-[![Dependency Status](http://img.shields.io/gemnasium/intridea/oauth2.svg)][gemnasium]
-[![Code Climate](http://img.shields.io/codeclimate/github/intridea/oauth2.svg)][codeclimate]
+[![Total Downloads](https://img.shields.io/gem/dt/oauth2.svg)][gem]
+[![Downloads Today](https://img.shields.io/gem/rt/oauth2.svg)][gem]
+[![Build Status](http://img.shields.io/travis/oauth-xx/oauth2.svg)][travis]
 [![Coverage Status](http://img.shields.io/coveralls/intridea/oauth2.svg)][coveralls]
+[![Maintainability](https://api.codeclimate.com/v1/badges/688c612528ff90a46955/maintainability)][codeclimate-maintainability]
+[![Depfu](https://badges.depfu.com/badges/6d34dc1ba682bbdf9ae2a97848241743/count.svg)][depfu]
+[![Open Source Helpers](https://www.codetriage.com/oauth-xx/oauth2/badges/users.svg)][code-triage]
+[![Chat](https://img.shields.io/gitter/room/oauth-xx/oauth2.svg)](https://gitter.im/oauth-xx/oauth2)
+[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)][source-license]
+[![Documentation](http://inch-ci.org/github/oauth-xx/oauth2.png)][inch-ci]
 
 [gem]: https://rubygems.org/gems/oauth2
-[travis]: http://travis-ci.org/intridea/oauth2
-[gemnasium]: https://gemnasium.com/intridea/oauth2
-[codeclimate]: https://codeclimate.com/github/intridea/oauth2
-[coveralls]: https://coveralls.io/r/intridea/oauth2
+[travis]: http://travis-ci.org/oauth-xx/oauth2
+[coveralls]: https://coveralls.io/r/oauth-xx/oauth2
+[codeclimate-maintainability]: https://codeclimate.com/github/oauth-xx/oauth2/maintainability
+[depfu]: https://depfu.com/github/oauth-xx/oauth2
+[source-license]: https://opensource.org/licenses/MIT
+[inch-ci]: http://inch-ci.org/github/oauth-xx/oauth2
+[code-triage]: https://www.codetriage.com/oauth-xx/oauth2
 
-A Ruby wrapper for the OAuth 2.0 specification.
+A Ruby wrapper for the [OAuth 2.0 specification][oauth2-spec].
+
+[oauth2-spec]: https://oauth.net/2/
 
 ## Installation
-    gem install oauth2
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'oauth2'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install oauth2
 
 ## Resources
+
 * [View Source on GitHub][code]
 * [Report Issues on GitHub][issues]
 * [Read More at the Wiki][wiki]
 
-[code]: https://github.com/intridea/oauth2
-[issues]: https://github.com/intridea/oauth2/issues
-[wiki]: https://wiki.github.com/intridea/oauth2
+[code]: https://github.com/oauth-xx/oauth2
+[issues]: https://github.com/oauth-xx/oauth2/issues
+[wiki]: https://github.com/oauth-xx/oauth2/wiki
 
 ## Usage Examples
 
@@ -100,19 +125,33 @@ You can always use the #request method on the OAuth2::Client instance to make
 requests for tokens for any Authentication grant type.
 
 ## Supported Ruby Versions
+
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
-* Ruby 1.8.7
+### Rubies with support ending at Oauth2 2.x
+
 * Ruby 1.9.3
 * Ruby 2.0.0
 * Ruby 2.1
 * Ruby 2.2
-* Ruby 2.3
+* [JRuby 1.7][jruby-1.7] (targets MRI v1.9)
+* [JRuby 9.0][jruby-9.0] (targets MRI v2.0)
+
+---
+
+### Rubies with continued support past Oauth2 2.x
+
+* Ruby 2.3 - Support through version 3.x series
 * Ruby 2.4
-* [JRuby 9K][jruby]
+* Ruby 2.5
+* [JRuby 9.1][jruby-9.1] (targets MRI v2.3) 
+* [JRuby 9.2][jruby-9.2] (targets MRI v2.5)
 
-[jruby]: http://jruby.org/
+[jruby-1.7]: https://www.jruby.org/2017/05/11/jruby-1-7-27.html
+[jruby-9.0]: https://www.jruby.org/2016/01/26/jruby-9-0-5-0.html
+[jruby-9.1]: https://www.jruby.org/2017/05/16/jruby-9-1-9-0.html
+[jruby-9.2]: https://www.jruby.org/2018/05/24/jruby-9-2-0-0.html
 
 If something doesn't work on one of these interpreters, it's a bug.
 
@@ -127,8 +166,51 @@ implementation, you will be responsible for providing patches in a timely
 fashion. If critical issues for a particular implementation exist at the time
 of a major release, support for that Ruby version may be dropped.
 
+## Versioning
+
+This library aims to adhere to [Semantic Versioning 2.0.0][semver].
+Violations of this scheme should be reported as bugs. Specifically,
+if a minor or patch version is released that breaks backward
+compatibility, a new version should be immediately released that
+restores compatibility. Breaking changes to the public API will
+only be introduced with new major versions.
+
+As a result of this policy, you can (and should) specify a
+dependency on this gem using the [Pessimistic Version Constraint][pvc] with two digits of precision.
+
+For example:
+
+```ruby
+spec.add_dependency 'oauth2', '~> 1.4'
+```
+
+[semver]: http://semver.org/
+[pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint
+
 ## License
-Copyright (c) 2011-2013 Michael Bleigh and Intridea, Inc. See [LICENSE][] for
-details.
 
-[license]: LICENSE.md
+[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)][source-license]
+
+- Copyright (c) 2011-2013 Michael Bleigh and Intridea, Inc.
+- Copyright (c) 2017-2018 [oauth-xx organization][oauth-xx]
+- See [LICENSE][license] for details.
+
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Foauth-xx%2Foauth2.svg?type=large)][fossa2]
+
+[license]: LICENSE
+[oauth-xx]: https://github.com/oauth-xx
+[fossa2]: https://app.fossa.io/projects/git%2Bgithub.com%2Foauth-xx%2Foauth2?ref=badge_large
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/oauth-xx/oauth2. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+## Code of Conduct
+
+Everyone interacting in the OAuth2 project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/oauth-xx/oauth2/blob/master/CODE_OF_CONDUCT.md).