lib/omniauth/strategies/gplus.rb in omniauth-gplus-2.0.0.beta1 vs lib/omniauth/strategies/gplus.rb in omniauth-gplus-2.0.0.beta2

@@ -1,35 +1,37 @@
+require 'omniauth/strategies/oauth2'
+
 module OmniAuth
   module Strategies
-    class GPlus < OAuth2
-      option :client_options, {
-        site: 'https://www.googleapis.com/oauth2/v1',
-        authorize_url: 'https://www.google.com/accounts/o8/oauth2/authorization',
-        token_url: 'https://www.google.com/accounts/o8/oauth2/token'
-      }
+    class GPlus < OmniAuth::Strategies::OAuth2
+      class NoAuthorizationCodeError < StandardError; end
+      class UnknownSignatureAlgorithmError < NotImplementedError; end
 
+      option :client_options,
+             :site => 'https://www.googleapis.com/oauth2/v1',
+             :authorize_url => 'https://www.google.com/accounts/o8/oauth2/authorization',
+             :token_url => 'https://www.google.com/accounts/o8/oauth2/token'
+
       option :authorize_options, [:scope, :request_visible_actions]
 
       option :scope, 'userinfo.email'
 
       option :request_visible_actions, nil
 
       option :uid_field, :uid
 
-      uid do
-        raw_info['id']
-      end
+      uid { raw_info['id'] }
 
       info do
         {
           'email' => raw_info['email'],
           'name' => raw_info['name'],
           'first_name' => raw_info['given_name'],
           'last_name' => raw_info['family_name'],
           'image' => raw_info['picture'],
           'urls' => {
-            "Google+" => raw_info['link']
+            'Google+' => raw_info['link']
           }
         }
       end
 
       extra do
@@ -42,42 +44,38 @@
       end
 
       def authorize_params
         super.tap do |params|
           params['scope'] = format_scopes(params['scope'])
-          if (params['request_visible_actions'])
-            params['request_visible_actions'] = format_actions(params['request_visible_actions'])
-          end
+          params['request_visible_actions'] = format_actions(params['request_visible_actions']) if params['request_visible_actions']
           custom_parameters(params)
         end
       end
 
       private
 
       def format_actions(actions)
-        actions.split(/,\s*/).map(&method(:format_action)).join(" ")
+        actions.split(/,\s*/).collect(&method(:format_action)).join(' ')
       end
 
       def format_action(action)
         "http://schemas.google.com/#{action}"
       end
 
       def format_scopes(scopes)
-        scopes.split(/,\s*/).map(&method(:format_scope)).join(" ")
+        scopes.split(/,\s*/).collect(&method(:format_scope)).join(' ')
       end
 
       def format_scope(scope)
         "https://www.googleapis.com/auth/#{scope}"
       end
 
       def custom_parameters(params)
-        ["scope", "client_options", "request_visible_actions"].each { |k| add_key_to_params(params, k) }
+        %w(scope client_options request_visible_actions access_type).each { |k| add_key_to_params(params, k) }
       end
 
       def add_key_to_params(params, key)
-        if request.params[key]
-          params[key] = request.params[key]
-        end
+        params[key] = request.params[key] if request.params[key]
       end
 
       def raw_info
         access_token.options[:mode] = :query
         @raw_info ||= access_token.get('userinfo').parsed