oa-openid 0.1.5 → 0.1.6

data/lib/omniauth/strategies/open_id.rb

@@ -25,6 +25,8 @@ module OmniAuth
         :image => 'http://axschema.org/media/image/aspect11'
       }
       
+      # Initialize the strategy as a Rack Middleware.
+      #
       # @param app [Rack Application] Standard Rack middleware application argument.
       # @param store [OpenID Store] The [OpenID Store](http://github.com/openid/ruby-openid/tree/master/lib/openid/store/)
       #   you wish to use. Defaults to OpenID::MemoryStore.
@@ -36,7 +38,7 @@ module OmniAuth
       def initialize(app, store = nil, options = {})
         super(app, options[:name] || :open_id)
         @options = options
-        @options[:required] ||= [AX[:email], AX[:first_name], AX[:last_name], 'email', 'fullname']
+        @options[:required] ||= [AX[:email], AX[:name], 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
@@ -48,7 +50,8 @@ module OmniAuth
           :identifier => identifier,
           :return_to => callback_url,
           :required => @options[:required],
-          :optional => @options[:optional]
+          :optional => @options[:optional],
+          :method => 'post'
         )}, []]}
       end
       
@@ -122,11 +125,13 @@ module OmniAuth
         ax = ::OpenID::AX::FetchResponse.from_success_response(response)
         return {} unless ax
         {
-          'email' => ax[AX[:email]],
-          'name' => ax[AX[:name]],
-          'location' => ("#{ax[AX[:city]]}, #{ax[AX[:state]]}" if Array(ax[AX[:city]]).any? && Array(ax[AX[:state]]).any?),
-          'nickname' => ax[AX[:nickname]],
-          'urls' => ({'Website' => Array(ax[AX[:website]]).first} if Array(ax[AX[:website]]).any?)
+          'email' => ax.get_single(AX[:email]),
+          'first_name' => ax.get_single(AX[:first_name]),
+          'last_name' => ax.get_single(AX[:last_name]),
+          'name' => (ax.get_single(AX[:name]) || [ax.get_single(AX[:first_name]), ax.get_single(AX[:last_name])].join(' ')),
+          'location' => ("#{ax.get_single(AX[:city])}, #{ax.get_single(AX[:state])}" if Array(ax.get_single(AX[:city])).any? && Array(ax.get_single(AX[:state])).any?),
+          'nickname' => ax.get_single(AX[:nickname]),
+          'urls' => ({'Website' => Array(ax.get_single(AX[:website])).first} if Array(ax.get_single(AX[:website])).any?)
         }.inject({}){|h,(k,v)| h[k] = Array(v).first; h}.reject{|k,v| v.nil? || v == ''}
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-openid
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 -05:00
+date: 2010-10-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,12 +24,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 23
         segments: 
         - 0
         - 1
-        - 5
-        version: 0.1.5
+        - 6
+        version: 0.1.6
   requirement: *id001
   name: oa-core
   prerelease: false
@@ -40,12 +40,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 31
         segments: 
         - 1
-        - 1
-        - 1
-        version: 1.1.1
+        - 2
+        - 0
+        version: 1.2.0
   requirement: *id002
   name: rack-openid
   prerelease: false