timber 1.1.13 → 1.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c4f1205077f2126e3ee9c9c52b553f3a0b1fcf4
-  data.tar.gz: 85720eb2baac30ecb300bb959f4fb2ee743dadf7
+  metadata.gz: 423710eb07f5ddad12eebd5cdb105a4557aba07e
+  data.tar.gz: 5c4c3c0303a09157b032b3d8fccc1fd86fe72814
 SHA512:
-  metadata.gz: ce7dbd8e9bed79ee89273a4bf72543ea7b87ff737f934e2724e20f5ff2e4efc90ab6d51fc9e21c4892a3c17b78147327813c40dd37329f0172959863ef73457a
-  data.tar.gz: a18c9a9bbda731c1f87c4729230b3d5db7af1fd25828925ca9ccc04d47d4f14b11139f8df3da35e61948d4863760127ecbc004f07608a035409cf7248c50eb11
+  metadata.gz: 88662c0e6a31886e9a20f4782db1b2bca3b44ae0d8ad501fb4457f1ec8a7aaaf67fd756c25486dfd722a93726153119abba56ca99edbdec5bb9b50db45a574ac
+  data.tar.gz: 676c3525de6505c9e9e514508c10113d27950dc0d597a4a29b78bafe2bc2d546c5456077aa558a62cf3727c0bc31c95f9fa15a9f707a74a86a37096bc850bbce

data/README.md

@@ -99,15 +99,15 @@ The recommended strategy for Heroku is to setup a
 
 <details><summary><strong>Or, all other platforms (Network / HTTP)</strong></summary><p>
 
-1. *Specify* the Timber Network logger backend in `config/environments/production.rb`:
+1. *Specify* the Timber HTTP logger backend in `config/environments/production.rb`:
 
   Replace any existing `config.logger =` calls with:
 
   ```ruby
   # config/environments/production.rb (or staging, etc)
 
-  network_log_device = Timber::LogDevices::Network.new(ENV['TIMBER_LOGS_KEY'])
-  config.logger = ActiveSupport::TaggedLogging.new(Timber::Logger.new(network_log_device))
+  http_log_device = Timber::LogDevices::HTTP.new(ENV['TIMBER_LOGS_KEY'])
+  config.logger = ActiveSupport::TaggedLogging.new(Timber::Logger.new(http_log_device))
   ```
 
 2. Obtain your Timber API :key: by **[adding your app in Timber](https://app.timber.io)**.

data/lib/timber/current_context.rb

@@ -23,13 +23,17 @@ module Timber
         instance.add(*args)
       end
 
+      def hash(*args)
+        instance.hash(*args)
+      end
+
       # Convenience method for {#remove}. See {#remove} for full details and examples.
       def remove(*args)
         instance.remove(*args)
       end
 
-      def hash(*args)
-        instance.hash(*args)
+      def reset(*args)
+        instance.reset(*args)
       end
     end
 
@@ -56,18 +60,11 @@ module Timber
     #
     # @example Adding multiple contexts
     #   Timber::CurrentContext.with(context1, context2) { ... }
-    def with(*contexts)
-      add(*contexts)
+    def with(*objects)
+      add(*objects)
       yield
     ensure
-      contexts.each do |context|
-        if context.keyspace == :custom
-          # Custom contexts are merged and should be removed the same
-          hash[context.keyspace].delete(context.type)
-        else
-          remove(context)
-        end
-      end
+      remove(*objects)
     end
 
     # Adds contexts but does not remove them. See {#with} for automatic maintenance and {#remove}
@@ -83,31 +80,51 @@ module Timber
         if key == :custom
           # Custom contexts are merged into the space
           hash[key] ||= {}
-          hash[key].merge(json)
+          hash[key].merge!(json)
         else
           hash[key] = json
         end
       end
     end
 
-    # Removes a context. This must be a {Timber::Context} type. See {Timber::Contexts} for a list.
-    # If you wish to remove by key, or some other way, use {#hash} and modify the hash accordingly.
-    def remove(*contexts)
-      contexts.each do |context|
-        hash.delete(context.keyspace)
-      end
-    end
-
     # The internal hash that is maintained. It is recommended that you use {#with} and {#add}
     # for hash maintenance.
     def hash
       Thread.current[THREAD_NAMESPACE] ||= {}
     end
 
+    # Removes a context. If you wish to remove by key, or some other way, use {#hash} and
+    # modify the hash accordingly.
+    def remove(*objects)
+      objects.each do |object|
+        if object.is_a?(Symbol)
+          hash.delete(object)
+        else
+          context = Contexts.build(object)
+
+          if context.keyspace == :custom
+            # Custom contexts are merged and should be removed the same
+            hash[context.keyspace].delete(context.type)
+            if hash[context.keyspace] == {}
+              hash.delete(context.keyspace)
+            end
+          else
+            hash.delete(context.keyspace)
+          end
+        end
+      end
+    end
+
+    # Resets the context to be blank. Use this carefully! This will remove *any* context,
+    # include context that is automatically included with Timber.
+    def reset
+      hash.clear
+    end
+
     # Snapshots the current context so that you get a moment in time representation of the context,
     # since the context can change as execution proceeds.
     def snapshot
       hash.clone
     end
   end
-end
+end

data/lib/timber/log_devices/http.rb

@@ -59,7 +59,6 @@ module Timber
       end
 
       TIMBER_URL = "https://logs.timber.io/frames".freeze
-      ACCEPT = "application/json".freeze
       CONTENT_TYPE = "application/msgpack".freeze
       USER_AGENT = "Timber Ruby/#{Timber::VERSION} (HTTP)".freeze
 
@@ -151,7 +150,6 @@ module Timber
           return if msgs.empty?
 
           req = Net::HTTP::Post.new(@timber_url.path)
-          req['Accept'] = ACCEPT
           req['Authorization'] = authorization_payload
           req['Content-Type'] = CONTENT_TYPE
           req['User-Agent'] = USER_AGENT

data/lib/timber/overrides/logger_add.rb

@@ -21,9 +21,6 @@ module Timber
               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

data/lib/timber/probes/action_view_log_subscriber/log_subscriber.rb

@@ -1,4 +1,4 @@
-module Timber
+  module Timber
   module Probes
     class ActionViewLogSubscriber < Probe
       # The log subscriber that replaces the default `ActionView::LogSubscriber`.
@@ -38,23 +38,30 @@ module Timber
         end
 
         def render_collection(event)
-          info do
-            identifier = event.payload[:identifier] || "templates"
-            full_name = from_rails_root(identifier)
-            message = "  Rendered collection of #{full_name}" \
-              " #{render_count(event.payload)} (#{event.duration.round(1)}ms)"
+          if respond_to?(:render_count, true)
+            info do
+              identifier = event.payload[:identifier] || "templates"
+              full_name = from_rails_root(identifier)
+              message = "  Rendered collection of #{full_name}" \
+                " #{render_count(event.payload)} (#{event.duration.round(1)}ms)"
 
-            Events::TemplateRender.new(
-              name: full_name,
-              time_ms: event.duration,
-              message: message
-            )
+              Events::TemplateRender.new(
+                name: full_name,
+                time_ms: event.duration,
+                message: message
+              )
+            end
+          else
+            # Older versions of rails delegate this method to #render_template
+            render_template(event)
           end
         end
 
         private
           def log_rendering_start(payload)
-            # Rails, you silly. We don't need to template rendering messages :)
+            # Consolidates 2 template rendering events into 1. We don't need 2 events for
+            # rendering a template. If you disagree, please feel free to open a PR and we
+            # can make this an option.
           end
       end
     end

data/lib/timber/version.rb

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

data/spec/timber/current_context_spec.rb

@@ -0,0 +1,57 @@
+require "spec_helper"
+
+describe Timber::CurrentContext, :rails_23 => true do
+  describe ".add" do
+    after(:each) do
+      described_class.reset
+    end
+
+    it "should add the context" do
+      expect(described_class.hash).to eq({})
+
+      described_class.add({build: {version: "1.0.0"}})
+      expect(described_class.hash).to eq({:custom=>{:build=>{:version=>"1.0.0"}}})
+
+      described_class.add({testing: {key: "value"}})
+      expect(described_class.hash).to eq({:custom=>{:build=>{:version=>"1.0.0"}, :testing=>{:key=>"value"}}})
+    end
+  end
+
+  describe ".remove" do
+    it "should remove the context by object" do
+      context = {:build=>{:version=>"1.0.0"}}
+      described_class.add(context)
+      expect(described_class.hash).to eq({:custom => context})
+
+      described_class.remove(context)
+      expect(described_class.hash).to eq({})
+    end
+
+    it "should remove context by key" do
+      context = {:build=>{:version=>"1.0.0"}}
+      described_class.add(context)
+      expect(described_class.hash).to eq({:custom => context})
+
+      described_class.remove(:custom)
+      expect(described_class.hash).to eq({})
+    end
+  end
+
+  describe ".with" do
+    it "should merge the context and cleanup on block exit" do
+      expect(described_class.hash).to eq({})
+
+      described_class.with({build: {version: "1.0.0"}}) do
+        expect(described_class.hash).to eq({:custom=>{:build=>{:version=>"1.0.0"}}})
+
+        described_class.with({testing: {key: "value"}}) do
+          expect(described_class.hash).to eq({:custom=>{:build=>{:version=>"1.0.0"}, :testing=>{:key=>"value"}}})
+        end
+
+        expect(described_class.hash).to eq({:custom=>{:build=>{:version=>"1.0.0"}}})
+      end
+
+      expect(described_class.hash).to eq({})
+    end
+  end
+end

data/spec/timber/log_devices/http_spec.rb

@@ -100,7 +100,6 @@ describe Timber::LogDevices::HTTP do
         with(
           :body => start_with("\x92\x85\xA5level\xA4INFO\xA2dt\xBB2016-09-01T12:00:00.000000Z\xA7message\xB2test log message 1\xA7context\x81\xA6system".force_encoding("ASCII-8BIT")),
           :headers => {
-            'Accept' => 'application/json',
             'Authorization' => 'Basic TVlLRVk=',
             'Content-Type' => 'application/msgpack',
             'User-Agent' => "Timber Ruby/#{Timber::VERSION} (HTTP)"

data/spec/timber/probes/action_controller_log_subscriber_spec.rb

@@ -1,68 +1,64 @@
 require "spec_helper"
 
 describe Timber::Probes::ActionControllerLogSubscriber do
-  if defined?(described_class::LogSubscriber)
-    describe described_class::LogSubscriber do
-      let(:time) { Time.utc(2016, 9, 1, 12, 0, 0) }
-      let(:io) { StringIO.new }
-      let(:logger) do
-        logger = Timber::Logger.new(io)
-        logger.level = ::Logger::WARN
-        logger
-      end
-
-      around(:each) do |example|
-        class LogSubscriberController < ActionController::Base
-          layout nil
+  let(:time) { Time.utc(2016, 9, 1, 12, 0, 0) }
+  let(:io) { StringIO.new }
+  let(:logger) do
+    logger = Timber::Logger.new(io)
+    logger.level = ::Logger::WARN
+    logger
+  end
 
-          def index
-            render json: {}
-          end
+  describe "#insert!" do
+    around(:each) do |example|
+      class LogSubscriberController < ActionController::Base
+        layout nil
 
-          def method_for_action(action_name)
-            action_name
-          end
+        def index
+          render json: {}
         end
 
-        ::RailsApp.routes.draw do
-          get 'log_subscriber' => 'log_subscriber#index'
+        def method_for_action(action_name)
+          action_name
         end
+      end
 
-        old_logger = ::ActionController::Base.logger
-        ::ActionController::Base.logger = logger
+      ::RailsApp.routes.draw do
+        get 'log_subscriber' => 'log_subscriber#index'
+      end
 
-        Timecop.freeze(time) { example.run }
+      old_logger = ::ActionController::Base.logger
+      ::ActionController::Base.logger = logger
 
-        Object.send(:remove_const, :LogSubscriberController)
-        ::ActionController::Base.logger = old_logger
-      end
+      Timecop.freeze(time) { example.run }
 
-      describe "#start_processing, #process_action" do
-        it "should not log if the level is not sufficient" do
-          dispatch_rails_request("/log_subscriber")
-          expect(io.string).to eq("")
-        end
+      Object.send(:remove_const, :LogSubscriberController)
+      ::ActionController::Base.logger = old_logger
+    end
 
-        context "with an info level" do
-          around(:each) do |example|
-            old_level = logger.level
-            logger.level = ::Logger::INFO
-            example.run
-            logger.level = old_level
-          end
+    it "should not log if the level is not sufficient" do
+      dispatch_rails_request("/log_subscriber")
+      expect(io.string).to eq("")
+    end
 
-          it "should log the controller call event" do
-            # Rails uses this to calculate the view runtime below
-            allow(Benchmark).to receive(:ms).and_return(1).and_yield
-            dispatch_rails_request("/log_subscriber")
-            lines = io.string.split("\n")
-            expect(lines.length).to eq(2)
-            expect(lines[0]).to start_with('Processing by LogSubscriberController#index as HTML @metadata {"level":"info","dt":"2016-09-01T12:00:00.000000Z"')
-            expect(lines[0]).to include('"event":{"server_side_app":{"controller_call":{"controller":"LogSubscriberController","action":"index"}}}')
-            expect(lines[1]).to start_with('Completed 200 OK in 0.0ms (Views: 1.0ms) @metadata {"level":"info","dt":"2016-09-01T12:00:00.000000Z"')
-            expect(lines[1]).to include('"event":{"server_side_app":{"http_server_response":{"status":200,"time_ms":0.0}}}')
-          end
-        end
+    context "with an info level" do
+      around(:each) do |example|
+        old_level = logger.level
+        logger.level = ::Logger::INFO
+        example.run
+        logger.level = old_level
+      end
+
+      it "should log the controller call event" do
+        # Rails uses this to calculate the view runtime below
+        allow(Benchmark).to receive(:ms).and_return(1).and_yield
+        dispatch_rails_request("/log_subscriber")
+        lines = io.string.split("\n")
+        expect(lines.length).to eq(2)
+        expect(lines[0]).to start_with('Processing by LogSubscriberController#index as HTML @metadata {"level":"info","dt":"2016-09-01T12:00:00.000000Z"')
+        expect(lines[0]).to include('"event":{"server_side_app":{"controller_call":{"controller":"LogSubscriberController","action":"index"}}}')
+        expect(lines[1]).to start_with('Completed 200 OK in 0.0ms (Views: 1.0ms) @metadata {"level":"info","dt":"2016-09-01T12:00:00.000000Z"')
+        expect(lines[1]).to include('"event":{"server_side_app":{"http_server_response":{"status":200,"time_ms":0.0}}}')
       end
     end
   end

data/spec/timber/probes/action_controller_user_context_spec.rb

@@ -1,15 +1,15 @@
 require "spec_helper"
 
 describe Timber::Probes::ActionControllerUserContext do
-  describe described_class::AroundFilter do
-    let(:time) { Time.utc(2016, 9, 1, 12, 0, 0) }
-    let(:io) { StringIO.new }
-    let(:logger) do
-      logger = Timber::Logger.new(io)
-      logger.level = ::Logger::WARN
-      logger
-    end
+  let(:time) { Time.utc(2016, 9, 1, 12, 0, 0) }
+  let(:io) { StringIO.new }
+  let(:logger) do
+    logger = Timber::Logger.new(io)
+    logger.level = ::Logger::WARN
+    logger
+  end
 
+  describe "#insert!" do
     around(:each) do |example|
       class UserContextController < ActionController::Base
         layout nil
@@ -45,11 +45,9 @@ describe Timber::Probes::ActionControllerUserContext do
       ::ActionController::Base.logger = old_logger
     end
 
-    describe "#index" do
-      it "should capture the user context" do
-        dispatch_rails_request("/user_context")
-        expect(io.string).to include("\"user\":{\"id\":\"1\",\"name\":\"Ben Johnson\",\"email\":\"hi@timber.io\"}")
-      end
+    it "should capture the user context" do
+      dispatch_rails_request("/user_context")
+      expect(io.string).to include("\"user\":{\"id\":\"1\",\"name\":\"Ben Johnson\",\"email\":\"hi@timber.io\"}")
     end
   end
 end

data/spec/timber/probes/action_dispatch_debug_exceptions_spec.rb

@@ -1,50 +1,48 @@
 require "spec_helper"
 
 describe Timber::Probes::ActionDispatchDebugExceptions do
-  describe "#{described_class}::*InstanceMethods" do
-    describe "#log_error" do
-      let(:time) { Time.utc(2016, 9, 1, 12, 0, 0) }
-      let(:io) { StringIO.new }
-      let(:logger) do
-        logger = Timber::Logger.new(io)
-        logger.level = ::Logger::DEBUG
-        logger
-      end
-
-      around(:each) do |example|
-        class ExceptionController < ActionController::Base
-          layout nil
+  let(:time) { Time.utc(2016, 9, 1, 12, 0, 0) }
+  let(:io) { StringIO.new }
+  let(:logger) do
+    logger = Timber::Logger.new(io)
+    logger.level = ::Logger::DEBUG
+    logger
+  end
 
-          def index
-            raise "boom"
-          end
+  describe "#insert!" do
+    around(:each) do |example|
+      class ExceptionController < ActionController::Base
+        layout nil
 
-          def method_for_action(action_name)
-            action_name
-          end
+        def index
+          raise "boom"
         end
 
-        ::RailsApp.routes.draw do
-          get 'exception' => 'exception#index'
+        def method_for_action(action_name)
+          action_name
         end
-
-        Timecop.freeze(time) { example.run }
-
-        Object.send(:remove_const, :ExceptionController)
       end
 
-      it "should set the context" do
-        mock_class
-        dispatch_rails_request("/exception")
-        # Because constantly updating the line numbers sucks :/
-        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\"},")
+      ::RailsApp.routes.draw do
+        get 'exception' => 'exception#index'
       end
 
-      def mock_class
-        klass = defined?(::ActionDispatch::DebugExceptions) ? ::ActionDispatch::DebugExceptions : ::ActionDispatch::ShowExceptions
-        allow_any_instance_of(klass).to receive(:logger).and_return(logger)
-      end
+      Timecop.freeze(time) { example.run }
+
+      Object.send(:remove_const, :ExceptionController)
+    end
+
+    it "should set the context" do
+      mock_class
+      dispatch_rails_request("/exception")
+      # Because constantly updating the line numbers sucks :/
+      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
+      klass = defined?(::ActionDispatch::DebugExceptions) ? ::ActionDispatch::DebugExceptions : ::ActionDispatch::ShowExceptions
+      allow_any_instance_of(klass).to receive(:logger).and_return(logger)
     end
   end
 end

data/spec/timber/probes/action_view_log_subscriber_spec.rb

@@ -1,58 +1,104 @@
 require "spec_helper"
 
 describe Timber::Probes::ActionViewLogSubscriber do
-  if defined?(described_class::LogSubscriber)
-    describe described_class::LogSubscriber do
-      let(:time) { Time.utc(2016, 9, 1, 12, 0, 0) }
-      let(:io) { StringIO.new }
-      let(:logger) do
-        logger = Timber::Logger.new(io)
-        logger.level = ::Logger::WARN
-        logger
-      end
-
-      around(:each) do |example|
-        class ActionViewLogSubscriberController < ActionController::Base
-          layout nil
+  let(:time) { Time.utc(2016, 9, 1, 12, 0, 0) }
+  let(:io) { StringIO.new }
+  let(:logger) do
+    logger = Timber::Logger.new(io)
+    logger.level = ::Logger::WARN
+    logger
+  end
 
-          def index
-            render template: "template"
-          end
+  describe "insert!" do
+    around(:each) do |example|
+      class ActionViewLogSubscriberController < ActionController::Base
+        layout nil
 
-          def method_for_action(action_name)
-            action_name
-          end
+        def index
+          render template: "template"
         end
 
-        ::RailsApp.routes.draw do
-          get 'action_view_log_subscriber' => 'action_view_log_subscriber#index'
+        def method_for_action(action_name)
+          action_name
         end
+      end
+
+      ::RailsApp.routes.draw do
+        get 'action_view_log_subscriber' => 'action_view_log_subscriber#index'
+      end
+
+      Timecop.freeze(time) { example.run }
 
-        Timecop.freeze(time) { example.run }
+      Object.send(:remove_const, :ActionViewLogSubscriberController)
+    end
 
-        Object.send(:remove_const, :ActionViewLogSubscriberController)
+    describe "#render_template" do
+      it "should not log if the level is not sufficient" do
+        allow_any_instance_of(Timber::Probes::ActionViewLogSubscriber::LogSubscriber).to receive(:logger).and_return(logger)
+        dispatch_rails_request("/action_view_log_subscriber")
+        expect(io.string).to eq("")
       end
 
-      describe "#sql" do
-        it "should not log if the level is not sufficient" do
+      context "with an info level" do
+        around(:each) do |example|
+          old_level = logger.level
+          logger.level = ::Logger::INFO
+          example.run
+          logger.level = old_level
+        end
+
+        it "should log the controller call event" do
           allow_any_instance_of(Timber::Probes::ActionViewLogSubscriber::LogSubscriber).to receive(:logger).and_return(logger)
           dispatch_rails_request("/action_view_log_subscriber")
-          expect(io.string).to eq("")
+          expect(io.string).to start_with("  Rendered spec/support/rails/templates/template.html (0.0ms) @metadata {\"level\":\"info\"")
+          expect(io.string).to include("\"event\":{\"server_side_app\":{\"template_render\":{\"name\":\"spec/support/rails/templates/template.html\",\"time_ms\":0.0}}},")
+        end
+      end
+    end
+  end
+
+  if defined?(described_class::LogSubscriber)
+    describe described_class::LogSubscriber do
+      let(:event) do
+        event = Struct.new(:duration, :payload)
+        event.new(2, identifier: "path/to/template.html")
+      end
+
+      around(:each) do |example|
+        old_level = logger.level
+        logger.level = ::Logger::INFO
+        example.run
+        logger.level = old_level
+      end
+
+      describe "#render_template" do
+        it "should render the collection" do
+          log_subscriber = described_class.new
+          log_subscriber.stub(:logger) { logger }
+          log_subscriber.render_template(event)
+          expect(io.string).to start_with("  Rendered path/to/template.html (2.0ms) @metadata")
+        end
+      end
+
+      describe "#render_partial" do
+        it "should render the collection" do
+          log_subscriber = described_class.new
+          log_subscriber.stub(:logger) { logger }
+          log_subscriber.render_partial(event)
+          expect(io.string).to start_with("  Rendered path/to/template.html (2.0ms) @metadata")
         end
+      end
 
-        context "with an info level" do
-          around(:each) do |example|
-            old_level = logger.level
-            logger.level = ::Logger::INFO
-            example.run
-            logger.level = old_level
-          end
+      describe "#render_collection" do
+        it "should render the collection" do
+          log_subscriber = described_class.new
+          log_subscriber.stub(:logger) { logger }
+          log_subscriber.render_collection(event)
 
-          it "should log the controller call event" do
-            allow_any_instance_of(Timber::Probes::ActionViewLogSubscriber::LogSubscriber).to receive(:logger).and_return(logger)
-            dispatch_rails_request("/action_view_log_subscriber")
-            expect(io.string).to start_with("  Rendered spec/support/rails/templates/template.html (0.0ms) @metadata {\"level\":\"info\"")
-            expect(io.string).to include("\"event\":{\"server_side_app\":{\"template_render\":{\"name\":\"spec/support/rails/templates/template.html\",\"time_ms\":0.0}}},")
+          if log_subscriber.respond_to?(:render_count, true)
+            expect(io.string).to start_with("  Rendered collection of path/to/template.html [ times] (2.0ms) @metadata ")
+          else
+            expect(io.string).to start_with("  Rendered path/to/template.html (2.0ms) @metadata")
           end
         end
       end

data/spec/timber/probes/active_record_log_subscriber_spec.rb

@@ -1,50 +1,46 @@
 require "spec_helper"
 
 describe Timber::Probes::ActiveRecordLogSubscriber do
-  if defined?(described_class::LogSubscriber)
-    describe described_class::LogSubscriber do
-      let(:time) { Time.utc(2016, 9, 1, 12, 0, 0) }
-      let(:io) { StringIO.new }
-      let(:logger) do
-        logger = Timber::Logger.new(io)
-        logger.level = ::Logger::INFO
-        logger
-      end
+  let(:time) { Time.utc(2016, 9, 1, 12, 0, 0) }
+  let(:io) { StringIO.new }
+  let(:logger) do
+    logger = Timber::Logger.new(io)
+    logger.level = ::Logger::INFO
+    logger
+  end
 
-      around(:each) do |example|
-        old_logger = ::ActiveRecord::Base.logger
-        ::ActiveRecord::Base.logger = logger
+  describe "#insert!" do
+    around(:each) do |example|
+      old_logger = ::ActiveRecord::Base.logger
+      ::ActiveRecord::Base.logger = logger
 
-        Timecop.freeze(time) { example.run }
+      Timecop.freeze(time) { example.run }
 
-        ::ActiveRecord::Base.logger = old_logger
-      end
+      ::ActiveRecord::Base.logger = old_logger
+    end
 
-      describe "#sql" do
-        it "should not log if the level is not sufficient" do
-          User.order("users.id DESC").all.collect # collect kicks the sql because it is lazily executed
-          expect(io.string).to eq("")
-        end
+    it "should not log if the level is not sufficient" do
+      User.order("users.id DESC").all.collect # collect kicks the sql because it is lazily executed
+      expect(io.string).to eq("")
+    end
 
-        context "with an info level" do
-          around(:each) do |example|
-            old_level = logger.level
-            logger.level = ::Logger::DEBUG
-            example.run
-            logger.level = old_level
-          end
+    context "with an info level" do
+      around(:each) do |example|
+        old_level = logger.level
+        logger.level = ::Logger::DEBUG
+        example.run
+        logger.level = old_level
+      end
 
-          it "should log the sql query" do
-            User.order("users.id DESC").all.collect # collect kicks the sql because it is lazily executed
-            # 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("\"event\":{\"server_side_app\":{\"sql_query\"")
-          end
-        end
+      it "should log the sql query" do
+        User.order("users.id DESC").all.collect # collect kicks the sql because it is lazily executed
+        # 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("\"event\":{\"server_side_app\":{\"sql_query\"")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timber
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.14
 platform: ruby
 authors:
 - Timber Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -120,6 +120,7 @@ files:
 - spec/timber/contexts/system_spec.rb
 - spec/timber/contexts/user_spec.rb
 - spec/timber/contexts_spec.rb
+- spec/timber/current_context_spec.rb
 - spec/timber/event_spec.rb
 - spec/timber/events/custom_spec.rb
 - spec/timber/events_spec.rb
@@ -178,6 +179,7 @@ test_files:
 - spec/timber/contexts/system_spec.rb
 - spec/timber/contexts/user_spec.rb
 - spec/timber/contexts_spec.rb
+- spec/timber/current_context_spec.rb
 - spec/timber/event_spec.rb
 - spec/timber/events/custom_spec.rb
 - spec/timber/events_spec.rb