Adds authorize_options with :scope as a default. Closes #1

Gemfile

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

lib/omniauth/strategies/oauth2.rb

@@ -20,6 +20,7 @@ class OAuth2
       option :client_options, {}
       option :authorize_params, {}
       option :token_params, {}
+      option :authorize_options, [:scope]
 
       attr_accessor :access_token
 
@@ -38,7 +39,11 @@ def callback_url
       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 callback_phase

spec/omniauth/strategies/oauth2_spec.rb

@@ -12,4 +12,18 @@ def app; lambda{|env| [200, {}, ["Hello."]]} end
       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
 end