omniauth-oauth2 1.0.0 → 1.0.1

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.swp

data/README.md

@@ -14,7 +14,7 @@ info).
 To create an OmniAuth OAuth2 strategy using this gem, you can simply
 subclass it and add a few extra methods like so:
 
-    require 'omniauth-oauth'
+    require 'omniauth-oauth2'
 
     module OmniAuth
       module Strategies

data/lib/omniauth-oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module OAuth2
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/omniauth/strategies/oauth2.rb

@@ -2,6 +2,7 @@ require 'cgi'
 require 'uri'
 require 'oauth2'
 require 'omniauth'
+require 'timeout'
 
 module OmniAuth
   module Strategies
@@ -59,7 +60,7 @@ module OmniAuth
         end
 
         self.access_token = build_access_token
-        self.access_token = client.auth_code.refresh_token(access_token.refresh_token) if access_token.expired?
+        self.access_token = access_token.refresh! if access_token.expired?
 
         super
       rescue ::OAuth2::Error, CallbackError => e
@@ -68,13 +69,15 @@ module OmniAuth
         fail!(:invalid_response, e)
       rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
         fail!(:timeout, e)
+      rescue ::SocketError => e
+        fail!(:failed_to_connect, e)
       end
 
       protected
 
       def build_access_token
         verifier = request.params['code']
-        client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(options.token_params.to_hash(:symbolize_keys => true)))
+        client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(token_params.to_hash(:symbolize_keys => true)))
       end
 
       # An error that is indicated in the OAuth 2.0 callback.

data/omniauth-oauth2.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/omniauth-oauth2/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.add_dependency 'omniauth', '~> 1.0'
-  gem.add_dependency 'oauth2', '~> 0.5.0'
+  gem.add_dependency 'oauth2', '~> 0.6.0'
 
   gem.add_development_dependency 'rspec', '~> 2.7'
   gem.add_development_dependency 'rack-test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-02 00:00:00.000000000Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70244359505740 !ruby/object:Gem::Requirement
+  requirement: &70168923789820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244359505740
+  version_requirements: *70168923789820
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &70244359505120 !ruby/object:Gem::Requirement
+  requirement: &70168923788900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70244359505120
+  version_requirements: *70168923788900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70244359504360 !ruby/object:Gem::Requirement
+  requirement: &70168923786760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70244359504360
+  version_requirements: *70168923786760
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70244359503620 !ruby/object:Gem::Requirement
+  requirement: &70168923785800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244359503620
+  version_requirements: *70168923785800
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70244359502240 !ruby/object:Gem::Requirement
+  requirement: &70168923763660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244359502240
+  version_requirements: *70168923763660
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70244359501400 !ruby/object:Gem::Requirement
+  requirement: &70168923762320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244359501400
+  version_requirements: *70168923762320
 description: An abstract OAuth2 strategy for OmniAuth.
 email:
 - michael@intridea.com
@@ -116,10 +116,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: An abstract OAuth2 strategy for OmniAuth.
 test_files:
 - spec/omniauth/strategies/oauth2_spec.rb
 - spec/spec_helper.rb
+has_rdoc: