omniauth-oauth2 1.0.0.beta1 → 1.0.0.pr1

data/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'omniauth', '1.0.0.pr2', :git => 'git://github.com/intridea/omniauth.git'
+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 < OmniAuth::Strategies::OAuth2
+        class SomeSite
           # 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.beta1"
+    VERSION = "1.0.0.pr1"
   end
 end

data/lib/omniauth/strategies/oauth2.rb

@@ -19,9 +19,7 @@ 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
 
@@ -40,15 +38,7 @@ module OmniAuth
       end
 
       def request_phase
-        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})
+        redirect client.auth_code.authorize_url({:redirect_uri => callback_url}.merge(options.authorize_params))
       end
 
       def callback_phase
@@ -72,7 +62,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(:symbolize_keys => true)))
+        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
       end

data/omniauth-oauth2.gemspec

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

data/spec/omniauth/strategies/oauth2_spec.rb

@@ -12,32 +12,4 @@ 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.beta1
+  version: 1.0.0.pr1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,33 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000Z
+date: 2011-10-13 00:00:00.000000000Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: &70318691424740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70318691424740
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70318691424240 !ruby/object:Gem::Requirement
+  requirement: &70197584085140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta1
+        version: 1.0.0.alpha
   type: :runtime
   prerelease: false
-  version_requirements: *70318691424240
+  version_requirements: *70197584085140
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &70318691423780 !ruby/object:Gem::Requirement
+  requirement: &70197584084640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +32,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70318691423780
+  version_requirements: *70197584084640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70318691423320 !ruby/object:Gem::Requirement
+  requirement: &70197584113860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +43,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70318691423320
+  version_requirements: *70197584113860
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70318691422940 !ruby/object:Gem::Requirement
+  requirement: &70197584113480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318691422940
+  version_requirements: *70197584113480
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70318691422480 !ruby/object:Gem::Requirement
+  requirement: &70197584113020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318691422480
+  version_requirements: *70197584113020
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70318691422060 !ruby/object:Gem::Requirement
+  requirement: &70197584112600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318691422060
+  version_requirements: *70197584112600
 description: An abstract OAuth2 strategy for OmniAuth.
 email:
 - michael@intridea.com