timber 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8f4370bada35338e39a28f00a5c1530175e285a
-  data.tar.gz: b15a814d3c4d6fdd557f7a509bc2452fd86a99ff
+  metadata.gz: 7c92caecf236aae6f47636ea5646c3822a31fa51
+  data.tar.gz: df5d9292f27cba1fa0405a919002434eb4d91bdf
 SHA512:
-  metadata.gz: eb512f1759ec51bcbeb28b3cfbbb193dc805cc55c403e48d1fa519fbed4012bebd00802d8467a8af2a0cc56dc5ba50bb27eb78109626d27b00e77e3f74994c58
-  data.tar.gz: b240d0b6062fc042676be8ab4e9fa89622efad45ccdee3514b102b53d83f0879a829617dbc9eac99372e22466030e088ef948a6bc80ad6dded4019cd031ecac8
+  metadata.gz: 8d1617ab8a68cb5ceef91036f196cc1fecd97f09236a2a06319dbb69c1b3e9a9c606ba98a214dc266e73ccc5f277e454939fb2acf2e19da9e6259ad8ce8005aa
+  data.tar.gz: ed1da42f194b9ce03c5e07c7b073306b1de59e0715e9721f3859efdb2e1a974dcb3de76a86c7271b6f38831eed2036bec52621d4b95f050b6454913f6d3ae11d

data/lib/timber/integrations/rack/user_context.rb

@@ -8,22 +8,30 @@ module Timber
         end
 
         def call(env)
+          debug { "#{self.class.name} - Starting user context" }
           user_hash = get_user_hash(env)
           if user_hash
+            debug { "#{self.class.name} - User hash found: #{user_hash.inspect}" }
             context = Contexts::User.new(user_hash)
             CurrentContext.with(context) do
               @app.call(env)
             end
           else
+            debug { "#{self.class.name} - User hash not found" }
             @app.call(env)
           end
         end
 
         private
           def get_user_hash(env)
-            if env['warden']
-              get_user_hash_from_object(env['warden'].user)
-            elsif env['omniauth.auth']
+            get_omniauth_user_hash(env) ||
+              get_warden_user_hash(env) ||
+              nil
+          end
+
+          def get_omniauth_user_hash(env)
+            if env['omniauth.auth']
+              debug { "#{self.class.name} - Omniauth hash present #{env['omniauth.auth'].inspect}" }
               auth_hash = env['omniauth.auth']
               info = auth_hash['info']
 
@@ -33,23 +41,42 @@ module Timber
                 email: info['email']
               }
             else
+              debug { "#{self.class.name} - Omniauth hash not present" }
               nil
             end
           end
 
-          def get_user_hash_from_object(user)
-            {
-              id: user_id(user),
-              name: user_name(user),
-              email: user_email(user)
-            }
+          def get_warden_user_hash(env)
+            if env['warden']
+              debug { "#{self.class.name} - Warden object present #{env['warden'].inspect}" }
+              user = env['warden'].user
+              if user
+                debug { "#{self.class.name} - Warden user object #{env['warden'].user.inspect}" }
+                id = try_user_id(user)
+                name = try_user_name(user)
+                email = try_user_email(user)
+
+                if id || name || email
+                  debug { "#{self.class.name} - At least one warden user attribute was present" }
+                  {id: id, name: name, email: email}
+                else
+                  debug { "#{self.class.name} - No warden user attributes were present" }
+                  nil
+                end
+              else
+                debug { "#{self.class.name} - Warden user object not present, not logged in" }
+                nil
+              end
+            else
+              nil
+            end
           end
 
-          def user_id(user)
+          def try_user_id(user)
             user.respond_to?(:id) ? user.id : nil
           end
 
-          def user_name(user)
+          def try_user_name(user)
             if user.respond_to?(:name) && user.name.is_a?(String)
               user.name
             elsif user.respond_to?(:first_name) && user.first_name.is_a?(String) && user.respond_to?(:last_name) && user.last_name.is_a?(String)
@@ -59,13 +86,24 @@ module Timber
             end
           end
 
-          def user_email(user)
+          def try_user_email(user)
             if user.respond_to?(:email) && user.email.is_a?(String)
               user.email
             else
               nil
             end
           end
+
+          def debug_logger
+            Timber::Config.instance.debug_logger
+          end
+
+          def debug(&block)
+            if debug_logger
+              message = yield
+              debug_logger.debug(message)
+            end
+          end
       end
     end
   end

data/lib/timber/version.rb

@@ -1,3 +1,3 @@
 module Timber
-  VERSION = "2.0.10"
+  VERSION = "2.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timber
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors:
 - Timber Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack