hubrise_initializer 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 382ed88d72aceb55e7cc9e65fc93be9415919c88759637252ba356e4c1d00721
-  data.tar.gz: fed70b073a0a56e416c38aa292fe94e53363f91fe50e4cab3f08c463a090f53e
+  metadata.gz: 66f2a6620893b4928f509dceaf4693f00d44e8f7372670d0bb29cb6aae7f88dc
+  data.tar.gz: 0b740151154568d2b42a49f0e508a333b164079a75fbca4513e62c1b4e78d5ce
 SHA512:
-  metadata.gz: 63e0994eb3f19d066d133228a566972fe91edba3f6bad916e6d1172b40d8b72c7cdcceb9491cbb4361d81cbfea30c8f9dbe3b0e814846219a3a671f3e0a68a38
-  data.tar.gz: 3413d1ae4814d3a1ed6671e2688f5013e79706ab27e29e88c1d202b5d9485e5bd9cb5e5bdccc1c78df4b6def8342d03f597f29eee4845ad210e4d7358eb0c341
+  metadata.gz: 38773d3d4ee8cb07554786a4db4cf84625a8d5106b34295cc11914401e8110347217b564d60acb5a817e66e6a3e04fd1fc62f31a54c49dcfd53ba139f24cca48
+  data.tar.gz: 5e37b26c88b4ae570aa938ff59deedbdffc3e7df0862dacab9ec9ee8cda884f900d6b3d0e40d6847f4ca2b5f4535f7a527a0fdf11a61395614d43f4cdc7fc531

data/lib/hubrise_initializer/lograge.rb

@@ -17,9 +17,9 @@ class HubriseInitializer
             if ENV['RAILS_LOGRAGE_QUERY'] == 'true'
               {
                   request_headers: process_request_headers(request).to_s,
-                  request_body: truncate_body(switch_to_utf8(request.raw_post, "Binary (#{request.raw_post.size} bytes)")),
+                  request_body: truncate_body(switch_to_utf8(request.raw_post)),
                   response_headers: response.headers.to_h.to_s,
-                  response_body: truncate_body(response.body),
+                  response_body: truncate_body(switch_to_utf8(response.body))
               }
             else
               {}
@@ -31,12 +31,17 @@ class HubriseInitializer
 
       TRUNCATED_BODY_MAX_LENGTH = 1000
 
-      # Switch string encoding to utf-8. Return fallback if not a valid utf-8 sequence.
-      def switch_to_utf8(s, fallback)
+      # Attempt to switch string encoding to utf-8. Return fallback if not a valid utf-8 sequence.
+      def switch_to_utf8(s)
+        return if !s
+
+        return s if s.encoding == Encoding::UTF_8
+
         s_utf_8 = s.dup.force_encoding(Encoding::UTF_8)
-        s_utf_8.valid_encoding? ?
-            s_utf_8 :
-            fallback
+        return s_utf_8 if s_utf_8.valid_encoding?
+
+        # Fallback for binary data
+        return "Binary (#{s.size} bytes)"
       end
 
       def truncate_body(s)

data/lib/hubrise_initializer/version.rb

@@ -1,3 +1,3 @@
 class HubriseInitializer
-  VERSION = '0.2.5'.freeze
+  VERSION = '0.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hubrise_initializer
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Antoine Monnier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lograge