omniauth-oauth 1.0.0 → 1.0.1

data/README.md

@@ -57,7 +57,7 @@ That's pretty much it!
 
 ## License
 
-Copyright (C) 2011 by Michael Bleigh and Intridea, Inc.
+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

data/lib/omniauth-oauth/version.rb

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

data/lib/omniauth/strategies/oauth.rb

@@ -14,6 +14,7 @@ module OmniAuth
       option :open_timeout, 30
       option :read_timeout, 30
       option :authorize_params, {}
+      option :request_params, {}
 
       attr_reader :access_token
 
@@ -25,7 +26,7 @@ module OmniAuth
       end
 
       def request_phase
-        request_token = consumer.get_request_token(:oauth_callback => callback_url)
+        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}
 
@@ -61,7 +62,7 @@ module OmniAuth
         fail!(:service_unavailable, e)
       rescue ::OAuth::Unauthorized => e
         fail!(:invalid_credentials, e)
-      rescue ::NoMethodError, ::MultiJson::DecodeError => e
+      rescue ::MultiJson::DecodeError => e
         fail!(:invalid_response, e)
       rescue ::OmniAuth::NoSessionError => e
         fail!(:session_expired, e)

data/spec/omniauth/strategies/oauth_spec.rb

@@ -12,6 +12,7 @@ describe "OmniAuth::Strategies::OAuth" do
       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'
       end
       run lambda { |env| [404, {'Content-Type' => 'text/plain'}, [env.key?('omniauth.auth').to_s]] }
     }.to_app
@@ -53,6 +54,12 @@ describe "OmniAuth::Strategies::OAuth" do
       it 'should set appropriate session variables' do
         session['oauth'].should == {"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" }
+      end
     end
 
     context 'unsuccessful' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-oauth
 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-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70104089058840 !ruby/object:Gem::Requirement
+  requirement: &70329159031760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70104089058840
+  version_requirements: *70329159031760
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70104089054580 !ruby/object:Gem::Requirement
+  requirement: &70329159031340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70104089054580
+  version_requirements: *70329159031340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70104089052540 !ruby/object:Gem::Requirement
+  requirement: &70329159030800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70104089052540
+  version_requirements: *70329159030800
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70104089049860 !ruby/object:Gem::Requirement
+  requirement: &70329159030380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70104089049860
+  version_requirements: *70329159030380
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70104089047940 !ruby/object:Gem::Requirement
+  requirement: &70329159029920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70104089047940
+  version_requirements: *70329159029920
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70104089046440 !ruby/object:Gem::Requirement
+  requirement: &70329159029500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70104089046440
+  version_requirements: *70329159029500
 description: A generic OAuth (1.0/1.0a) 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: A generic OAuth (1.0/1.0a) strategy for OmniAuth.
 test_files:
 - spec/omniauth/strategies/oauth_spec.rb
 - spec/spec_helper.rb
+has_rdoc: