omniauth-oauth 1.0.1 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d51821d2156b46cf7954f1ac30678998f5f2a93b
+  data.tar.gz: 8b8fceab109adc5085bb894c5c18fd7eeac5cb0d
+SHA512:
+  metadata.gz: 9ed599e75401adf88aef86315b2dc00d035e77a91cea8c5922ad2c46c14dc312570884202e75b22c5985fe4c303058d8fbd123db252ba0bf28eff79a78dc5404
+  data.tar.gz: 4f9ea2ffcf4ac1731605358d5420b0870843082fa96f7628508e0c6bac6e4b116c7bd2426ed39d822a50bb49c1dda5f85d0d4777d4c4b488609fcf316606c52d

data/.rubocop.yml

@@ -0,0 +1,55 @@
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Max: 2
+
+Metrics/LineLength:
+  AllowURI: true
+  Enabled: false
+
+Metrics/MethodLength:
+  CountComments: false
+  Max: 10
+
+Metrics/ParameterLists:
+  Max: 4
+  CountKeywordArgs: true
+
+Style/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Style/CollectionMethods:
+  PreferredMethods:
+    map:      'collect'
+    reduce:   'inject'
+    find:     'detect'
+    find_all: 'select'
+
+Style/Documentation:
+  Enabled: false
+
+Style/DotPosition:
+  EnforcedStyle: trailing
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/FileName:
+  Exclude:
+    - 'lib/omniauth-oauth.rb'
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/Lambda:
+  Enabled: false
+
+Style/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/TrailingComma:
+  EnforcedStyleForMultiline: 'comma'

data/.travis.yml

@@ -0,0 +1,22 @@
+before_install: gem install bundler
+env:
+  global:
+    - 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-head
+  - rbx-2
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: ruby-head
+  fast_finish: true
+sudo: false

data/Gemfile

@@ -1,11 +1,13 @@
-source 'http://rubygems.org'
+source "http://rubygems.org"
 
 gemspec
 
-group :development, :test do
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-bundler'
-  gem 'growl'
-  gem 'rb-fsevent'
+gem "rake"
+
+group :test do
+  gem "rack-test"
+  gem "rspec", "~> 3.2"
+  gem "rubocop", ">= 0.30", :platforms => [:ruby_19, :ruby_20, :ruby_21, :ruby_22]
+  gem "simplecov"
+  gem "webmock"
 end

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,9 +1,5 @@
 # OmniAuth OAuth
 
-**Note:** This gem is designed to work with the in-beta OmniAuth 1.0
-library. It will not be officially released on RubyGems.org until
-OmniAuth 1.0 is released.
-
 This gem contains a generic OAuth 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
@@ -14,65 +10,44 @@ info).
 To create an OmniAuth OAuth strategy using this gem, you can simply
 subclass it and add a few extra methods like so:
 
-    require 'omniauth-oauth'
-
-    module OmniAuth
-      module Strategies
-        class SomeSite < OmniAuth::Strategies::OAuth
-          # 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{ request.params['user_id'] }
-
-          info do
-            {
-              :name => raw_info['name'],
-              :location => raw_info['city']
-            }
-          end
+```ruby
+require 'json'
+require 'omniauth-oauth'
+
+module OmniAuth
+  module Strategies
+    class SomeSite < OmniAuth::Strategies::OAuth
+      # 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{ request.params['user_id'] }
+
+      info do
+        {
+          :name => raw_info['name'],
+          :location => raw_info['city']
+        }
+      end
 
-          extra do
-            {
-              'raw_info' => raw_info
-            }
-          end
+      extra do
+        {
+          'raw_info' => raw_info
+        }
+      end
 
-          def raw_info
-            @raw_info ||= MultiJson.decode(access_token.get('/me.json')).body
-          end
-        end
+      def raw_info
+        @raw_info ||= JSON.load(access_token.get('/me.json')).body
       end
     end
-
-That's pretty much it!
-
-## License
-
-Copyright (C) 2012 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.
+  end
+end
+```

data/Rakefile

@@ -1,9 +1,16 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 
-desc 'Default: run specs.'
-task :default => :spec
-
-desc "Run specs"
 RSpec::Core::RakeTask.new
+
+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-oauth.rb

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

data/lib/omniauth-oauth/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module OAuth
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/lib/omniauth/strategies/oauth.rb

@@ -1,6 +1,5 @@
-require 'multi_json'
-require 'oauth'
-require 'omniauth'
+require "oauth"
+require "omniauth"
 
 module OmniAuth
   module Strategies
@@ -25,10 +24,10 @@ module OmniAuth
         consumer
       end
 
-      def request_phase
+      def request_phase # rubocop:disable MethodLength
         request_token = consumer.get_request_token({:oauth_callback => callback_url}, options.request_params)
-        session['oauth'] ||= {}
-        session['oauth'][name.to_s] = {'callback_confirmed' => request_token.callback_confirmed?, 'request_token' => request_token.token, 'request_secret' => request_token.secret}
+        session["oauth"] ||= {}
+        session["oauth"][name.to_s] = {"callback_confirmed" => request_token.callback_confirmed?, "request_token" => request_token.token, "request_secret" => request_token.secret}
 
         if request_token.callback_confirmed?
           redirect request_token.authorize_url(options[:authorize_params])
@@ -42,14 +41,14 @@ module OmniAuth
         fail!(:service_unavailable, e)
       end
 
-      def callback_phase
-        raise OmniAuth::NoSessionError.new("Session Expired") if session['oauth'].nil?
+      def callback_phase # rubocop:disable MethodLength
+        fail(OmniAuth::NoSessionError, "Session Expired") if session["oauth"].nil?
 
-        request_token = ::OAuth::RequestToken.new(consumer, session['oauth'][name.to_s].delete('request_token'), session['oauth'][name.to_s].delete('request_secret'))
+        request_token = ::OAuth::RequestToken.new(consumer, session["oauth"][name.to_s].delete("request_token"), session["oauth"][name.to_s].delete("request_secret"))
 
         opts = {}
-        if session['oauth'][name.to_s]['callback_confirmed']
-          opts[:oauth_verifier] = request['oauth_verifier']
+        if session["oauth"][name.to_s]["callback_confirmed"]
+          opts[:oauth_verifier] = request["oauth_verifier"]
         else
           opts[:oauth_callback] = callback_url
         end
@@ -62,21 +61,19 @@ module OmniAuth
         fail!(:service_unavailable, e)
       rescue ::OAuth::Unauthorized => e
         fail!(:invalid_credentials, e)
-      rescue ::MultiJson::DecodeError => e
-        fail!(:invalid_response, e)
       rescue ::OmniAuth::NoSessionError => e
         fail!(:session_expired, e)
       end
 
       credentials do
-        {'token' => access_token.token, 'secret' => access_token.secret}
+        {"token" => access_token.token, "secret" => access_token.secret}
       end
 
       extra do
-        {'access_token' => access_token}
+        {"access_token" => access_token}
       end
     end
   end
 end
 
-OmniAuth.config.add_camelization 'oauth', 'OAuth'
+OmniAuth.config.add_camelization "oauth", "OAuth"

data/omniauth-oauth.gemspec

@@ -1,21 +1,18 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/omniauth-oauth/version', __FILE__)
+require File.expand_path("../lib/omniauth-oauth/version", __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Michael Bleigh"]
-  gem.email         = ["michael@intridea.com"]
-  gem.description   = %q{A generic OAuth (1.0/1.0a) strategy for OmniAuth.}
-  gem.summary       = %q{A generic OAuth (1.0/1.0a) strategy for OmniAuth.}
+  gem.authors       = ["Michael Bleigh", "Erik Michaels-Ober"]
+  gem.email         = ["michael@intridea.com", "sferik@gmail.com"]
+  gem.description   = "A generic OAuth (1.0/1.0a) strategy for OmniAuth."
+  gem.summary       = gem.description
   gem.homepage      = "https://github.com/intridea/omniauth-oauth"
+  gem.license       = "MIT"
 
-  gem.add_runtime_dependency     'omniauth', '~> 1.0'
-  gem.add_runtime_dependency     'oauth'
-  gem.add_development_dependency 'rspec', '~> 2.6'
-  gem.add_development_dependency 'webmock'
-  gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'rack-test'
+  gem.add_dependency "omniauth", "~> 1.0"
+  gem.add_dependency "oauth"
+  gem.add_development_dependency "bundler", "~> 1.9"
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |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-oauth"

data/spec/helper.rb

@@ -0,0 +1,19 @@
+$LOAD_PATH.unshift File.expand_path("..", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+require "simplecov"
+SimpleCov.start do
+  minimum_coverage(89.8)
+end
+require "rspec"
+require "rack/test"
+require "webmock/rspec"
+require "omniauth"
+require "omniauth-oauth"
+
+RSpec.configure do |config|
+  config.include WebMock::API
+  config.include Rack::Test::Methods
+  config.extend OmniAuth::Test::StrategyMacros, :type => :strategy
+end
+
+OmniAuth.config.logger = Logger.new("/dev/null")

data/spec/omniauth/strategies/oauth_spec.rb

@@ -1,147 +1,147 @@
-require 'spec_helper'
+require "helper"
 
 describe "OmniAuth::Strategies::OAuth" do
   class MyOAuthProvider < OmniAuth::Strategies::OAuth
-    uid{ access_token.token }
-    info{ {'name' => access_token.token} }
+    uid { access_token.token }
+    info { {"name" => access_token.token} }
   end
 
   def app
-    Rack::Builder.new {
+    Rack::Builder.new do
       use OmniAuth::Test::PhonySession
       use OmniAuth::Builder do
-        provider MyOAuthProvider, 'abc', 'def', :client_options => {:site => 'https://api.example.org'}, :name => 'example.org'
-        provider MyOAuthProvider, 'abc', 'def', :client_options => {:site => 'https://api.example.org'}, :authorize_params => {:abc => 'def'}, :name => 'example.org_with_authorize_params'
-        provider MyOAuthProvider, 'abc', 'def', :client_options => {:site => 'https://api.example.org'}, :request_params => {:scope => 'http://foobar.example.org'}, :name => 'example.org_with_request_params'
+        provider MyOAuthProvider, "abc", "def", :client_options => {:site => "https://api.example.org"}, :name => "example.org"
+        provider MyOAuthProvider, "abc", "def", :client_options => {:site => "https://api.example.org"}, :authorize_params => {:abc => "def"}, :name => "example.org_with_authorize_params"
+        provider MyOAuthProvider, "abc", "def", :client_options => {:site => "https://api.example.org"}, :request_params => {:scope => "http://foobar.example.org"}, :name => "example.org_with_request_params"
       end
-      run lambda { |env| [404, {'Content-Type' => 'text/plain'}, [env.key?('omniauth.auth').to_s]] }
-    }.to_app
+      run lambda { |env| [404, {"Content-Type" => "text/plain"}, [env.key?("omniauth.auth").to_s]] }
+    end.to_app
   end
 
   def session
-    last_request.env['rack.session']
+    last_request.env["rack.session"]
   end
 
   before do
-    stub_request(:post, 'https://api.example.org/oauth/request_token').
-       to_return(:body => "oauth_token=yourtoken&oauth_token_secret=yoursecret&oauth_callback_confirmed=true")
+    stub_request(:post, "https://api.example.org/oauth/request_token").
+      to_return(:body => "oauth_token=yourtoken&oauth_token_secret=yoursecret&oauth_callback_confirmed=true")
   end
 
-  it 'should add a camelization for itself' do
-    OmniAuth::Utils.camelize('oauth').should == 'OAuth'
+  it "should add a camelization for itself" do
+    expect(OmniAuth::Utils.camelize("oauth")).to eq("OAuth")
   end
 
-  describe '/auth/{name}' do
-    context 'successful' do
+  describe "/auth/{name}" do
+    context "successful" do
       before do
-        get '/auth/example.org'
+        get "/auth/example.org"
       end
 
-      it 'should redirect to authorize_url' do
-        last_response.should be_redirect
-        last_response.headers['Location'].should == 'https://api.example.org/oauth/authorize?oauth_token=yourtoken'
+      it "should redirect to authorize_url" do
+        expect(last_response).to be_redirect
+        expect(last_response.headers["Location"]).to eq("https://api.example.org/oauth/authorize?oauth_token=yourtoken")
       end
 
-      it 'should redirect to authorize_url with authorize_params when set' do
-        get '/auth/example.org_with_authorize_params'
-        last_response.should be_redirect
-        [
-          'https://api.example.org/oauth/authorize?abc=def&oauth_token=yourtoken',
-          'https://api.example.org/oauth/authorize?oauth_token=yourtoken&abc=def'
-        ].should be_include(last_response.headers['Location'])
+      it "should redirect to authorize_url with authorize_params when set" do
+        get "/auth/example.org_with_authorize_params"
+        expect(last_response).to be_redirect
+        expect([
+          "https://api.example.org/oauth/authorize?abc=def&oauth_token=yourtoken",
+          "https://api.example.org/oauth/authorize?oauth_token=yourtoken&abc=def",
+        ]).to be_include(last_response.headers["Location"])
       end
 
-      it 'should set appropriate session variables' do
-        session['oauth'].should == {"example.org" => {'callback_confirmed' => true, 'request_token' => 'yourtoken', 'request_secret' => 'yoursecret'}}
+      it "should set appropriate session variables" do
+        expect(session["oauth"]).to eq("example.org" => {"callback_confirmed" => true, "request_token" => "yourtoken", "request_secret" => "yoursecret"})
       end
 
-      it 'should pass request_params to get_request_token' do
-        get '/auth/example.org_with_request_params'
-        WebMock.should have_requested(:post, 'https://api.example.org/oauth/request_token').
-           with {|req| req.body == "scope=http%3a%2f%2ffoobar.example.org" }
+      it "should pass request_params to get_request_token" do
+        get "/auth/example.org_with_request_params"
+        expect(WebMock).to have_requested(:post, "https://api.example.org/oauth/request_token").
+          with { |req| req.body == "scope=http%3A%2F%2Ffoobar.example.org" }
       end
     end
 
-    context 'unsuccessful' do
+    context "unsuccessful" do
       before do
-        stub_request(:post, 'https://api.example.org/oauth/request_token').
-           to_raise(::Net::HTTPFatalError.new(%Q{502 "Bad Gateway"}, nil))
-        get '/auth/example.org'
+        stub_request(:post, "https://api.example.org/oauth/request_token").
+          to_raise(::Net::HTTPFatalError.new('502 "Bad Gateway"', nil))
+        get "/auth/example.org"
       end
 
-      it 'should call fail! with :service_unavailable' do
-        last_request.env['omniauth.error'].should be_kind_of(::Net::HTTPFatalError)
-        last_request.env['omniauth.error.type'] = :service_unavailable
+      it "should call fail! with :service_unavailable" do
+        expect(last_request.env["omniauth.error"]).to be_kind_of(::Net::HTTPFatalError)
+        last_request.env["omniauth.error.type"] = :service_unavailable
       end
 
       context "SSL failure" do
         before do
-          stub_request(:post, 'https://api.example.org/oauth/request_token').
-             to_raise(::OpenSSL::SSL::SSLError.new("SSL_connect returned=1 errno=0 state=SSLv3 read server certificate B: certificate verify failed"))
-          get '/auth/example.org'
+          stub_request(:post, "https://api.example.org/oauth/request_token").
+            to_raise(::OpenSSL::SSL::SSLError.new("SSL_connect returned=1 errno=0 state=SSLv3 read server certificate B: certificate verify failed"))
+          get "/auth/example.org"
         end
 
-        it 'should call fail! with :service_unavailable' do
-          last_request.env['omniauth.error'].should be_kind_of(::OpenSSL::SSL::SSLError)
-          last_request.env['omniauth.error.type'] = :service_unavailable
+        it "should call fail! with :service_unavailable" do
+          expect(last_request.env["omniauth.error"]).to be_kind_of(::OpenSSL::SSL::SSLError)
+          last_request.env["omniauth.error.type"] = :service_unavailable
         end
       end
     end
   end
 
-    describe '/auth/{name}/callback' do
-      before do
-        stub_request(:post, 'https://api.example.org/oauth/access_token').
-         to_return(:body => "oauth_token=yourtoken&oauth_token_secret=yoursecret")
-      get '/auth/example.org/callback', {:oauth_verifier => 'dudeman'}, {'rack.session' => {'oauth' => {"example.org" => {'callback_confirmed' => true, 'request_token' => 'yourtoken', 'request_secret' => 'yoursecret'}}}}
+  describe "/auth/{name}/callback" do
+    before do
+      stub_request(:post, "https://api.example.org/oauth/access_token").
+        to_return(:body => "oauth_token=yourtoken&oauth_token_secret=yoursecret")
+      get "/auth/example.org/callback", {:oauth_verifier => "dudeman"}, "rack.session" => {"oauth" => {"example.org" => {"callback_confirmed" => true, "request_token" => "yourtoken", "request_secret" => "yoursecret"}}}
     end
 
-    it 'should exchange the request token for an access token' do
-      last_request.env['omniauth.auth']['provider'].should == 'example.org'
-      last_request.env['omniauth.auth']['extra']['access_token'].should be_kind_of(OAuth::AccessToken)
+    it "should exchange the request token for an access token" do
+      expect(last_request.env["omniauth.auth"]["provider"]).to eq("example.org")
+      expect(last_request.env["omniauth.auth"]["extra"]["access_token"]).to be_kind_of(OAuth::AccessToken)
     end
 
-    it 'should call through to the master app' do
-      last_response.body.should == 'true'
+    it "should call through to the master app" do
+      expect(last_response.body).to eq("true")
     end
 
     context "bad gateway (or any 5xx) for access_token" do
       before do
-        stub_request(:post, 'https://api.example.org/oauth/access_token').
-           to_raise(::Net::HTTPFatalError.new(%Q{502 "Bad Gateway"}, nil))
-        get '/auth/example.org/callback', {:oauth_verifier => 'dudeman'}, {'rack.session' => {'oauth' => {"example.org" => {'callback_confirmed' => true, 'request_token' => 'yourtoken', 'request_secret' => 'yoursecret'}}}}
+        stub_request(:post, "https://api.example.org/oauth/access_token")  .
+          to_raise(::Net::HTTPFatalError.new('502 "Bad Gateway"', nil))
+        get "/auth/example.org/callback", {:oauth_verifier => "dudeman"}, "rack.session" => {"oauth" => {"example.org" => {"callback_confirmed" => true, "request_token" => "yourtoken", "request_secret" => "yoursecret"}}}
       end
 
-      it 'should call fail! with :service_unavailable' do
-        last_request.env['omniauth.error'].should be_kind_of(::Net::HTTPFatalError)
-        last_request.env['omniauth.error.type'] = :service_unavailable
+      it "should call fail! with :service_unavailable" do
+        expect(last_request.env["omniauth.error"]).to be_kind_of(::Net::HTTPFatalError)
+        last_request.env["omniauth.error.type"] = :service_unavailable
       end
     end
 
     context "SSL failure" do
       before do
-        stub_request(:post, 'https://api.example.org/oauth/access_token').
-           to_raise(::OpenSSL::SSL::SSLError.new("SSL_connect returned=1 errno=0 state=SSLv3 read server certificate B: certificate verify failed"))
-        get '/auth/example.org/callback', {:oauth_verifier => 'dudeman'}, {'rack.session' => {'oauth' => {"example.org" => {'callback_confirmed' => true, 'request_token' => 'yourtoken', 'request_secret' => 'yoursecret'}}}}
+        stub_request(:post, "https://api.example.org/oauth/access_token")  .
+          to_raise(::OpenSSL::SSL::SSLError.new("SSL_connect returned=1 errno=0 state=SSLv3 read server certificate B: certificate verify failed"))
+        get "/auth/example.org/callback", {:oauth_verifier => "dudeman"}, "rack.session" => {"oauth" => {"example.org" => {"callback_confirmed" => true, "request_token" => "yourtoken", "request_secret" => "yoursecret"}}}
       end
 
-      it 'should call fail! with :service_unavailable' do
-        last_request.env['omniauth.error'].should be_kind_of(::OpenSSL::SSL::SSLError)
-        last_request.env['omniauth.error.type'] = :service_unavailable
+      it "should call fail! with :service_unavailable" do
+        expect(last_request.env["omniauth.error"]).to be_kind_of(::OpenSSL::SSL::SSLError)
+        last_request.env["omniauth.error.type"] = :service_unavailable
       end
     end
   end
 
-  describe '/auth/{name}/callback with expired session' do
+  describe "/auth/{name}/callback with expired session" do
     before do
-      stub_request(:post, 'https://api.example.org/oauth/access_token').
-         to_return(:body => "oauth_token=yourtoken&oauth_token_secret=yoursecret")
-      get '/auth/example.org/callback', {:oauth_verifier => 'dudeman'}, {'rack.session' => {}}
+      stub_request(:post, "https://api.example.org/oauth/access_token").
+        to_return(:body => "oauth_token=yourtoken&oauth_token_secret=yoursecret")
+      get "/auth/example.org/callback", {:oauth_verifier => "dudeman"}, "rack.session" => {}
     end
 
-    it 'should call fail! with :session_expired' do
-      last_request.env['omniauth.error'].should be_kind_of(::OmniAuth::NoSessionError)
-      last_request.env['omniauth.error.type'] = :session_expired
+    it "should call fail! with :session_expired" do
+      expect(last_request.env["omniauth.error"]).to be_kind_of(::OmniAuth::NoSessionError)
+      last_request.env["omniauth.error.type"] = :session_expired
     end
   end
 end

metadata

@@ -1,126 +1,104 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-oauth
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Bleigh
+- Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70329159031760 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70329159031760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70329159031340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70329159031340
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70329159030800 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :development
-  prerelease: false
-  version_requirements: *70329159030800
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: &70329159030380 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70329159030380
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &70329159029920 !ruby/object:Gem::Requirement
-    none: false
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
   type: :development
   prerelease: false
-  version_requirements: *70329159029920
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: &70329159029500 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70329159029500
+        version: '1.9'
 description: A generic OAuth (1.0/1.0a) 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-oauth.rb
 - lib/omniauth-oauth/version.rb
 - lib/omniauth/strategies/oauth.rb
 - omniauth-oauth.gemspec
+- spec/helper.rb
 - spec/omniauth/strategies/oauth_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/intridea/omniauth-oauth
-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.11
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A generic OAuth (1.0/1.0a) strategy for OmniAuth.
 test_files:
+- spec/helper.rb
 - spec/omniauth/strategies/oauth_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 

data/Guardfile

@@ -1,11 +0,0 @@
-guard 'rspec', :version => 2 do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end
-
-
-guard 'bundler' do
-  watch('Gemfile')
-  watch(/^.+\.gemspec/)
-end

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-oauth'
-
-RSpec.configure do |config|
-  config.include WebMock::API
-  config.include Rack::Test::Methods
-  config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
-end
-