omniauth-oauth2 1.0.0.pr2 → 1.0.0.rc1

data/Gemfile

@@ -1,6 +1,5 @@
 source 'http://rubygems.org'
 
-gem 'omniauth', '1.0.0.alpha', :git => 'git://github.com/intridea/omniauth.git'
 # Specify your gem's dependencies in omniauth-oauth2.gemspec
 gemspec
 

data/README.md

@@ -18,7 +18,7 @@ subclass it and add a few extra methods like so:
 
     module OmniAuth
       module Strategies
-        class SomeSite
+        class SomeSite < OmniAuth::Strategies::OAuth2
           # Give your strategy a name.
           option :name, "some_site"
 

data/lib/omniauth-oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module OAuth2
-    VERSION = "1.0.0.pr2"
+    VERSION = "1.0.0.rc1"
   end
 end

data/lib/omniauth/strategies/oauth2.rb

@@ -19,7 +19,9 @@ module OmniAuth
       option :client_secret, nil
       option :client_options, {}
       option :authorize_params, {}
+      option :authorize_options, [:scope]
       option :token_params, {}
+      option :token_options, []
 
       attr_accessor :access_token
 
@@ -33,12 +35,22 @@ module OmniAuth
 
       credentials do
         hash = {'token' => access_token.token}
-        hash.merge!('refresh_token' => access_token.refresh_token) if access_token.expires?
+        hash.merge!('refresh_token' => access_token.refresh_token) if access_token.expires? && access_token.refresh_token
+        hash.merge!('expires_at' => access_token.expires_at) if access_token.expires?
+        hash.merge!('expires' => access_token.expires?)
         hash
       end
 
       def request_phase
-        redirect client.auth_code.authorize_url({:redirect_uri => callback_url}.merge(options.authorize_params))
+        redirect client.auth_code.authorize_url({:redirect_uri => callback_url}.merge(authorize_params))
+      end
+
+      def authorize_params
+        options.authorize_params.merge(options.authorize_options.inject({}){|h,k| h[k.to_sym] = options[k] if options[k]; h})
+      end
+
+      def token_params
+        options.token_params.merge(options.token_options.inject({}){|h,k| h[k.to_sym] = options[k] if options[k]; h})
       end
 
       def callback_phase
@@ -62,9 +74,7 @@ module OmniAuth
 
       def build_access_token
         verifier = request.params['code']
-        client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(options.token_params.to_hash.inject({}){|h,(k,v)| h[k.to_sym] = v; h}))
-      rescue ::OAuth2::Error => e
-        raise e.response.inspect
+        client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(options.token_params.to_hash(:symbolize_keys => true)))
       end
 
       # An error that is indicated in the OAuth 2.0 callback.

data/omniauth-oauth2.gemspec

@@ -2,7 +2,8 @@
 require File.expand_path('../lib/omniauth-oauth2/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_dependency 'omniauth', '~> 1.0.0.pr2'
+  gem.add_dependency 'hashie', '~> 1.2'
+  gem.add_dependency 'omniauth', '1.0.0.beta1'
   gem.add_dependency 'oauth2', '~> 0.5.0'
 
   gem.add_development_dependency 'rspec', '~> 2.6'

data/spec/omniauth/strategies/oauth2_spec.rb

@@ -12,4 +12,32 @@ describe OmniAuth::Strategies::OAuth2 do
       instance.client.options[:authorize_url].should == 'https://example.com'
     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'})
+      instance.authorize_params.should == {'foo' => 'bar', 'baz' => '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')
+      instance.authorize_params.should == {'scope' => 'bar', 'foo' => 'baz'}
+    end
+  end
+
+  describe '#token_params' do
+    subject { fresh_strategy }
+
+    it 'should include 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'}
+    end
+
+    it 'should include 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'}
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pr2
+  version: 1.0.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,22 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-13 00:00:00.000000000Z
+date: 2011-10-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: omniauth
-  requirement: &70247627053560 !ruby/object:Gem::Requirement
+  name: hashie
+  requirement: &70331647759620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.pr2
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70331647759620
+- !ruby/object:Gem::Dependency
+  name: omniauth
+  requirement: &70331647759120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta1
   type: :runtime
   prerelease: false
-  version_requirements: *70247627053560
+  version_requirements: *70331647759120
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &70247627053060 !ruby/object:Gem::Requirement
+  requirement: &70331647758620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70247627053060
+  version_requirements: *70331647758620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70247627052600 !ruby/object:Gem::Requirement
+  requirement: &70331647758140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70247627052600
+  version_requirements: *70331647758140
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70247627052220 !ruby/object:Gem::Requirement
+  requirement: &70331647757580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247627052220
+  version_requirements: *70331647757580
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70247627082720 !ruby/object:Gem::Requirement
+  requirement: &70331647757000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247627082720
+  version_requirements: *70331647757000
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70247627082300 !ruby/object:Gem::Requirement
+  requirement: &70331647756420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247627082300
+  version_requirements: *70331647756420
 description: An abstract OAuth2 strategy for OmniAuth.
 email:
 - michael@intridea.com