timber 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59dfc96fa6eee2260cbfb09b2fb6eddfcae573e6
-  data.tar.gz: dce374823788ebcfeb4f036e2c01a09170354d2e
+  metadata.gz: 764a9a04b4bb8dcb4a6bd93e531ba1eea9959f8d
+  data.tar.gz: 6dbf3db66270006e11d274c0a966456bb57e9419
 SHA512:
-  metadata.gz: 0cff008838b0289281df7f30904d65cf435a91c46f50050a23261cbba66c6a61db8632e649f77e3cbcb04fdda09b741b1cc02fc02aba0d0b239eb7105d298881
-  data.tar.gz: 4fbe781f747db8043c783e8732157f2d285e84f4ba14c0010b5944e082dbec86defdeacb9a5c66be5352122dd8652348aee09e26d33513256608569b927bf498
+  metadata.gz: b9b093be5167377e5b6566441c7e5e91f98f2eaa06bd18d25906ffd11fba35b9338dadb7aa99e85b05c8d64ddd659686d29d58d7aa8f8f8865d058d9c15688e2
+  data.tar.gz: fc8ebd26419c4b8b248c8af55007b6579e428c96249cfc673ee4439de9480cde0f883d66880110cb1d5cb15b4ba84254e823bfd6da084fa716f330908dbd4507

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

@@ -8,13 +8,9 @@ module Timber
         end
 
         def call(env)
-          user = get_user(env)
-          if user
-            context = Contexts::User.new(
-              id: user_id(user),
-              name: user_name(user),
-              email: user_email(user)
-            )
+          user_hash = get_user_hash(env)
+          if user_hash
+            context = Contexts::User.new(user_hash)
             CurrentContext.with(context) do
               @app.call(env)
             end
@@ -24,14 +20,31 @@ module Timber
         end
 
         private
-          def get_user(env)
+          def get_user_hash(env)
             if env['warden']
-              env['warden'].user
+              get_user_hash_from_object(env['warden'].user)
+            elsif env['omniauth.auth']
+              auth_hash = env['omniauth.auth']
+              info = auth_hash['info']
+
+              {
+                id: auth_hash['uid'],
+                name: info['name'],
+                email: info['email']
+              }
             else
               nil
             end
           end
 
+          def get_user_hash_from_object(user)
+            {
+              id: user_id(user),
+              name: user_name(user),
+              email: user_email(user)
+            }
+          end
+
           def user_id(user)
             user.respond_to?(:id) ? user.id : nil
           end

data/lib/timber/version.rb

@@ -1,3 +1,3 @@
 module Timber
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/timber.gemspec

@@ -20,16 +20,16 @@ Gem::Specification.new do |s|
 
   s.add_dependency('msgpack', '~> 1.0')
 
-  s.add_development_dependency('rails_stdout_logging')
-  s.add_development_dependency('rake')
+  s.add_development_dependency('rails_stdout_logging', '~> 0')
+  s.add_development_dependency('rake', '~> 0')
   s.add_development_dependency('rspec', '~> 3.4')
-  s.add_development_dependency('rspec-its')
-  s.add_development_dependency('timecop')
+  s.add_development_dependency('rspec-its', '~> 0')
+  s.add_development_dependency('timecop', '~> 0')
 
   if RUBY_PLATFORM == "java"
-    s.add_development_dependency('activerecord-jdbcsqlite3-adapter')
+    s.add_development_dependency('activerecord-jdbcsqlite3-adapter', '~> 0')
   else
-    s.add_development_dependency('sqlite3')
+    s.add_development_dependency('sqlite3', '~> 0')
   end
 
   if RUBY_VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timber
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Timber Technologies, Inc.
@@ -28,28 +28,28 @@ dependencies:
   name: rails_stdout_logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -70,42 +70,42 @@ dependencies:
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency