timber 2.0.23 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcda9ae1986cc2ba1cc86941ab161e98cbf87267
-  data.tar.gz: 0dd221e5f41253700dc08a47edd24c9d5097ff6c
+  metadata.gz: 8c631daf0393857de501da9e12c1087f4f6cceda
+  data.tar.gz: 55b336aec1471657a0358d80e7bfabdd1c6a7a1b
 SHA512:
-  metadata.gz: e11eff7209118ea8b0e0731e80ec3e1c24deed610a17eddc13d6becd282c66f906fc5cf48dd065ec07df41d2d174273c6695aaea903110d6fa7e29e8b1fe11ee
-  data.tar.gz: 163e16d153963b5e2d13ce2da63ff70c3158bfd70f7c29f04a72ea6bf5cecb2d5d50380bf70a83cb10a23344c249d125816db574a864b6170d3709a214fb6d2a
+  metadata.gz: 706a67aec83bf76c5a2089c3d7ca14b15226a05fd3113a4896cc0faec27ba7976c439783e7a3f50367ec38e7cbacf9c7611a8e493a4faadfcdc3356610df5634
+  data.tar.gz: c4e70b7199e075ce052593fe0a4d9c12cb83e2ecd0599fbb3188f939d6b234517e07f50d32f7c0daaf0f5a92a635b355830560044d7407de45e57fdf9511bd56

data/lib/timber/util/http_event.rb

@@ -3,6 +3,7 @@ module Timber
     module HTTPEvent
       AUTHORIZATION_HEADER = 'authorization'.freeze
       QUERY_STRING_LIMIT = 5_000.freeze
+      STRING_CLASS_NAME = 'String'.freeze
 
       extend self
 
@@ -26,9 +27,23 @@ module Timber
         if headers.is_a?(::Hash)
           h = headers.each_with_object({}) do |(k, v), h|
             # Force the header into a valid UTF-8 string, otherwise we will encounter
-            # encoding issues when we convert this data to json. Moreoever, if the
+            # encoding issues when we serialize this data. Moreoever, if the
             # data is already valid UTF-8 we don't pay a penalty.
-            h[k] = v && Timber::Util::String.normalize_to_utf8(v)
+            #
+            # Note: we compare the class name because...
+            #
+            #   string = 'my string'.force_encoding('ASCII-8BIT')
+            #   string.is_a?(String) => false
+            #   string.class => String
+            #   string.class == String => false
+            #   string.class.name == "String" => true
+            #
+            # ¯\_(ツ)_/¯
+            if v.class.name == STRING_CLASS_NAME
+              h[k] = Timber::Util::String.normalize_to_utf8(v)
+            else
+              h[k] = v
+            end
           end
 
           keys_to_sanitize = [AUTHORIZATION_HEADER] + (Config.instance.header_filters || [])

data/lib/timber/util/string.rb

@@ -9,7 +9,7 @@ module Timber
         if string.encoding.to_s == UTF8
           string
         else
-          string.encode('UTF-8', {
+          string.encode(UTF8, {
             :invalid => :replace,
             :undef   => :replace,
             :replace => '?'

data/lib/timber/version.rb

@@ -1,3 +1,3 @@
 module Timber
-  VERSION = "2.0.23"
+  VERSION = "2.0.24"
 end

data/spec/timber/util/http_event_spec.rb

@@ -6,5 +6,10 @@ describe Timber::Util::HTTPEvent, :rails_23 => true do
       result = described_class.normalize_headers({"key" => nil})
       expect(result).to eq({"key" => nil})
     end
+
+    it "should handle non strings" do
+      result = described_class.normalize_headers({"key" => 1})
+      expect(result).to eq({"key" => 1})
+    end
   end
 end

metadata

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