slack_log_device 5.1.3 → 5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f341ad9a62ebfc4b35e66667ea30f6004938e90a281945c43ac86718a00ebafa
-  data.tar.gz: 6fe8289362507dc6a1c96215b11f15114ed3f72b2270d9f738cce1aeccd8570a
+  metadata.gz: abd06c80c27bf0d22d5e646a6998a0fdba732665296bb13d79872ae67529d5b2
+  data.tar.gz: 826eb4eafe925c5b7411caa868cb2ec837bf22f78e0e9db763c2e70ed55288f7
 SHA512:
-  metadata.gz: 7a7c93726e522eaa5787420f980f167bfe44c03389ec52e97c66a2f50614ff757b16fe1ec8013b93c05ef66ff63ae9017bcef4621310ff3296960ed938d6f57c
-  data.tar.gz: 77db6c7b401bbeed0effdc46705ae29ee5fe93d1dc1993bb07822cccc6b6dd1e3458234e6f7656fa3694a31c0596df7114857b377f524520bde51ffca7bae8a3
+  metadata.gz: bd156b4340ee81c5067b00d083d8838652d452818b52240ee5ca5ea88c02ac98aa1b7ff0992e2c42b331a27de080c2c352ddd61a96125fc598e9ca97624dd17a
+  data.tar.gz: 36fa2812286ef682b815fbb9c8d43cd8acdfcf0fdfb132d954eac2c5a4b7a8a45845c7363ab26228e2407ae11ab200cbe486cc00cd9360c65ae137320ceb6485

data/VERSION

@@ -1 +1 @@
-5.1.3
+5.1.4

data/lib/slack_log_device/formatter.rb

@@ -10,7 +10,6 @@ class SlackLogDevice
       'FATAL' => ':fire:',
       'UNKNOWN' => ':interrobang:',
     }.freeze
-    ENCODING = 'UTF-8'
     MAX_MESSAGE_LENGTH = 4000
 
     attr_reader :extra_metadata, :max_backtrace_lines
@@ -30,7 +29,7 @@ class SlackLogDevice
 
     def call(severity, datetime, progname, message)
       text = "*`#{severity}`*"
-      text << " (*#{progname.encode(ENCODING)}*)" if progname.present?
+      text << " (*#{to_utf8(progname)}*)" if progname.present?
       text << ':'
       if message.is_a?(Exception)
         exception = message
@@ -90,26 +89,27 @@ class SlackLogDevice
 
     def append_exception_backtrace(text, exception)
       backtrace = format_backtrace(exception, MAX_MESSAGE_LENGTH - text.size - 2)
-      backtrace.present? ? "#{text}\n\n#{backtrace}" : text
+      backtrace.present? ? "#{to_utf8(text)}\n\n#{backtrace}" : text
     end
 
     def append_exception_cause(text, exception)
       cause = exception.cause
+      text = to_utf8(text)
       return text if cause.nil?
       message = "\n\nCaused by `#{cause.class}`"
       return text if (text + message).size > MAX_MESSAGE_LENGTH
-      text = truncate("#{text}#{message}: #{cause.message.try(:encode, ENCODING)}")
+      text = truncate("#{text}#{message}: #{to_utf8(cause.message)}")
       text = append_exception_backtrace(text, cause)
       append_exception_cause(text, cause)
     end
 
     def append_metadata(text, message)
       metadata = format_metadata(message, MAX_MESSAGE_LENGTH - text.size - 2)
-      metadata.present? ? "#{text}\n\n#{metadata}" : text
+      metadata.present? ? "#{to_utf8(text)}\n\n#{metadata}" : text
     end
 
     def convert_message(message)
-      @message_converter.call(message.to_s.strip).to_s.strip.encode(ENCODING)
+      to_utf8(@message_converter.call(to_utf8(message.to_s.strip)).to_s.strip)
     end
 
     def default_metadata(request)
@@ -128,14 +128,14 @@ class SlackLogDevice
       })
       metadata.keys.each do |key|
         value = metadata[key]
-        metadata[key] = "`#{value.to_s.strip}`" if value.present?
+        metadata[key] = "`#{to_utf8(value.to_s.strip)}`" if value.present?
       end
       metadata
     end
 
     def format_backtrace(exception, size_available)
       return nil if max_backtrace_lines == 0 || size_available < 7
-      backtrace = (exception.backtrace || []).select(&:present?).compact.map { |line| line.encode(ENCODING) }
+      backtrace = (exception.backtrace || []).select(&:present?).compact.map { |line| to_utf8(line) }
       return nil if backtrace.empty?
       if max_backtrace_lines < 0
         text = backtrace.join("\n")
@@ -154,7 +154,7 @@ class SlackLogDevice
       options[:request] = request if request.present?
       text = default_metadata(request).merge(extra_metadata).map do |name, value|
         value = value.call(options) if value.respond_to?(:call)
-        value.present? ? "• *#{name.encode(ENCODING).strip}*: #{value.encode(ENCODING).strip}" : nil
+        value.present? ? "• *#{to_utf8(name).strip}*: #{to_utf8(value).strip}" : nil
       end.compact.join("\n")
       return nil if text.blank?
       truncate(text, size_available)
@@ -170,7 +170,12 @@ class SlackLogDevice
       message = message.strip
       return message if message.size <= max_length
       return message[0, max_length] if max_length < 3
-      "#{message[0, max_length - 3]}...".encode(ENCODING)
+      to_utf8("#{message[0, max_length - 3]}...")
+    end
+
+    def to_utf8(text)
+      return text if text.nil? || text.encoding == Encoding::UTF_8
+      text.encode(Encoding::UTF_8) rescue text.dup.force_encoding(Encoding::UTF_8)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slack_log_device
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 5.1.4
 platform: ruby
 authors:
 - Alexis Toulotte