omniauth-oauth2 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c67fe41a9f73381bfe2508f48a5d7631db4d52b3
-  data.tar.gz: 42be96f41a3a53ef47ee01818bf4785ac8ec2dc1
+  metadata.gz: b10f5718de27b490cf3d5ec7f353540ffba5f502
+  data.tar.gz: 83c8192af6408344b0735c4ed30418f6f0377c61
 SHA512:
-  metadata.gz: 967e76c8a0654283e0e0610c1260781736475d945e4fac63262c1acd900f4a70828dad325e73949578b39d902649e4ce920f6b41dc6b6e809d407e706abb779f
-  data.tar.gz: bf0a2d0579591dc2e9793b72c02ca6bc20729b4e18bbee3041c0e0a054ef50a18218d30456a104b50b1e438a94fe36ba0b4f570b89bdca8b6452e6d4b4b1db6a
+  metadata.gz: 95f86ca6fcc8adc4fcddd16ac2a9e19ae70a3b5545021527c6620e56994d6ce2113dcda3aca61b26fbb120337c723eabddb3b2d5ae3e27f019d24bcf1a1b5487
+  data.tar.gz: 0a9dbce2fa3424a19bd12cdd1e9f8ad4a5987f594742b5023ad7cbb5558464a4596e45035e946e5213f495db51a57345ec8f65d7abe287ab6d2332f0e728f014

data/.rubocop.yml

@@ -1,3 +1,9 @@
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
 Metrics/BlockNesting:
   Max: 2
 
@@ -13,9 +19,6 @@ Metrics/ParameterLists:
   Max: 4
   CountKeywordArgs: true
 
-Style/AccessModifierIndentation:
-  EnforcedStyle: outdent
-
 Style/CollectionMethods:
   PreferredMethods:
     map:      'collect'
@@ -32,11 +35,14 @@ Style/DoubleNegation:
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
+Style/StderrPuts:
+  Enabled: false
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
-Style/TrailingComma:
-  EnforcedStyleForMultiline: 'comma'
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma

data/.travis.yml

@@ -4,15 +4,12 @@ env:
     - JRUBY_OPTS="$JRUBY_OPTS --debug"
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - jruby-18mode
-  - jruby-19mode
+  - jruby-9000
+  - 2.1.10 # EOL Soon
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
   - jruby-head
-  - rbx-2
   - ruby-head
 matrix:
   allow_failures:

data/Gemfile

@@ -1,17 +1,18 @@
 source "http://rubygems.org"
 
-gem "rake"
+gem "rake", "~> 10.5"
 
 group :test do
+  gem "addressable", "~> 2.3.8", :platforms => %i[jruby ruby_18]
   gem "coveralls"
-  gem "json", :platforms => [:jruby, :ruby_18, :ruby_19]
-  gem "mime-types", "~> 1.25", :platforms => [:jruby, :ruby_18]
+  gem "json", :platforms => %i[jruby ruby_18 ruby_19]
+  gem "mime-types", "~> 1.25", :platforms => %i[jruby ruby_18]
   gem "rack-test"
-  gem "rest-client", "~> 1.6.0", :platforms => [:jruby, :ruby_18]
+  gem "rest-client", "~> 1.7.3", :platforms => %i[jruby ruby_18]
   gem "rspec", "~> 3.2"
-  gem "rubocop", ">= 0.30", :platforms => [:ruby_19, :ruby_20, :ruby_21, :ruby_22]
+  gem "rubocop", ">= 0.51", :platforms => %i[ruby_19 ruby_20 ruby_21 ruby_22 ruby_23 ruby_24]
   gem "simplecov", ">= 0.9"
-  gem "webmock"
+  gem "webmock", "~> 1.0"
 end
 
 # Specify your gem's dependencies in omniauth-oauth2.gemspec

data/README.md

@@ -1,8 +1,8 @@
 # OmniAuth OAuth2
 
 [![Gem Version](http://img.shields.io/gem/v/omniauth-oauth2.svg)][gem]
-[![Build Status](http://img.shields.io/travis/intridea/omniauth-oauth2.svg)][travis]
-[![Dependency Status](http://img.shields.io/gemnasium/intridea/omniauth-oauth2.svg)][gemnasium]
+[![Build Status](http://img.shields.io/travis/omniauth/omniauth-oauth2.svg)][travis]
+[![Dependency Status](http://img.shields.io/gemnasium/omniauth/omniauth-oauth2.svg)][gemnasium]
 [![Code Climate](http://img.shields.io/codeclimate/github/intridea/omniauth-oauth2.svg)][codeclimate]
 [![Coverage Status](http://img.shields.io/coveralls/intridea/omniauth-oauth2.svg)][coveralls]
 

data/Rakefile

@@ -15,4 +15,4 @@ rescue LoadError
   end
 end
 
-task :default => [:spec, :rubocop]
+task :default => %i[spec rubocop]

data/lib/omniauth-oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module OAuth2
-    VERSION = "1.4.0"
+    VERSION = "1.5.0".freeze
   end
 end

data/lib/omniauth/strategies/oauth2.rb

@@ -18,7 +18,7 @@ module OmniAuth
         OmniAuth::Strategy.included(subclass)
       end
 
-      args [:client_id, :client_secret]
+      args %i[client_id client_secret]
 
       option :client_id, nil
       option :client_secret, nil
@@ -38,9 +38,9 @@ module OmniAuth
 
       credentials do
         hash = {"token" => access_token.token}
-        hash.merge!("refresh_token" => access_token.refresh_token) if access_token.expires? && access_token.refresh_token
-        hash.merge!("expires_at" => access_token.expires_at) if access_token.expires?
-        hash.merge!("expires" => access_token.expires?)
+        hash["refresh_token"] = access_token.refresh_token if access_token.expires? && access_token.refresh_token
+        hash["expires_at"] = access_token.expires_at if access_token.expires?
+        hash["expires"] = access_token.expires?
         hash
       end
 

data/omniauth-oauth2.gemspec

@@ -3,22 +3,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "omniauth-oauth2/version"
 
 Gem::Specification.new do |gem|
-  gem.add_dependency "oauth2",     "~> 1.0"
+  gem.add_dependency "oauth2",     "~> 1.1"
   gem.add_dependency "omniauth",   "~> 1.2"
 
   gem.add_development_dependency "bundler", "~> 1.0"
 
-  gem.authors       = ["Michael Bleigh", "Erik Michaels-Ober"]
-  gem.email         = ["michael@intridea.com", "sferik@gmail.com"]
+  gem.authors       = ["Michael Bleigh", "Erik Michaels-Ober", "Tom Milewski"]
+  gem.email         = ["michael@intridea.com", "sferik@gmail.com", "tmilewski@gmail.com"]
   gem.description   = "An abstract OAuth2 strategy for OmniAuth."
   gem.summary       = gem.description
-  gem.homepage      = "https://github.com/intridea/omniauth-oauth2"
-  gem.licenses      = %w(MIT)
+  gem.homepage      = "https://github.com/omniauth/omniauth-oauth2"
+  gem.licenses      = %w[MIT]
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").collect { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "omniauth-oauth2"
-  gem.require_paths = %w(lib)
+  gem.require_paths = %w[lib]
   gem.version       = OmniAuth::OAuth2::VERSION
 end

data/spec/omniauth/strategies/oauth2_spec.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-describe OmniAuth::Strategies::OAuth2 do
+describe OmniAuth::Strategies::OAuth2 do # rubocop:disable Metrics/BlockLength
   def app
     lambda do |_env|
       [200, {}, ["Hello."]]
@@ -49,7 +49,7 @@ describe OmniAuth::Strategies::OAuth2 do
     end
 
     it "includes top-level options that are marked as :authorize_options" do
-      instance = subject.new("abc", "def", :authorize_options => [:scope, :foo, :state], :scope => "bar", :foo => "baz")
+      instance = subject.new("abc", "def", :authorize_options => %i[scope foo state], :scope => "bar", :foo => "baz")
       expect(instance.authorize_params["scope"]).to eq("bar")
       expect(instance.authorize_params["foo"]).to eq("baz")
     end
@@ -70,7 +70,7 @@ describe OmniAuth::Strategies::OAuth2 do
     end
 
     it "includes top-level options that are marked as :authorize_options" do
-      instance = subject.new("abc", "def", :token_options => [:scope, :foo], :scope => "bar", :foo => "baz")
+      instance = subject.new("abc", "def", :token_options => %i[scope foo], :scope => "bar", :foo => "baz")
       expect(instance.token_params).to eq("scope" => "bar", "foo" => "baz")
     end
   end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Michael Bleigh
 - Erik Michaels-Ober
+- Tom Milewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -17,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -57,6 +58,7 @@ description: An abstract OAuth2 strategy for OmniAuth.
 email:
 - michael@intridea.com
 - sferik@gmail.com
+- tmilewski@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -75,7 +77,7 @@ files:
 - omniauth-oauth2.gemspec
 - spec/helper.rb
 - spec/omniauth/strategies/oauth2_spec.rb
-homepage: https://github.com/intridea/omniauth-oauth2
+homepage: https://github.com/omniauth/omniauth-oauth2
 licenses:
 - MIT
 metadata: {}
@@ -95,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: An abstract OAuth2 strategy for OmniAuth.