open_id.rb in oa-openid-0.1.4

- old
+ new

@@ -1,7 +1,7 @@
 require 'rack/openid'
-require 'gapps_openid'
+require 'omniauth/openid/gapps'
 require 'omniauth/openid'
 
 module OmniAuth
   module Strategies
     class OpenID
@@ -22,11 +22,11 @@
         :website => 'http://axschema.org/contact/web/default',
         :image => 'http://axschema.org/media/image/aspect11'
       }
       
       def initialize(app, store = nil, options = {})
-        super(app, options[:name] || :open_id)
+        super(app, options.delete(:name) || :open_id)
         @options = options
         @options[:required] ||= [AX[:email], AX[:first_name], AX[:last_name], 'email', 'fullname']
         @options[:optional] ||= [AX[:nickname], AX[:city], AX[:state], AX[:website], AX[:image], 'postcode', 'nickname']
         @store = store
       end
@@ -45,10 +45,10 @@
         uri.path += '/callback'
         uri.to_s
       end
       
       def identifier
-        request[IDENTIFIER_URL_PARAMETER]
+        options[:identifier] || request[IDENTIFIER_URL_PARAMETER]
       end
       
       def request_phase
         identifier ? start : get_identifier
       end