coaster 1.3.10 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b2e4ea7b170f104949852f0413f81dac320102b8045377554d8fcc8034004fd
-  data.tar.gz: d20610716bddf3fada3e41f6b9762738ce0eaa3aca7072e5b612d93539d10d0c
+  metadata.gz: f0e72ea3485bb3e0fe4cf4a1ba46a8b9d15121f88451b616f7135a79b6c69513
+  data.tar.gz: 4ea2ff71f70966987d41ee298b06d2b98d94888faf765eb55860a3bc99d042c0
 SHA512:
-  metadata.gz: bf519218cfcabfbe77f9cc8f6f56aafa6810048e443098fa725b0039684806413da62130545265969d43bea81f185811362c35dc1330bac688497fbd5af99287
-  data.tar.gz: 283eb1f6a28247e902bdc986f244b249ceace63fb661c89700e0fe914b598da2acca9147334988de6d472c9327549e256ad4c34f611974dd5977e94053aedd3e
+  metadata.gz: 5395ecbe606496812df91dd98fc79ac6917cc0f89bf85bc3e269deeff9a1316ac562a6273e64f403f85c8fd8a865b3b6307bb9764cc6ba8704cb9908f346cb59
+  data.tar.gz: ae9094a1c819b49a356014c5bcc218291f4ecbb15e0670d3aaf6af88c4e52a19d2eac0b420118260927268fe01a593fb21e4f383395c0800b70b68cc0d42169b

data/lib/coaster/core_ext/standard_error.rb

@@ -29,6 +29,14 @@ class StandardError
       end
     end
 
+    def user_digests_with!(&block)
+      define_method(:user_digests, &block)
+    end
+
+    def user_digests_with_default!
+      define_method(:user_digests) { _user_digests }
+    end
+
     def before_logging(name, &block)
       @before_logging_blocks ||= {}
       @before_logging_blocks[name] = block
@@ -55,21 +63,25 @@ class StandardError
     @tags = {}
     @level = 'error'
     @attributes = HashWithIndifferentAccess.new
-    @attributes.merge!(cause.attributes || {}) if cause && cause.respond_to?(:attributes)
     @tkey = nil
+    if cause && cause.is_a?(StandardError)
+      @fingerprint = cause.fingerprint.dup
+      @tags = cause.tags.dup
+      @level = cause.level
+      @tkey = cause.tkey
+      @attributes = cause.attributes.dup
+    end
 
     case message
-    when Exception
-      msg = message
-      set_backtrace(message.backtrace)
     when StandardError
-      @fingerprint = message.fingerprint
-      @tags = message.tags
+      @fingerprint = [message.fingerprint, @fingerprint].flatten.compact.uniq
+      @tags = @tags.merge(message.tags || {})
       @level = message.level
       @tkey = message.tkey
-      @attributes = message.attributes
+      @attributes = @attributes.merge(message.attributes || {})
+      msg = message
+    when Exception
       msg = message
-      set_backtrace(message.backtrace)
     when Hash then
       @coaster = true # coaster 확장을 사용한 에러임을 확인할 수 있음.
       hash = message.with_indifferent_access rescue message
@@ -100,6 +112,11 @@ class StandardError
     @tags = {} unless @tags.is_a?(Hash)
     msg = "{#{cause.message}}" if msg.blank? && cause
     super(msg)
+    set_backtrace(msg.backtrace) if msg.is_a?(Exception)
+    @fingerprint << digest_message
+    @fingerprint << digest_backtrace
+    @fingerprint.compact!
+    self
   end
 
   def safe_message; message || '' end
@@ -111,7 +128,8 @@ class StandardError
     @digest_message ||= Digest::MD5.hexdigest(m)[0...6]
   end
   def digest_backtrace; @digest_backtrace ||= backtrace ? Digest::MD5.hexdigest(cleaned_backtrace.join("\n"))[0...8] : nil end
-  def user_digests; @user_digests ||= "#{[digest_message, digest_backtrace].compact.join(' ')}" end
+  def _user_digests; "#{[digest_message, digest_backtrace].compact.join(' ')}" end
+  alias_method :user_digests, :_user_digests
   def status;       self.class.status end
   def before_logging_blocks; self.class.before_logging_blocks end
   def after_logging_blocks; self.class.after_logging_blocks end

data/lib/coaster/version.rb

@@ -1,3 +1,3 @@
 module Coaster
-  VERSION = '1.3.10'
+  VERSION = '1.3.13'
 end

data/test/test_backtrace.rb

@@ -178,5 +178,34 @@ module Coaster
         end
       end
     end
+
+    def test_backtrace_to_keep
+      e = ArgumentError.new(m: 'blahasdf', desc: 'qwer')
+      new_e = StandardError.new(e)
+      assert_equal new_e.message, e.message
+      assert_equal new_e.description, e.description
+      assert_nil new_e.backtrace
+      assert_nil e.backtrace
+    end
+
+    def test_backtrace_to_keep_as_cause
+      raise ArgumentError, m: 'blahasdf', desc: 'qwer'
+    rescue => e
+      new_e = StandardError.new(e)
+      assert_equal new_e.message, e.message
+      assert_equal new_e.description, e.description
+      assert_equal new_e.backtrace, e.backtrace
+    end
+
+    def sample_method_for_sse
+      sample_method_for_sse
+    end
+
+    def test_system_stack_error
+      sample_method_for_sse
+    rescue SystemStackError => e
+      new_e = StandardError.new(e)
+      assert_equal new_e.backtrace, e.backtrace
+    end
   end
 end

data/test/test_standard_error.rb

@@ -199,7 +199,9 @@ module Coaster
   MESSAGE: Test example error (Coaster::TestStandardError::ExampleError) cause{Test sample error (Coaster::TestStandardError::SampleError)}
   @attributes: {\"frog\"=>\"rams\", \"wat\"=>\"cha\"}
   @coaster: true
-  @fingerprint: []
+  @digest_backtrace: NilClass
+  @digest_message: a8c7c1
+  @fingerprint: ["a8c7c1"]
   @ins_var: [\"Coaster::TestStandardError::SampleError\", {\"h\"=>1}]
   @ins_varr: {\"dd\"=>true}
   @level: \"error\"
@@ -215,7 +217,9 @@ CAUSE: [Coaster::TestStandardError::SampleError] status:10
     MESSAGE: Test sample error (Coaster::TestStandardError::SampleError)
     @attributes: {"frog"=>"rams"}
     @coaster: true
-    @fingerprint: []
+    @digest_backtrace: NilClass
+    @digest_message: cbe233
+    @fingerprint: ["cbe233"]
     @level: "error"
     @raven: {}
     @tags: {}
@@ -311,7 +315,7 @@ LOG
       assert_equal 'NameError', e.to_hash['type']
       assert_equal 999999, e.to_hash['status']
       assert_equal 500, e.to_hash['http_status']
-      assert_equal 'standard error translation (a962bd 80dfafa3)', e.user_message
+      assert_equal 'standard error translation (a962bd 3a7cb999)', e.user_message
       assert_match(/undefined local variable or method `aa'/, e.to_hash['message'])
     end
 
@@ -344,5 +348,34 @@ LOG
       e = SampleErrorMightHappen.new('fbar')
       assert !e.report?
     end
+
+    def test_user_message_change
+      SampleErrorSub.user_digests_with! do
+        message
+      end
+
+      begin
+        raise SampleError, 'asdff'
+      rescue => e
+        assert_equal e.user_message, 'Test sample error (0dba9e f0fa4c35)'
+      end
+      begin
+        raise SampleErrorSub, 'asdff'
+      rescue => e
+        assert_equal e.user_message, 'Test sample error (asdff)'
+      end
+      begin
+        raise SampleErrorSubSub, 'asdff'
+      rescue => e
+        assert_equal e.user_message, 'Test sample error (asdff)'
+      end
+
+      SampleErrorSubSub.user_digests_with_default!
+      begin
+        raise SampleErrorSubSub, 'asdff'
+      rescue => e
+        assert_equal e.user_message, 'Test sample error (58ee3f 3d0f84b9)'
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coaster
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.3.13
 platform: ruby
 authors:
 - buzz jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n