timber 1.1.11 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04d27a972b601ecae982beff3a8c0fcd6bb46294
-  data.tar.gz: ae3ef7225f3127618d06f831bbd00e874585826a
+  metadata.gz: ade6b71eaa06bca6d7cb9ff1a551fcbfd64d0052
+  data.tar.gz: 704576249bdd4e7a281f26a2b291180e40adeb6b
 SHA512:
-  metadata.gz: 29b027106869a5c1f3f68d46eecaaff96c7549b1bb03fa2916ca16704ca687e27c17f1842484f80e6c694fc608a31e387417c12556c6b2a8da0274577d55fb5c
-  data.tar.gz: 1dca319df6e3b7523da304ee6009422230b583dde0b9482616027afc11de8d4dd8d6b530afc1001b3471dd0105d824182fc4f9bdbb4142ab671f937a246e3e9c
+  metadata.gz: f068e2c366402a47b9d7f88d70b25c4e2e007f1c5bdb59ec611d17c59aa129152cfea39a805e0059500a4d493e54285a6c2cb6fa450d9cb54227447e1a32d25d
+  data.tar.gz: 1e2ea1d6268b5a0ab041448e8912e9eca0d31c6ea0a06b6b449d2d557bc83f8265f9afb4dd3802139cefdb8f00a6334f7f3d0e8d4696c028227047ace980edfe

data/lib/timber/log_entry.rb

@@ -3,7 +3,7 @@ module Timber
   # `Logger` and the log device that you set it up with.
   class LogEntry #:nodoc:
     DT_PRECISION = 6.freeze
-    SCHEMA = "https://raw.githubusercontent.com/timberio/log-event-json-schema/1.2.5/schema.json".freeze
+    SCHEMA = "https://raw.githubusercontent.com/timberio/log-event-json-schema/1.2.6/schema.json".freeze
 
     attr_reader :context_snapshot, :event, :level, :message, :progname, :tags, :time, :time_ms
 

data/lib/timber/overrides/logger_add.rb

@@ -0,0 +1,41 @@
+module Timber
+  module Overrides
+    module LoggerAdd
+      def self.included(klass)
+        klass.class_eval do
+          alias_method :_timber_original_add, :add
+
+          def add(severity, message = nil, progname = nil)
+            # Extract the message: https://github.com/ruby/ruby/blob/f6e77b9d3555c1fbaa8aab1cdc0bd6bde95f62c6/lib/logger.rb#L461-L468
+            progname ||= @progname
+            if message.nil?
+              if block_given?
+                message = yield
+              else
+                message = progname
+                progname = @progname
+              end
+            end
+
+            if message.is_a?(::Timber::Event)
+              if self.is_a?(::Timber::Logger)
+                _timber_original_add(severity, message, progname)
+              else
+                if message.message.nil?
+                  STDOUT.write message.inspect
+                end
+                _timber_original_add(severity, message.message, progname)
+              end
+            else
+              _timber_original_add(severity, message, progname)
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+require "logger"
+
+::Logger.send(:include, Timber::Overrides::LoggerAdd)

data/lib/timber/version.rb

@@ -1,3 +1,3 @@
 module Timber
-  VERSION = "1.1.11"
+  VERSION = "1.1.12"
 end

data/spec/timber/event_spec.rb

@@ -0,0 +1,10 @@
+require "spec_helper"
+
+describe Timber::Event, :rails_23 => true do
+  describe "#to_s" do
+    it "should display the message" do
+      event = Timber::Events::Custom.new(message: "Build version 1.0.0", type: :build, data: {version: "1.0.0"})
+      expect(event.to_s).to eq("Build version 1.0.0")
+    end
+  end
+end

data/spec/timber/overrides/logger_add_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+describe Timber::Overrides::LoggerAdd, :rails_23 => true do
+  describe "#add" do
+    it "should display the message only when passed to a default logger" do
+      event = Timber::Events::Custom.new(message: "Build version 1.0.0", type: :build, data: {version: "1.0.0"})
+      io = StringIO.new
+      logger = ::Logger.new(io)
+      logger.info(event)
+      expect(io.string).to eq("Build version 1.0.0\n")
+    end
+
+    it "should work with blocks" do
+      event = Timber::Events::Custom.new(message: "Build version 1.0.0", type: :build, data: {version: "1.0.0"})
+      io = StringIO.new
+      logger = ::Logger.new(io)
+      logger.info { event }
+      expect(io.string).to eq("Build version 1.0.0\n")
+    end
+  end
+end

data/spec/timber/probes/active_record_log_subscriber_spec.rb

@@ -36,14 +36,13 @@ describe Timber::Probes::ActiveRecordLogSubscriber do
 
           it "should log the sql query" do
             User.order("users.id DESC").all.collect # collect kicks the sql because it is lazily executed
-            message = "  \e[1m\e[36mUser Load (0.0ms)\e[0m  \e[1m\e[34mSELECT \"users\".* FROM \"users\" ORDER BY users.id DESC\e[0m @metadata {\"level\":\"debug\",\"dt\":\"2016-09-01T12:00:00.000000Z\",\"event\":{\"sql_query\":{\"sql\":\"SELECT \\\"users\\\".* FROM \\\"users\\\" ORDER BY users.id DESC\",\"time_ms\":0.0}}}\n"
             # Rails 4.X adds random spaces :/
             string = io.string.gsub("   ORDER BY", " ORDER BY")
             string = string.gsub("  ORDER BY", " ORDER BY")
             expect(string).to include("users.id DESC")
             expect(string).to include("@metadata")
             expect(string).to include("\"level\":\"debug\"")
-            expect(string).to include("\"sql\":")
+            expect(string).to include("\"event\":{\"server_side_app\":{\"sql_query\"")
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timber
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
 platform: ruby
 authors:
 - Timber Technologies, Inc.
@@ -79,6 +79,7 @@ files:
 - lib/timber/log_devices/http.rb
 - lib/timber/log_entry.rb
 - lib/timber/logger.rb
+- lib/timber/overrides/logger_add.rb
 - lib/timber/overrides/rails_stdout_logging.rb
 - lib/timber/probe.rb
 - lib/timber/probes.rb
@@ -119,11 +120,13 @@ files:
 - spec/timber/contexts/system_spec.rb
 - spec/timber/contexts/user_spec.rb
 - spec/timber/contexts_spec.rb
+- spec/timber/event_spec.rb
 - spec/timber/events/custom_spec.rb
 - spec/timber/events_spec.rb
 - spec/timber/log_devices/http_spec.rb
 - spec/timber/log_entry_spec.rb
 - spec/timber/logger_spec.rb
+- spec/timber/overrides/logger_add_spec.rb
 - spec/timber/probes/action_controller_log_subscriber_spec.rb
 - spec/timber/probes/action_controller_user_context_spec.rb
 - spec/timber/probes/action_dispatch_debug_exceptions_spec.rb
@@ -175,11 +178,13 @@ test_files:
 - spec/timber/contexts/system_spec.rb
 - spec/timber/contexts/user_spec.rb
 - spec/timber/contexts_spec.rb
+- spec/timber/event_spec.rb
 - spec/timber/events/custom_spec.rb
 - spec/timber/events_spec.rb
 - spec/timber/log_devices/http_spec.rb
 - spec/timber/log_entry_spec.rb
 - spec/timber/logger_spec.rb
+- spec/timber/overrides/logger_add_spec.rb
 - spec/timber/probes/action_controller_log_subscriber_spec.rb
 - spec/timber/probes/action_controller_user_context_spec.rb
 - spec/timber/probes/action_dispatch_debug_exceptions_spec.rb