exception_notification-lark-notifier 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e0a0ee12c91e89f27b20f8af7803b09cc1cad5c4c81de4f4740add60409af83
-  data.tar.gz: 5c9d14db23ec2f71276cd1cfbfe026fdc620f465dee858b32a5f2876903ee3c8
+  metadata.gz: a952dcfa9e9a72d7ece18771204fb3ccd603c557743483b0bdedee25895ada95
+  data.tar.gz: 8914ae0f5ef4c17d332da7d96ce87df098b968c93b90cdc4e89cebfd9a8a2237
 SHA512:
-  metadata.gz: 2045bebbcc8ef6f9428b28c80203660d37109fc96267b9123a2e0e00872b91b4914ca12695bf2e153d0d86e2df1715ce7129fb62d7be95e098da2fc432425350
-  data.tar.gz: b3bc14d8e61f6caa17d373becb1baeca121ba0b0892c6a28fa7db5664c601f4431b30731ad6356cd190ca78bdf4e49ca4a61282c1364e3458d5b4a5a3eebfee2
+  metadata.gz: f3b006430401da944ee17f5a5e55a2594c97030b8637013b176443641471426a686ee713c82199a3bbb8516910efd5d1be3097d7f9a077ac2105a0e64cc84f1c
+  data.tar.gz: ce331203d3d2cb020ec008d70a1ecbbc207cc20e7253e8011e98e73937bd1a65e61c53c19537966929f7071de1ee252419a36affc59dac63e2a52b80b21dfed6

data/Gemfile.lock

@@ -1,40 +1,40 @@
 PATH
   remote: .
   specs:
-    exception_notification-lark-notifier (0.0.1)
+    exception_notification-lark-notifier (1.0.2)
       exception_notification (~> 4.0)
       http (~> 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (7.0.4)
-      actionpack (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionmailer (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.4)
-      actionview (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionpack (7.0.4.3)
+      actionview (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.4)
-      activesupport (= 7.0.4)
+    actionview (7.0.4.3)
+      activesupport (= 7.0.4.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.4)
-      activesupport (= 7.0.4)
+    activejob (7.0.4.3)
+      activesupport (= 7.0.4.3)
       globalid (>= 0.3.6)
-    activesupport (7.0.4)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -44,7 +44,7 @@ GEM
     ast (2.4.2)
     builder (3.2.4)
     childprocess (4.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -61,7 +61,7 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    globalid (1.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
     http (5.1.1)
@@ -72,7 +72,7 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
     json (2.6.3)
@@ -80,16 +80,16 @@ GEM
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    loofah (2.19.1)
+    loofah (2.21.2)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.8.0)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
     mini_mime (1.1.2)
-    minitest (5.16.3)
+    minitest (5.18.0)
     net-imap (0.3.4)
       date
       net-protocol
@@ -99,7 +99,7 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.4-x86_64-linux)
       racc (~> 1.4)
     overcommit (0.59.1)
       childprocess (>= 0.6.3, < 5)
@@ -110,13 +110,13 @@ GEM
       ast (~> 2.4.1)
     public_suffix (5.0.1)
     racc (1.6.2)
-    rack (2.2.5)
-    rack-test (2.0.2)
+    rack (2.2.7)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
     rainbow (3.1.1)
     rake (13.0.6)
@@ -156,8 +156,8 @@ GEM
       language_server-protocol (~> 3.17.0.2)
       rubocop (= 1.40.0)
       rubocop-performance (= 1.15.1)
-    timeout (0.3.1)
-    tzinfo (2.0.5)
+    timeout (0.3.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext

data/README.md

@@ -55,6 +55,18 @@ The Incoming WebHook URL on Lark.
 
 The secret key for *Signature validation*.
 
+#### app_name
+
+*String, optional*
+
+Your application name, shown in the notification.
+
+#### env_name
+
+*String, optional*
+
+Your env name, shown in the notification.
+
 #### http
 
 *Hash, optional*

data/lib/exception_notification-lark-notifier/http.rb

@@ -21,8 +21,13 @@ module ExceptionNotificationLarkNotifier
       parse_response(response) do |parse_as, result|
         case parse_as
         when :json
-          break result if result["StatusCode"] == 0
-          raise ExceptionNotificationLarkNotifier::Exceptions::APIError, result["msg"]
+          if result.key?("code")
+            break result if result["code"] == 0
+            raise ExceptionNotificationLarkNotifier::Exceptions::APIError, result["msg"]
+          else
+            break result if result["StatusCode"] == 0
+            raise ExceptionNotificationLarkNotifier::Exceptions::APIError, result["StatusMessage"]
+          end
         else
           result
         end

data/lib/exception_notification-lark-notifier/version.rb

@@ -1,3 +1,3 @@
 module ExceptionNotificationLarkNotifier
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/lib/exception_notifier/lark_notifier.rb

@@ -2,19 +2,44 @@ module ExceptionNotifier
   class LarkNotifier
     include ExceptionNotifier::BacktraceCleaner
 
+    class << self
+      def rails_app_name
+        return unless defined?(::Rails) && ::Rails.respond_to?(:application)
+        if ::Gem::Version.new(::Rails.version) >= ::Gem::Version.new("6.0")
+          ::Rails.application.class.module_parent_name
+        else
+          ::Rails.application.class.parent_name
+        end
+      end
+
+      def rails_env_name
+        return unless defined?(::Rails) && ::Rails.respond_to?(:env)
+        ::Rails.env
+      end
+    end
+
     def initialize(options)
-      @default_appname = "#{rails_app_name} (env: #{rails_env_name})" if rails_app_name && rails_env_name
+      @default_app_name = self.class.rails_app_name
+      @default_env_name = self.class.rails_env_name
+      @default_options = options
+
       @notifier = ExceptionNotificationLarkNotifier::Client.new(
         options.slice(:webhook_url, :webhook_secret, :http)
       )
     end
 
-    def call(exception, options = {})
-      title = @default_appname ? "Exception Occurred in #{@default_appname}" : "Exception Occurred"
-      clean_message = exception.message.tr("`", "'")
-      backtrace = exception.backtrace ? clean_backtrace(exception) : ""
-      info, data = information_from_options(exception.class, options)
-      fields = fields(clean_message, backtrace, data)
+    def call(exception, call_options = {})
+      options = call_options.merge(@default_options)
+      app_name = options.delete(:app_name) || @default_app_name
+      env_name = options.delete(:env_name) || @default_env_name
+
+      title = "Exception Occurred"
+      title += " in #{app_name}" if app_name
+      title += " (env: #{env_name})" if env_name
+
+      backtrace = exception.backtrace ? clean_backtrace(exception) : []
+      summary, data = information_from_options(exception.class, options)
+      fields = fields(exception.message, backtrace, data)
 
       @notifier.post interactive: {
         header: {
@@ -22,7 +47,7 @@ module ExceptionNotifier
         },
         elements: [{
           tag: "div",
-          text: {tag: "lark_md", content: info},
+          text: {tag: "lark_md", content: summary},
           fields: fields
         }]
       }
@@ -30,26 +55,26 @@ module ExceptionNotifier
 
     private
 
-    def fields(clean_message, backtrace, data)
+    def fields(message, backtrace, data)
       fields = []
 
-      unless clean_message.empty?
+      unless message.empty?
         fields << {is_short: false, text: {tag: "lark_md", content: "**Message:**"}}
-        fields << {is_short: false, text: {tag: "plain_text", content: clean_message}}
-        fields << {is_short: false, text: {tag: "lark_md", content: "\n"}}
+        fields << {is_short: false, text: {tag: "plain_text", content: message}}
+        fields << {is_short: false, text: {tag: "plain_text", content: "\n"}}
       end
 
       unless backtrace.empty?
         fields << {is_short: false, text: {tag: "lark_md", content: "**Backtrace:**"}}
         fields << {is_short: false, text: {tag: "plain_text", content: backtrace.first(10).join("\n")}}
-        fields << {is_short: false, text: {tag: "lark_md", content: "\n"}}
+        fields << {is_short: false, text: {tag: "plain_text", content: "\n"}}
       end
 
       unless data.empty?
         data = data.map { |k, v| "#{k}: #{v}" }.join("\n")
         fields << {is_short: false, text: {tag: "lark_md", content: "**Data:**"}}
         fields << {is_short: false, text: {tag: "plain_text", content: data}}
-        fields << {is_short: false, text: {tag: "lark_md", content: "\n"}}
+        fields << {is_short: false, text: {tag: "plain_text", content: "\n"}}
       end
 
       fields
@@ -79,19 +104,5 @@ module ExceptionNotifier
 
       [text, data]
     end
-
-    def rails_app_name
-      return unless defined?(::Rails) && ::Rails.respond_to?(:application)
-      if ::Gem::Version.new(::Rails.version) >= ::Gem::Version.new("6.0")
-        ::Rails.application.class.module_parent_name
-      else
-        ::Rails.application.class.parent_name
-      end
-    end
-
-    def rails_env_name
-      return unless defined?(::Rails) && ::Rails.respond_to?(:env)
-      ::Rails.env
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exception_notification-lark-notifier
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - John Doe
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-29 00:00:00.000000000 Z
+date: 2023-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exception_notification