timber 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a530de0193b8608dad9cf57cd4695260fa861eda
-  data.tar.gz: 30d326dde43b0fa6ecaa68dc3361a2379bbc8a54
+  metadata.gz: e4136faf51b1142a6707645674bb4837b2584844
+  data.tar.gz: 85b1e858102d857f4bba6cddce0f74009801367d
 SHA512:
-  metadata.gz: fe81f00a478333a7a51b95b7136d14f843e462e71dda131196ed0fbdc53fe86c52b5ea5e163926cefe09b0ca1c3a493fc8fed7e1de96c7707fedb0d556d8028e
-  data.tar.gz: 8e0af30d2ecb86e448b4d3d90f679ec00adca9fbf204a496cb694ac9c476fea63760b925f3a06455e3633e4ad6175cec46858e02f0c7168294b4dfe02f2cbb31
+  metadata.gz: d8dd6a597c362cd30ea3480d0fc435768f3c22e813344b43554aa66bf6f2e093b8e2ba262d44aaa42aab24288d364d34be52d14384acdb5451552043de49a11d
+  data.tar.gz: 386e1e71a751dec353c51442697a4dd455a325bbfd0dab82a2df240efa6908a933ff1b2f627634f608921cc238902b379430c20c464eb268aac259d345e7c751

data/lib/timber/contexts/user.rb

@@ -8,14 +8,27 @@ module Timber
     # Note: Timber will attempt to automatically add this if you add a #current_user
     # method to your controllers. Most authentication solutions do this for you automatically.
     #
-    # Example:
-    #
+    # @example Basic example
     #   user_context = Timber::Contexts::User.new(id: "abc1234", name: "Ben Johnson")
     #   Timber::CurrentContext.with(user_context) do
     #     # Logging will automatically include this context
     #     logger.info("This is a log message")
     #   end
     #
+    # @example Rails example
+    #   class ApplicationController < ActionController::Base
+    #     around_filter :capture_user_context
+    #     private
+    #       def capture_user_context
+    #         if current_user
+    #           user_context = Timber::Contexts::User.new(id: current_user.id,
+    #             name: current_user.name, email: current_user.email)
+    #           Timber::CurrentContext.with(user_context) { yield }
+    #         else
+    #           yield
+    #         end
+    #       end
+    #   end
     class User < Context
       @keyspace = :user
 

data/lib/timber/events/http_server_request.rb

@@ -29,10 +29,7 @@ module Timber
       alias to_h to_hash
 
       def as_json(_options = {})
-        hash = to_hash
-        hash[:headers] = Util::Hash.compact(hash[:headers])
-        hash = Util::Hash.compact(hash)
-        {:server_side_app => {:http_request => hash}}
+        {:server_side_app => {:http_request => to_hash}}
       end
 
       def message

data/lib/timber/log_entry.rb

@@ -39,7 +39,7 @@ module Timber
         :time_ms => time_ms}
 
       if !event.nil?
-        hash[:event] = event
+        hash[:event] = event.as_json
       end
 
       if !context_snapshot.nil? && context_snapshot.length > 0
@@ -60,7 +60,7 @@ module Timber
         hash
       end
 
-      Util::Hash.compact(hash)
+      Util::Hash.deep_compact(hash)
     end
 
     def to_json(options = {})

data/lib/timber/util/hash.rb

@@ -4,10 +4,22 @@ module Timber
     module Hash
       extend self
 
-      def compact(hash)
-        hash.select do |k, v|
-          v != nil && v != {} && v != []
+      def deep_compact(hash)
+        new_hash = {}
+
+        hash.each do |k, v|
+          v = if v.is_a?(::Hash)
+            deep_compact(v)
+          else
+            v
+          end
+
+          if v != nil && v != "" && v != {} && v != []
+            new_hash[k] = v
+          end
         end
+
+        new_hash
       end
     end
   end

data/lib/timber/version.rb

@@ -1,3 +1,3 @@
 module Timber
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timber
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Timber Technologies, Inc.