timber 1.1.12 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ade6b71eaa06bca6d7cb9ff1a551fcbfd64d0052
-  data.tar.gz: 704576249bdd4e7a281f26a2b291180e40adeb6b
+  metadata.gz: 2c4f1205077f2126e3ee9c9c52b553f3a0b1fcf4
+  data.tar.gz: 85720eb2baac30ecb300bb959f4fb2ee743dadf7
 SHA512:
-  metadata.gz: f068e2c366402a47b9d7f88d70b25c4e2e007f1c5bdb59ec611d17c59aa129152cfea39a805e0059500a4d493e54285a6c2cb6fa450d9cb54227447e1a32d25d
-  data.tar.gz: 1e2ea1d6268b5a0ab041448e8912e9eca0d31c6ea0a06b6b449d2d557bc83f8265f9afb4dd3802139cefdb8f00a6334f7f3d0e8d4696c028227047ace980edfe
+  metadata.gz: ce7dbd8e9bed79ee89273a4bf72543ea7b87ff737f934e2724e20f5ff2e4efc90ab6d51fc9e21c4892a3c17b78147327813c40dd37329f0172959863ef73457a
+  data.tar.gz: a18c9a9bbda731c1f87c4729230b3d5db7af1fd25828925ca9ccc04d47d4f14b11139f8df3da35e61948d4863760127ecbc004f07608a035409cf7248c50eb11

data/lib/timber/events/exception.rb

@@ -10,7 +10,13 @@ module Timber
       def initialize(attributes)
         @name = attributes[:name] || raise(ArgumentError.new(":name is required"))
         @exception_message = attributes[:exception_message] || raise(ArgumentError.new(":exception_message is required"))
-        @backtrace = attributes[:backtrace]
+
+        backtrace = attributes[:backtrace]
+        if backtrace.nil? || backtrace == []
+          raise(ArgumentError.new(":backtrace is required"))
+        end
+
+        @backtrace = backtrace.collect { |line| parse_backtrace_line(line) }
       end
 
       def to_hash
@@ -23,13 +29,16 @@ module Timber
       end
 
       def message
-        message = "#{name} (#{exception_message}):"
-        if backtrace.is_a?(Array) && backtrace.length > 0
-          message << "\n\n"
-          message << backtrace.join("\n")
-        end
-        message
+        "#{name} (#{exception_message})"
       end
+
+      private
+        def parse_backtrace_line(line)
+          # using split for performance reasons
+          file, line, function_part = line.split(":", 3)
+          _prefix, function = function_part.split("`", 2)
+          {file: file, line: line.to_i, function: function.chomp("'")}
+        end
     end
   end
 end

data/lib/timber/version.rb

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

data/spec/support/rails.rb

@@ -2,7 +2,7 @@ require "rails"
 
 # Defualt the rails logger to nothing, each test shoould be
 # responsible for setting up the logger
-logger = ::Logger.new(nil) # change to STDOUT to see rails logs
+logger = ::Logger.new(STDOUT) # change to STDOUT to see rails logs
 Rails.logger = logger
 
 class RailsApp < Rails::Application

data/spec/timber/overrides/logger_add_spec.rb

@@ -2,18 +2,23 @@ require "spec_helper"
 
 describe Timber::Overrides::LoggerAdd, :rails_23 => true do
   describe "#add" do
+    let(:io) { StringIO.new }
+    let(:logger) do
+      logger = ::Logger.new(io)
+      logger.formatter = proc do |severity, datetime, progname, msg|
+         "#{msg}\n"
+      end
+      logger
+    end
+
     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

data/spec/timber/probes/action_dispatch_debug_exceptions_spec.rb

@@ -37,9 +37,8 @@ describe Timber::Probes::ActionDispatchDebugExceptions do
         mock_class
         dispatch_rails_request("/exception")
         # Because constantly updating the line numbers sucks :/
-        expect(io.string).to include("RuntimeError (boom):\\n\\n")
-        expect(io.string).to include("@metadata")
-        expect(io.string).to include("\"event\":{\"server_side_app\":{\"exception\":{\"name\":\"RuntimeError\",\"message\":\"boom\",\"backtrace\":[\"")
+        expect(io.string).to include("RuntimeError (boom) @metadata")
+        expect(io.string).to include("\"event\":{\"server_side_app\":{\"exception\":{\"name\":\"RuntimeError\",\"message\":\"boom\",\"backtrace\":[{\"file\":\"lib/timber/probes/action_controller_user_context.rb\",\"line\":33,\"function\":\"_timber_capture_user_context\"},")
       end
 
       def mock_class

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timber
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.1.13
 platform: ruby
 authors:
 - Timber Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack