slack_log_device 5.1.3 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f341ad9a62ebfc4b35e66667ea30f6004938e90a281945c43ac86718a00ebafa
-  data.tar.gz: 6fe8289362507dc6a1c96215b11f15114ed3f72b2270d9f738cce1aeccd8570a
+  metadata.gz: e8cf57d3cec462d6f71fc712a028d98cd6e8670244b8f2c5a904d1afb7832535
+  data.tar.gz: '047883fd1fa893a828ad245cd4d8dfb302bd6114811b76040237ef321c895ef7'
 SHA512:
-  metadata.gz: 7a7c93726e522eaa5787420f980f167bfe44c03389ec52e97c66a2f50614ff757b16fe1ec8013b93c05ef66ff63ae9017bcef4621310ff3296960ed938d6f57c
-  data.tar.gz: 77db6c7b401bbeed0effdc46705ae29ee5fe93d1dc1993bb07822cccc6b6dd1e3458234e6f7656fa3694a31c0596df7114857b377f524520bde51ffca7bae8a3
+  metadata.gz: 27a9b2b9fb885de47b713141d5e72fe61808b48e848adc5fc9b45dd7849626f0e4cdadd78f05f44416889bddb546f4c94c061ff404252432dc65f6f92a444085
+  data.tar.gz: 64789b2fdd1be785d8b3e2b4abaa0fc6a07f6eed76ef192f9982569ee4170f686cb07a1f134cf3ee812a41f59e155385b62992340a9c5c93f60776acc5197aba

data/VERSION

@@ -1 +1 @@
-5.1.3
+6.0.1

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
@@ -28,9 +27,9 @@ class SlackLogDevice
       @message_converter = block_given? ? Proc.new(&block) : -> (message) { message }
     end
 
-    def call(severity, datetime, progname, message)
+    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
@@ -64,7 +63,7 @@ class SlackLogDevice
 
     def icon_emoji=(value)
       value = value.to_s.strip.presence
-      @icon_emojis.keys.each do |severity|
+      @icon_emojis.each_key do |severity|
         @icon_emojis[severity] = value
       end
     end
@@ -77,7 +76,6 @@ class SlackLogDevice
       values.each do |severity, emoji|
         @icon_emojis[parse_severity(severity)] = emoji.to_s.strip.presence
       end
-      @icon_emojis
     end
 
     def max_backtrace_lines=(value)
@@ -90,26 +88,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)
@@ -126,16 +125,16 @@ class SlackLogDevice
         'Machine' => Socket.gethostname,
         'PID' => Process.pid,
       })
-      metadata.keys.each do |key|
+      metadata.each_key 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 +153,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 +169,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

data/lib/slack_log_device.rb

@@ -1,3 +1,4 @@
+require 'active_support/isolated_execution_state'
 require 'active_support/core_ext/hash'
 require 'active_support/core_ext/string'
 require 'httparty'
@@ -53,7 +54,7 @@ class SlackLogDevice
   end
 
   def flush
-    while !@buffer.empty? do
+    until @buffer.empty?
       message = nil
       @mutex.synchronize do
         message = @buffer.pop
@@ -65,9 +66,11 @@ class SlackLogDevice
       data['icon_emoji'] = message.icon_emoji if message.respond_to?(:icon_emoji) && message.icon_emoji.present?
       data['username'] = username if username.present?
       begin
-        HTTParty.post(webhook_url, body: data.to_json, headers: { 'Content-Type' => 'application/json' }, timeout: timeout)
+        HTTParty.post(webhook_url, body: data.to_json, headers: { 'Content-Type' => 'application/json' }, timeout:)
+      # rubocop:disable Lint/RescueException
       rescue Exception => e
-        STDERR.puts(e)
+        # rubocop:enable Lint/RescueException
+        warn(e)
       end
     end
     nil
@@ -111,7 +114,7 @@ class SlackLogDevice
     @mutex.synchronize do
       @buffer << message
     end
-    @flush_thread.kill if @flush_thread
+    @flush_thread&.kill
     if flush?
       flush
     else

data/slack_log_device.gemspec

@@ -9,16 +9,19 @@ Gem::Specification.new do |s|
   s.description = 'LogDevice implementation that post logs on a Slack channel'
   s.license = 'MIT'
 
-  s.files = `git ls-files | grep -vE '^(spec/|test/|\\.|Gemfile|Rakefile)'`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files = %x(git ls-files | grep -vE '^(spec/|test/|\\.|Gemfile|Rakefile)').split("\n")
+  s.executables = %x(git ls-files -- bin/*).split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.1.0'
+  s.required_ruby_version = '>= 3.1.0'
 
-  s.add_dependency 'activesupport', '>= 4.1.0', '< 7.0.0'
-  s.add_dependency 'httparty', '>= 0.14.0', '< 0.18.0'
+  s.add_dependency 'activesupport', '>= 7.0.0', '< 8.0.0'
+  s.add_dependency 'httparty', '>= 0.14.0', '< 0.21.0'
 
   s.add_development_dependency 'byebug', '>= 9.0.0', '< 12.0.0'
-  s.add_development_dependency 'rake', '>= 12.0.0', '< 13.0.0'
-  s.add_development_dependency 'rspec', '>= 3.5.0', '< 3.9.0'
+  s.add_development_dependency 'rake', '>= 12.0.0', '< 14.0.0'
+  s.add_development_dependency 'rspec', '>= 3.5.0', '< 3.11.0'
+  s.add_development_dependency 'rubocop', '>= 1.25.0', '< 2.0.0'
+  s.add_development_dependency 'rubocop-rake', '>= 0.6.0', '< 1.0.0'
+  s.add_development_dependency 'rubocop-rspec', '>= 2.8.0', '< 3.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack_log_device
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 6.0.1
 platform: ruby
 authors:
 - Alexis Toulotte
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2022-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
         version: 12.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: 14.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ dependencies:
         version: 12.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: 14.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
         version: 3.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,7 +109,67 @@ dependencies:
         version: 3.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.11.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.25.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.25.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: LogDevice implementation that post logs on a Slack channel
 email: al@alweb.org
 executables: []
@@ -129,7 +189,7 @@ homepage: https://github.com/alexistoulotte/slack_log_device
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,15 +197,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: LogDevice for Slack
 test_files: []