omniauth-google-oauth2 0.1.0 → 0.1.1

data/Rakefile

@@ -1,2 +1,7 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/examples/config.ru

@@ -7,6 +7,8 @@ require 'sinatra'
 require 'omniauth'
 require 'omniauth-google-oauth2'
 
+OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+
 class App < Sinatra::Base
   get '/' do
     <<-HTML
@@ -18,12 +20,12 @@ class App < Sinatra::Base
 
   get '/auth/:provider/callback' do
     content_type 'text/plain'
-    request.env['omniauth.auth'].to_hash.inspect
+    request.env['omniauth.auth'].to_hash.inspect rescue "No Data"
   end
   
   get '/auth/failure' do
     content_type 'text/plain'
-    request.env['omniauth.auth'].to_hash.inspect
+    request.env['omniauth.auth'].to_hash.inspect rescue "No Data"
   end
 end
 

data/lib/omniauth/google_oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GoogleOauth2
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/omniauth/strategies/google_oauth2.rb

@@ -12,10 +12,11 @@ module OmniAuth
       }
 
       def request_phase
-        redirect client.auth_code.authorize_url(authorize_options)
+        setup_authorize_params
+        super
       end
 
-      def authorize_options
+      def setup_authorize_params
         opts = {
           :client_id => options[:client_id],
           :redirect_uri => callback_url,
@@ -25,7 +26,7 @@ module OmniAuth
         google_email_scope = "www.googleapis.com/auth/userinfo.email"
         opts[:scope] ||= "https://#{google_email_scope}"
         opts[:scope] << " https://#{google_email_scope}" unless opts[:scope] =~ %r[http[s]?:\/\/#{google_email_scope}]
-        opts
+        options[:authorize_params] = opts.merge(options[:authorize_params])
       end
 
       def auth_hash

data/omniauth-contrib.gemspec

@@ -18,4 +18,7 @@ Gem::Specification.new do |gem|
   gem.version       = OmniAuth::GoogleOauth2::VERSION
 
   gem.add_runtime_dependency 'omniauth-oauth2'
+
+  gem.add_development_dependency 'rspec', '~> 2.6.0'
+  gem.add_development_dependency 'rake'
 end

data/spec/omniauth/strategies/google_oauth2_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'omniauth-google-oauth2'
+
+describe OmniAuth::Strategies::GoogleOauth2 do
+  subject do
+    OmniAuth::Strategies::GoogleOauth2.new(nil, @options || {})
+  end
+
+  it_should_behave_like 'an oauth2 strategy'
+
+  describe '#client' do
+    it 'has correct Google site' do
+      subject.client.site.should eq('https://accounts.google.com')
+    end
+
+    it 'has correct authorize url' do
+      subject.client.options[:authorize_url].should eq('/o/oauth2/auth')
+    end
+
+    it 'has correct token url' do
+      subject.client.options[:token_url].should eq('/o/oauth2/token')
+    end
+  end
+
+  describe '#callback_path' do
+    it "has the correct callback path" do
+      subject.callback_path.should eq('/auth/google_oauth2/callback')
+    end
+  end
+
+  # These are setup during the request_phase
+  # At init they are blank
+  describe '#authorize_params' do
+    it "has no authorize params at init" do
+      subject.authorize_params.should be_empty
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+require 'bundler/setup'
+require 'rspec'
+Dir[File.expand_path('../support/**/*', __FILE__)].each { |f| require f }
+
+RSpec.configure do |config|
+end

data/spec/support/shared_examples.rb

@@ -0,0 +1,37 @@
+# NOTE it would be useful if this lived in omniauth-oauth2 eventually
+shared_examples 'an oauth2 strategy' do
+  describe '#client' do
+    it 'should be initialized with symbolized client_options' do
+      @options = { :client_options => { 'authorize_url' => 'https://example.com' } }
+      subject.client.options[:authorize_url].should == 'https://example.com'
+    end
+  end
+
+  describe '#authorize_params' do
+    it 'should include any authorize params passed in the :authorize_params option' do
+      @options = { :authorize_params => { :foo => 'bar', :baz => 'zip' } }
+      subject.authorize_params['foo'].should eq('bar')
+      subject.authorize_params['baz'].should eq('zip')
+    end
+
+    it 'should include top-level options that are marked as :authorize_options' do
+      @options = { :authorize_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
+      subject.authorize_params['scope'].should eq('bar')
+      subject.authorize_params['foo'].should eq('baz')
+    end
+  end
+
+  describe '#token_params' do
+    it 'should include any token params passed in the :token_params option' do
+      @options = { :token_params => { :foo => 'bar', :baz => 'zip' } }
+      subject.token_params['foo'].should eq('bar')
+      subject.token_params['baz'].should eq('zip')
+    end
+
+    it 'should include top-level options that are marked as :token_options' do
+      @options = { :token_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
+      subject.token_params['scope'].should eq('bar')
+      subject.token_params['foo'].should eq('baz')
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: omniauth-google-oauth2
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Josh Ellithorpe
@@ -47,6 +47,36 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: A Google oauth2 strategy for OmniAuth 1.0
 email: 
 - quest@mac.com
@@ -68,6 +98,9 @@ files:
 - lib/omniauth/google_oauth2/version.rb
 - lib/omniauth/strategies/google_oauth2.rb
 - omniauth-contrib.gemspec
+- spec/omniauth/strategies/google_oauth2_spec.rb
+- spec/spec_helper.rb
+- spec/support/shared_examples.rb
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -102,5 +135,7 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Google oauth2 strategy for OmniAuth 1.0
-test_files: []
-
+test_files: 
+- spec/omniauth/strategies/google_oauth2_spec.rb
+- spec/spec_helper.rb
+- spec/support/shared_examples.rb