warden-github 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c67b01bbd594201720d597739d548d7d3cdfa0f1
-  data.tar.gz: d2579092f8f208ad1595601bd64b9d1a830a3c79
+  metadata.gz: 3157cb993681be8dafe7f2a76c0b6c93594dff58
+  data.tar.gz: abfe1e6a32e6d7230c6d5c63911b40773fdc71e7
 SHA512:
-  metadata.gz: 770c694827a511d2184f716bc2815f841ca0030425069d4ec44cdcfafde8951a0ee1d4e4a4986af7a9f20bc32534346e9e30f5832be0f2bcaaa6c53eabb9e986
-  data.tar.gz: e4b0dc2d35df3101eb3537dd734a1b6ec29a5b578856ae41eca29613d6dd4a60b5fb12bd8e6fabd3e7a524d590c615978c3abaf9405d99849109cad39f53dafe
+  metadata.gz: 5310d52b3c309bbaa4e5879762907a5ce687ba58425c0bc1a73f7a29b6b6453f2799d3ab4b0cfd0ba76680637be243d2cfbe695c16c45cac39f9e2f53cf27124
+  data.tar.gz: 6f9bb9279df04d8c2ce3e903537fe9ccfb73f9f250f63789d0c6b0056cc48f2cdc616893d8df1319fe588f5837538fae8778c2c462f584864ce8db470d0f2cf6

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.4.1

data/Gemfile

@@ -1,7 +1,6 @@
 source "https://rubygems.org"
 
-gem 'debugger',   :platforms => :ruby_19, :require => false
-gem 'ruby-debug', :platforms => :ruby_18, :require => false
+gem 'byebug', require: false
 
 # Specify your gem's dependencies in warden-github.gemspec
 gemspec

data/README.md

@@ -48,11 +48,11 @@ use Warden::Manager do |config|
   config.failure_app = BadAuthentication
   config.default_strategies :github
 
-  config.scope_defaults :default, :config => { :scope => 'user:email' }
-  config.scope_defaults :admin, :config => { :client_id     => 'foobar',
-                                             :client_secret => 'barfoo',
-                                             :scope         => 'user,repo',
-                                             :redirect_uri  => '/admin/oauth/callback' }
+  config.scope_defaults :default, config: { scope: 'user:email' }
+  config.scope_defaults :admin, config: { client_id:     'foobar',
+                                          client_secret: 'barfoo',
+                                          scope:         'user,repo',
+                                          redirect_uri:  '/admin/oauth/callback' }
 
   config.serialize_from_session { |key| Warden::GitHub::Verifier.load(key) }
   config.serialize_into_session { |user| Warden::GitHub::Verifier.dump(user) }

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems/specification'
 require 'date'
 require 'bundler'
 
-task :default => [:spec]
+task default: [:spec]
 
 require 'rspec/core/rake_task'
 desc "Run specs"

data/example/multi_scope_app.rb

@@ -5,15 +5,15 @@ module Example
     enable :inline_templates
 
     GITHUB_CONFIG = {
-      :client_id     => ENV['GITHUB_CLIENT_ID']     || 'test_client_id',
-      :client_secret => ENV['GITHUB_CLIENT_SECRET'] || 'test_client_secret'
+      client_id:     ENV['GITHUB_CLIENT_ID']     || 'test_client_id',
+      client_secret: ENV['GITHUB_CLIENT_SECRET'] || 'test_client_secret'
     }
 
     use Warden::Manager do |config|
       config.failure_app = BadAuthentication
       config.default_strategies :github
-      config.scope_defaults :default, :config => GITHUB_CONFIG
-      config.scope_defaults :admin, :config => GITHUB_CONFIG.merge(:scope => 'user,notifications')
+      config.scope_defaults :default, config: GITHUB_CONFIG
+      config.scope_defaults :admin, config: GITHUB_CONFIG.merge(scope: 'user,notifications')
     end
 
     get '/' do
@@ -26,7 +26,7 @@ module Example
     end
 
     get '/admin/login' do
-      env['warden'].authenticate!(:scope => :admin)
+      env['warden'].authenticate!(scope: :admin)
       redirect '/'
     end
 

data/example/simple_app.rb

@@ -7,15 +7,15 @@ module Example
     enable :inline_templates
 
     GITHUB_CONFIG = {
-      :client_id     => ENV['GITHUB_CLIENT_ID']     || 'test_client_id',
-      :client_secret => ENV['GITHUB_CLIENT_SECRET'] || 'test_client_secret',
-      :scope         => 'user'
+      client_id:     ENV['GITHUB_CLIENT_ID']     || 'test_client_id',
+      client_secret: ENV['GITHUB_CLIENT_SECRET'] || 'test_client_secret',
+      scope:         'user'
     }
 
     use Warden::Manager do |config|
       config.failure_app = BadAuthentication
       config.default_strategies :github
-      config.scope_defaults :default, :config => GITHUB_CONFIG
+      config.scope_defaults :default, config: GITHUB_CONFIG
       config.serialize_from_session { |key| Warden::GitHub::Verifier.load(key) }
       config.serialize_into_session { |user| Warden::GitHub::Verifier.dump(user) }
     end

data/lib/warden/github/config.rb

@@ -43,10 +43,10 @@ module Warden
     #
     #     # This configures an additional scope that uses the github strategy
     #     # with custom configuration.
-    #     config.scope_defaults :admin, :config => { :client_id => 'foobar',
-    #                                                :client_secret => 'barfoo',
-    #                                                :scope => 'user,repo',
-    #                                                :redirect_uri => '/admin/oauth/callback' }
+    #     config.scope_defaults :admin, config: { client_id: 'foobar',
+    #                                             client_secret: 'barfoo',
+    #                                             scope: 'user,repo',
+    #                                             redirect_uri: '/admin/oauth/callback' }
     #   end
     class Config
       BadConfig = Class.new(StandardError)
@@ -88,10 +88,10 @@ module Warden
       end
 
       def to_hash
-        { :client_id     => client_id,
-          :client_secret => client_secret,
-          :redirect_uri  => redirect_uri,
-          :scope         => scope }
+        { client_id:     client_id,
+          client_secret: client_secret,
+          redirect_uri:  redirect_uri,
+          scope:         scope }
       end
 
       private

data/lib/warden/github/hook.rb

@@ -4,3 +4,10 @@ Warden::Manager.after_authentication do |user, auth, opts|
 
   strategy.finalize_flow!  if strategy.class == Warden::GitHub::Strategy
 end
+
+Warden::Manager.after_set_user do |user, auth, opts|
+  if user.is_a?(Warden::GitHub::User)
+    session = auth.session(opts.fetch(:scope))
+    user.memberships = session[:_memberships] ||= {}
+  end
+end

data/lib/warden/github/oauth.rb

@@ -25,10 +25,10 @@ module Warden
       def authorize_uri
         @authorize_uri ||= build_uri(
           '/login/oauth/authorize',
-          :client_id => client_id,
-          :redirect_uri => redirect_uri,
-          :scope => scope,
-          :state => state)
+          client_id: client_id,
+          redirect_uri: redirect_uri,
+          scope: scope,
+          state: state)
       end
 
       def access_token
@@ -53,9 +53,9 @@ module Warden
       def access_token_uri
         @access_token_uri ||= build_uri(
           '/login/oauth/access_token',
-          :client_id => client_id,
-          :client_secret => client_secret,
-          :code => code)
+          client_id: client_id,
+          client_secret: client_secret,
+          code: code)
       end
 
       def build_uri(path, params)

data/lib/warden/github/strategy.rb

@@ -92,7 +92,7 @@ module Warden
 
       def oauth
         @oauth ||= OAuth.new(
-          config.to_hash.merge(:code => params['code'], :state => state))
+          config.to_hash.merge(code: params['code'], state: state))
       end
 
       def config

data/lib/warden/github/user.rb

@@ -1,10 +1,12 @@
 module Warden
   module GitHub
-    class User < Struct.new(:attribs, :token, :browser_session_id, :memberships)
+    class User < Struct.new(:attribs, :token, :browser_session_id)
       ATTRIBUTES = %w[id login name gravatar_id avatar_url email company site_admin].freeze
 
+      attr_accessor :memberships
+
       def self.load(access_token, browser_session_id = nil)
-        api  = Octokit::Client.new(:access_token => access_token)
+        api  = Octokit::Client.new(access_token: access_token)
         data =  { }
 
         api.user.to_hash.each do |k,v|
@@ -75,7 +77,7 @@ module Warden
       def browser_session_valid?(since = 120)
         return true unless using_single_sign_out?
         client = api
-        client.get("/user/sessions/active", :browser_session_id => browser_session_id)
+        client.get("/user/sessions/active", browser_session_id: browser_session_id)
         client.last_response.status == 204
       rescue Octokit::ServerError # GitHub API unavailable
         true
@@ -100,7 +102,7 @@ module Warden
         # Don't cache instance for now because of a ruby marshaling bug present
         # in MRI 1.9.3 (Bug #7627) that causes instance variables to be
         # marshaled even when explicitly specifying #marshal_dump.
-        Octokit::Client.new(:login => login, :access_token => token)
+        Octokit::Client.new(login: login, access_token: token)
       end
 
       private

data/lib/warden/github/version.rb

@@ -1,5 +1,5 @@
 module Warden
   module GitHub
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

data/spec/integration/oauth_spec.rb

@@ -5,17 +5,17 @@ describe 'OAuth' do
 
   def stub_code_for_token_exchange(answer='access_token=the_token')
     stub_request(:post, 'https://github.com/login/oauth/access_token').
-      with(:body => hash_including(:code => code)).
-      to_return(:status => 200, :body => answer)
+      with(body: hash_including(code: code)).
+      to_return(status: 200, body: answer)
   end
 
   def stub_user_retrieval
     stub_request(:get, 'https://api.github.com/user').
-      with(:headers => { 'Authorization' => 'token the_token' }).
+      with(headers: { 'Authorization' => 'token the_token' }).
       to_return(
-        :status => 200,
-        :body => File.read('spec/fixtures/user.json'),
-        :headers => { 'Content-Type' => 'application/json; charset=utf-8' })
+        status: 200,
+        body: File.read('spec/fixtures/user.json'),
+        headers: { 'Content-Type' => 'application/json; charset=utf-8' })
   end
 
   def redirect_uri(response)
@@ -27,12 +27,12 @@ describe 'OAuth' do
       unauthenticated_response = get '/profile'
       github_uri = redirect_uri(unauthenticated_response)
 
-      github_uri.scheme.should eq 'https'
-      github_uri.host.should eq 'github.com'
-      github_uri.path.should eq '/login/oauth/authorize'
-      github_uri.query_values['client_id'].should =~ /\w+/
-      github_uri.query_values['state'].should =~ /\w+/
-      github_uri.query_values['redirect_uri'].should =~ /^http.*\/profile$/
+      expect(github_uri.scheme).to eq 'https'
+      expect(github_uri.host).to eq 'github.com'
+      expect(github_uri.path).to eq '/login/oauth/authorize'
+      expect(github_uri.query_values['client_id']).to match(/\w+/)
+      expect(github_uri.query_values['state']).to match(/\w+/)
+      expect(github_uri.query_values['redirect_uri']).to match(/^http.*\/profile$/)
     end
   end
 
@@ -53,8 +53,8 @@ describe 'OAuth' do
         get '/login'
         response = get "/login?code=#{code}&state=foobar"
 
-        response.should_not be_successful
-        response.body.should include 'State mismatch'
+        expect(response).not_to be_successful
+        expect(response.body).to include 'State mismatch'
       end
     end
 
@@ -67,8 +67,8 @@ describe 'OAuth' do
         state = github_uri.query_values['state']
         response = get "/login?code=#{code}&state=#{state}"
 
-        response.should_not be_successful
-        response.body.should include 'Bad verification code'
+        expect(response).not_to be_successful
+        expect(response.body).to include 'Bad verification code'
       end
     end
 
@@ -79,8 +79,8 @@ describe 'OAuth' do
         state = github_uri.query_values['state']
         response = get "/login?error=access_denied&state=#{state}"
 
-        response.should_not be_successful
-        response.body.should include 'access denied'
+        expect(response).not_to be_successful
+        expect(response.body).to include 'access denied'
       end
     end
 
@@ -96,8 +96,8 @@ describe 'OAuth' do
         callback_response = get "/profile?code=#{code}&state=#{state}"
         authenticated_uri = redirect_uri(callback_response)
 
-        authenticated_uri.path.should eq '/profile'
-        authenticated_uri.query.should eq 'foo=bar'
+        expect(authenticated_uri.path).to eq '/profile'
+        expect(authenticated_uri.query).to eq 'foo=bar'
       end
     end
 
@@ -113,8 +113,8 @@ describe 'OAuth' do
         callback_response = get "/profile?code=#{code}&state=#{state}&browser_session_id=abcdefghijklmnop"
         authenticated_uri = redirect_uri(callback_response)
 
-        authenticated_uri.path.should eq '/profile'
-        authenticated_uri.query.should eq 'foo=bar'
+        expect(authenticated_uri.path).to eq '/profile'
+        expect(authenticated_uri.query).to eq 'foo=bar'
       end
     end
   end
@@ -123,8 +123,8 @@ describe 'OAuth' do
     it 'does not recognize a seeming callback url as an actual callback' do
       response = get '/profile?state=foo&code=bar'
 
-      a_request(:post, 'https://github.com/login/oauth/access_token').
-        should have_not_been_made
+      expect(a_request(:post, 'https://github.com/login/oauth/access_token')).
+        to have_not_been_made
     end
   end
 
@@ -142,7 +142,7 @@ describe 'OAuth' do
       get authenticated_uri.path
       logged_in_response = get '/login'
 
-      redirect_uri(logged_in_response).path.should eq '/'
+      expect(redirect_uri(logged_in_response).path).to eq '/'
     end
   end
 end

data/spec/spec_helper.rb

@@ -19,6 +19,6 @@ RSpec.configure do |config|
 
   def stub_user_session_request
     stub_request(:get, "https://api.github.com/user/sessions/active?browser_session_id=abcdefghijklmnop").
-      with(:headers => {'Accept'=>'application/vnd.github.v3+json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'token the_token', 'Content-Type'=>'application/json', 'User-Agent'=>"Octokit Ruby Gem #{Octokit::VERSION}"})
+      with(headers: {'Accept'=>'application/vnd.github.v3+json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'token the_token', 'Content-Type'=>'application/json', 'User-Agent'=>"Octokit Ruby Gem #{Octokit::VERSION}"})
   end
 end

data/spec/unit/config_spec.rb

@@ -4,11 +4,11 @@ describe Warden::GitHub::Config do
   let(:warden_scope) { :test_scope }
 
   let(:env) do
-    { 'warden' => double(:config => warden_config) }
+    { 'warden' => double(config: warden_config) }
   end
 
   let(:warden_config) do
-    { :scope_defaults => { warden_scope => { :config => scope_config } } }
+    { scope_defaults: { warden_scope => { config: scope_config } } }
   end
 
   let(:scope_config) do
@@ -16,7 +16,7 @@ describe Warden::GitHub::Config do
   end
 
   let(:request) do
-    double(:url => 'http://example.com/the/path', :path => '/the/path')
+    double(url: 'http://example.com/the/path', path: '/the/path')
   end
 
   subject(:config) do
@@ -24,7 +24,7 @@ describe Warden::GitHub::Config do
   end
 
   before do
-    config.stub(:request => request)
+    allow(config).to receive_messages(request: request)
   end
 
   def silence_warnings
@@ -38,7 +38,7 @@ describe Warden::GitHub::Config do
     context 'when specified in scope config' do
       it 'returns the client id' do
         scope_config[:client_id] = 'foobar'
-        config.client_id.should eq 'foobar'
+        expect(config.client_id).to eq 'foobar'
       end
     end
 
@@ -46,15 +46,15 @@ describe Warden::GitHub::Config do
       it 'returns the client id' do
         warden_config[:github_client_id] = 'foobar'
         silence_warnings do
-          config.client_id.should eq 'foobar'
+          expect(config.client_id).to eq 'foobar'
         end
       end
     end
 
     context 'when specified in ENV' do
       it 'returns the client id' do
-        ENV.stub(:[]).with('GITHUB_CLIENT_ID').and_return('foobar')
-        config.client_id.should eq 'foobar'
+        allow(ENV).to receive(:[]).with('GITHUB_CLIENT_ID').and_return('foobar')
+        expect(config.client_id).to eq 'foobar'
       end
     end
 
@@ -69,7 +69,7 @@ describe Warden::GitHub::Config do
     context 'when specified in scope config' do
       it 'returns the client secret' do
         scope_config[:client_secret] = 'foobar'
-        config.client_secret.should eq 'foobar'
+        expect(config.client_secret).to eq 'foobar'
       end
     end
 
@@ -77,16 +77,16 @@ describe Warden::GitHub::Config do
       it 'returns the client secret' do
         warden_config[:github_secret] = 'foobar'
         silence_warnings do
-          config.client_secret.should eq 'foobar'
+          expect(config.client_secret).to eq 'foobar'
         end
       end
     end
 
     context 'when specified in ENV' do
       it 'returns the client secret' do
-        ENV.stub(:[]).with('GITHUB_CLIENT_SECRET').and_return('foobar')
+        allow(ENV).to receive(:[]).with('GITHUB_CLIENT_SECRET').and_return('foobar')
         silence_warnings do
-          config.client_secret.should eq 'foobar'
+          expect(config.client_secret).to eq 'foobar'
         end
       end
     end
@@ -102,14 +102,14 @@ describe Warden::GitHub::Config do
     context 'when specified in scope config' do
       it 'returns the expanded redirect uri' do
         scope_config[:redirect_uri] = '/callback'
-        config.redirect_uri.should eq 'http://example.com/callback'
+        expect(config.redirect_uri).to eq 'http://example.com/callback'
       end
     end
 
     context 'when specified path lacks leading slash' do
       it 'corrects the path and returns the expanded uri' do
         scope_config[:redirect_uri] = 'callback'
-        config.redirect_uri.should eq 'http://example.com/callback'
+        expect(config.redirect_uri).to eq 'http://example.com/callback'
       end
     end
 
@@ -117,40 +117,40 @@ describe Warden::GitHub::Config do
       it 'returns the expanded redirect uri' do
         warden_config[:github_callback_url] = '/callback'
         silence_warnings do
-          config.redirect_uri.should eq 'http://example.com/callback'
+          expect(config.redirect_uri).to eq 'http://example.com/callback'
         end
       end
     end
 
     context 'when not specified' do
       it 'returns the expanded redirect uri with the current path' do
-        config.redirect_uri.should eq 'http://example.com/the/path'
+        expect(config.redirect_uri).to eq 'http://example.com/the/path'
       end
     end
 
     context 'when HTTP_X_FORWARDED_PROTO is set to https' do
       it 'returns the expanded redirect uri(with port) with adjusted scheme' do
         env['HTTP_X_FORWARDED_PROTO'] = 'https'
-        request.stub(:url => 'http://example.com:443/the/path')
-        config.redirect_uri.should eq 'https://example.com/the/path'
+        allow(request).to receive_messages(url: 'http://example.com:443/the/path')
+        expect(config.redirect_uri).to eq 'https://example.com/the/path'
       end
 
       it 'returns the expanded redirect uri with adjusted scheme including port 80' do
         env['HTTP_X_FORWARDED_PROTO'] = 'https'
-        request.stub(:url => 'http://example.com:80/the/path')
-        config.redirect_uri.should eq 'https://example.com/the/path'
+        allow(request).to receive_messages(url: 'http://example.com:80/the/path')
+        expect(config.redirect_uri).to eq 'https://example.com/the/path'
       end
 
       it 'returns the expanded redirect uri with adjusted scheme including port 80 with multiple forwarded protocols' do
         env['HTTP_X_FORWARDED_PROTO'] = 'https,https'
-        request.stub(:url => 'https://example.com:80/the/path')
-        config.redirect_uri.should eq 'https://example.com/the/path'
+        allow(request).to receive_messages(url: 'https://example.com:80/the/path')
+        expect(config.redirect_uri).to eq 'https://example.com/the/path'
       end
 
       it 'returns the expanded redirect uri(without port) with adjusted scheme' do
         env['HTTP_X_FORWARDED_PROTO'] = 'https'
-        request.stub(:url => 'http://example.com/the/path')
-        config.redirect_uri.should eq 'https://example.com/the/path'
+        allow(request).to receive_messages(url: 'http://example.com/the/path')
+        expect(config.redirect_uri).to eq 'https://example.com/the/path'
       end
     end
   end
@@ -159,7 +159,7 @@ describe Warden::GitHub::Config do
     context 'when specified in scope config' do
       it 'returns the client secret' do
         scope_config[:scope] = 'user'
-        config.scope.should eq 'user'
+        expect(config.scope).to eq 'user'
       end
     end
 
@@ -167,14 +167,14 @@ describe Warden::GitHub::Config do
       it 'returns the client secret' do
         warden_config[:github_scopes] = 'user'
         silence_warnings do
-          config.scope.should eq 'user'
+          expect(config.scope).to eq 'user'
         end
       end
     end
 
     context 'when not specified' do
       it 'returns nil' do
-        config.scope.should be_nil
+        expect(config.scope).to be_nil
       end
     end
   end
@@ -182,13 +182,13 @@ describe Warden::GitHub::Config do
   describe '#to_hash' do
     it 'includes all configs' do
       scope_config.merge!(
-        :scope         => 'user',
-        :client_id     => 'abc',
-        :client_secret => '123',
-        :redirect_uri  => '/foo')
+        scope:         'user',
+        client_id:     'abc',
+        client_secret: '123',
+        redirect_uri:  '/foo')
 
-      config.to_hash.keys.
-        should =~ [:scope, :client_id, :client_secret, :redirect_uri]
+      expect(config.to_hash.keys).
+        to match_array([:scope, :client_id, :client_secret, :redirect_uri])
     end
   end
 end

data/spec/unit/membership_cache_spec.rb

@@ -4,7 +4,7 @@ describe Warden::GitHub::MembershipCache do
   describe '#fetch_membership' do
     it 'returns false by default' do
       cache = described_class.new({})
-      cache.fetch_membership('foo', 'bar').should be_falsey
+      expect(cache.fetch_membership('foo', 'bar')).to be_falsey
     end
 
     context 'when cache valid' do
@@ -15,7 +15,7 @@ describe Warden::GitHub::MembershipCache do
       end
 
       it 'returns true' do
-        cache.fetch_membership('foo', 'bar').should be_truthy
+        expect(cache.fetch_membership('foo', 'bar')).to be_truthy
       end
 
       it 'does not invoke the block' do
@@ -24,7 +24,7 @@ describe Warden::GitHub::MembershipCache do
       end
 
       it 'converts type and id to strings' do
-        cache.fetch_membership(:foo, :bar).should be_truthy
+        expect(cache.fetch_membership(:foo, :bar)).to be_truthy
       end
     end
 
@@ -37,7 +37,7 @@ describe Warden::GitHub::MembershipCache do
 
       context 'when no block given' do
         it 'returns false' do
-          cache.fetch_membership('foo', 'bar').should be_falsey
+          expect(cache.fetch_membership('foo', 'bar')).to be_falsey
         end
       end
 
@@ -50,13 +50,13 @@ describe Warden::GitHub::MembershipCache do
     it 'caches the value when block returns true' do
       cache = described_class.new({})
       cache.fetch_membership('foo', 'bar') { true }
-      cache.fetch_membership('foo', 'bar').should be_truthy
+      expect(cache.fetch_membership('foo', 'bar')).to be_truthy
     end
 
     it 'does not cache the value when block returns false' do
       cache = described_class.new({})
       cache.fetch_membership('foo', 'bar') { false }
-      cache.fetch_membership('foo', 'bar').should be_falsey
+      expect(cache.fetch_membership('foo', 'bar')).to be_falsey
     end
   end
 
@@ -71,8 +71,8 @@ describe Warden::GitHub::MembershipCache do
     cache = described_class.new(hash)
 
     # Verify that existing data in the hash is used:
-    expect(cache.fetch_membership('foo', 'valid')).to be_true
-    expect(cache.fetch_membership('foo', 'timedout')).to be_false
+    expect(cache.fetch_membership('foo', 'valid')).to be(true)
+    expect(cache.fetch_membership('foo', 'timedout')).to be(false)
 
     # Add new data to the hash:
     cache.fetch_membership('foo', 'new') { true }

data/spec/unit/oauth_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe Warden::GitHub::OAuth do
   let(:default_attrs) do
-    { :state => 'abc',
-      :client_id => 'foo',
-      :client_secret => 'bar',
-      :redirect_uri => 'http://example.com/callback' }
+    { state: 'abc',
+      client_id: 'foo',
+      client_secret: 'bar',
+      redirect_uri: 'http://example.com/callback' }
   end
 
   def oauth(attrs=default_attrs)
@@ -14,7 +14,7 @@ describe Warden::GitHub::OAuth do
 
   describe '#authorize_uri' do
     it 'contains the base uri' do
-      oauth.authorize_uri.to_s.should \
+      expect(oauth.authorize_uri.to_s).to \
         include Octokit.web_endpoint
     end
 
@@ -22,15 +22,15 @@ describe Warden::GitHub::OAuth do
       it "contains the correct #{name} param" do
         uri = Addressable::URI.parse(oauth.authorize_uri)
 
-        uri.query_values[name].should eq default_attrs[name.to_sym]
+        expect(uri.query_values[name]).to eq default_attrs[name.to_sym]
       end
     end
 
-    { :nil => nil, :empty => '' }.each do |desc, value|
+    { nil: nil, empty: '' }.each do |desc, value|
       it "does not contain the scope param if #{desc}" do
-        uri = oauth(default_attrs.merge(:scope => value)).authorize_uri
+        uri = oauth(default_attrs.merge(scope: value)).authorize_uri
 
-        uri.to_s.should_not include 'scope'
+        expect(uri.to_s).not_to include 'scope'
       end
     end
   end
@@ -38,19 +38,19 @@ describe Warden::GitHub::OAuth do
   describe '#access_token' do
     def expect_request(attrs={})
       stub_request(:post, %r{\/login\/oauth\/access_token$}).
-        with(:body => hash_including(attrs.fetch(:params, {}))).
-        to_return(:status => 200,
-                  :body => attrs.fetch(:answer, 'access_token=foobar'))
+        with(body: hash_including(attrs.fetch(:params, {}))).
+        to_return(status: 200,
+                  body: attrs.fetch(:answer, 'access_token=foobar'))
     end
 
     it 'exchanges the code for an access token' do
-      expect_request(:answer => 'access_token=the_token&token_type=bearer')
+      expect_request(answer: 'access_token=the_token&token_type=bearer')
 
-      oauth.access_token.should eq 'the_token'
+      expect(oauth.access_token).to eq 'the_token'
     end
 
     it 'raises BadVerificationCode if no access token is returned' do
-      expect_request(:answer => 'error=bad_verification_code')
+      expect_request(answer: 'error=bad_verification_code')
 
       expect { oauth.access_token }.
         to raise_error(described_class::BadVerificationCode)
@@ -58,8 +58,8 @@ describe Warden::GitHub::OAuth do
 
     %w[ client_id client_secret code ].each do |name|
       it "performs a request containing the correct #{name} param" do
-        oauth(default_attrs.merge(:code => 'the_code')).tap do |o|
-          expect_request(:params => { name => o.send(name) })
+        oauth(default_attrs.merge(code: 'the_code')).tap do |o|
+          expect_request(params: { name => o.send(name) })
           o.access_token
         end
       end

data/spec/unit/sso_spec.rb

@@ -28,15 +28,15 @@ describe Warden::GitHub::SSO do
   describe "warden_github_sso_session_valid?" do
     it "identifies when browsers need to be reverified" do
       subject.session[:warden_github_sso_session_verified_at] = Time.now.utc.to_i - 10
-      subject.should be_warden_github_sso_session_valid(user)
+      expect(subject).to be_warden_github_sso_session_valid(user)
 
       subject.session[:warden_github_sso_session_verified_at] = Time.now.utc.to_i - 300
-      stub_user_session_request.to_return(:status => 204, :body => "", :headers => {})
-      subject.should be_warden_github_sso_session_valid(user)
+      stub_user_session_request.to_return(status: 204, body: "", headers: {})
+      expect(subject).to be_warden_github_sso_session_valid(user)
 
       subject.session[:warden_github_sso_session_verified_at] = Time.now.utc.to_i - 300
-      stub_user_session_request.to_return(:status => 404, :body => "", :headers => {})
-      subject.should_not be_warden_github_sso_session_valid(user)
+      stub_user_session_request.to_return(status: 404, body: "", headers: {})
+      expect(subject).not_to be_warden_github_sso_session_valid(user)
     end
   end
 end

data/spec/unit/user_spec.rb

@@ -21,14 +21,14 @@ describe Warden::GitHub::User do
 
   describe '#token' do
     it 'returns the token' do
-      user.token.should eq token
+      expect(user.token).to eq token
     end
   end
 
   %w[login name gravatar_id avatar_url email company].each do |name|
     describe "##{name}" do
       it "returns the #{name}" do
-        user.send(name).should eq default_attrs[name]
+        expect(user.send(name)).to eq default_attrs[name]
       end
     end
   end
@@ -37,16 +37,16 @@ describe Warden::GitHub::User do
     it 'returns a preconfigured Octokit client for the user' do
       api = user.api
 
-      api.should be_an Octokit::Client
-      api.login.should eq user.login
-      api.access_token.should eq user.token
+      expect(api).to be_an Octokit::Client
+      expect(api.login).to eq user.login
+      expect(api.access_token).to eq user.token
     end
   end
 
   def stub_api(user, method, args, ret)
     api = double
-    user.stub(:api => api)
-    api.should_receive(method).with(*args).and_return(ret)
+    allow(user).to receive_messages(api: api)
+    expect(api).to receive(method).with(*args).and_return(ret)
   end
 
   [:organization_public_member?, :organization_member?].each do |method|
@@ -54,14 +54,14 @@ describe Warden::GitHub::User do
       context 'when user is not member' do
         it 'returns false' do
           stub_api(user, method, ['rails', user.login], false)
-          user.send(method, 'rails').should be_falsey
+          expect(user.send(method, 'rails')).to be_falsey
         end
       end
 
       context 'when user is member' do
         it 'returns true' do
           stub_api(user, method, ['rails', user.login], true)
-          user.send(method, 'rails').should be_truthy
+          expect(user.send(method, 'rails')).to be_truthy
         end
       end
     end
@@ -71,21 +71,21 @@ describe Warden::GitHub::User do
     context 'when user is not member' do
       it 'returns false' do
         api = double()
-        user.stub(:api => api)
+        allow(user).to receive_messages(api: api)
 
-        api.stub(:team_member?).with(123, user.login).and_return(false)
+        allow(api).to receive(:team_member?).with(123, user.login).and_return(false)
 
-        user.should_not be_team_member(123)
+        expect(user).not_to be_team_member(123)
       end
     end
 
     context 'when user is member' do
       it 'returns true' do
         api = double()
-        user.stub(:api => api)
-        api.stub(:team_member?).with(123, user.login).and_return(true)
+        allow(user).to receive_messages(api: api)
+        allow(api).to receive(:team_member?).with(123, user.login).and_return(true)
 
-        user.should be_team_member(123)
+        expect(user).to be_team_member(123)
       end
     end
   end
@@ -95,49 +95,49 @@ describe Warden::GitHub::User do
       client = double
       attrs = {}
 
-      Octokit::Client.
-        should_receive(:new).
-        with(:access_token => token).
+      expect(Octokit::Client).
+        to receive(:new).
+        with(access_token: token).
         and_return(client)
-      client.should_receive(:user).and_return(attrs)
+      expect(client).to receive(:user).and_return(attrs)
 
       user = described_class.load(token)
 
-      user.attribs.should eq attrs
-      user.token.should eq token
+      expect(user.attribs).to eq attrs
+      expect(user.token).to eq token
     end
   end
 
   # NOTE: This always passes on MRI 1.9.3 because of ruby bug #7627.
   it 'marshals correctly' do
-    Marshal.load(Marshal.dump(user)).should eq user
+    expect(Marshal.load(Marshal.dump(user))).to eq user
   end
 
   describe 'single sign out' do
     it "knows if the user is using single sign out" do
-      user.should_not be_using_single_sign_out
-      sso_user.should be_using_single_sign_out
+      expect(user).not_to be_using_single_sign_out
+      expect(sso_user).to be_using_single_sign_out
     end
 
     context "browser reverification" do
       it "handles success" do
-        stub_user_session_request.to_return(:status => 204, :body => "", :headers => {})
-        sso_user.should be_browser_session_valid
+        stub_user_session_request.to_return(status: 204, body: "", headers: {})
+        expect(sso_user).to be_browser_session_valid
       end
 
       it "handles failure" do
-        stub_user_session_request.to_return(:status => 404, :body => "", :headers => {})
-        sso_user.should_not be_browser_session_valid
+        stub_user_session_request.to_return(status: 404, body: "", headers: {})
+        expect(sso_user).not_to be_browser_session_valid
       end
 
       it "handles GitHub being unavailable" do
         stub_user_session_request.to_raise(Octokit::ServerError.new)
-        sso_user.should be_browser_session_valid
+        expect(sso_user).to be_browser_session_valid
       end
 
       it "handles authentication failures" do
-        stub_user_session_request.to_return(:status => 403, :body => "", :headers => {})
-        sso_user.should_not be_browser_session_valid
+        stub_user_session_request.to_return(status: 403, body: "", headers: {})
+        expect(sso_user).not_to be_browser_session_valid
       end
     end
   end

data/warden-github.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rack",      "~>1.4.1"
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec",     "~>2.8"
+  s.add_development_dependency "rspec",     "~>3.6"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "webmock",   "~>1.9"
   s.add_development_dependency "sinatra"

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: warden-github
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Corey Donohoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-16 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shotgun
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A warden strategy for easy oauth integration with github
@@ -199,9 +199,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -240,17 +240,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: warden-github
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: A warden strategy for easy oauth integration with github