omniauth-orcid 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c433403ee6a5a8336bfd361259dfefa176138e54
-  data.tar.gz: 2e27a8831978bb6e4e404c20ee4067d75b13a35d
+  metadata.gz: 2de75de45baf1b335765369cd1b064583b61402b
+  data.tar.gz: 4c8da80aa0fa68d5313ca41c281e50df641f2483
 SHA512:
-  metadata.gz: f42e6ed8d7ae1fa6cee3b35706c98e6271f30556729f8868132d3a534ab9370177e2f0d5c987d0ad7fdcc549b6cd1718732ac2ddf5ddc64965993b6452ba27f4
-  data.tar.gz: fd90e3f753f1fe382d92b5d7788615faf4645714a8d4cc8d1a9f9f423e8faae875c4de55d37aa7080d7e5a5e97e2d0857a4b321e68134b99cca5310471c6f9e0
+  metadata.gz: 7ba2ff0b986734c45b28a79cb2b7ba531c119c392937ba13749e381551116a98c0b8da2687b26b8c229fcf4e43e2d737bc2911c80259617a38e0ec77e342d9ec
+  data.tar.gz: f81b4bbc001f5be28b61e88a24d27b46a62fa460ce90b863d19cd87e007b4e73c8ff9ef2f6735234ba727646f268a0d1c945bc3cff90620f06b575177fef657c

data/lib/omniauth/orcid/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Orcid
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
   end
 end

data/lib/omniauth/strategies/orcid.rb

@@ -123,23 +123,21 @@ module OmniAuth
       end
 
       def request_info
-        @request_info || client.request(:get, "#{api_base_url}/#{uid}/person", headers: { accept: 'application/json' }).parsed || {}
+        @request_info ||= client.request(:get, "#{api_base_url}/#{uid}/person", headers: { accept: 'application/json' }).parsed || {}
       end
 
+      # retrieve all verified email addresses and include visibility (LIMITED vs. PUBLIC)
+      # and whether this is the primary email address
+      # all other information will in almost all cases be PUBLIC
       def raw_info
-        # retrieve all verified email addresses and include visibility (LIMITED vs. PUBLIC)
-        # and whether this is the primary email address
-        # all other information will in almost all cases be PUBLIC
-        emails = request_info.dig('emails', 'email')
-          .select { |e| e.fetch('verified') }
-          .map { |e| e.select { |k, | %w(email visibility primary).include? k } }
-
-        { first_name: request_info.dig('name', 'given-names', 'value'),
+        @raw_info ||= {
+          first_name: request_info.dig('name', 'given-names', 'value'),
           last_name: request_info.dig('name', 'family-name', 'value'),
           other_names: request_info.dig('other-names', 'other-name').map { |o| o.fetch('content') },
           description: request_info.dig('biography', 'content'),
           location: request_info.dig('addresses', 'address').map { |a| a.dig('country', 'value') }.first,
-          email: emails.find { |e| e.fetch('primary') }.to_h.fetch('email', nil),
+          email: request_info.dig('emails', 'email')
+            .select { |e| e.fetch('verified') }.find { |e| e.fetch('primary') }.to_h.fetch('email', nil),
           urls: request_info.dig('researcher-urls', 'researcher-url').map do |r|
             { r.fetch("url-name", nil) => r.dig('url', 'value') }
           end,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-orcid
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Gudmundur A. Thorisson