omniauth-oauth2 1.1.1 → 1.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 729f67df8ee052a37b39db77bb84fc0e954b5c47
+  data.tar.gz: 03e11773729ff900ad4edb07be8c8e13fc001316
+SHA512:
+  metadata.gz: 4e17fffddb77d20eb90a87b88974e8d65a48fe07b8efb6c193bcac18cd51320ffbc253f1c78a47ed07fb59b70049d632a583580940215a11d27f1160c466c8de
+  data.tar.gz: 630038ac3b8270b536dfed054e3a26a9ba7de3bfd5d563a8e0ff094154431fc6b322ad27d573ce3fbe5a7f2c8bd907e2cd1382eda42587d777037e4b2d58b8aa

data/.rubocop.yml

@@ -0,0 +1,78 @@
+AllCops:
+  Includes:
+    - 'Gemfile'
+    - 'Rakefile'
+    - 'omniauth-oauth2.gemspec'
+
+# Avoid long parameter lists
+ParameterLists:
+  Max: 5
+  CountKeywordArgs: true
+
+MethodLength:
+  CountComments: false
+  Max: 18
+
+# Avoid more than `Max` levels of nesting.
+BlockNesting:
+  Max: 2
+
+# Align with the style guide.
+CollectionMethods:
+  PreferredMethods:
+    map:      'collect'
+    reduce:   'inject'
+    find:     'detect'
+    find_all: 'select'
+
+# Do not force public/protected/private keyword to be indented at the same
+# level as the def keyword. My personal preference is to outdent these keywords
+# because I think when scanning code it makes it easier to identify the
+# sections of code and visually separate them. When the keyword is at the same
+# level I think it sort of blends in with the def keywords and makes it harder
+# to scan the code and see where the sections are.
+AccessModifierIndentation:
+  Enabled: false
+
+# Limit line length
+LineLength:
+  Enabled: false
+
+# Disable documentation checking until a class needs to be documented once
+Documentation:
+  Enabled: false
+
+# Enforce Ruby 1.8-compatible hash syntax
+HashSyntax:
+  EnforcedStyle: hash_rockets
+
+# No spaces inside hash literals
+SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+# Allow dots at the end of lines
+DotPosition:
+  Enabled: false
+
+# Don't require magic comment at the top of every file
+Encoding:
+  Enabled: false
+
+# Enforce outdenting of access modifiers (i.e. public, private, protected)
+AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+EmptyLinesAroundAccessModifier:
+  Enabled: true
+
+# Align ends correctly
+EndAlignment:
+  AlignWith: variable
+
+# Indentation of when/else
+CaseIndentation:
+  IndentWhenRelativeTo: end
+  IndentOneStep: false
+
+Lambda:
+  Enabled: false

data/.travis.yml

@@ -0,0 +1,27 @@
+before_install:
+  - gem install bundler
+  - bundle --version
+  - gem update --system 2.1.11
+  - gem --version
+bundler_args: --without development
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - rbx
+  - ruby-head
+matrix:
+  include:
+    - rvm: jruby-18mode
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+    - rvm: jruby-19mode
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+    - rvm: jruby-head
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: ruby-head
+  fast_finish: true

data/Gemfile

@@ -1,12 +1,31 @@
 source 'http://rubygems.org'
 
-# Specify your gem's dependencies in omniauth-oauth2.gemspec
-gemspec
+gem 'rake'
 
-group :development, :test do
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-bundler'
-  gem 'growl'
-  gem 'rb-fsevent'
+group :development do
+  platforms :ruby_19, :ruby_20, :ruby_21 do
+    gem 'guard'
+    gem 'guard-rspec'
+    gem 'guard-bundler'
+  end
 end
+
+group :test do
+  gem 'coveralls', :require => false
+  gem 'json', :platforms => [:jruby, :rbx, :ruby_18, :ruby_19]
+  gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
+  gem 'rack-test'
+  gem 'rspec', '~> 2.14'
+  gem 'rubocop', '>= 0.16', :platforms => [:ruby_19, :ruby_20, :ruby_21]
+  gem 'simplecov', :require => false
+  gem 'webmock'
+end
+
+platforms :rbx do
+  gem 'racc'
+  gem 'rubinius-coverage', '~> 2.0'
+  gem 'rubysl', '~> 2.0'
+end
+
+# Specify your gem's dependencies in omniauth-oauth2.gemspec
+gemspec

data/LICENSE.md

@@ -0,0 +1,19 @@
+Copyright (C) 2014 Michael Bleigh, Erik Michaels-Ober and Intridea, Inc.
+
+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,74 +1,67 @@
 # OmniAuth OAuth2
 
-This gem contains a generic OAuth2 strategy for OmniAuth. It is meant to
-serve as a building block strategy for other strategies and not to be
-used independently (since it has no inherent way to gather uid and user
-info).
+[![Gem Version](https://badge.fury.io/rb/omniauth-oauth2.png)][gem]
+[![Build Status](https://secure.travis-ci.org/intridea/omniauth-oauth2.png?branch=master)][travis]
+[![Dependency Status](https://gemnasium.com/intridea/omniauth-oauth2.png?travis)][gemnasium]
+[![Code Climate](https://codeclimate.com/github/intridea/omniauth-oauth2.png)][codeclimate]
+[![Coverage Status](https://coveralls.io/repos/intridea/omniauth-oauth2/badge.png?branch=master)][coveralls]
+
+[gem]: https://rubygems.org/gems/omniauth-oauth2
+[travis]: http://travis-ci.org/intridea/omniauth-oauth2
+[gemnasium]: https://gemnasium.com/intridea/omniauth-oauth2
+[codeclimate]: https://codeclimate.com/github/intridea/omniauth-oauth2
+[coveralls]: https://coveralls.io/r/intridea/omniauth-oauth2
+
+This gem contains a generic OAuth2 strategy for OmniAuth. It is meant to serve
+as a building block strategy for other strategies and not to be used
+independently (since it has no inherent way to gather uid and user info).
 
 ## Creating an OAuth2 Strategy
 
-To create an OmniAuth OAuth2 strategy using this gem, you can simply
-subclass it and add a few extra methods like so:
-
-    require 'omniauth-oauth2'
-
-    module OmniAuth
-      module Strategies
-        class SomeSite < OmniAuth::Strategies::OAuth2
-          # Give your strategy a name.
-          option :name, "some_site"
-
-          # This is where you pass the options you would pass when
-          # initializing your consumer from the OAuth gem.
-          option :client_options, {:site => "https://api.somesite.com"}
-
-          # These are called after authentication has succeeded. If
-          # possible, you should try to set the UID without making
-          # additional calls (if the user id is returned with the token
-          # or as a URI parameter). This may not be possible with all
-          # providers.
-          uid{ raw_info['id'] }
-
-          info do
-            {
-              :name => raw_info['name'],
-              :email => raw_info['email']
-            }
-          end
+To create an OmniAuth OAuth2 strategy using this gem, you can simply subclass
+it and add a few extra methods like so:
+
+```ruby
+require 'omniauth-oauth2'
+
+module OmniAuth
+  module Strategies
+    class SomeSite < OmniAuth::Strategies::OAuth2
+      # Give your strategy a name.
+      option :name, "some_site"
+
+      # This is where you pass the options you would pass when
+      # initializing your consumer from the OAuth gem.
+      option :client_options, {:site => "https://api.somesite.com"}
+
+      # These are called after authentication has succeeded. If
+      # possible, you should try to set the UID without making
+      # additional calls (if the user id is returned with the token
+      # or as a URI parameter). This may not be possible with all
+      # providers.
+      uid{ raw_info['id'] }
+
+      info do
+        {
+          :name => raw_info['name'],
+          :email => raw_info['email']
+        }
+      end
 
-          extra do
-            {
-              'raw_info' => raw_info
-            }
-          end
+      extra do
+        {
+          'raw_info' => raw_info
+        }
+      end
 
-          def raw_info
-            @raw_info ||= access_token.get('/me').parsed
-          end
-        end
+      def raw_info
+        @raw_info ||= access_token.get('/me').parsed
       end
     end
+  end
+end
+```
 
 That's pretty much it!
 
-## License
-
-Copyright (C) 2011 by Michael Bleigh and Intridea, Inc.
-
-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.
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/intridea/omniauth-oauth2/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/Rakefile

@@ -1,9 +1,18 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-desc 'Default: run specs.'
-task :default => :spec
-
-desc "Run specs"
 RSpec::Core::RakeTask.new
+
+task :test => :spec
+
+begin
+  require 'rubocop/rake_task'
+  Rubocop::RakeTask.new
+rescue LoadError
+  task :rubocop do
+    $stderr.puts 'Rubocop is disabled'
+  end
+end
+
+task :default => [:spec, :rubocop]

data/lib/omniauth-oauth2.rb

@@ -1,2 +1,2 @@
-require "omniauth-oauth2/version"
+require 'omniauth-oauth2/version'
 require 'omniauth/strategies/oauth2'

data/lib/omniauth-oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module OAuth2
-    VERSION = "1.1.1"
+    VERSION = '1.1.2'
   end
 end

data/lib/omniauth/strategies/oauth2.rb

@@ -1,9 +1,10 @@
-require 'cgi'
-require 'uri'
 require 'oauth2'
 require 'omniauth'
-require 'timeout'
 require 'securerandom'
+require 'socket'       # for SocketError
+require 'timeout'      # for Timeout::Error
+require 'faraday'      # for Faraday::Error::TimeoutError and Faraday::Error::ConnectionFailed
+require 'multi_json'   # for MultiJson::DecodeError
 
 module OmniAuth
   module Strategies
@@ -24,6 +25,7 @@ module OmniAuth
       option :authorize_options, [:scope]
       option :token_params, {}
       option :token_options, []
+      option :auth_token_params, {}
       option :provider_ignores_state, false
 
       attr_accessor :access_token
@@ -50,7 +52,7 @@ module OmniAuth
 
       def authorize_params
         options.authorize_params[:state] = SecureRandom.hex(24)
-        params = options.authorize_params.merge(options.authorize_options.inject({}){|h,k| h[k.to_sym] = options[k] if options[k]; h})
+        params = options.authorize_params.merge(options_for('authorize'))
         if OmniAuth.config.test_mode
           @env ||= {}
           @env['rack.session'] ||= {}
@@ -60,43 +62,51 @@ module OmniAuth
       end
 
       def token_params
-        options.token_params.merge(options.token_options.inject({}){|h,k| h[k.to_sym] = options[k] if options[k]; h})
+        options.token_params.merge(options_for('token'))
       end
 
-      def callback_phase
-        if request.params['error'] || request.params['error_reason']
-          raise CallbackError.new(request.params['error'], request.params['error_description'] || request.params['error_reason'], request.params['error_uri'])
+      def callback_phase # rubocop:disable CyclomaticComplexity
+        error = request.params['error_reason'] || request.params['error']
+        if error
+          fail!(error, CallbackError.new(request.params['error'], request.params['error_description'] || request.params['error_reason'], request.params['error_uri']))
+        elsif !options.provider_ignores_state && (request.params['state'].to_s.empty? || request.params['state'] != session.delete('omniauth.state'))
+          fail!(:csrf_detected, CallbackError.new(:csrf_detected, 'CSRF detected'))
+        else
+          self.access_token = build_access_token
+          self.access_token = access_token.refresh! if access_token.expired?
+          super
         end
-        if !options.provider_ignores_state && (request.params['state'].to_s.empty? || request.params['state'] != session.delete('omniauth.state'))
-          raise CallbackError.new(nil, :csrf_detected)
-        end
-
-        self.access_token = build_access_token
-        self.access_token = access_token.refresh! if access_token.expired?
-
-        super
       rescue ::OAuth2::Error, CallbackError => e
         fail!(:invalid_credentials, e)
       rescue ::MultiJson::DecodeError => e
         fail!(:invalid_response, e)
-      rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
+      rescue ::Timeout::Error, ::Errno::ETIMEDOUT, Faraday::Error::TimeoutError => e
         fail!(:timeout, e)
-      rescue ::SocketError => e
+      rescue ::SocketError, Faraday::Error::ConnectionFailed => e
         fail!(:failed_to_connect, e)
       end
 
-      protected
+    protected
+
+      def build_access_token
+        verifier = request.params['code']
+        client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(token_params.to_hash(:symbolize_keys => true)), deep_symbolize(options.auth_token_params))
+      end
 
-      def deep_symbolize(hash)
-        hash.inject({}) do |h, (k,v)|
-          h[k.to_sym] = v.is_a?(Hash) ? deep_symbolize(v) : v
-          h
+      def deep_symbolize(options)
+        hash = {}
+        options.each do |key, value|
+          hash[key.to_sym] = value.is_a?(Hash) ? deep_symbolize(value) : value
         end
+        hash
       end
 
-      def build_access_token
-        verifier = request.params['code']
-        client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(token_params.to_hash(:symbolize_keys => true)))
+      def options_for(option)
+        hash = {}
+        options.send(:"#{option}_options").select { |key| options[key] }.each do |key|
+          hash[key.to_sym] = options[key]
+        end
+        hash
       end
 
       # An error that is indicated in the OAuth 2.0 callback.
@@ -104,13 +114,18 @@ module OmniAuth
       class CallbackError < StandardError
         attr_accessor :error, :error_reason, :error_uri
 
-        def initialize(error, error_reason=nil, error_uri=nil)
+        def initialize(error, error_reason = nil, error_uri = nil)
           self.error = error
           self.error_reason = error_reason
           self.error_uri = error_uri
         end
+
+        def message
+          [error, error_reason, error_uri].compact.join(' | ')
+        end
       end
     end
   end
 end
+
 OmniAuth.config.add_camelization 'oauth2', 'OAuth2'

data/omniauth-oauth2.gemspec

@@ -1,25 +1,26 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/omniauth-oauth2/version', __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'omniauth-oauth2/version'
 
 Gem::Specification.new do |gem|
-  gem.add_dependency 'omniauth', '~> 1.0'
-  gem.add_dependency 'oauth2', '~> 0.8.0'
+  gem.add_dependency 'faraday',   ['>= 0.8', '< 0.10']
+  gem.add_dependency 'multi_json', '~> 1.3'
+  gem.add_dependency 'oauth2',     '~> 0.9.3'
+  gem.add_dependency 'omniauth',   '~> 1.2'
 
-  gem.add_development_dependency 'rspec', '~> 2.7'
-  gem.add_development_dependency 'rack-test'
-  gem.add_development_dependency 'webmock'
-  gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'bundler', '~> 1.0'
 
-  gem.authors       = ["Michael Bleigh"]
-  gem.email         = ["michael@intridea.com"]
+  gem.authors       = ['Michael Bleigh', 'Erik Michaels-Ober']
+  gem.email         = ['michael@intridea.com', 'sferik@gmail.com']
   gem.description   = %q{An abstract OAuth2 strategy for OmniAuth.}
-  gem.summary       = %q{An abstract OAuth2 strategy for OmniAuth.}
-  gem.homepage      = "https://github.com/intridea/omniauth-oauth2"
+  gem.summary       = gem.description
+  gem.homepage      = 'https://github.com/intridea/omniauth-oauth2'
+  gem.license       = 'MIT'
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  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 = ["lib"]
+  gem.name          = 'omniauth-oauth2'
+  gem.require_paths = ['lib']
   gem.version       = OmniAuth::OAuth2::VERSION
 end

data/spec/helper.rb

@@ -0,0 +1,28 @@
+$LOAD_PATH.unshift File.expand_path('..', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start do
+  minimum_coverage(76)
+end
+
+require 'rspec'
+require 'rack/test'
+require 'webmock/rspec'
+require 'omniauth'
+require 'omniauth-oauth2'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+  config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
+  config.include Rack::Test::Methods
+  config.include WebMock::API
+end

data/spec/omniauth/strategies/oauth2_spec.rb

@@ -1,8 +1,12 @@
-require 'spec_helper'
+require 'helper'
 
 describe OmniAuth::Strategies::OAuth2 do
-  def app; lambda{|env| [200, {}, ["Hello."]]} end
-  let(:fresh_strategy){ Class.new(OmniAuth::Strategies::OAuth2) }
+  def app
+    lambda do |env|
+      [200, {}, ['Hello.']]
+    end
+  end
+  let(:fresh_strategy) { Class.new(OmniAuth::Strategies::OAuth2) }
 
   before do
     OmniAuth.config.test_mode = true
@@ -13,51 +17,82 @@ describe OmniAuth::Strategies::OAuth2 do
   end
 
   describe '#client' do
-    subject{ fresh_strategy }
+    subject { fresh_strategy }
 
-    it 'should be initialized with symbolized client_options' do
+    it 'is initialized with symbolized client_options' do
       instance = subject.new(app, :client_options => {'authorize_url' => 'https://example.com'})
-      instance.client.options[:authorize_url].should == 'https://example.com'
+      expect(instance.client.options[:authorize_url]).to eq('https://example.com')
     end
 
-    it 'should set ssl options as connection options' do
+    it 'sets ssl options as connection options' do
       instance = subject.new(app, :client_options => {'ssl' => {'ca_path' => 'foo'}})
-      instance.client.options[:connection_opts][:ssl] =~ {:ca_path => 'foo'}
+      expect(instance.client.options[:connection_opts][:ssl]).to eq(:ca_path => 'foo')
     end
   end
 
   describe '#authorize_params' do
     subject { fresh_strategy }
 
-    it 'should include any authorize params passed in the :authorize_params option' do
-      instance = subject.new('abc', 'def', :authorize_params => {:foo => 'bar', :baz => 'zip', :state => '123'})
-      instance.authorize_params.should == {'foo' => 'bar', 'baz' => 'zip', 'state' => '123'}
+    it 'includes any authorize params passed in the :authorize_params option' do
+      instance = subject.new('abc', 'def', :authorize_params => {:foo => 'bar', :baz => 'zip'})
+      expect(instance.authorize_params['foo']).to eq('bar')
+      expect(instance.authorize_params['baz']).to eq('zip')
     end
 
-    it 'should include top-level options that are marked as :authorize_options' do
-      instance = subject.new('abc', 'def', :authorize_options => [:scope, :foo], :scope => 'bar', :foo => 'baz', :authorize_params => {:state => '123'})
-      instance.authorize_params.should == {'scope' => 'bar', 'foo' => 'baz', 'state' => '123'}
+    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')
+      expect(instance.authorize_params['scope']).to eq('bar')
+      expect(instance.authorize_params['foo']).to eq('baz')
     end
 
-    it 'should include random state in the authorize params' do
+    it 'includes random state in the authorize params' do
       instance = subject.new('abc', 'def')
-      instance.authorize_params.keys.should == ['state']
-      instance.session['omniauth.state'].should_not be_empty
-      instance.session['omniauth.state'].should == instance.authorize_params['state']
+      expect(instance.authorize_params.keys).to eq(['state'])
+      expect(instance.session['omniauth.state']).not_to be_empty
     end
   end
 
   describe '#token_params' do
     subject { fresh_strategy }
 
-    it 'should include any authorize params passed in the :authorize_params option' do
+    it 'includes any authorize params passed in the :authorize_params option' do
       instance = subject.new('abc', 'def', :token_params => {:foo => 'bar', :baz => 'zip'})
-      instance.token_params.should == {'foo' => 'bar', 'baz' => 'zip'}
+      expect(instance.token_params).to eq('foo' => 'bar', 'baz' => 'zip')
     end
 
-    it 'should include top-level options that are marked as :authorize_options' do
+    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.token_params.should == {'scope' => 'bar', 'foo' => 'baz'}
+      expect(instance.token_params).to eq('scope' => 'bar', 'foo' => 'baz')
+    end
+  end
+
+  describe '#callback_phase' do
+    subject { fresh_strategy }
+    it 'calls fail with the client error received' do
+      instance = subject.new('abc', 'def')
+      instance.stub(:request) do
+        double('Request', :params => {'error_reason' => 'user_denied', 'error' => 'access_denied'})
+      end
+
+      expect(instance).to receive(:fail!).with('user_denied', anything)
+      instance.callback_phase
+    end
+  end
+end
+
+describe OmniAuth::Strategies::OAuth2::CallbackError do
+  let(:error) { Class.new(OmniAuth::Strategies::OAuth2::CallbackError) }
+  describe '#message' do
+    subject { error }
+    it 'includes all of the attributes' do
+      instance = subject.new('error', 'description', 'uri')
+      expect(instance.message).to match(/error/)
+      expect(instance.message).to match(/description/)
+      expect(instance.message).to match(/uri/)
+    end
+    it 'includes all of the attributes' do
+      instance = subject.new(nil, :symbol)
+      expect(instance.message).to eq('symbol')
     end
   end
 end

metadata

@@ -1,154 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.1.2
 platform: ruby
 authors:
 - Michael Bleigh
+- Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: omniauth
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: oauth2
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+        version: '0.8'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :development
+        version: '1.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: oauth2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.9.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: omniauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: An abstract OAuth2 strategy for OmniAuth.
 email:
 - michael@intridea.com
+- sferik@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - Guardfile
+- LICENSE.md
 - README.md
 - Rakefile
 - lib/omniauth-oauth2.rb
 - lib/omniauth-oauth2/version.rb
 - lib/omniauth/strategies/oauth2.rb
 - omniauth-oauth2.gemspec
+- spec/helper.rb
 - spec/omniauth/strategies/oauth2_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/intridea/omniauth-oauth2
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An abstract OAuth2 strategy for OmniAuth.
-test_files: []
-has_rdoc: 
+test_files:
+- spec/helper.rb
+- spec/omniauth/strategies/oauth2_spec.rb

data/spec/spec_helper.rb

@@ -1,16 +0,0 @@
-$:.unshift File.expand_path('..', __FILE__)
-$:.unshift File.expand_path('../../lib', __FILE__)
-require 'simplecov'
-SimpleCov.start
-require 'rspec'
-require 'rack/test'
-require 'webmock/rspec'
-require 'omniauth'
-require 'omniauth-oauth2'
-
-RSpec.configure do |config|
-  config.include WebMock::API
-  config.include Rack::Test::Methods
-  config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
-end
-