trusty 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57e1e69812a9eff269cfb035d3581c7c54b4aa85
-  data.tar.gz: 8e0a6b6d11ef2f74565ecd417ec5163353775bd6
+  metadata.gz: c138b9fca14a52e0c321c4704aea6f7391766662
+  data.tar.gz: 5757a65d2ca71592cfaa24cd5c683133c77b3be6
 SHA512:
-  metadata.gz: fbd241c9a26ec21105da1a400da7ae367750bffc81aba9f82f18da4a34de22d0e7b57dbf89ca1eb101dacab14effeef1294973f385543852cdad81fe393315de
-  data.tar.gz: 8e3f8dfc7b0d7661d489a994ff3186843fb11d204934a8852558202f69b5e96652e27f5cc38cb3fe2489691f14aa5d6cbe935bfa241c48253fa757d5eee5d1d0
+  metadata.gz: f5bf1bceee74c2fffeb430902453acb09805ca3e12d54e69f5a451f8ed288fd0fc84ed262bc211f67a791d35d520516fa1f42928d4da521e5bf4cec1e76ef1bb
+  data.tar.gz: fd5462f1db6d72d9f4bcb643145fb0f71ca30271002d0b43f2cc69c3e0f1dfdefd1fd14177b15ebf6684388439762c47bf29b82d3ba4046afdcbf54362f99b13

data/lib/trusty/omniauth/mapping_helpers.rb

@@ -2,14 +2,14 @@ module Trusty
   module Omniauth
     module MappingHelpers
       def clean(value, *filters, &default_value)
-        default_value ||= lambda{ nil }
-        
+        default_value ||= ->{ nil }
+
         filters.each do |method_name|
           value = value.to_s.send(method_name)
         end
-        
+
         value.blank? ? default_value.call : value
       end
     end
   end
-end
+end

data/lib/trusty/omniauth/model_mapper.rb

@@ -101,7 +101,6 @@ module Trusty
       def stringify_keys(original_hash)
         original_hash.each_with_object({}){|(key, value), hash| hash[key.to_s] = value}
       end
-
     end
   end
 end

data/lib/trusty/omniauth/provider_mapper.rb

@@ -122,11 +122,7 @@ module Trusty
 
       def attributes(*filter_attribute_names)
         unless @attributes
-          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 }
+          name       = clean(info['name'])       { info.values_at('first_name', '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', {})
@@ -137,14 +133,14 @@ module Trusty
             :name           => name,
             :company        => info['company'] || raw_info['company'],
             :email          => clean(info['email'], :downcase, :strip),
-            :verified       => !!(raw_info['verified_email'] || raw_info['verified']),
+            :verified       => !!first_for(raw_info, %w{verified_email email_verified verified confirmed verified_account}),
             :username       => clean(info['nickname']),
             :first_name     => first_name,
             :middle_name    => clean(info['middle_name']),
             :last_name      => last_name,
             :phone          => clean(info['phone'] || raw_info['sms_number']),
             :image_url      => info['image'],
-            :profile_url    => urls['public_profile'] || urls['GitHub'] || raw_info['blog'],
+            :profile_url    => first_for(urls, %w{profile public_profile GitHub}) || first_for(raw_info, %w{url blog}),
             :token_type     => clean(credentials['token_type']),
             :token          => clean(credentials['token']),
             :secret         => clean(credentials['secret']),
@@ -169,6 +165,25 @@ module Trusty
         end
       end
 
+    private
+
+      def raw_info
+        @raw_info ||= provider_attributes['extra']['raw_info'] || provider_attributes['extra']
+      end
+
+      def info
+        @info ||= provider_attributes.fetch('info', raw_info)
+      end
+
+      def credentials
+        provider_attributes['credentials']
+      end
+
+      def first_for(hash, *names)
+        key = names.flatten.find{ |name| hash[name] }
+
+        hash[key]
+      end
     end
   end
 end

data/lib/trusty/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Joel Van Horn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-26 00:00:00.000000000 Z
+date: 2017-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler