timber 2.0.15 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fb5d7f9bf8255145cfbe6e05c58072f6eb06d1a
-  data.tar.gz: cc7cc1da9a3da82a14077f6ac2d64fff33adf203
+  metadata.gz: 1038cc42a24a78320336990a6773fd333c622798
+  data.tar.gz: adc0a024f67b5bf31c8c11fde6c322daf790d621
 SHA512:
-  metadata.gz: f192dc532458f33e061d2d4912e0507e9f268e15b60693120e40251093e6cb93f7d61bbf34cd5ae03647cd5070979abdefc34eff03237d7f0b129f99ddae3ad7
-  data.tar.gz: b2b7fd1d672662d0a80bb4f72536b39470b6190b8c0bd0a16a37c40cb6ce0b7156eb6d5d23670a1df2c13ce449ed14afaf37aad289dc6e3fd5d2c1e6e238aabe
+  metadata.gz: 4b5e9b1d8a39a5bf05b7f36c552192629f8384737533e8970f301308ef1971da83a1eca589f3cce588a391544e8487ba4db16e2a8d743b2d8bf9811fdf82e8bb
+  data.tar.gz: 08a59f9d54d3e01f12f73ea627593dbe3f5b98493947deee31a6fe05c675fb2839083e3c9eea9cd29bee062bb682c7ca0fc57836b5969412d987587a04216d5f

data/lib/timber/frameworks/rails.rb

@@ -3,24 +3,64 @@ module Timber
     # Module for Rails specific code, such as the Railtie and any methods that assist
     # with Rails setup.
     module Rails
+      # Because of the crazy way Rails sorts it's initializers, it is
+      # impossible for Timber to be inserted after Devise's omnitauth
+      # middlewares.
+      # See: https://github.com/plataformatec/devise/blob/master/lib/devise/rails.rb#L22
+      # As such, we take a brute force approach here, ensuring we are inserted last
+      # no matter what. This ensures that we come after authentication so that we can
+      # properly set the user context.
+      #
+      # @private
+      module MiddlewareStackProxyFix
+        def self.included(klass)
+          klass.class_eval do
+            attr_accessor :timber_operations
+
+            alias old_merge_into merge_into
+
+            # This method does not exist for older versions of rails
+            begin
+              alias old_plus +
+            rescue NameError
+            end
+
+            def +(*args)
+              result = old_plus(*args)
+              result.timber_operations = timber_operations
+              result
+            end
+
+            def merge_into(*args)
+              if timber_operations
+                @operations -= timber_operations
+                @operations += timber_operations
+              end
+              old_merge_into(*args)
+            end
+          end
+        end
+      end
+
+      ::Rails::Configuration::MiddlewareStackProxy.send(:include, MiddlewareStackProxyFix)
+
       # Installs Timber into your Rails app automatically.
       class Railtie < ::Rails::Railtie
         config.timber = Config.instance
 
         # Initialize Timber immediately after the logger in case anything uses the logger
         # during the initialization process.
-        initializer(:timber, group: :all, after: :initialize_logger) do
+        initializer(:timber, after: :initialize_logger) do
           logger = Rails.ensure_timber_logger(::Rails.logger)
           Rails.set_logger(logger)
 
           Integrations.integrate!
-        end
 
-        # Ensures that we insert the middlewares last. We need to insert these last
-        # because initializers, such as Omniauth, insert middleware. If we are not
-        # after these initializers we will not capture user context, for example.
-        initializer(:timber_middlewares, after: :engines_blank_point) do
-          Rails.configure_middlewares(config.app_middleware)
+          timber_operations = Integrations::Rack.middlewares.collect do |middleware_class|
+            [:use, [middleware_class], nil]
+          end
+
+          config.app_middleware.timber_operations = timber_operations
         end
       end
 
@@ -60,17 +100,6 @@ module Timber
         ::ActiveRecord::Base.logger = logger if defined?(::ActiveRecord::Base) && ::ActiveRecord::Base.respond_to?(:logger=)
         ::Rails.logger = logger
       end
-
-      def self.configure_middlewares(middleware)
-        var_name = :"@_timber_middlewares_inserted"
-        return true if middleware.instance_variable_defined?(var_name) && middleware.instance_variable_get(var_name) == true
-
-        # Rails uses a proxy :/, so we need to do this instance variable hack
-        middleware.instance_variable_set(var_name, true)
-        Integrations::Rack.middlewares.each do |middleware_class|
-          middleware.use middleware_class
-        end
-      end
     end
   end
 end

data/lib/timber/version.rb

@@ -1,3 +1,3 @@
 module Timber
-  VERSION = "2.0.15"
+  VERSION = "2.0.16"
 end

data/spec/timber/util/http_event_spec.rb

@@ -0,0 +1,10 @@
+require "spec_helper"
+
+describe Timber::Util::HTTPEvent, :rails_23 => true do
+  describe ".normalize_headers" do
+    it "should ignore nils" do
+      result = described_class.normalize_headers({"key" => nil})
+      expect(result).to eq({"key" => nil})
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timber
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.0.16
 platform: ruby
 authors:
 - Timber Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -243,6 +243,7 @@ files:
 - spec/timber/log_devices/http_spec.rb
 - spec/timber/log_entry_spec.rb
 - spec/timber/logger_spec.rb
+- spec/timber/util/http_event_spec.rb
 - timber.gemspec
 homepage: https://github.com/timberio/timber-ruby
 licenses: []
@@ -299,3 +300,4 @@ test_files:
 - spec/timber/log_devices/http_spec.rb
 - spec/timber/log_entry_spec.rb
 - spec/timber/logger_spec.rb
+- spec/timber/util/http_event_spec.rb