trusty 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da402961c1200966ab167b95e1bc978534018ec5
-  data.tar.gz: bb8dfa60b4fae41ca354fb975ff7d1e7ba409c88
+  metadata.gz: 57e1e69812a9eff269cfb035d3581c7c54b4aa85
+  data.tar.gz: 8e0a6b6d11ef2f74565ecd417ec5163353775bd6
 SHA512:
-  metadata.gz: 554ac7e31363efa90cea9a2eef425036146d8ac35bf7c2ee1d6d574168ae58f70a8cc00051b8094deee5d3aa8603ac3973bd08df0887d13f7a109fa1abac581c
-  data.tar.gz: 7e7795d47f04e934856e64f683764264c05ff68ae21d71c3cf582e25f00817f110b50d8479dd29a92135f433b946ca0348a75f2eac197e531de1d6ae860e366b
+  metadata.gz: fbd241c9a26ec21105da1a400da7ae367750bffc81aba9f82f18da4a34de22d0e7b57dbf89ca1eb101dacab14effeef1294973f385543852cdad81fe393315de
+  data.tar.gz: 8e3f8dfc7b0d7661d489a994ff3186843fb11d204934a8852558202f69b5e96652e27f5cc38cb3fe2489691f14aa5d6cbe935bfa241c48253fa757d5eee5d1d0

data/lib/trusty/omniauth/provider_mapper.rb

@@ -122,26 +122,29 @@ module Trusty
 
       def attributes(*filter_attribute_names)
         unless @attributes
-          info            = provider_attributes.fetch('info', {})
-          credentials     = provider_attributes['credentials']
+          raw_info    = provider_attributes['extra']['raw_info'] || provider_attributes['extra']
+          info        = provider_attributes.fetch('info', raw_info)
+          credentials = provider_attributes['credentials']
 
-          name            = clean(info['name'])       { [info['first_name'], info['last_name']].join(" ").strip }
-          first_name      = clean(info['first_name']) { name.split(/\s+/, 2).first }
-          last_name       = clean(info['last_name'])  { name.split(/\s+/, 2).last }
+          name       = clean(info['name'])       { [info['first_name'], info['last_name']].join(" ").strip }
+          first_name = clean(info['first_name']) { name.split(/\s+/, 2).first }
+          last_name  = clean(info['last_name'])  { name.split(/\s+/, 2).last }
+          urls       = info.fetch('urls', {})
 
           @attributes = {
             :provider       => provider_name,
             :uid            => clean(provider_attributes['uid']),
             :name           => name,
+            :company        => info['company'] || raw_info['company'],
             :email          => clean(info['email'], :downcase, :strip),
-            :verified       => provider_attributes['extra']['raw_info']['verified_email'] == true,
+            :verified       => !!(raw_info['verified_email'] || raw_info['verified']),
             :username       => clean(info['nickname']),
             :first_name     => first_name,
             :middle_name    => clean(info['middle_name']),
             :last_name      => last_name,
-            :phone          => clean(info['phone']),
+            :phone          => clean(info['phone'] || raw_info['sms_number']),
             :image_url      => info['image'],
-            :profile_url    => info.fetch('urls', {})['public_profile'],
+            :profile_url    => urls['public_profile'] || urls['GitHub'] || raw_info['blog'],
             :token_type     => clean(credentials['token_type']),
             :token          => clean(credentials['token']),
             :secret         => clean(credentials['secret']),
@@ -150,7 +153,7 @@ module Trusty
             :expires_at     => (Time.at(credentials['expires_at']) rescue nil),
             :raw_info       => provider_attributes['extra'].except('access_token').as_json,
             # extra
-            :location       => info['location'],
+            :location       => info['location'] || raw_info['location'],
             :time_zone      => info['time_zone'] || Time.zone.name,
             :locale         => info['locale'] || I18n.locale
           }.with_indifferent_access

data/lib/trusty/version.rb

@@ -1,3 +1,3 @@
 module Trusty
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Joel Van Horn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Trusty allows you to manage environment variables and other common configuration