coaster 1.3.11 → 1.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acbec4ff07fe4d7c1dc23f17fef5d7e6cd6d04927b939a3cc4dd1f18d6b06ee6
-  data.tar.gz: e6577b880b519901eeb33c0caa02a0064befb16828b07d4a444bbebfe94078e1
+  metadata.gz: a813e9a52472c914ad88ee95a1022645ffa3a93a2e921aebbb1ab5130b967f59
+  data.tar.gz: c1e74b7ff24af1484c97370c9eef806ffe0a7ca6ad140e818024ab110b4a69bc
 SHA512:
-  metadata.gz: 64d8b9037c64e68d42d25f632d4d0b76f3b4adde43b8946e297b1fd1d34eee4e8c904a62b075f5e973b50ac57cc2e7f9644d64f014c052eb0fc788138ac988fa
-  data.tar.gz: 2e53bfbe09a5c66cd88a1a56a7f8ad2eeede07dfea0a63d4aa20cdddf3dc070004ba7f8cd1b4c492d6013bf22328b71b7b1668e9d079b23572118e3602e3c692
+  metadata.gz: 90b871d5de0b4302cd686db1e1f4c3e11b39e1546420e61dd868b015bb47b20c84867f31d05ed7f274798efe24b6933dbfde42a54ae731478314946747441f7f
+  data.tar.gz: 5253a5d4a178e34c98193a296891ebb32e882531b802a65346b466c00a3e2961bf6400564c50202a9a15ac704ede90d7ccca47d66bc20636c6e3ce0ac32d4dfe

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
@@ -165,7 +183,8 @@ class StandardError
   # user friendly message, for overid
   def user_message
     return _translate if description.present? || tkey.present?
-    "#{_translate} (#{user_digests})"
+    return "#{_translate} (#{user_digests})" unless defined?(@coaster)
+    message
   rescue => e
     "#{message} (user_message_error - #{e.class.name} #{e.message})"
   end

data/lib/coaster/version.rb

@@ -1,3 +1,3 @@
 module Coaster
-  VERSION = '1.3.11'
+  VERSION = '1.3.14'
 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

@@ -88,7 +88,7 @@ module Coaster
       assert_nil e.description
       assert_nil e.desc
       assert_equal 'Test sample error', e._translate
-      assert_equal 'Test sample error (cbe233)', e.user_message
+      assert_equal 'Test sample error (Coaster::TestStandardError::SampleError)', e.user_message
       assert_equal 'Test this title',  e.title
       e = SampleError.new('developer message')
       assert_equal "developer message", e.to_s
@@ -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: {}
@@ -308,10 +312,11 @@ LOG
     def test_to_hash
       aa # raise NameError
     rescue => e
+      bt = e.digest_backtrace
       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 #{bt})", e.user_message
       assert_match(/undefined local variable or method `aa'/, e.to_hash['message'])
     end
 
@@ -344,5 +349,36 @@ 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
+        bt = e.digest_backtrace
+        assert_equal "Test sample error (0dba9e #{bt})", e.user_message
+      end
+      begin
+        raise SampleErrorSub, 'asdff'
+      rescue => e
+        assert_equal 'Test sample error (asdff)', e.user_message
+      end
+      begin
+        raise SampleErrorSubSub, 'asdff'
+      rescue => e
+        assert_equal 'Test sample error (asdff)', e.user_message
+      end
+
+      SampleErrorSubSub.user_digests_with_default!
+      begin
+        raise SampleErrorSubSub, 'asdff'
+      rescue => e
+        bt = e.digest_backtrace
+        assert_equal "Test sample error (58ee3f #{bt})", e.user_message
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coaster
 version: !ruby/object:Gem::Version
-  version: 1.3.11
+  version: 1.3.14
 platform: ruby
 authors:
 - buzz jung
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -169,7 +169,7 @@ homepage: http://github.com/frograms/coaster
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -184,14 +184,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: A little convenient feature for standard library
 test_files:
 - test/locales/en.yml
-- test/test_standard_error.rb
-- test/test_month.rb
 - test/test_backtrace.rb
 - test/test_helper.rb
+- test/test_month.rb
 - test/test_object_translation.rb
+- test/test_standard_error.rb